Huge upade containing several bugfixes related to i18n, and a huge number of new translatable strings, including almost all description messages for command specific completions

darcs-hash:20060108025656-ac50b-e2309829a0afa6b3270d13814e9600d0fd372407.gz

118 files changed, 2009 insertions, 2015 deletions

diff --git a/init/completions/apm.fish b/init/completions/apm.fish
index ed7a32fd..b0067b53 100644
--- a/init/completions/apm.fish
+++ b/init/completions/apm.fish
@@ -1,8 +1,8 @@
 #apm
-complete -f -c apm -s V -l version -d "print version"
-complete -f -c apm -s v -l verbose -d "print APM info"
-complete -f -c apm -s m -l minutes -d "print time remaining"
-complete -f -c apm -s M -l monitor -d "monitor status info"
-complete -f -c apm -s S -l standby -d "request APM standby mode"
-complete -f -c apm -s s -l suspend -d "request APM suspend mode"
-complete -f -c apm -s d -l debug -d "APM status debuggin info"
+complete -f -c apm -s V -l version -d (_ "Display version and exit")
+complete -f -c apm -s v -l verbose -d (_ "print APM info")
+complete -f -c apm -s m -l minutes -d (_ "print time remaining")
+complete -f -c apm -s M -l monitor -d (_ "monitor status info")
+complete -f -c apm -s S -l standby -d (_ "request APM standby mode")
+complete -f -c apm -s s -l suspend -d (_ "request APM suspend mode")
+complete -f -c apm -s d -l debug -d (_ "APM status debugging info")
diff --git a/init/completions/apropos.fish b/init/completions/apropos.fish
index 8caf49bf..0a4e2ae8 100644
--- a/init/completions/apropos.fish
+++ b/init/completions/apropos.fish
@@ -6,16 +6,16 @@ function __fish_complete_apropos
 	end
 end
 
-complete -xc apropos -a '(__fish_complete_apropos)' -d "Whatis entry"
+complete -xc apropos -a '(__fish_complete_apropos)' -d (_ "Whatis entry")
 
-complete -c apropos -s h -l help -d "apropos command help"
-complete -f -c apropos -s d -l debug -d "print debugging info"
-complete -f -c apropos -s v -l verbose -d "print verbose warning"
-complete -f -c apropos -s r -l regex -d "keyword as regex"
-complete -f -c apropos -s w -l wildcard -d "keyword as wildwards"
-complete -f -c apropos -s e -l exact -d "keyword as exactly match"
-complete -x -c apropos -s m -l system -d "search for other system"
-complete -x -c apropos -s M -l manpath -a '(echo $MANPATH)' -d "specify man path"
-complete -x -c apropos -s C -l config-file -d "specify a conf file"
-complete -f -c apropos -s V -l version -d "Display version"
+complete -c apropos -s h -l help -d (_ "Display help and exit")
+complete -f -c apropos -s d -l debug -d (_ "Print debugging info")
+complete -f -c apropos -s v -l verbose -d (_ "Print verbose warning")
+complete -f -c apropos -s r -l regex -d (_ "Keyword as regex")
+complete -f -c apropos -s w -l wildcard -d (_ "Keyword as wildwards")
+complete -f -c apropos -s e -l exact -d (_ "Keyword as exactly match")
+complete -x -c apropos -s m -l system -d (_ "Search for other system")
+complete -x -c apropos -s M -l manpath -a '(echo $MANPATH)' -d (_ "Specify man path")
+complete -x -c apropos -s C -l config-file -d (_ "Specify a conf file")
+complete -f -c apropos -s V -l version -d (_ "Display version and exit")
 
diff --git a/init/completions/apt-build.fish b/init/completions/apt-build.fish
index 370474c2..5934cbd3 100644
--- a/init/completions/apt-build.fish
+++ b/init/completions/apt-build.fish
@@ -1,29 +1,29 @@
 
 #apt-build
-complete -c apt-build -l help -d "apt-build command help"
-complete -f -c apt-build -a update -d "update list of packages"
-complete -f -c apt-build -a upgrade -d "upgrade packages"
-complete -f -c apt-bulid -a world -d "rebuild your system"
-complete -x -c apt-build -a install -d "build and install a new pkg"
-complete -x -c apt-build -a source -d "download and extract a src"
-complete -x -c apt-build -a info -d "info on a pkg"
-complete -x -c apt-build -a remove -d "remove packages"
-complete -x -c apt-build -a clean-build -d "erase built pkgs"
-complete -x -c apt-build -a build-source -d "build src without install"
-complete -x -c apt-build -a clean-sources -d "clean src dirs"
-complete -x -c apt-build -a update-source -d "update src and rebuild them"
-complete -x -c apt-build -a update-repository -d "update the repository"
-complete -f -c apt-build -l nowrapper -d "do not use gcc wrapper"
-complete -f -c apt-build -l remove-builddep -d "remove build-dep"
-complete -f -c apt-build -l no-source -d "do not download source"
-complete -f -c apt-build -l build-dir -d "specify build-dir"
-complete -f -c apt-build -l rebuild -d "rebuild a package"
-complete -f -c apt-build -l reinstall -d "rebuild and install an installed pkg"
-complete -r -f -c apt-build -l build-command -d "use <command> to build"
-complete -r -c apt-build -l patch -d "apply <file> patch"
-complete -c apt-build -s p -l patch-strip -d "prefix to strip on patch"
-complete -c apt-build -s y -l yes -d "assume yes"
-complete -c apt-build -l purge -d "use purge instead of remove"
-complete -c apt-build -l noupdate -d "do not run update"
-complete -r -c apt-build -l source-list -d "specify sources.list file"
-complete -f -c apt-build -s v -l version -d "show version"
+complete -c apt-build -l help -d (_ "Display help and exit")
+complete -f -c apt-build -a update -d (_ "Update list of packages")
+complete -f -c apt-build -a upgrade -d (_ "Upgrade packages")
+complete -f -c apt-bulid -a world -d (_ "Rebuild your system")
+complete -x -c apt-build -a install -d (_ "Build and install a new pkg")
+complete -x -c apt-build -a source -d (_ "Download and extract a src")
+complete -x -c apt-build -a info -d (_ "Info on a pkg")
+complete -x -c apt-build -a remove -d (_ "Remove packages")
+complete -x -c apt-build -a clean-build -d (_ "Erase built pkgs")
+complete -x -c apt-build -a build-source -d (_ "Build src without install")
+complete -x -c apt-build -a clean-sources -d (_ "Clean src dirs")
+complete -x -c apt-build -a update-source -d (_ "Update src and rebuild them")
+complete -x -c apt-build -a update-repository -d (_ "Update the repository")
+complete -f -c apt-build -l nowrapper -d (_ "Do not use gcc wrapper")
+complete -f -c apt-build -l remove-builddep -d (_ "Remove build-dep")
+complete -f -c apt-build -l no-source -d (_ "Do not download source")
+complete -f -c apt-build -l build-dir -d (_ "Specify build-dir")
+complete -f -c apt-build -l rebuild -d (_ "Rebuild a package")
+complete -f -c apt-build -l reinstall -d (_ "Rebuild and install an installed pkg")
+complete -r -f -c apt-build -l build-command -d (_ "Use <command> to build")
+complete -r -c apt-build -l patch -d (_ "Apply <file> patch")
+complete -c apt-build -s p -l patch-strip -d (_ "Prefix to strip on patch")
+complete -c apt-build -s y -l yes -d (_ "Assume yes")
+complete -c apt-build -l purge -d (_ "Use purge instead of remove")
+complete -c apt-build -l noupdate -d (_ "Do not run update")
+complete -r -c apt-build -l source-list -d (_ "Specify sources.list file")
+complete -f -c apt-build -s v -l version -d (_ "Show version")
diff --git a/init/completions/apt-cache.fish b/init/completions/apt-cache.fish
index 5e755af6..7d3444e5 100644
--- a/init/completions/apt-cache.fish
+++ b/init/completions/apt-cache.fish
@@ -1,33 +1,31 @@
 #apt-cache
-complete -c apt-cache -s h -l help -d "apt-cache command help"
-complete -c apt-cache -a add -d "add index files Debug only"
-complete -f -c apt-cache -a gencaches -d "build apt cache"
-complete -x -c apt-cache -a showpkg -d "show package info"
-complete -f -c apt-cache -a stats -d "show cache statistics"
-complete -x -c apt-cache -a showsrc -d "show source package"
-complete -f -c apt-cache -a dump -d "show packages in cache"
-complete -f -c apt-cache -a dumpavail -d "print available list"
-complete -f -c apt-cache -a unmet -d "list unmet dep in cache"
-complete -x -c apt-cache -a show -d "display package record"
-complete -x -c apt-cache -a search -d "search pkgname by REGEX"
-complete -c apt-cache -l full -a search -d "search full package name"
-complete -x -c apt-cache -l names-only -a search -d "search pkgname only"
-complete -x -c apt-cache -a depends -d "list dep for the package"
-complete -x -c apt-cache -a rdepends -d "list reverse dep for the package"
-complete -x -c apt-cache -a pkgnames -d "print package name by prefix"
-complete -x -c apt-cache -a dotty -d "generate dotty output for packages"
-complete -x -c apt-cache -a policy -d "debug preferences file"
-complete -x -c apt-cache -a madison -d "mimic madison"
-complete -r -c apt-cache -s p -l pkg-cache -d "select file to store pkg cache"
-complete -r -c apt-cache -s s -l src-cache -d "select file to store src cache"
-complete -f -c apt-cache -s q -l quiet -d "quiet output"
-complete -f -c apt-cache -s i -l important -d "print important deps"
-complete -f -c apt-cache -s a -l all-versions -d "print full records"
-complete -f -c apt-cache -s g -l generate -d "auto-gen package cache"
-complete -f -c apt-cache -l all-names -d "print all names"
-complete -f -c apt-cache -l recurse -d "dep and rdep recursive"
-complete -f -c apt-cache -l installed -d "limit to installed"
-complete -f -c apt-cache -s v -l version -d "show version"
-complete -r -c apt-cache -s c -l config-file -d "specify config file"
-complete -x -c apt-cache -s o -l option -d "specify options"
+complete -c apt-cache -s h -l help -d (_ "Display help and exit")
+complete -f -c apt-cache -a gencaches -d (_ "Build apt cache")
+complete -x -c apt-cache -a showpkg -d (_ "Show package info")
+complete -f -c apt-cache -a stats -d (_ "Show cache statistics")
+complete -x -c apt-cache -a showsrc -d (_ "Show source package")
+complete -f -c apt-cache -a dump -d (_ "Show packages in cache")
+complete -f -c apt-cache -a dumpavail -d (_ "Print available list")
+complete -f -c apt-cache -a unmet -d (_ "List unmet dep in cache")
+complete -x -c apt-cache -a show -d (_ "Display package record")
+complete -x -c apt-cache -a search -d (_ "Search pkgname by REGEX")
+complete -c apt-cache -l full -a search -d (_ "Search full package name")
+complete -x -c apt-cache -l names-only -a search -d (_ "Search pkgname only")
+complete -x -c apt-cache -a depends -d (_ "List dep for the package")
+complete -x -c apt-cache -a rdepends -d (_ "List reverse dep for the package")
+complete -x -c apt-cache -a pkgnames -d (_ "Print package name by prefix")
+complete -x -c apt-cache -a dotty -d (_ "Generate dotty output for packages")
+complete -x -c apt-cache -a policy -d (_ "Debug preferences file")
+complete -r -c apt-cache -s p -l pkg-cache -d (_ "Select file to store pkg cache")
+complete -r -c apt-cache -s s -l src-cache -d (_ "Select file to store src cache")
+complete -f -c apt-cache -s q -l quiet -d (_ "Quiet mode")
+complete -f -c apt-cache -s i -l important -d (_ "Print important deps")
+complete -f -c apt-cache -s a -l all-versions -d (_ "Print full records")
+complete -f -c apt-cache -s g -l generate -d (_ "Auto-gen package cache")
+complete -f -c apt-cache -l all-names -d (_ "Print all names")
+complete -f -c apt-cache -l recurse -d (_ "Dep and rdep recursive")
+complete -f -c apt-cache -l installed -d (_ "Limit to installed")
+complete -f -c apt-cache -s v -l version -d (_ "Show version")
+complete -r -c apt-cache -s c -l config-file -d (_ "Specify config file")
+complete -x -c apt-cache -s o -l option -d (_ "Specify options")
 
diff --git a/init/completions/apt-cdrom.fish b/init/completions/apt-cdrom.fish
index 12d9dab3..59b268cf 100644
--- a/init/completions/apt-cdrom.fish
+++ b/init/completions/apt-cdrom.fish
@@ -1,13 +1,13 @@
 #apt-cdrom
-complete -c apt-cdrom -s h -l help -d "apt-cdrom command help"
-complete -r -c apt-cdrom -a add -d "add new disc to source list"
-complete -x -c apt-cdrom -a ident -d "report identity of disc"
-complete -r -c apt-cdrom -s d -l cdrom -d "mount point"
-complete -f -c apt-cdrom -s r -l rename -d "rename a disc"
-complete -f -c apt-cdrom -s m -l no-mount -d "no mounting"
-complete -f -c apt-cdrom -s f -l fast -d "fast copy"
-complete -f -c apt-cdrom -s a -l thorough -d "thorough pkg scan"
-complete -f -c apt-cdrom -s n -l no-act -d "no changes"
-complete -f -c apt-cdrom -s v -l version -d "show version"
-complete -r -c apt-cdrom -s c -l config-file -d "specify config file"
-complete -x -c apt-cdrom -s o -l option -d "specify options"
+complete -c apt-cdrom -s h -l help -d (_ "Display help and exit")
+complete -r -c apt-cdrom -a add -d (_ "Add new disc to source list")
+complete -x -c apt-cdrom -a ident -d (_ "Report identity of disc")
+complete -r -c apt-cdrom -s d -l cdrom -d (_ "Mount point")
+complete -f -c apt-cdrom -s r -l rename -d (_ "Rename a disc")
+complete -f -c apt-cdrom -s m -l no-mount -d (_ "No mounting")
+complete -f -c apt-cdrom -s f -l fast -d (_ "Fast copy")
+complete -f -c apt-cdrom -s a -l thorough -d (_ "Thorough pkg scan")
+complete -f -c apt-cdrom -s n -l no-act -d (_ "No changes")
+complete -f -c apt-cdrom -s v -l version -d (_ "Show version")
+complete -r -c apt-cdrom -s c -l config-file -d (_ "Specify config file")
+complete -x -c apt-cdrom -s o -l option -d (_ "Specify options")
diff --git a/init/completions/apt-config.fish b/init/completions/apt-config.fish
index 6bc72c35..26dd5e27 100644
--- a/init/completions/apt-config.fish
+++ b/init/completions/apt-config.fish
@@ -1,7 +1,7 @@
 #apt-config
-complete -c apt-config -s h -l help -d "apt-config command help"
-complete -c apt-config -a shell -d "access config file from shell"
-complete -f -c apt-config -a dump -d "dump contents of config file"
-complete -f -c apt-config -s v -l version -d "show version"
-complete -r -c apt-config -s c -l config-file -d "specify config file"
-complete -x -c apt-config -s o -l option -d "specify options"
+complete -c apt-config -s h -l help -d (_ "Display help and exit")
+complete -c apt-config -a shell -d (_ "Access config file from shell")
+complete -f -c apt-config -a dump -d (_ "Dump contents of config file")
+complete -f -c apt-config -s v -l version -d (_ "Show version")
+complete -r -c apt-config -s c -l config-file -d (_ "Specify config file")
+complete -x -c apt-config -s o -l option -d (_ "Specify options")
diff --git a/init/completions/apt-extracttemplates.fish b/init/completions/apt-extracttemplates.fish
index 23bcff86..f3bdb66d 100644
--- a/init/completions/apt-extracttemplates.fish
+++ b/init/completions/apt-extracttemplates.fish
@@ -1,7 +1,7 @@
 
 #apt-extracttemplates
-complete -c apt-extracttemplates -s h -l help -d "apt-extracttemplates command help"
-complete -r -c apt-extracttemplates -s t -d "set temp dir"
-complete -r -c apt-extracttemplates -s c -d "specifiy config file"
-complete -r -c apt-extracttemplates -s o -d "specify options"
+complete -c apt-extracttemplates -s h -l help -d (_ "Display help and exit")
+complete -r -c apt-extracttemplates -s t -d (_ "Set temp dir")
+complete -r -c apt-extracttemplates -s c -d (_ "Specifiy config file")
+complete -r -c apt-extracttemplates -s o -d (_ "Specify options")
 
diff --git a/init/completions/apt-file.fish b/init/completions/apt-file.fish
index 3a4ce193..50589309 100644
--- a/init/completions/apt-file.fish
+++ b/init/completions/apt-file.fish
@@ -1,17 +1,17 @@
 #apt-file
-complete -c apt-file -s h -l help -d "apt-file command help"
-complete -x -c apt-file -a update -d "resync pkg contents from source"
-complete -r -c apt-file -a search -d "search pkg containing pattern"
-complete -r -c apt-file -a list -d "list contents of a pkg matching pattern"
-complete -x -c apt-file -a purge -d "remove all gz files from cache"
-complete -r -c apt-file -s c -l cache -d "set cache dir"
-complete -f -c apt-file -s v -l verbose -d "run in verbose"
-complete -c apt-file -s d -l cdrom-mount -d "use cdrom-mount-point"
-complete -f -c apt-file -s i -l ignore-case -d "do not expand pattern"
-complete -f -c apt-file -s x -l regexp -d "pattern is regexp"
-complete -f -c apt-file -s V -l version -d "show version"
-complete -f -c apt-file -s a -l architecture -d "set arch"
-complete -r -c apt-file -s s -l sources-list -a "(ls /etc/apt)" -d "set sources.list file"
-complete -f -c apt-file -s l -l package-only -d "only display pkg name"
-complete -f -c apt-file -s F -l fixed-string -d "do not expand pattern"
-complete -f -c apt-file -s y -l dummy -d "run in dummy mode"
+complete -c apt-file -s h -l help -d (_ "Display help and exit")
+complete -x -c apt-file -a update -d (_ "Resync pkg contents from source")
+complete -r -c apt-file -a search -d (_ "Search pkg containing pattern")
+complete -r -c apt-file -a list -d (_ "List contents of a pkg matching pattern")
+complete -x -c apt-file -a purge -d (_ "Remove all gz files from cache")
+complete -r -c apt-file -s c -l cache -d (_ "Set cache dir")
+complete -f -c apt-file -s v -l verbose -d (_ "Run in verbose")
+complete -c apt-file -s d -l cdrom-mount -d (_ "Use cdrom-mount-point")
+complete -f -c apt-file -s i -l ignore-case -d (_ "Do not expand pattern")
+complete -f -c apt-file -s x -l regexp -d (_ "Pattern is regexp")
+complete -f -c apt-file -s V -l version -d (_ "Show version")
+complete -f -c apt-file -s a -l architecture -d (_ "Set arch")
+complete -r -c apt-file -s s -l sources-list -a "(ls /etc/apt)" -d (_ "Set sources.list file")
+complete -f -c apt-file -s l -l package-only -d (_ "Only display pkg name")
+complete -f -c apt-file -s F -l fixed-string -d (_ "Do not expand pattern")
+complete -f -c apt-file -s y -l dummy -d (_ "Run in dummy mode")
diff --git a/init/completions/apt-ftparchive.fish b/init/completions/apt-ftparchive.fish
index cf6a49c2..1e7e1195 100644
--- a/init/completions/apt-ftparchive.fish
+++ b/init/completions/apt-ftparchive.fish
@@ -1,17 +1,17 @@
 #apt-ftparchive
-complete -c apt-ftparchive -s h -l help -d "apt-ftparchive command help"
-complete -f -c apt-ftparchive -a packages -d "generate pkg from source"
-complete -f -c apt-ftparchive -a sources -d "generate source index file"
-complete -f -c apt-ftparchive -a contents -d "generate contents file"
-complete -f -c apt-ftparchive -a release -d "generate release file"
-complete -f -c apt-ftparchive -a clean -d "remove records"
-complete -f -c apt-ftparchive -l md5 -d "generate MD5 sums"
-complete -f -c apt-ftparchive -s d -l db -d "use a binary db"
-complete -f -c apt-ftparchive -s q -l quiet -d "quiet mode"
-complete -f -c apt-ftparchive -l delink -d "perform delinking"
-complete -f -c apt-ftparchive -l contents -d "perform contents generation"
-complete -c apt-ftparchive -s s -l source-override -d "use source override"
-complete -f -c apt-ftparchive -l readonly -d "make caching db readonly"
-complete -f -c apt-ftparchive -s v -l version -d "show version"
-complete -r -c apt-ftparchive -s c -l config-file -d "use config file"
-complete -r -c apt-ftparchive -s o -l option -d "set config options"
+complete -c apt-ftparchive -s h -l help -d (_ "Display help and exit")
+complete -f -c apt-ftparchive -a packages -d (_ "Generate pkg from source")
+complete -f -c apt-ftparchive -a sources -d (_ "Generate source index file")
+complete -f -c apt-ftparchive -a contents -d (_ "Generate contents file")
+complete -f -c apt-ftparchive -a release -d (_ "Generate release file")
+complete -f -c apt-ftparchive -a clean -d (_ "Remove records")
+complete -f -c apt-ftparchive -l md5 -d (_ "Generate MD5 sums")
+complete -f -c apt-ftparchive -s d -l db -d (_ "Use a binary db")
+complete -f -c apt-ftparchive -s q -l quiet -d (_ "Quiet mode")
+complete -f -c apt-ftparchive -l delink -d (_ "Perform delinking")
+complete -f -c apt-ftparchive -l contents -d (_ "Perform contents generation")
+complete -c apt-ftparchive -s s -l source-override -d (_ "Use source override")
+complete -f -c apt-ftparchive -l readonly -d (_ "Make caching db readonly")
+complete -f -c apt-ftparchive -s v -l version -d (_ "Display version and exit")
+complete -r -c apt-ftparchive -s c -l config-file -d (_ "Use config file")
+complete -r -c apt-ftparchive -s o -l option -d (_ "Set config options")
diff --git a/init/completions/apt-get.fish b/init/completions/apt-get.fish
index ec328b8f..27b67a63 100644
--- a/init/completions/apt-get.fish
+++ b/init/completions/apt-get.fish
@@ -1,6 +1,6 @@
 #completion for apt-get
 
-function __fish_apt_no_subcommand -d 'test if apt has yet to be given the subcommand'
+function __fish_apt_no_subcommand -d (_ '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 'test if apt has yet to be given the subcom
 	return 0
 end
 
-function __fish_apt_use_package -d 'Test if apt command should have packages as potential completion'
+function __fish_apt_use_package -d (_ '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 'Test if apt command should have packages as
 	return 1
 end
 
-complete -c apt-get -n '__fish_apt_use_package' -a '(__fish_print_packages)' -d 'Package'
+complete -c apt-get -n '__fish_apt_use_package' -a '(__fish_print_packages)' -d (_ 'Package')
 
-complete -c apt-get -s h -l help -d 'apt-get command help'
-complete -f -n '__fish_apt_no_subcommand' -c apt-get -a 'update' -d 'update sources'
-complete -f -n '__fish_apt_no_subcommand' -c apt-get -a 'upgrade' -d 'upgrade or install newest packages'
-complete -f -n '__fish_apt_no_subcommand' -c apt-get -a 'dselect-upgrade' -d 'use with dselect front-end'
-complete -f -n '__fish_apt_no_subcommand' -c apt-get -a 'dist-upgrade' -d 'distro upgrade'
-complete -f -n '__fish_apt_no_subcommand' -c apt-get -a 'install' -d 'install one or more packages'
-complete -f -n '__fish_apt_no_subcommand' -c apt-get -a 'remove' -d 'remove one or more packages'
-complete -f -n '__fish_apt_no_subcommand' -c apt-get -a 'source' -d 'fetch source packages'
-complete -f -n '__fish_apt_no_subcommand' -c apt-get -a 'build-dep' -d 'install/remove packages for dependencies'
-complete -f -n '__fish_apt_no_subcommand' -c apt-get -a 'check' -d 'update cache and check dep'
-complete -f -n '__fish_apt_no_subcommand' -c apt-get -a 'clean' -d 'clean local caches and packages'
-complete -f -n '__fish_apt_no_subcommand' -c apt-get -a 'autoclean' -d 'clean packages no longer be downloaded'
-complete -c apt-get -s d -l download-only -d 'Download Only'
-complete -c apt-get -s f -l fix-broken -d 'correct broken deps'
-complete -c apt-get -s m -l fix-missing -d 'ignore missing packages'
-complete -c apt-get -l no-download -d 'Disable downloading packages'
-complete -c apt-get -s q -l quiet -d 'quiet output'
-complete -c apt-get -s s -l simulate -d 'perform a siulation'
-complete -c apt-get -s y -l assume-yes -d 'automatic yes to prompts'
-complete -c apt-get -s u -l show-upgraded -d 'show upgraded packages'
-complete -c apt-get -s V -l verbose-versions -d 'show full versions for packages'
-complete -c apt-get -s b -l compile -d 'compile source packages'
-complete -c apt-get -s b -l build -d 'compile source packages'
-complete -c apt-get -l ignore-hold -d 'ignore package Holds'
-complete -c apt-get -l no-upgrade -d 'Do not upgrade packages'
-complete -c apt-get -l force-yes -d 'Force yes'
-complete -c apt-get -l print-uris -d 'print the URIs'
-complete -c apt-get -l purge -d 'use purge instead of remove'
-complete -c apt-get -l reinstall -d 'reinstall packages'
-complete -c apt-get -l list-cleanup -d 'erase obsolete files'
-complete -c apt-get -s t -l target-release -d 'control default input to the policy engine'
-complete -c apt-get -l trivial-only -d 'only perform operations that are trivial'
-complete -c apt-get -l no-remove -d 'abort if any packages are to be removed'
-complete -c apt-get -l only-source -d 'only accept source packages'
-complete -c apt-get -l diff-only -d 'download only diff file'
-complete -c apt-get -l tar-only -d 'download only tar file'
-complete -c apt-get -l arch-only -d 'only process arch-dep build-deps'
-complete -c apt-get -l allow-unauthenticated -d 'ignore non-authenticated packages'
-complete -c apt-get -s v -l version -d 'show program version'
-complete -r -c apt-get -s c -l config-file -d 'specify a config file'
-complete -r -c apt-get -s o -l option -d 'set a config option'
+complete -c apt-get -s h -l help -d (_ 'Apt-get command help')
+complete -f -n '__fish_apt_no_subcommand' -c apt-get -a 'update' -d (_ 'Update sources')
+complete -f -n '__fish_apt_no_subcommand' -c apt-get -a 'upgrade' -d (_ 'Upgrade or install newest packages')
+complete -f -n '__fish_apt_no_subcommand' -c apt-get -a 'dselect-upgrade' -d (_ 'Use with dselect front-end')
+complete -f -n '__fish_apt_no_subcommand' -c apt-get -a 'dist-upgrade' -d (_ 'Distro upgrade')
+complete -f -n '__fish_apt_no_subcommand' -c apt-get -a 'install' -d (_ 'Install one or more packages')
+complete -f -n '__fish_apt_no_subcommand' -c apt-get -a 'remove' -d (_ 'Remove one or more packages')
+complete -f -n '__fish_apt_no_subcommand' -c apt-get -a 'source' -d (_ 'Fetch source packages')
+complete -f -n '__fish_apt_no_subcommand' -c apt-get -a 'build-dep' -d (_ 'Install/remove packages for dependencies')
+complete -f -n '__fish_apt_no_subcommand' -c apt-get -a 'check' -d (_ 'Update cache and check dep')
+complete -f -n '__fish_apt_no_subcommand' -c apt-get -a 'clean' -d (_ 'Clean local caches and packages')
+complete -f -n '__fish_apt_no_subcommand' -c apt-get -a 'autoclean' -d (_ 'Clean packages no longer be downloaded')
+complete -c apt-get -s d -l download-only -d (_ 'Download Only')
+complete -c apt-get -s f -l fix-broken -d (_ 'Correct broken deps')
+complete -c apt-get -s m -l fix-missing -d (_ 'Ignore missing packages')
+complete -c apt-get -l no-download -d (_ 'Disable downloading packages')
+complete -c apt-get -s q -l quiet -d (_ 'Quiet mode')
+complete -c apt-get -s s -l simulate -d (_ 'Perform a siulation')
+complete -c apt-get -s y -l assume-yes -d (_ 'Automatic yes to prompts')
+complete -c apt-get -s u -l show-upgraded -d (_ 'Show upgraded packages')
+complete -c apt-get -s V -l verbose-versions -d (_ 'Show full versions for packages')
+complete -c apt-get -s b -l compile -d (_ 'Compile source packages')
+complete -c apt-get -s b -l build -d (_ 'Compile source packages')
+complete -c apt-get -l ignore-hold -d (_ 'Ignore package Holds')
+complete -c apt-get -l no-upgrade -d (_ 'Do not upgrade packages')
+complete -c apt-get -l force-yes -d (_ 'Force yes')
+complete -c apt-get -l print-uris -d (_ 'Print the URIs')
+complete -c apt-get -l purge -d (_ 'Use purge instead of remove')
+complete -c apt-get -l reinstall -d (_ 'Reinstall packages')
+complete -c apt-get -l list-cleanup -d (_ 'Erase obsolete files')
+complete -c apt-get -s t -l target-release -d (_ 'Control default input to the policy engine')
+complete -c apt-get -l trivial-only -d (_ 'Only perform operations that are trivial')
+complete -c apt-get -l no-remove -d (_ 'Abort if any packages are to be removed')
+complete -c apt-get -l only-source -d (_ 'Only accept source packages')
+complete -c apt-get -l diff-only -d (_ 'Download only diff file')
+complete -c apt-get -l tar-only -d (_ 'Download only tar file')
+complete -c apt-get -l arch-only -d (_ 'Only process arch-dep build-deps')
+complete -c apt-get -l allow-unauthenticated -d (_ 'Ignore non-authenticated packages')
+complete -c apt-get -s v -l version -d (_ 'Show program version')
+complete -r -c apt-get -s c -l config-file -d (_ 'Specify a config file')
+complete -r -c apt-get -s o -l option -d (_ 'Set a config option')
 
diff --git a/init/completions/apt-key.fish b/init/completions/apt-key.fish
index 391ff635..0e5dc2e4 100644
--- a/init/completions/apt-key.fish
+++ b/init/completions/apt-key.fish
@@ -1,5 +1,5 @@
 #apt-key
-complete -r -c apt-key -a add -d "add a new key"
-complete -f -c apt-key -a del -d "remove a key"
-complete -f -c apt-key -a list -d "list trusted keys"
+complete -r -c apt-key -a add -d (_ "Add a new key")
+complete -f -c apt-key -a del -d (_ "Remove a key")
+complete -f -c apt-key -a list -d (_ "List trusted keys")
 
diff --git a/init/completions/apt-listbugs.fish b/init/completions/apt-listbugs.fish
index eec950e3..44fa579c 100644
--- a/init/completions/apt-listbugs.fish
+++ b/init/completions/apt-listbugs.fish
@@ -1,25 +1,25 @@
 #apt-listbugs
-complete -c apt-listbugs -s h -l help -d "apt-listbugs command help"
-complete -f -c apt-listbugs -s s -l severity -a "critical grave"  -d "set severity"
-complete -f -c apt-listbugs -s T -l tag -d "Targs you want to see"
-complete -f -c apt-listbugs -s S -l stats -d "outstanding 'pending upload' resolved done open" -d "status you want to see"
-complete -f -c apt-listbugs -s l -l showless -d "ignore bugs in your system"
-complete -f -c apt-listbugs -s g -l showgreater -d "ignore newer bugs than upgrade pkgs"
-complete -f -c apt-listbugs -s D -l show-downgrade -d "bugs for downgrade pkgs"
-complete -f -c apt-listbugs -s H -l hostname -a "osdn.debian.or.jp" -d "Bug Tracking system"
-complete -f -c apt-listbugs -s p -l port -d "specify port for web interface"
-complete -f -c apt-listbugs -s R -l release-critical -d "use daily bug report"
-complete -f -c apt-listbugs -s I -l index -d "use the raw index.db"
-complete -f -c apt-listbugs -s X -l indexdir -d "specify index dir"
-complete -f -c apt-listbugs -s P -l pin-priority -d "specify Pin-Priority value"
-complete -f -c apt-listbugs -l title -d "specify the title of rss"
-complete -f -c apt-listbugs -s f -l force-download -d "retrieve fresh bugs"
-complete -f -c apt-listbugs -s q -l quiet -d "do not display progress bar"
-complete -f -c apt-listbugs -s c -l cache-dir -a "/var/cache/apt-listbugs/" -d "specify local cache dir"
-complete -f -c apt-listbugs -s t -l timer -d "specify the expire cache timer"
-complete -c apt-listbugs -s C -l aptconf -d "specify apt config file"
-complete -f -c apt-listbugs -s y -l force-yes -d "assume all yes"
-complete -f -c apt-listbugs -s n -l force-no -d "assume all no"
-complete -c apt-listbugs -a list -d "list bugs from pkgs"
-complete -c apt-listbugs -a rss -d "list bugs in rss format"
+complete -c apt-listbugs -s h -l help -d (_ "Apt-listbugs command help")
+complete -f -c apt-listbugs -s s -l severity -a "critical grave"  -d (_ "Set severity")
+complete -f -c apt-listbugs -s T -l tag -d (_ "Targs you want to see")
+complete -f -c apt-listbugs -s S -l stats -d (_ "Outstanding 'pending upload' resolved done open") -d "status you want to see"
+complete -f -c apt-listbugs -s l -l showless -d (_ "Ignore bugs in your system")
+complete -f -c apt-listbugs -s g -l showgreater -d (_ "Ignore newer bugs than upgrade pkgs")
+complete -f -c apt-listbugs -s D -l show-downgrade -d (_ "Bugs for downgrade pkgs")
+complete -f -c apt-listbugs -s H -l hostname -a "osdn.debian.or.jp" -d (_ "Bug Tracking system")
+complete -f -c apt-listbugs -s p -l port -d (_ "Specify port for web interface")
+complete -f -c apt-listbugs -s R -l release-critical -d (_ "Use daily bug report")
+complete -f -c apt-listbugs -s I -l index -d (_ "Use the raw index.db")
+complete -f -c apt-listbugs -s X -l indexdir -d (_ "Specify index dir")
+complete -f -c apt-listbugs -s P -l pin-priority -d (_ "Specify Pin-Priority value")
+complete -f -c apt-listbugs -l title -d (_ "Specify the title of rss")
+complete -f -c apt-listbugs -s f -l force-download -d (_ "Retrieve fresh bugs")
+complete -f -c apt-listbugs -s q -l quiet -d (_ "Do not display progress bar")
+complete -f -c apt-listbugs -s c -l cache-dir -a "/var/cache/apt-listbugs/" -d (_ "Specify local cache dir")
+complete -f -c apt-listbugs -s t -l timer -d (_ "Specify the expire cache timer")
+complete -c apt-listbugs -s C -l aptconf -d (_ "Specify apt config file")
+complete -f -c apt-listbugs -s y -l force-yes -d (_ "Assume all yes")
+complete -f -c apt-listbugs -s n -l force-no -d (_ "Assume all no")
+complete -c apt-listbugs -a list -d (_ "List bugs from pkgs")
+complete -c apt-listbugs -a rss -d (_ "List bugs in rss format")
 
diff --git a/init/completions/apt-listchanges.fish b/init/completions/apt-listchanges.fish
index c02cb1af..cbb388ca 100644
--- a/init/completions/apt-listchanges.fish
+++ b/init/completions/apt-listchanges.fish
@@ -1,13 +1,13 @@
 #apt-listchanges
-complete -c apt-listchanges -l help -d "apt-listchanges command help"
-complete -c apt-listchanges -l apt -d "read filenames from pipe"
-complete -f -c apt-listchanges -s v -l verbose -d "verbose info"
-complete -f -c apt-listchanges -s f -l frontend -a "pager browser xterm-pager xterm-browser text mail none" -d "select fronend interface"
-complete -r -f -c apt-listchanges -l email-address -d "specify email address"
-complete -f -c apt-listchanges -s c -l confirm -d "ask confirmation"
-complete -f -c apt-listchanges -s a -l all -d "display all changelogs"
-complete -r -c apt-listchanges -l save_seen -d "avoid changelogs from db in named file"
-complete -r -f -c apt-listchanges -l which -a "news changelogs both" -d "select display"
-complete -f -c apt-listchanges -s h -l headers -d "insert header"
-complete -f -c apt-listchanges -l debug -d "display debug info"
-complete -r -c apt-listchanges -l profile -d "select an option profile"
+complete -c apt-listchanges -l help -d (_ "Apt-listchanges command help")
+complete -c apt-listchanges -l apt -d (_ "Read filenames from pipe")
+complete -f -c apt-listchanges -s v -l verbose -d (_ "Verbose info")
+complete -f -c apt-listchanges -s f -l frontend -a "pager browser xterm-pager xterm-browser text mail none" -d (_ "Select fronend interface")
+complete -r -f -c apt-listchanges -l email-address -d (_ "Specify email address")
+complete -f -c apt-listchanges -s c -l confirm -d (_ "Ask confirmation")
+complete -f -c apt-listchanges -s a -l all -d (_ "Display all changelogs")
+complete -r -c apt-listchanges -l save_seen -d (_ "Avoid changelogs from db in named file")
+complete -r -f -c apt-listchanges -l which -a "news changelogs both" -d (_ "Select display")
+complete -f -c apt-listchanges -s h -l headers -d (_ "Insert header")
+complete -f -c apt-listchanges -l debug -d (_ "Display debug info")
+complete -r -c apt-listchanges -l profile -d (_ "Select an option profile")
diff --git a/init/completions/apt-move.fish b/init/completions/apt-move.fish
index 62b53bbc..57bf43e3 100644
--- a/init/completions/apt-move.fish
+++ b/init/completions/apt-move.fish
@@ -1,23 +1,23 @@
 #apt-move
-complete -c apt-move -a get -d "generate master file"
-complete -c apt-move -a getlocal -d "alias of get"
-complete -f -c apt-move -a move -d "move pkgs to local tree"
-complete -f -c apt-move -a delete -d "delete obsolete pkg files"
-complete -f -c apt-move -a packages -d "build new local files"
-complete -f -c apt-move -a fsck -d "rebuild index files"
-complete -f -c apt-move -a update -d "move pkgs from cache to local mirror"
-complete -f -c apt-move -a local -d "alias to move delete packages"
-complete -f -c apt-move -a localupdate -d "alias for update"
-complete -f -c apt-move -a mirror -d "download pkg missing from mirror"
-complete -f -c apt-move -a sync -d "sync pkgs installed"
+complete -c apt-move -a get -d (_ "Generate master file")
+complete -c apt-move -a getlocal -d (_ "Alias of get")
+complete -f -c apt-move -a move -d (_ "Move pkgs to local tree")
+complete -f -c apt-move -a delete -d (_ "Delete obsolete pkg files")
+complete -f -c apt-move -a packages -d (_ "Build new local files")
+complete -f -c apt-move -a fsck -d (_ "Rebuild index files")
+complete -f -c apt-move -a update -d (_ "Move pkgs from cache to local mirror")
+complete -f -c apt-move -a local -d (_ "Alias to move delete packages")
+complete -f -c apt-move -a localupdate -d (_ "Alias for update")
+complete -f -c apt-move -a mirror -d (_ "Download pkg missing from mirror")
+complete -f -c apt-move -a sync -d (_ "Sync pkgs installed")
 complete -f -c apt-move -a exclude -d 'test $LOCALDIR/.exclude file'
-complete -c apt-move -a movefile -d "move file from CLI"
-complete -f -c apt-move -a listbin -d "mirror|sync|repo"
-complete -f -c apt-move -a mirrorbin -d "fetch pkg from STDIN"
-complete -f -c apt-move -a mirrorsrc -d "fetch src pkg from STDIN"
-complete -f -c apt-move -s a -d "process all pkgs"
-complete -c apt-move -s c -d "use specific conffile"
-complete -f -c apt-move -s d -d "use specific dist"
-complete -f -c apt-move -s f -d "force deletion"
-complete -f -c apt-move -s q -d "suppresses normal output"
-complete -f -c apt-move -s t -d "test run"
+complete -c apt-move -a movefile -d (_ "Move file from CLI")
+complete -f -c apt-move -a listbin -d (_ "Mirror|sync|repo")
+complete -f -c apt-move -a mirrorbin -d (_ "Fetch pkg from STDIN")
+complete -f -c apt-move -a mirrorsrc -d (_ "Fetch src pkg from STDIN")
+complete -f -c apt-move -s a -d (_ "Process all pkgs")
+complete -c apt-move -s c -d (_ "Use specific conffile")
+complete -f -c apt-move -s d -d (_ "Use specific dist")
+complete -f -c apt-move -s f -d (_ "Force deletion")
+complete -f -c apt-move -s q -d (_ "Suppresses normal output")
+complete -f -c apt-move -s t -d (_ "Test run")
diff --git a/init/completions/apt-proxy-import.fish b/init/completions/apt-proxy-import.fish
index 97d880ac..1529936e 100644
--- a/init/completions/apt-proxy-import.fish
+++ b/init/completions/apt-proxy-import.fish
@@ -1,10 +1,10 @@
 #apt-proxy-import
-complete -c apt-proxy-import -s h -l help -d 'apt-proxy-import command help'
-complete -f -c apt-proxy-import -s V -l version -d 'print version'
-complete -f -c apt-proxy-import -s v -l verbose -d 'verbose info'
-complete -f -c apt-proxy-import -s q -l quiet -d 'no message to STDOUT'
-complete -f -c apt-proxy-import -s r -l recursive -d 'recurse into subdir'
-complete -r -c apt-proxy-import -s i -l import-dir -a '(ls -Fp|grep /$)' -d 'dir to import'
-complete -r -c apt-proxy-import -s u -l user -a '(__fish_complete_users)' -d 'change to user'
-complete -r -c apt-proxy-import -s d -l debug -d 'debug level[default 0]'
+complete -c apt-proxy-import -s h -l help -d (_ 'Apt-proxy-import command help')
+complete -f -c apt-proxy-import -s V -l version -d (_ 'Print version')
+complete -f -c apt-proxy-import -s v -l verbose -d (_ 'Verbose info')
+complete -f -c apt-proxy-import -s q -l quiet -d (_ 'No message to STDOUT')
+complete -f -c apt-proxy-import -s r -l recursive -d (_ 'Recurse into subdir')
+complete -r -c apt-proxy-import -s i -l import-dir -a '(ls -Fp|grep /$)' -d (_ 'Dir to import')
+complete -r -c apt-proxy-import -s u -l user -a '(__fish_complete_users)' -d (_ 'Change to user')
+complete -r -c apt-proxy-import -s d -l debug -d (_ 'Debug level[default 0]')
 
diff --git a/init/completions/apt-rdepends.fish b/init/completions/apt-rdepends.fish
index 30cd6482..c3e649db 100644
--- a/init/completions/apt-rdepends.fish
+++ b/init/completions/apt-rdepends.fish
@@ -1,13 +1,13 @@
 #apt-rdepends
-complete -c apt-rdepends -l help -d "apt-rdepends command help"
-complete -f -c apt-rdepends -s b -l build-depends -d "show bulid deps"
-complete -f -c apt-rdepends -s d -l dotty -d "generate a dotty graph"
-complete -f -c apt-rdepends -s p -l print-state -d "show state of deps"
-complete -f -c apt-rdepends -s r -l reverse -d "list pkgs depending on"
-complete -r -f -c apt-rdepends -s f -l follow -d "only follow DEPENDS recursively"
-complete -r -f -c apt-rdepends -s s -l show -d "only show DEPENDS"
-complete -r -f -c apt-rdepends -l state-follow -d "only follow STATES recursively"
-complete -r -f -c apt-rdepends -l state-show -d "only show STATES"
-complete -f -c apt-rdepends -l man -d "display man page"
-complete -f -c apt-rdepends -l version -d "print version"
+complete -c apt-rdepends -l help -d (_ "Apt-rdepends command help")
+complete -f -c apt-rdepends -s b -l build-depends -d (_ "Show bulid deps")
+complete -f -c apt-rdepends -s d -l dotty -d (_ "Generate a dotty graph")
+complete -f -c apt-rdepends -s p -l print-state -d (_ "Show state of deps")
+complete -f -c apt-rdepends -s r -l reverse -d (_ "List pkgs depending on")
+complete -r -f -c apt-rdepends -s f -l follow -d (_ "Only follow DEPENDS recursively")
+complete -r -f -c apt-rdepends -s s -l show -d (_ "Only show DEPENDS")
+complete -r -f -c apt-rdepends -l state-follow -d (_ "Only follow STATES recursively")
+complete -r -f -c apt-rdepends -l state-show -d (_ "Only show STATES")
+complete -f -c apt-rdepends -l man -d (_ "Display man page")
+complete -f -c apt-rdepends -l version -d (_ "Print version")
 
diff --git a/init/completions/apt-setup.fish b/init/completions/apt-setup.fish
index 715d0f35..b57b95db 100644
--- a/init/completions/apt-setup.fish
+++ b/init/completions/apt-setup.fish
@@ -1,4 +1,4 @@
 #apt-setup
-complete -c apt-setup -a probe -d "probe a CD"
-complete -c apt-setup -s N -d "run in noninteractive mode"
+complete -c apt-setup -a probe -d (_ "Probe a CD")
+complete -c apt-setup -s N -d (_ "Run in noninteractive mode")
 
diff --git a/init/completions/apt-show-source.fish b/init/completions/apt-show-source.fish
index fc1b459f..ad9ab452 100644
--- a/init/completions/apt-show-source.fish
+++ b/init/completions/apt-show-source.fish
@@ -1,10 +1,10 @@
 #apt-show-source
-complete -c apt-show-source -s h -l help -d 'apt-show-source command help'
-complete -r -c apt-show-source -l status-file -d 'read pkg from FILE' -f
-complete -r -c apt-show-source -o stf -d 'read pkg from FILE' -f
-complete -r -c apt-show-source -l list-dir -a '(ls -Fp .|grep /$) /var/lib/apt/lists' -d 'specify APT list dir'
-complete -r -c apt-show-source -o ld -a '(ls -Fp .|grep /$) /var/lib/apt/lists' -d 'specify APT list dir'
-complete -r -c apt-show-source -s p -l package -a '(apt-cache pkgnames)' -d 'list PKG info'
-complete -f -c apt-show-source -l version-only -d 'print version only'
-complete -f -c apt-show-source -s a -l all -d 'print all src pkgs with version'
-complete -f -c apt-show-source -s v -l verbose -d 'verbose message'
+complete -c apt-show-source -s h -l help -d (_ 'Apt-show-source command help')
+complete -r -c apt-show-source -l status-file -d (_ 'Read pkg from FILE') -f
+complete -r -c apt-show-source -o stf -d (_ 'Read pkg from FILE') -f
+complete -r -c apt-show-source -l list-dir -a '(ls -Fp .|grep /$) /var/lib/apt/lists' -d (_ 'Specify APT list dir')
+complete -r -c apt-show-source -o ld -a '(ls -Fp .|grep /$) /var/lib/apt/lists' -d (_ 'Specify APT list dir')
+complete -r -c apt-show-source -s p -l package -a '(apt-cache pkgnames)' -d (_ 'List PKG info')
+complete -f -c apt-show-source -l version-only -d (_ 'Print version only')
+complete -f -c apt-show-source -s a -l all -d (_ 'Print all src pkgs with version')
+complete -f -c apt-show-source -s v -l verbose -d (_ 'Verbose message')
diff --git a/init/completions/apt-show-versions.fish b/init/completions/apt-show-versions.fish
index 733327f4..5c1b5f56 100644
--- a/init/completions/apt-show-versions.fish
+++ b/init/completions/apt-show-versions.fish
@@ -1,14 +1,14 @@
 #apt-show-versions
-complete -c apt-show-source -s h -l help -d 'apt-show-versions command help'
-complete -r -c apt-show-versions -s p -l packages -a '(apt-cache pkgnames)' -d 'print PKG versions'
-complete -f -c apt-show-versions -s r -l regex -d 'using regex'
-complete -f -c apt-show-versions -s u -l upgradeable -d 'print only upgradeable pkgs'
-complete -f -c apt-show-versions -s a -l allversions -d 'print all versions'
-complete -f -c apt-show-versions -s b -l brief -d 'print pkg name/distro'
-complete -f -c apt-show-versions -s v -l verbose -d 'print verbose info'
-complete -f -c apt-show-versions -s i -l initialize -d 'init or update cache only'
-complete -r -c apt-show-versions -l status-file -d 'read pkg from FILE'
-complete -r -c apt-show-versions -o stf -d 'read pkg from FILE'
-complete -r -c apt-show-versions -l list-dir -a '(ls -Fp .|grep /$) /var/lib/apt/lists /var/state/apt/lists' -d 'specify APT list dir'
-complete -r -c apt-show-versions -o ld -a '(ls -Fp .|grep /$) /var/lib/apt/lists /var/state/apt/lists' -d 'specify APT list dir'
+complete -c apt-show-source -s h -l help -d (_ 'Apt-show-versions command help')
+complete -r -c apt-show-versions -s p -l packages -a '(apt-cache pkgnames)' -d (_ 'Print PKG versions')
+complete -f -c apt-show-versions -s r -l regex -d (_ 'Using regex')
+complete -f -c apt-show-versions -s u -l upgradeable -d (_ 'Print only upgradeable pkgs')
+complete -f -c apt-show-versions -s a -l allversions -d (_ 'Print all versions')
+complete -f -c apt-show-versions -s b -l brief -d (_ 'Print pkg name/distro')
+complete -f -c apt-show-versions -s v -l verbose -d (_ 'Print verbose info')
+complete -f -c apt-show-versions -s i -l initialize -d (_ 'Init or update cache only')
+complete -r -c apt-show-versions -l status-file -d (_ 'Read pkg from FILE')
+complete -r -c apt-show-versions -o stf -d (_ 'Read pkg from FILE')
+complete -r -c apt-show-versions -l list-dir -a '(ls -Fp .|grep /$) /var/lib/apt/lists /var/state/apt/lists' -d (_ 'Specify APT list dir')
+complete -r -c apt-show-versions -o ld -a '(ls -Fp .|grep /$) /var/lib/apt/lists /var/state/apt/lists' -d (_ 'Specify APT list dir')
 
diff --git a/init/completions/apt-sortpkgs.fish b/init/completions/apt-sortpkgs.fish
index 86c3cfbe..9c47f91f 100644
--- a/init/completions/apt-sortpkgs.fish
+++ b/init/completions/apt-sortpkgs.fish
@@ -1,7 +1,7 @@
 #apt-sortpkgs
-complete -c apt-sortpkgs -s h -l help -d "apt-sortpkgs command help"
-complete -f -c apt-sortpkgs -s s -l source -d "use source index field"
-complete -f -c apt-sortpkgs -s v -l version -d "show version"
-complete -r -c apt-sortpkgs -s c -l conf-file -d "specify conffile"
-complete -r -f -c apt-sortpkgs -s o -l option -d "set config options"
+complete -c apt-sortpkgs -s h -l help -d (_ "Apt-sortpkgs command help")
+complete -f -c apt-sortpkgs -s s -l source -d (_ "Use source index field")
+complete -f -c apt-sortpkgs -s v -l version -d (_ "Show version")
+complete -r -c apt-sortpkgs -s c -l conf-file -d (_ "Specify conffile")
+complete -r -f -c apt-sortpkgs -s o -l option -d (_ "Set config options")
 
diff --git a/init/completions/apt-spy.fish b/init/completions/apt-spy.fish
index ab9471c4..971daf4d 100644
--- a/init/completions/apt-spy.fish
+++ b/init/completions/apt-spy.fish
@@ -1,20 +1,20 @@
 #apt-spy
-complete -c apt-spy -s h -d "apt-spy command help"
-complete -f -c apt-spy -s d -a "stable testing unstable" -d "Debian distribtion"
-complete -f -c apt-spy -s a -a "Africa Asia Europe North-America Oceania South-America" -d "servers in the areas"
-complete -c apt-spy -s c -d "conf file"
-complete -f -c apt-spy -s e -d "finish after number of servers"
-complete -c apt-spy -s f -d "file to grab servers"
-complete -c apt-spy -s i -d "file as input"
-complete -c apt-spy -s m -d "mirror-list file"
-complete -c apt-spy -s o -d "output sources.list file"
-complete -f -c apt-spy -s p -d "use proxy server"
-complete -f -c apt-spy -s s -d "comma separated country list"
-complete -f -c apt-spy -s t -d "how long in sec to download"
-complete -f -c apt-spy -s u -d "custom URL to get mirror list"
-complete -c apt-spy -s w -d "write top servers to file"
-complete -f -c apt-spy -s n -d "number of top servers"
-complete -f -c apt-spy -a "update" -d "update mirror list"
-complete -f -c apt-spy -s v -d "version number"
+complete -c apt-spy -s h -d (_ "Apt-spy command help")
+complete -f -c apt-spy -s d -a "stable testing unstable" -d (_ "Debian distribtion")
+complete -f -c apt-spy -s a -a "Africa Asia Europe North-America Oceania South-America" -d (_ "Servers in the areas")
+complete -c apt-spy -s c -d (_ "Conf file")
+complete -f -c apt-spy -s e -d (_ "Finish after number of servers")
+complete -c apt-spy -s f -d (_ "File to grab servers")
+complete -c apt-spy -s i -d (_ "File as input")
+complete -c apt-spy -s m -d (_ "Mirror-list file")
+complete -c apt-spy -s o -d (_ "Output sources.list file")
+complete -f -c apt-spy -s p -d (_ "Use proxy server")
+complete -f -c apt-spy -s s -d (_ "Comma separated country list")
+complete -f -c apt-spy -s t -d (_ "How long in sec to download")
+complete -f -c apt-spy -s u -d (_ "Custom URL to get mirror list")
+complete -c apt-spy -s w -d (_ "Write top servers to file")
+complete -f -c apt-spy -s n -d (_ "Number of top servers")
+complete -f -c apt-spy -a "update" -d (_ "Update mirror list")
+complete -f -c apt-spy -s v -d (_ "Version number")
 
 
diff --git a/init/completions/apt-src.fish b/init/completions/apt-src.fish
index bbea22a0..a3fd9324 100644
--- a/init/completions/apt-src.fish
+++ b/init/completions/apt-src.fish
@@ -1,24 +1,24 @@
 #apt-src
-complete -c apt-src -s h -l help -d "apt-src command help"
-complete -f -c apt-src -a "update" -d "update list of src pkgs"
-complete -f -c apt-src -a "install" -d "install src pkgs"
-complete -f -c apt-src -a "upgrade" -d "upgrade src pkgs"
-complete -f -c apt-src -a "remove" -d "remove src pkgs"
-complete -f -c apt-src -a "build" -d "build src pkgs"
-complete -f -c apt-src -a "clean" -d "clean src pkgs"
-complete -f -c apt-src -a "import" -d "detect known src tree"
-complete -f -c apt-src -a "list" -d "list installed src pkg\(s\)"
-complete -f -c apt-src -a "location" -d "root src tree"
-complete -f -c apt-src -a "version" -d "version of src pkg"
-complete -f -c apt-src -a "name" -d "name of the src pkg"
-complete -f -c apt-src -s b -l build -d "build src pkgs"
-complete -f -c apt-src -s i -l installdebs -d "install after build"
-complete -f -c apt-src -s p -l patch -d "patch local changes"
-complete -r -c apt-src -s l -l location -d "specify a dir"
-complete -c apt-src -s c -l here -d "run on current dir"
-complete -f -c apt-src -l upstream-version -d "omit debian version"
-complete -f -c apt-src -s k -l keep-built -d "do not del built files"
-complete -f -c apt-src -s n -l no-delete-source -d "do not del source files"
-complete -f -c apt-src -l version -d "source tree version"
-complete -f -c apt-src -s q -l quiet -d "output to /dev/null"
-complete -f -c apt-src -s t -l trace -d "output trace"
+complete -c apt-src -s h -l help -d (_ "Apt-src command help")
+complete -f -c apt-src -a "update" -d (_ "Update list of src pkgs")
+complete -f -c apt-src -a "install" -d (_ "Install src pkgs")
+complete -f -c apt-src -a "upgrade" -d (_ "Upgrade src pkgs")
+complete -f -c apt-src -a "remove" -d (_ "Remove src pkgs")
+complete -f -c apt-src -a "build" -d (_ "Build src pkgs")
+complete -f -c apt-src -a "clean" -d (_ "Clean src pkgs")
+complete -f -c apt-src -a "import" -d (_ "Detect known src tree")
+complete -f -c apt-src -a "list" -d (_ "List installed src pkg\(s\)")
+complete -f -c apt-src -a "location" -d (_ "Root src tree")
+complete -f -c apt-src -a "version" -d (_ "Version of src pkg")
+complete -f -c apt-src -a "name" -d (_ "Name of the src pkg")
+complete -f -c apt-src -s b -l build -d (_ "Build src pkgs")
+complete -f -c apt-src -s i -l installdebs -d (_ "Install after build")
+complete -f -c apt-src -s p -l patch -d (_ "Patch local changes")
+complete -r -c apt-src -s l -l location -d (_ "Specify a dir")
+complete -c apt-src -s c -l here -d (_ "Run on current dir")
+complete -f -c apt-src -l upstream-version -d (_ "Omit debian version")
+complete -f -c apt-src -s k -l keep-built -d (_ "Do not del built files")
+complete -f -c apt-src -s n -l no-delete-source -d (_ "Do not del source files")
+complete -f -c apt-src -l version -d (_ "Source tree version")
+complete -f -c apt-src -s q -l quiet -d (_ "Output to /dev/null")
+complete -f -c apt-src -s t -l trace -d (_ "Output trace")
diff --git a/init/completions/apt-zip-inst.fish b/init/completions/apt-zip-inst.fish
index 8fe7bb3d..4fbf840a 100644
--- a/init/completions/apt-zip-inst.fish
+++ b/init/completions/apt-zip-inst.fish
@@ -1,10 +1,10 @@
 #apt-zip-inst
-complete -c apt-zip-inst -s h -l help -d "apt-zip-inst command help"
-complete -f -c apt-zip-inst -s V -l version -d "show version"
-complete -c apt-zip-inst -s m -l medium -d "removable medium"
-complete -f -c apt-zip-inst -s a -l aptgetaction -a "dselect-upgrade upgrade dist-upgrade" -d "select an action"
-complete -c apt-zip-inst -s p -l packages -d "list of pkgs to install"
-complete -f -c apt-zip-inst -s f -l fix-broken -d "fix broken option"
-complete -c apt-zip-inst -l skip-mount -d "specify a non-mountpoint dir"
+complete -c apt-zip-inst -s h -l help -d (_ "Display help and exit")
+complete -f -c apt-zip-inst -s V -l version -d (_ "Show version")
+complete -c apt-zip-inst -s m -l medium -d (_ "Removable medium")
+complete -f -c apt-zip-inst -s a -l aptgetaction -a "dselect-upgrade upgrade dist-upgrade" -d (_ "Select an action")
+complete -c apt-zip-inst -s p -l packages -d (_ "List of pkgs to install")
+complete -f -c apt-zip-inst -s f -l fix-broken -d (_ "Fix broken option")
+complete -c apt-zip-inst -l skip-mount -d (_ "Specify a non-mountpoint dir")
 
 
diff --git a/init/completions/apt-zip-list.fish b/init/completions/apt-zip-list.fish
index ee91bd82..cdb3f6ef 100644
--- a/init/completions/apt-zip-list.fish
+++ b/init/completions/apt-zip-list.fish
@@ -1,13 +1,13 @@
 #apt-zip-list
-complete -c apt-zip-list -s h -l help -d "apt-zip-list command help"
-complete -f -c apt-zip-list -s V -l version -d "show version"
-complete -c apt-zip-list -s m -l medium -d "removable medium"
-complete -f -c apt-zip-list -s a -l aptgetaction -a "dselect-upgrade upgrade dist-upgrade" -d "select an action"
-complete -c apt-zip-list -s p -l packages -d "list of pkgs to install"
-complete -f -c apt-zip-list -s f -l fix-broken -d "fix broken option"
-complete -c apt-zip-list -l skip-mount -d "specify a non-mountpoint dir"
-complete -c apt-zip-list -s M -l method -d "select a method"
-complete -c apt-zip-list -s o -l options -a "tar restart" -d "specify options"
-complete -c apt-zip-list -s A -l accept -a "http ftp" -d "accept protocols"
-complete -c apt-zip-list -s R -l reject -a "http ftp" -d "reject protocols"
+complete -c apt-zip-list -s h -l help -d (_ "Display help and exit")
+complete -f -c apt-zip-list -s V -l version -d (_ "Show version")
+complete -c apt-zip-list -s m -l medium -d (_ "Removable medium")
+complete -f -c apt-zip-list -s a -l aptgetaction -a "dselect-upgrade upgrade dist-upgrade" -d (_ "Select an action")
+complete -c apt-zip-list -s p -l packages -d (_ "List of pkgs to install")
+complete -f -c apt-zip-list -s f -l fix-broken -d (_ "Fix broken option")
+complete -c apt-zip-list -l skip-mount -d (_ "Specify a non-mountpoint dir")
+complete -c apt-zip-list -s M -l method -d (_ "Select a method")
+complete -c apt-zip-list -s o -l options -a "tar restart" -d (_ "Specify options")
+complete -c apt-zip-list -s A -l accept -a "http ftp" -d (_ "Accept protocols")
+complete -c apt-zip-list -s R -l reject -a "http ftp" -d (_ "Reject protocols")
 
diff --git a/init/completions/arp.fish b/init/completions/arp.fish
index 27195e71..f691b182 100644
--- a/init/completions/arp.fish
+++ b/init/completions/arp.fish
@@ -1,11 +1,11 @@
 #completion for arp
-complete -c arp -s v -l verbose -d "verbose mode"
-complete -c arp -s n -l numeric -d "numerical address"
-complete -x -c arp -s H -l tw-type -a "ether arcnet pronet ax25 netrom" -d "class of hw type"
-complete -c arp -s a -l display -x -a "(__fish_print_hostnames)" -d "show arp entries"
-complete -x -c arp -s d -l delete -a "(__fish_print_hostnames)" -d "remove an entry for hostname"
-complete -c arp -s D -l use-device -d "use hardware address"
-complete -x -c arp -s i -l device -a "(__fish_print_interfaces)" -d "select interface"
-complete -x -c arp -s s -l set -d "Manually create ARP address" -a "(__fish_print_hostnames)"
-complete -f -c arp -s f -l file -d "taken addr from filename, default /etc/ethers" 
+complete -c arp -s v -l verbose -d (_ "Verbose mode")
+complete -c arp -s n -l numeric -d (_ "numerical address")
+complete -x -c arp -s H -l tw-type -a "ether arcnet pronet ax25 netrom" -d (_ "class of hw type")
+complete -c arp -s a -l display -x -a "(__fish_print_hostnames)" -d (_ "show arp entries")
+complete -x -c arp -s d -l delete -a "(__fish_print_hostnames)" -d (_ "remove an entry for hostname")
+complete -c arp -s D -l use-device -d (_ "use hardware address")
+complete -x -c arp -s i -l device -a "(__fish_print_interfaces)" -d (_ "select interface")
+complete -x -c arp -s s -l set -d (_ "Manually create ARP address") -a "(__fish_print_hostnames)"
+complete -f -c arp -s f -l file -d (_ "take addr from filename, default /etc/ethers") 
 
diff --git a/init/completions/at.fish b/init/completions/at.fish
index c4243b55..54450138 100644
--- a/init/completions/at.fish
+++ b/init/completions/at.fish
@@ -1,10 +1,10 @@
 #at
-complete -f -c at -s V -d "print version"
-complete -f -c at -s q -d "use specified queue"
-complete -f -c at -s m -d "send mail to user"
-complete -c at -s f -x -a "(__fish_complete_suffix (commandline -ct) '' 'At job')" -d "Read job from file"
-complete -f -c at -s l -d "alias for atq"
-complete -f -c at -s d -d "alias for atrm"
-complete -f -c at -s v -d "show the time"
-complete -f -c at -s c -d "cat the jobs listed"
+complete -f -c at -s V -d (_ "Display version and exit")
+complete -f -c at -s q -d (_ "Use specified queue")
+complete -f -c at -s m -d (_ "Send mail to user")
+complete -c at -s f -x -a "(__fish_complete_suffix (commandline -ct) '' 'At job')" -d (_ "Read job from file")
+complete -f -c at -s l -d (_ "Alias for atq")
+complete -f -c at -s d -d (_ "Alias for atrm")
+complete -f -c at -s v -d (_ "Show the time")
+complete -f -c at -s c -d (_ "Print the jobs listed")
 
diff --git a/init/completions/atd.fish b/init/completions/atd.fish
index 0360a267..61dcb0cc 100644
--- a/init/completions/atd.fish
+++ b/init/completions/atd.fish
@@ -1,6 +1,6 @@
 #atd
-complete -f -c atd -s l -d "limiting load factor"
-complete -f -c atd -s b -d "minimum interval in seconds"
-complete -f -c atd -s d -d "Debug mode"
-complete -f -c atd -s s -d "process at queue only once"
+complete -f -c atd -s l -d (_ "limiting load factor")
+complete -f -c atd -s b -d (_ "minimum interval in seconds")
+complete -f -c atd -s d -d (_ "Debug mode")
+complete -f -c atd -s s -d (_ "process at queue only once")
 
diff --git a/init/completions/atq.fish b/init/completions/atq.fish
index c018d703..1a5665c9 100644
--- a/init/completions/atq.fish
+++ b/init/completions/atq.fish
@@ -1,4 +1,4 @@
 #atq
-complete -f -c atq -s V -d "print version"
-complete -f -c atq -s q -d "use specified queue"
+complete -f -c atq -s V -d (_ "print version")
+complete -f -c atq -s q -d (_ "use specified queue")
 
diff --git a/init/completions/atrm.fish b/init/completions/atrm.fish
index 2834d0d6..5a09e789 100644
--- a/init/completions/atrm.fish
+++ b/init/completions/atrm.fish
@@ -1,2 +1,2 @@
 #atrm
-complete -f -c atrm -s V -d "print version"
+complete -f -c atrm -s V -d (_ "print version")
diff --git a/init/completions/bc.fish b/init/completions/bc.fish
index c783e54f..e05d0992 100644
--- a/init/completions/bc.fish
+++ b/init/completions/bc.fish
@@ -1,9 +1,9 @@
 # Completions for the binary calculator
 
-complete -c bc -s i -l interactive -d "Force interactive mode"
-complete -c bc -s l -l math-lib -d "Define math library"
-complete -c bc -s w -l warn -d "Give warnings for extensions to POSIX bc"
-complete -c bc -s s -l standard -d "Process exactly POSIX bc"
-complete -c bc -s q -l quiet -d "Do not print the GNU welcome"
-complete -c bc -s v -l version -d "Display version and exit"
-complete -c bc -s h -l help -d "Display help and exit"
+complete -c bc -s i -l interactive -d (_ "Force interactive mode")
+complete -c bc -s l -l math-lib -d (_ "Define math library")
+complete -c bc -s w -l warn -d (_ "Give warnings for extensions to POSIX bc")
+complete -c bc -s s -l standard -d (_ "Process exactly POSIX bc")
+complete -c bc -s q -l quiet -d (_ "Do not print the GNU welcome")
+complete -c bc -s v -l version -d (_ "Display version and exit")
+complete -c bc -s h -l help -d (_ "Display help and exit")
diff --git a/init/completions/btdownloadheadless.py.fish b/init/completions/btdownloadheadless.py.fish
index 366cd640..0fb89804 100644
--- a/init/completions/btdownloadheadless.py.fish
+++ b/init/completions/btdownloadheadless.py.fish
@@ -1,34 +1,33 @@
 # Bittorrent commands
 
 for i in btdownloadcurses.py btdownloadheadless.py;
-	complete -c $i -l max_uploads -x -d "Maximum uploads at once"
-	complete -c $i -l keepalive_interval -x -d "Number of seconds between keepalives"
-	complete -c $i -l download_slice_size -x -d "Bytes per request"
-	complete -c $i -l request_backlog -x -d "Requests per pipe"
-	complete -c $i -l max_message_length -x -d "Maximum length prefix encoding"
-	complete -c $i -l ip -d "IP to report to the tracker" -x -a "(__fish_print_addresses)"
-	complete -c $i -l minport -d "Minimum port to listen to"
-	complete -c $i -l maxport -d "Maximum port to listen to"
-	complete -c $i -l responsefile -r -d "File for server response"
-	complete -c $i -l url -x -d "URL to get file from"
-	complete -c $i -l saveas -r -d "Local file target"
-	complete -c $i -l timeout -x -d "Time to close inactive socket"
-	complete -c $i -l timeout_check_interval -x -d "Time between checking timeouts"
-	complete -c $i -l max_slice_length -x -d "Maximum outgoing slice length"
-	complete -c $i -l max_rate_period -x -d "Maximum time to guess rate"
-	complete -c $i -l bind -x -d "IP to bind to locally" -a "(__fish_print_addresses)"
-	complete -c $i -l upload_rate_fudge -x -d "time equivalent of writing to kernel-level TCP buffer"
-	complete -c $i -l display_interval -x -d "Time between screen updates"
-	complete -c $i -l rerequest_interval -x -d "Time to wait between requesting more peers"
-	complete -c $i -l min_peers -x -d "Minimum number of peers to not do requesting"
-	complete -c $i -l http_timeout -x -d "Number of seconds before assuming http timeout"
-	complete -c $i -l max_initiate -x -d "Number of peers at which to stop initiating new connections"
-	complete -c $i -l max_allow_in -x -d "Maximum number of connections to allow"
-	complete -c $i -l check_hashes -x -d "Whether to check hashes on disk"
-	complete -c $i -l max_upload_rate -x -d "Maximum kB/s to upload at"
-	complete -c $i -l snub_time -x -d "Seconds to wait for data to come in before assuming choking"
-	complete -c $i -l spew -x -d "Whether to display diagnostic info"
-	complete -c $i -l rarest_first_cutoff -x -d "Number of downloads at which to switch from random to rarest first"
-	complete -c $i -l min_uploads -x -d "Number of uploads to fill out to with optimistic unchokes"
-	complete -c $i -l report_hash_failiures -x -d "Whether to inform the user that hash failures occur"
+	complete -c $i -l max_uploads -x -d (_ "Maximum uploads at once")
+	complete -c $i -l keepalive_interval -x -d (_ "Number of seconds between keepalives")
+	complete -c $i -l download_slice_size -x -d (_ "Bytes per request")
+	complete -c $i -l request_backlog -x -d (_ "Requests per pipe")
+	complete -c $i -l max_message_length -x -d (_ "Maximum length prefix encoding")
+	complete -c $i -l ip -d (_ "IP to report to the tracker") -x -a "(__fish_print_addresses)"
+	complete -c $i -l minport -d (_ "Minimum port to listen to")
+	complete -c $i -l maxport -d (_ "Maximum port to listen to")
+	complete -c $i -l responsefile -r -d (_ "File for server response")
+	complete -c $i -l url -x -d (_ "URL to get file from")
+	complete -c $i -l saveas -r -d (_ "Local file target")
+	complete -c $i -l timeout -x -d (_ "Time to close inactive socket")
+	complete -c $i -l timeout_check_interval -x -d (_ "Time between checking timeouts")
+	complete -c $i -l max_slice_length -x -d (_ "Maximum outgoing slice length")
+	complete -c $i -l max_rate_period -x -d (_ "Maximum time to guess rate")
+	complete -c $i -l bind -x -d (_ "IP to bind to locally") -a "(__fish_print_addresses)"
+	complete -c $i -l display_interval -x -d (_ "Time between screen updates")
+	complete -c $i -l rerequest_interval -x -d (_ "Time to wait between requesting more peers")
+	complete -c $i -l min_peers -x -d (_ "Minimum number of peers to not do requesting")
+	complete -c $i -l http_timeout -x -d (_ "Number of seconds before assuming http timeout")
+	complete -c $i -l max_initiate -x -d (_ "Number of peers at which to stop initiating new connections")
+	complete -c $i -l max_allow_in -x -d (_ "Maximum number of connections to allow")
+	complete -c $i -l check_hashes -x -d (_ "Whether to check hashes on disk")
+	complete -c $i -l max_upload_rate -x -d (_ "Maximum kB/s to upload at")
+	complete -c $i -l snub_time -x -d (_ "Seconds to wait for data to come in before assuming choking")
+	complete -c $i -l spew -x -d (_ "Whether to display diagnostic info")
+	complete -c $i -l rarest_first_cutoff -x -d (_ "Number of downloads at which to switch from random to rarest first")
+	complete -c $i -l min_uploads -x -d (_ "Number of uploads to fill out to with optimistic unchokes")
+	complete -c $i -l report_hash_failiures -x -d (_ "Whether to inform the user that hash failures occur")
 end;
diff --git a/init/completions/bunzip2.fish b/init/completions/bunzip2.fish
index 53e5625d..d98efe95 100644
--- a/init/completions/bunzip2.fish
+++ b/init/completions/bunzip2.fish
@@ -6,10 +6,10 @@ complete -c bunzip2 -x -a "(
 )
 "
 
-complete -c bunzip2 -s c -l stdout -d "Decompress to stdout"
-complete -c bunzip2 -s f -l force -d "Overwrite"
-complete -c bunzip2 -s k -l keep -d "Do not overwrite"
-complete -c bunzip2 -s s -l small -d "Reduce memory usage"
-complete -c bunzip2 -s v -l verbose -d "Print compression ratios"
-complete -c bunzip2 -s L -l license -d "Print license"
-complete -c bunzip2 -s V -l version -d "Print version"
+complete -c bunzip2 -s c -l stdout -d (_ "Decompress to stdout")
+complete -c bunzip2 -s f -l force -d (_ "Overwrite")
+complete -c bunzip2 -s k -l keep -d (_ "Do not overwrite")
+complete -c bunzip2 -s s -l small -d (_ "Reduce memory usage")
+complete -c bunzip2 -s v -l verbose -d (_ "Print compression ratios")
+complete -c bunzip2 -s L -l license -d (_ "Print license")
+complete -c bunzip2 -s V -l version -d (_ "Display version and exit")
diff --git a/init/completions/bzcat.fish b/init/completions/bzcat.fish
index 9ec6f1ff..6bc9bdfb 100644
--- a/init/completions/bzcat.fish
+++ b/init/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 "Reduce memory usage"
+complete -c bzcat -s s -l small -d (_ "Reduce memory usage")
diff --git a/init/completions/bzip2.fish b/init/completions/bzip2.fish
index d0d3de7e..6727d162 100644
--- a/init/completions/bzip2.fish
+++ b/init/completions/bzip2.fish
@@ -1,4 +1,4 @@
-complete -c bzip2 -s c -l stdout -d "Compress to stdout"
+complete -c bzip2 -s c -l stdout -d (_ "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 "Compress file"
-complete -c bzip2 -s t -l test -d "Check integrity"
-complete -c bzip2 -s f -l force -d "Overwrite"
-complete -c bzip2 -s k -l keep -d "Do not overwrite"
-complete -c bzip2 -s s -l small -d "Reduce memory usage"
-complete -c bzip2 -s q -l quiet -d "Supress errors"
-complete -c bzip2 -s v -l verbose -d "Print compression ratios"
-complete -c bzip2 -s L -l license -d "Print license"
-complete -c bzip2 -s V -l version -d "Print version"
-complete -c bzip2 -s 1 -l fast -d "Small block size"
-complete -c bzip2 -s 9 -l best -d "Large block size"
+complete -c bzip2 -s z -l compress -d (_ "Compress file")
+complete -c bzip2 -s t -l test -d (_ "Check integrity")
+complete -c bzip2 -s f -l force -d (_ "Overwrite")
+complete -c bzip2 -s k -l keep -d (_ "Do not overwrite")
+complete -c bzip2 -s s -l small -d (_ "Reduce memory usage")
+complete -c bzip2 -s q -l quiet -d (_ "Supress errors")
+complete -c bzip2 -s v -l verbose -d (_ "Print compression ratios")
+complete -c bzip2 -s L -l license -d (_ "Print license")
+complete -c bzip2 -s V -l version -d (_ "Display version and exit")
+complete -c bzip2 -s 1 -l fast -d (_ "Small block size")
+complete -c bzip2 -s 9 -l best -d (_ "Large block size")
diff --git a/init/completions/cat.fish b/init/completions/cat.fish
index 1919d216..d20a2a9b 100644
--- a/init/completions/cat.fish
+++ b/init/completions/cat.fish
@@ -1,12 +1,12 @@
-complete -c cat -s A -l show-all -d 'Escape all non-printing characters'
-complete -c cat -s b -l number-nonblank -d 'Number nonblank lines'
-complete -c cat -s e -d 'Escape non-printing characters except tab'
-complete -c cat -s E -l show-ends -d 'Display $ at end of line'
-complete -c cat -s n -l number -d 'Number all lines'
-complete -c cat -s s -l squeeze-blank -d 'Never more than single blank line'
-complete -c cat -s t -d 'Escape non-printing characters except newline'
-complete -c cat -s T -l show-tabs -d 'Escape tab'
-complete -c cat -s v -d 'Escape non-printing except newline and tab'
-complete -c cat -l help -d 'Display help and exit'
-complete -c cat -l version -d 'Display version and exit'
+complete -c cat -s A -l show-all -d (_ "Escape all non-printing characters")
+complete -c cat -s b -l number-nonblank -d (_ "Number nonblank lines")
+complete -c cat -s e -d (_ "Escape non-printing characters except tab")
+complete -c cat -s E -l show-ends -d (_ "Display $ at end of line")
+complete -c cat -s n -l number -d (_ "Number all lines")
+complete -c cat -s s -l squeeze-blank -d (_ "Never more than single blank line")
+complete -c cat -s t -d (_ "Escape non-printing characters except newline")
+complete -c cat -s T -l show-tabs -d (_ "Escape tab")
+complete -c cat -s v -d (_ "Escape non-printing except newline and tab")
+complete -c cat -l help -d (_ "Display help and exit")
+complete -c cat -l version -d (_ "Display version and exit")
 
diff --git a/init/completions/chgrp.fish b/init/completions/chgrp.fish
index d1bdfb98..41cce959 100644
--- a/init/completions/chgrp.fish
+++ b/init/completions/chgrp.fish
@@ -1,12 +1,12 @@
 
-complete -c chgrp -s c -l changes -d "Output diagnostic for changed files"
-complete -c chgrp -l dereference -d "Dereferense symbolic links"
-complete -c chgrp -s h -l no-dereference -d "Do not dereference symbolic links"
-complete -c chgrp -l from -d "Change from owner/group"
-complete -c chgrp -s f -l silent -d "Supress errors"
-complete -c chgrp -l reference -d "Use same owner/group as file" -r
-complete -c chgrp -s R -l recursive -d "Operate recursively"
-complete -c chgrp -s v -l verbose -d "Output diagnostic for every file"
-complete -c chgrp -s h -l help -d "Display help and exit"
-complete -c chgrp -l version -d "Display version and exit"
+complete -c chgrp -s c -l changes -d (_ "Output diagnostic for changed files")
+complete -c chgrp -l dereference -d (_ "Dereferense symbolic links")
+complete -c chgrp -s h -l no-dereference -d (_ "Do not dereference symbolic links")
+complete -c chgrp -l from -d (_ "Change from owner/group")
+complete -c chgrp -s f -l silent -d (_ "Supress errors")
+complete -c chgrp -l reference -d (_ "Use same owner/group as file") -r
+complete -c chgrp -s R -l recursive -d (_ "Operate recursively")
+complete -c chgrp -s v -l verbose -d (_ "Output diagnostic for every file")
+complete -c chgrp -s h -l help -d (_ "Display help and exit")
+complete -c chgrp -l version -d (_ "Display version and exit")
 complete -c chgrp -d Group -a "(__fish_complete_groups)"
diff --git a/init/completions/chown.fish b/init/completions/chown.fish
index 4de98e24..1ba22d29 100644
--- a/init/completions/chown.fish
+++ b/init/completions/chown.fish
@@ -1,12 +1,12 @@
-complete -c chown -s c -l changes -d "Output diagnostic for changed files"
-complete -c chown -l dereference -d "Dereferense symbolic links"
-complete -c chown -s h -l no-dereference -d "Do not dereference symbolic links"
-complete -c chown -l from -d "Change from owner/group"
-complete -c chown -s f -l silent -d "Supress errors"
-complete -c chown -l reference -d "Use same owner/group as file" -r
-complete -c chown -s R -l recursive -d "Operate recursively"
-complete -c chown -s v -l verbose -d "Output diagnostic for every file"
-complete -c chown -s h -l help -d "Display help and exit"
-complete -c chown -l version -d "Display version and exit"
-complete -c chown -d "Username" -a "(__fish_print_users):"
-complete -c chown -d "Username" -a "(echo (commandline -ct)|grep -o '.*:')(cat /etc/group |cut -d : -f 1)"
+complete -c chown -s c -l changes -d (_ "Output diagnostic for changed files")
+complete -c chown -l dereference -d (_ "Dereferense symbolic links")
+complete -c chown -s h -l no-dereference -d (_ "Do not dereference symbolic links")
+complete -c chown -l from -d (_ "Change from owner/group")
+complete -c chown -s f -l silent -d (_ "Supress errors")
+complete -c chown -l reference -d (_ "Use same owner/group as file") -r
+complete -c chown -s R -l recursive -d (_ "Operate recursively")
+complete -c chown -s v -l verbose -d (_ "Output diagnostic for every file")
+complete -c chown -s h -l help -d (_ "Display help and exit")
+complete -c chown -l version -d (_ "Display version and exit")
+complete -c chown -d (_ "Username") -a "(__fish_print_users):"
+complete -c chown -d (_ "Username") -a "(echo (commandline -ct)|grep -o '.*:')(cat /etc/group |cut -d : -f 1)"
diff --git a/init/completions/commandline.fish b/init/completions/commandline.fish
index 442a00b7..70924c9e 100644
--- a/init/completions/commandline.fish
+++ b/init/completions/commandline.fish
@@ -1,12 +1,12 @@
-complete -c commandline -s a -l append -d "Add text to the end of commandline"
-complete -c commandline -s i -l insert -d "Add text at cursor"
-complete -c commandline -s r -l replace -d "Replace selected part of buffer (replace)"
+complete -c commandline -s a -l append -d (_ "Add text to the end of commandline")
+complete -c commandline -s i -l insert -d (_ "Add text at cursor")
+complete -c commandline -s r -l replace -d (_ "Replace selected part of buffer (replace)")
 
-complete -c commandline -s j -l current-job  -d "Operate only on job under cursor"
-complete -c commandline -s p -l current-process  -d "Operate only on process under cursor"
-complete -c commandline -s t -l current-token -d "Operate only on tokenizer token under cursor"
-complete -c commandline -s b -l current-buffer -d "Operate on entire buffer (default)"
+complete -c commandline -s j -l current-job  -d (_ "Operate only on job under cursor")
+complete -c commandline -s p -l current-process  -d (_ "Operate only on process under cursor")
+complete -c commandline -s t -l current-token -d (_ "Operate only on tokenizer token under cursor")
+complete -c commandline -s b -l current-buffer -d (_ "Operate on entire buffer (default)")
 
-complete -c commandline -s c -l cut-at-cursor -d "Only return part of commandline before the cursor"
-complete -c commandline -s f -l function -d "Inject readline functions to reader"
+complete -c commandline -s c -l cut-at-cursor -d (_ "Only return part of commandline before the cursor")
+complete -c commandline -s f -l function -d (_ "Inject readline functions to reader")
 
diff --git a/init/completions/complete.fish b/init/completions/complete.fish
index 937777b2..55d4994e 100644
--- a/init/completions/complete.fish
+++ b/init/completions/complete.fish
@@ -1,13 +1,13 @@
-complete -c complete -s c -l command -d "Command to add completion to" -r
-complete -c complete -s p -l path -d "Path to add completion to"
-complete -c complete -s s -l short-option -d "Posix-style option to complete"
-complete -c complete -s l -l long-option -d "GNU-style option to complete"
-complete -c complete -s o -l old-option -d "Old style long option to complete"
-complete -c complete -s f -l no-files -d "Do not use file completion"
-complete -c complete -s r -l require-parameter -d "Require parameter"
-complete -c complete -s x -l exclusive -d "Require parameter and do not use file completion"
-complete -c complete -s a -l arguments -d "A list of possible arguments"
-complete -c complete -s d -l description -d "Description of this completions"
-complete -c complete -s u -l unauthorative -d "Option list is not complete"
-complete -c complete -s e -l erase -d "Remove completion"
-complete -c complete -s h -l help -d "Display help and exit"
+complete -c complete -s c -l command -d (_ "Command to add completion to") -r
+complete -c complete -s p -l path -d (_ "Path to add completion to")
+complete -c complete -s s -l short-option -d (_ "Posix-style option to complete")
+complete -c complete -s l -l long-option -d (_ "GNU-style option to complete")
+complete -c complete -s o -l old-option -d (_ "Old style long option to complete")
+complete -c complete -s f -l no-files -d (_ "Do not use file completion")
+complete -c complete -s r -l require-parameter -d (_ "Require parameter")
+complete -c complete -s x -l exclusive -d (_ "Require parameter and do not use file completion")
+complete -c complete -s a -l arguments -d (_ "A list of possible arguments")
+complete -c complete -s d -l description -d (_ "Description of this completions")
+complete -c complete -s u -l unauthorative -d (_ "Option list is not complete")
+complete -c complete -s e -l erase -d (_ "Remove completion")
+complete -c complete -s h -l help -d (_ "Display help and exit")
diff --git a/init/completions/configure.fish b/init/completions/configure.fish
index d3c25eb1..d8437564 100644
--- a/init/completions/configure.fish
+++ b/init/completions/configure.fish
@@ -1,12 +1,12 @@
-complete -c configure -s h -l help -x -a "short recursive" -d "Display help and exit"
-complete -c configure -s V -l version -d "Display version and exit"
-complete -c configure -s q -l quiet -d "Be less verbose"
-complete -c configure -l cache-file -f -d "Cache test results in specified file"
-complete -c configure -s C -l config-cache -d "Cache test results in file config.cache"
-complete -c configure -s n -l no-create -d "Do not create output files"
-complete -c configure -l srcdir -d "Set source directory" -a "__fish_complete_directory (commandline -ct)" -x
-complete -c configure -l prefix -d "Architecture-independent install directory" -a "__fish_complete_directory (commandline -ct)" -x
-complete -c configure -l exec-prefix -d "Architecture-dependent install directory" -a "__fish_complete_directory (commandline -ct)" -x
-complete -c configure -l build -d "configure for building on BUILD" -x
-complete -c configure -l host -d "cross-compile to build programs to run on HOST" -x
-complete -c configure -l target -d "configure for building compilers for TARGET" -x -u
+complete -c configure -s h -l help -x -a "short recursive" -d (_ "Display help and exit")
+complete -c configure -s V -l version -d (_ "Display version and exit")
+complete -c configure -s q -l quiet -d (_ "Be less verbose")
+complete -c configure -l cache-file -f -d (_ "Cache test results in specified file")
+complete -c configure -s C -l config-cache -d (_ "Cache test results in file config.cache")
+complete -c configure -s n -l no-create -d (_ "Do not create output files")
+complete -c configure -l srcdir -d (_ "Set source directory") -a "__fish_complete_directory (commandline -ct)" -x
+complete -c configure -l prefix -d (_ "Architecture-independent install directory") -a "__fish_complete_directory (commandline -ct)" -x
+complete -c configure -l exec-prefix -d (_ "Architecture-dependent install directory") -a "__fish_complete_directory (commandline -ct)" -x
+complete -c configure -l build -d (_ "configure for building on BUILD") -x
+complete -c configure -l host -d (_ "cross-compile to build programs to run on HOST") -x
+complete -c configure -l target -d (_ "configure for building compilers for TARGET") -x -u
diff --git a/init/completions/cut.fish b/init/completions/cut.fish
index a5015d8e..c4d12b73 100644
--- a/init/completions/cut.fish
+++ b/init/completions/cut.fish
@@ -1,10 +1,10 @@
-complete -c cut -s b -l bytes -x -d "Ouput byte range"
-complete -c cut -s c -l characters -x -d "Output character range"
-complete -c cut -s d -l delimiter -x -d "Select field delimiter"
-complete -c cut -s d -l fields -x -d "Select fields"
-complete -c cut -s n -d "Dont split mutibyte characters"
-complete -c cut -s s -l only-delimited -d "Do not print lines without delimiter"
-complete -c cut -l output-delimiter -d "Select output delimiter"
-complete -c cut -l help -d "Display help and exit"
-complete -c cut -l version -d "Display version and exit"
+complete -c cut -s b -l bytes -x -d (_ "Ouput byte range")
+complete -c cut -s c -l characters -x -d (_ "Output character range")
+complete -c cut -s d -l delimiter -x -d (_ "Select field delimiter")
+complete -c cut -s d -l fields -x -d (_ "Select fields")
+complete -c cut -s n -d (_ "Dont split mutibyte characters")
+complete -c cut -s s -l only-delimited -d (_ "Do not print lines without delimiter")
+complete -c cut -l output-delimiter -d (_ "Select output delimiter")
+complete -c cut -l help -d (_ "Display help and exit")
+complete -c cut -l version -d (_ "Display version and exit")
 
diff --git a/init/completions/cvs.fish b/init/completions/cvs.fish
index 9bc531b1..26102247 100644
--- a/init/completions/cvs.fish
+++ b/init/completions/cvs.fish
@@ -2,52 +2,52 @@
 # I don't use CVS, so these completions are probably not all that good.
 #
 
-complete -c cvs -x -a 'add' -d 'Add a new file/directory to the repository'
-complete -c cvs -x -a 'admin' -d 'Administration front end for rcs'
-complete -c cvs -x -a 'annotate' -d 'Show last revision where each line was modified'
-complete -c cvs -x -a 'checkout' -d 'Checkout sources for editing'
-complete -c cvs -x -a 'commit' -d 'Check files into the repository'
-complete -c cvs -x -a 'diff' -d 'Show differences between revisions'
-complete -c cvs -x -a 'edit' -d 'Get ready to edit a watched file'
-complete -c cvs -x -a 'editors' -d 'See who is editing a watched file'
-complete -c cvs -x -a 'export' -d 'Export sources from CVS, similar to checkout'
-complete -c cvs -x -a 'history' -d 'Show repository access history'
-complete -c cvs -x -a 'import' -d 'Import sources into CVS, using vendor branches'
-complete -c cvs -x -a 'init' -d 'Create a CVS repository if it doesnt exist'
-complete -c cvs -x -a 'kserver' -d 'Kerberos server mode'
-complete -c cvs -x -a 'log' -d 'Print out history information for files'
-complete -c cvs -x -a 'login' -d 'Prompt for password for authenticating server'
-complete -c cvs -x -a 'logout' -d 'Removes entry in .cvspass for remote repository'
-complete -c cvs -x -a 'pserver' -d 'Password server mode'
-complete -c cvs -x -a 'rannotate' -d 'Show last revision where each line of module was modified'
-complete -c cvs -x -a 'rdiff' -d 'Create "patch" format diffs between releases'
-complete -c cvs -x -a 'release' -d 'Indicate that a Module is no longer in use'
-complete -c cvs -x -a 'remove' -d 'Remove an entry from the repository'
-complete -c cvs -x -a 'rlog' -d 'Print out history information for a module'
-complete -c cvs -x -a 'rtag' -d 'Add a symbolic tag to a module'
-complete -c cvs -x -a 'server' -d 'Server mode'
-complete -c cvs -x -a 'status' -d 'Display status information on checked out files'
-complete -c cvs -x -a 'tag' -d 'Add a symbolic tag to checked out version of files'
-complete -c cvs -x -a 'unedit' -d 'Undo an edit command'
-complete -c cvs -x -a 'update' -d 'Bring work tree in sync with repository'
-complete -c cvs -x -a 'version' -d 'Show current CVS version(s)'
-complete -c cvs -x -a 'watch' -d 'Set watches'
-complete -c cvs -x -a 'watchers' -d 'See who is watching a file'
+complete -c cvs -x -a 'add' -d (_ 'Add a new file/directory to the repository')
+complete -c cvs -x -a 'admin' -d (_ 'Administration front end for rcs')
+complete -c cvs -x -a 'annotate' -d (_ 'Show last revision where each line was modified')
+complete -c cvs -x -a 'checkout' -d (_ 'Checkout sources for editing')
+complete -c cvs -x -a 'commit' -d (_ 'Check files into the repository')
+complete -c cvs -x -a 'diff' -d (_ 'Show differences between revisions')
+complete -c cvs -x -a 'edit' -d (_ 'Get ready to edit a watched file')
+complete -c cvs -x -a 'editors' -d (_ 'See who is editing a watched file')
+complete -c cvs -x -a 'export' -d (_ 'Export sources from CVS, similar to checkout')
+complete -c cvs -x -a 'history' -d (_ 'Show repository access history')
+complete -c cvs -x -a 'import' -d (_ 'Import sources into CVS, using vendor branches')
+complete -c cvs -x -a 'init' -d (_ 'Create a CVS repository if it doesnt exist')
+complete -c cvs -x -a 'kserver' -d (_ 'Kerberos server mode')
+complete -c cvs -x -a 'log' -d (_ 'Print out history information for files')
+complete -c cvs -x -a 'login' -d (_ 'Prompt for password for authenticating server')
+complete -c cvs -x -a 'logout' -d (_ 'Removes entry in .cvspass for remote repository')
+complete -c cvs -x -a 'pserver' -d (_ 'Password server mode')
+complete -c cvs -x -a 'rannotate' -d (_ 'Show last revision where each line of module was modified')
+complete -c cvs -x -a 'rdiff' -d (_ 'Create "patch" format diffs between releases')
+complete -c cvs -x -a 'release' -d (_ 'Indicate that a Module is no longer in use')
+complete -c cvs -x -a 'remove' -d (_ 'Remove an entry from the repository')
+complete -c cvs -x -a 'rlog' -d (_ 'Print out history information for a module')
+complete -c cvs -x -a 'rtag' -d (_ 'Add a symbolic tag to a module')
+complete -c cvs -x -a 'server' -d (_ 'Server mode')
+complete -c cvs -x -a 'status' -d (_ 'Display status information on checked out files')
+complete -c cvs -x -a 'tag' -d (_ 'Add a symbolic tag to checked out version of files')
+complete -c cvs -x -a 'unedit' -d (_ 'Undo an edit command')
+complete -c cvs -x -a 'update' -d (_ 'Bring work tree in sync with repository')
+complete -c cvs -x -a 'version' -d (_ 'Display version and exit')
+complete -c cvs -x -a 'watch' -d (_ 'Set watches')
+complete -c cvs -x -a 'watchers' -d (_ 'See who is watching a file')
 
-complete -c cvs -x -s H -d 'Displays usage information for command'
-complete -c cvs -x -s Q -d 'Cause CVS to be really quiet'
-complete -c cvs -x -s q -d 'Cause CVS to be somewhat quiet'
-complete -c cvs -x -s r -d 'Make checked-out files read-only'
-complete -c cvs -x -s w -d 'Make checked-out files read-write (default)'
-complete -c cvs -x -s n -d 'Do not execute anything that will change the disk'
-complete -c cvs -x -s t -d 'Show trace of program execution -- try with -n'
-complete -c cvs -x -s v -d 'CVS version and copyright'
-complete -c cvs -x -s T -r -d 'Use "tmpdir" for temporary files'
-complete -c cvs -x -s e -r -d 'Use "editor" for editing log information'
-complete -c cvs -x -s d -r -d 'Overrides $CVSROOT as the root of the CVS tree'
-complete -c cvs -x -s f -d 'Do not use the ~/.cvsrc file'
-complete -c cvs -x -s z -d 'Compression level for net traffic' -x -a '1 2 3 4 5 6 7 8 9'
-complete -c cvs -x -s x -d 'Encrypt all net traffic'
-complete -c cvs -x -s a -d 'Authenticate all net traffic'
-complete -c cvs -x -s s -d 'Set CVS user variable' -x
+complete -c cvs -x -s H -d (_ 'Displays usage information for command')
+complete -c cvs -x -s Q -d (_ 'Cause CVS to be really quiet')
+complete -c cvs -x -s q -d (_ 'Cause CVS to be somewhat quiet')
+complete -c cvs -x -s r -d (_ 'Make checked-out files read-only')
+complete -c cvs -x -s w -d (_ 'Make checked-out files read-write (default)')
+complete -c cvs -x -s n -d (_ 'Do not execute anything that will change the disk')
+complete -c cvs -x -s t -d (_ 'Show trace of program execution -- try with -n')
+complete -c cvs -x -s v -d (_ 'Display version and exit')
+complete -c cvs -x -s T -r -d (_ 'Use "tmpdir" for temporary files')
+complete -c cvs -x -s e -r -d (_ 'Use "editor" for editing log information')
+complete -c cvs -x -s d -r -d (_ 'Overrides $CVSROOT as the root of the CVS tree')
+complete -c cvs -x -s f -d (_ 'Do not use the ~/.cvsrc file')
+complete -c cvs -x -s z -d (_ 'Compression level for net traffic') -x -a '1 2 3 4 5 6 7 8 9'
+complete -c cvs -x -s x -d (_ 'Encrypt all net traffic')
+complete -c cvs -x -s a -d (_ 'Authenticate all net traffic')
+complete -c cvs -x -s s -d (_ 'Set CVS user variable') -x
 
diff --git a/init/completions/darcs.fish b/init/completions/darcs.fish
index 470c6b94..0de106f9 100644
--- a/init/completions/darcs.fish
+++ b/init/completions/darcs.fish
@@ -25,177 +25,175 @@ end
 # If no subcommand has been specified, complete using all available subcommands
 #
 
-complete -c darcs -n '__fish_use_subcommand' -xa "
-	initialize\t'Create new project'
-	get\t'Create a local copy of another repository'
-	add\t'Add one or more new files or directories'
-	remove\t'Remove one or more files or directories from the repository'
-	mv\t'Move/rename one or more files or directories'
-	replace\t'Replace a token with a new value for that token'
-	record\t'Save changes in the working copy to the repository as a patch'
-	pull\t'Copy and apply patches from another repository to this one'
-	send\t'Send by email a bundle of one or more patches'
-	apply\t'Apply patches (from an email bundle) to the repository'
-	push\t'Copy and apply patches from this repository to another one'
-	whatsnew\t'Display unrecorded changes in the working copy'
-	changes\t'Gives a changelog style summary of the repo history'
-	unrecord\t'Remove recorded patches without changing the working copy'
-	amend-record\t'Replace a recorded patch with a better version'
-	revert\t'Revert to the recorded version (safe the first time only)'
-	unrevert\t'Undo the last revert (may fail if changes after the revert)'
-	unpull\t'Opposite of pull; unsafe if the patch is not in remote repo'
-	rollback\t'Record an inverse patch without changing the working directory'
-	tag\t'Tag the contents of the repository with a version name'
-	setpref\t'Set a value for a preference (test, predist, ...)'
-	diff\t'Create a diff between two versions of the repository'
-	annotate\t'Display which patch last modified something'
-	optimize\t'Optimize the repository'
-	check\t'Check the repository for consistency'
-	resolve\t'Mark any conflicts to the working copy for manual resolution'
-	dist\t'Create a distribution tarball'
-	trackdown\t'Locate the most recent version lacking an error'
-	repair\t'Repair the corrupted repository'
-"
-
+complete -c darcs -n '__fish_use_subcommand' -xa 'initialize\t"'(_ "Create new project")'"'
+complete -c darcs -n '__fish_use_subcommand' -xa 'get\t"'(_ "Create a local copy of another repository")'"'
+complete -c darcs -n '__fish_use_subcommand' -xa 'add\t"'(_ "Add one or more new files or directories")'"'
+complete -c darcs -n '__fish_use_subcommand' -xa 'remove\t"'(_ "Remove one or more files or directories from the repository")'"'
+complete -c darcs -n '__fish_use_subcommand' -xa 'mv\t"'(_ "Move/rename one or more files or directories")'"'
+complete -c darcs -n '__fish_use_subcommand' -xa 'replace\t"'(_ "Replace a token with a new value for that token")'"'
+complete -c darcs -n '__fish_use_subcommand' -xa 'record\t"'(_ "Save changes in the working copy to the repository as a patch")'"'
+complete -c darcs -n '__fish_use_subcommand' -xa 'pull\t"'(_ "Copy and apply patches from another repository to this one")'"'
+complete -c darcs -n '__fish_use_subcommand' -xa 'send\t"'(_ "Send by email a bundle of one or more patches")'"'
+complete -c darcs -n '__fish_use_subcommand' -xa 'apply\t"'(_ "Apply patches (from an email bundle) to the repository")'"'
+complete -c darcs -n '__fish_use_subcommand' -xa 'push\t"'(_ "Copy and apply patches from this repository to another one")'"'
+complete -c darcs -n '__fish_use_subcommand' -xa 'whatsnew\t"'(_ "Display unrecorded changes in the working copy")'"'
+complete -c darcs -n '__fish_use_subcommand' -xa 'changes\t"'(_ "Gives a changelog style summary of the repo history")'"'
+complete -c darcs -n '__fish_use_subcommand' -xa 'unrecord\t"'(_ "Remove recorded patches without changing the working copy")'"'
+complete -c darcs -n '__fish_use_subcommand' -xa 'amend-record\t"'(_ "Replace a recorded patch with a better version")'"'
+complete -c darcs -n '__fish_use_subcommand' -xa 'revert\t"'(_ "Revert to the recorded version (safe the first time only)" )'"'
+complete -c darcs -n '__fish_use_subcommand' -xa 'unrevert\t"'(_ "Undo the last revert (may fail if changes after the revert)")'"'
+complete -c darcs -n '__fish_use_subcommand' -xa 'unpull\t"'(_ "Opposite of pull; unsafe if the patch is not in remote repo")'"'
+complete -c darcs -n '__fish_use_subcommand' -xa 'rollback\t"'(_ "Record an inverse patch without changing the working copy" )'"'
+complete -c darcs -n '__fish_use_subcommand' -xa 'tag\t"'(_ "Tag the contents of the repository with a version name")'"'
+complete -c darcs -n '__fish_use_subcommand' -xa 'setpref\t"'(_ "Set a value for a preference (test, predist, ...)")'"'
+complete -c darcs -n '__fish_use_subcommand' -xa 'diff\t"'(_ "Create a diff between two versions of the repository")'"'
+complete -c darcs -n '__fish_use_subcommand' -xa 'annotate\t"'(_ "Display which patch last modified something")'"'
+complete -c darcs -n '__fish_use_subcommand' -xa 'optimize\t"'(_ "Optimize the repository")'"'
+complete -c darcs -n '__fish_use_subcommand' -xa 'check\t"'(_ "Check the repository for consistency")'"'
+complete -c darcs -n '__fish_use_subcommand' -xa 'resolve\t"'(_ "Mark any conflicts to the working copy for manual resolution")'"'
+complete -c darcs -n '__fish_use_subcommand' -xa 'dist\t"'(_ "Create a distribution tarball")'"'
+complete -c darcs -n '__fish_use_subcommand' -xa 'trackdown\t"'(_ "Locate the most recent version lacking an error")'"'
+complete -c darcs -n '__fish_use_subcommand' -xa 'repair\t"'(_ "Repair the corrupted repository")'"'
+ 
 #
 # These switches are universal
 #
-complete -c darcs -s h -l help -d "shows brief description of command and its arguments"
-complete -c darcs -l disable -d "Disable this command"
-complete -c darcs -l repodir -d "Specify the repository directory in which to run" -x -a '(__fish_complete_directory (commandline -ct))'
-complete -c darcs -s v -l verbose -d "give verbose output"
+complete -c darcs -s h -l help -d (_ "Shows brief description of command and its arguments")
+complete -c darcs -l disable -d (_ "Disable this command")
+complete -c darcs -l repodir -d (_ "Specify the repository directory in which to run") -x -a '(__fish_complete_directory (commandline -ct))'
+complete -c darcs -s v -l verbose -d (_ "Give verbose output")
 
 #
 # Here follows a huge list of subcommand-specific completions
 #
 
 set -- record_opt -c darcs -n 'contains record (commandline -poc)'
-complete $record_opt -s m -l patch-name -d "Name of patch" -x
-complete $record_opt -s A -l author -d "Specify author id" -x
-complete $record_opt -l logfile -d "Give patch name and comment in file" -r
-complete $record_opt -s a -l all -d "answer yes to all patches"
-complete $record_opt -s l -l look-for-adds -d "In addition to modifications, look for files that are not boring, and thus are potentially pending addition"
-complete $record_opt -l delete-logfile -d "Delete the logfile when done"
-complete $record_opt -l standard-verbosity -d "Don"\'"t give verbose output"
-complete $record_opt -l no-test -d "Don"\'"t run the test script"
-complete $record_opt -l test -d "Run the test script"
-complete $record_opt -l leave-test-directory -d "Don"\'"t remove the test directory"
-complete $record_opt -l remove-test-directory -d "Remove the test directory"
-complete $record_opt -l compress -d "Create compressed patches"
-complete $record_opt -l dont-compress -d "Don"\'"t create compressed patches"
-complete $record_opt -l pipe -d "Expect to receive input from a pipe"
-complete $record_opt -l interactive -d "Prompt user interactively"
-complete $record_opt -l ask-deps -d "Ask for extra dependencies"
-complete $record_opt -l no-ask-deps -d "Don"\'"t ask for extra dependencies"
-complete $record_opt -l edit-long-comment -d "Edit the long comment by default"
-complete $record_opt -l skip-long-comment -d "Don"\'"t give a long comment"
-complete $record_opt -l prompt-long-comment -d "Prompt for whether to edit the long comment"
-complete $record_opt -l ignore-times -d "Don"\'"t trust the file modification times"
-complete $record_opt -l dont-look-for-adds -d "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 -d (_ "Name of patch") -x
+complete $record_opt -s A -l author -d (_ "Specify author id") -x
+complete $record_opt -l logfile -d (_ "Give patch name and comment in file") -r
+complete $record_opt -s a -l all -d (_ "Answer yes to all patches")
+complete $record_opt -s l -l look-for-adds -d (_ "In addition to modifications, look for files that are not boring, and thus are potentially pending addition")
+complete $record_opt -l delete-logfile -d (_ "Delete the logfile when done")
+complete $record_opt -l standard-verbosity -d (_ "Don't give verbose output")
+complete $record_opt -l no-test -d (_ "Don't run the test script")
+complete $record_opt -l test -d (_ "Run the test script")
+complete $record_opt -l leave-test-directory -d (_ "Don't remove the test directory")
+complete $record_opt -l remove-test-directory -d (_ "Remove the test directory")
+complete $record_opt -l compress -d (_ "Create compressed patches")
+complete $record_opt -l dont-compress -d (_ "Don't create compressed patches")
+complete $record_opt -l pipe -d (_ "Expect to receive input from a pipe")
+complete $record_opt -l interactive -d (_ "Prompt user interactively")
+complete $record_opt -l ask-deps -d (_ "Ask for extra dependencies")
+complete $record_opt -l no-ask-deps -d (_ "Don't ask for extra dependencies")
+complete $record_opt -l edit-long-comment -d (_ "Edit the long comment by default")
+complete $record_opt -l skip-long-comment -d (_ "Don't give a long comment")
+complete $record_opt -l prompt-long-comment -d (_ "Prompt for whether to edit the long comment")
+complete $record_opt -l ignore-times -d (_ "Don't trust the file modification times")
+complete $record_opt -l dont-look-for-adds -d (_ "Don't look for any files or directories that could be added, and don't add them automatically")
 set -e record_opt
 
 
 set -- pull_opt -c darcs -n 'contains pull (commandline -poc)'
-complete $pull_opt -s p -l patches -d "select patches matching REGEXP" -x
-complete $pull_opt -s t -l tags -d "select tags matching REGEXP" -x
-complete $pull_opt -s a -l all -d "answer yes to all patches"
-complete $pull_opt -s s -l summary -d "summarize changes"
-complete $pull_opt -s q -l quiet -d "suppress informational output"
-complete $pull_opt -l matches -d "select patches matching PATTERN" -x
-complete $pull_opt -l external-merge -d "Use external tool to merge conflicts" -x
-complete $pull_opt -l interactive -d "prompt user interactively"
-complete $pull_opt -l compress -d "create compressed patches"
-complete $pull_opt -l dont-compress -d "don"\'"t create compressed patches"
-complete $pull_opt -l test -d "run the test script"
-complete $pull_opt -l no-test -d "don"\'"t run the test script"
-complete $pull_opt -l dry-run -d "don"\'"t actually take the action"
-complete $pull_opt -l no-summary -d "don"\'"t summarize changes"
-complete $pull_opt -l standard-verbosity -d "neither verbose nor quiet output"
-complete $pull_opt -l ignore-times -d "don"\'"t trust the file modification times"
-complete $pull_opt -l no-deps -d "don"\'"t automatically fulfill dependencies"
-complete $pull_opt -l set-default -d "set default repository [DEFAULT]"
-complete $pull_opt -l no-set-default -d "don"\'"t set default repository"
-complete $pull_opt -l set-scripts-executable -d "make scripts executable"
-complete $pull_opt -l dont-set-scripts-executable -d "don"\'"t make scripts executable"
+complete $pull_opt -s p -l patches -d (_ "Select patches matching REGEXP") -x
+complete $pull_opt -s t -l tags -d (_ "Select tags matching REGEXP") -x
+complete $pull_opt -s a -l all -d (_ "Answer yes to all patches")
+complete $pull_opt -s s -l summary -d (_ "Summarize changes")
+complete $pull_opt -s q -l quiet -d (_ "Suppress informational output")
+complete $pull_opt -l matches -d (_ "Select patches matching PATTERN") -x
+complete $pull_opt -l external-merge -d (_ "Use external tool to merge conflicts") -x
+complete $pull_opt -l interactive -d (_ "Prompt user interactively")
+complete $pull_opt -l compress -d (_ "Create compressed patches")
+complete $pull_opt -l dont-compress -d (_ "Don't create compressed patches")
+complete $pull_opt -l test -d (_ "Run the test script")
+complete $pull_opt -l no-test -d (_ "Don't run the test script")
+complete $pull_opt -l dry-run -d (_ "Don't actually take the action")
+complete $pull_opt -l no-summary -d (_ "Don't summarize changes")
+complete $pull_opt -l standard-verbosity -d (_ "Neither verbose nor quiet output")
+complete $pull_opt -l ignore-times -d (_ "Don't trust the file modification times")
+complete $pull_opt -l no-deps -d (_ "Don't automatically fulfill dependencies")
+complete $pull_opt -l set-default -d (_ "Set default repository [DEFAULT]")
+complete $pull_opt -l no-set-default -d (_ "Don't set default repository")
+complete $pull_opt -l set-scripts-executable -d (_ "Make scripts executable")
+complete $pull_opt -l dont-set-scripts-executable -d (_ "Don't make scripts executable")
 set -e pull_opt
 
 
 set -- apply_opt  -c darcs -n 'contains apply (commandline -poc)'
-complete $apply_opt -s a -l all -d "answer yes to all patches"
-complete $apply_opt -l verify -d "verify that the patch was signed by a key in PUBRING" -r
-complete $apply_opt -l verify-ssl -d "verify using openSSL with authorized keys from file "\'"KEYS"\'"" -r
-complete $apply_opt -l sendmail-command -d "specify sendmail command" -r
-complete $apply_opt -l reply -d "reply to email-based patch using FROM address" -x
-complete $apply_opt -l cc -d "mail results to additional EMAIL(s). Requires --reply" -x
-complete $apply_opt -l external-merge -d "Use external tool to merge conflicts" -r
-complete $apply_opt -l no-verify -d "don"\'"t verify patch signature"
-complete $apply_opt -l standard-verbosity -d "don"\'"t give verbose output"
-complete $apply_opt -l ignore-times -d "don"\'"t trust the file modification times"
-complete $apply_opt -l compress -d "create compressed patches"
-complete $apply_opt -l dont-compress -d "don"\'"t create compressed patches"
-complete $apply_opt -l interactive -d "prompt user interactively"
-complete $apply_opt -l mark-conflicts -d "mark conflicts"
-complete $apply_opt -l allow-conflicts -d "allow conflicts, but don"\'"t mark them"
-complete $apply_opt -l no-resolve-conflicts -d "equivalent to --dont-allow-conflicts, for backwards compatibility"
-complete $apply_opt -l dont-allow-conflicts -d "fail on patches that create conflicts [DEFAULT]"
-complete $apply_opt -l no-test -d "don"\'"t run the test script"
-complete $apply_opt -l test -d "run the test script"
-complete $apply_opt -l happy-forwarding -d "forward unsigned messages without extra header"
-complete $apply_opt -l leave-test-directory -d "don"\'"t remove the test directory"
-complete $apply_opt -l remove-test-directory -d "remove the test directory"
-complete $apply_opt -l set-scripts-executable -d "make scripts executable"
-complete $apply_opt -l dont-set-scripts-executable -d "don"\'"t make scripts executable"
+complete $apply_opt -s a -l all -d (_ "Answer yes to all patches")
+complete $apply_opt -l verify -d (_ "Verify that the patch was signed by a key in PUBRING") -r
+complete $apply_opt -l verify-ssl -d (_ "Verify using openSSL with authorized keys from file 'KEYS'") -r
+complete $apply_opt -l sendmail-command -d (_ "Specify sendmail command") -r
+complete $apply_opt -l reply -d (_ "Reply to email-based patch using FROM address") -x
+complete $apply_opt -l cc -d (_ "Mail results to additional EMAIL(s). Requires --reply") -x
+complete $apply_opt -l external-merge -d (_ "Use external tool to merge conflicts") -r
+complete $apply_opt -l no-verify -d (_ "Don't verify patch signature")
+complete $apply_opt -l standard-verbosity -d (_ "Don't give verbose output")
+complete $apply_opt -l ignore-times -d (_ "Don't trust the file modification times")
+complete $apply_opt -l compress -d (_ "Create compressed patches")
+complete $apply_opt -l dont-compress -d (_ "Don't create compressed patches")
+complete $apply_opt -l interactive -d (_ "Prompt user interactively")
+complete $apply_opt -l mark-conflicts -d (_ "Mark conflicts")
+complete $apply_opt -l allow-conflicts -d (_ "Allow conflicts, but don't mark them")
+complete $apply_opt -l no-resolve-conflicts -d (_ "Equivalent to --dont-allow-conflicts, for backwards compatibility")
+complete $apply_opt -l dont-allow-conflicts -d (_ "Fail on patches that create conflicts [DEFAULT]")
+complete $apply_opt -l no-test -d (_ "Don't run the test script")
+complete $apply_opt -l test -d (_ "Run the test script")
+complete $apply_opt -l happy-forwarding -d (_ "Forward unsigned messages without extra header")
+complete $apply_opt -l leave-test-directory -d (_ "Don't remove the test directory")
+complete $apply_opt -l remove-test-directory -d (_ "Remove the test directory")
+complete $apply_opt -l set-scripts-executable -d (_ "Make scripts executable")
+complete $apply_opt -l dont-set-scripts-executable -d (_ "Don't make scripts executable")
 set -e apply_opt
 
 set -- check_opt  -c darcs -n 'contains check (commandline -poc)'
-complete $check_opt -s v -l verbose -d "give verbose output"
-complete $check_opt -s q -l quiet -d "suppress informational output"
-complete $check_opt -l complete -d "check the entire repository"
-complete $check_opt -l partial -d "check patches since latest checkpoint"
-complete $check_opt -l standard-verbosity -d "neither verbose nor quiet output"
-complete $check_opt -l no-test -d "don"\'"t run the test script"
-complete $check_opt -l test -d "run the test script"
-complete $check_opt -l leave-test-directory -d "don"\'"t remove the test directory"
-complete $check_opt -l remove-test-directory -d "remove the test directory"
+complete $check_opt -s v -l verbose -d (_ "Give verbose output")
+complete $check_opt -s q -l quiet -d (_ "Suppress informational output")
+complete $check_opt -l complete -d (_ "Check the entire repository")
+complete $check_opt -l partial -d (_ "Check patches since latest checkpoint")
+complete $check_opt -l standard-verbosity -d (_ "Neither verbose nor quiet output")
+complete $check_opt -l no-test -d (_ "Don't run the test script")
+complete $check_opt -l test -d (_ "Run the test script")
+complete $check_opt -l leave-test-directory -d (_ "Don't remove the test directory")
+complete $check_opt -l remove-test-directory -d (_ "Remove the test directory")
 set -e check_opt
 
 set -- mv_opt  -c darcs -n 'contains mv (commandline -poc)'
-complete $mv_opt -s v -l verbose -d "give verbose output"
-complete $mv_opt -l case-ok -d "don"\'"t refuse to add files differing only in case"
-complete $mv_opt -l standard-verbosity -d "don"\'"t give verbose output"
+complete $mv_opt -s v -l verbose -d (_ "Give verbose output")
+complete $mv_opt -l case-ok -d (_ "Don't refuse to add files differing only in case")
+complete $mv_opt -l standard-verbosity -d (_ "Don't give verbose output")
 set -e mv_opt
 
 set -- send_opt -c darcs -n 'contains send (commandline -poc)'
-complete $send_opt -s v -l verbose -d "give verbose output"
-complete $send_opt -s q -l quiet -d "suppress informational output"
-complete $send_opt -xs p -l patches -d "select patches matching REGEXP"
-complete $send_opt -xs t -l tags -d "select tags matching REGEXP"
-complete $send_opt -s a -l all -d "answer yes to all patches"
-complete $send_opt -xs A  -l author -d "specify author id"
-complete $send_opt -rs o -l output -d "specify output filename"
-complete $send_opt -s u -l unified -d "output patch in a darcs-specific format similar to diff -u"
-complete $send_opt -s s -l summary -d "summarize changes"
-complete $send_opt -l standard-verbosity -d "neither verbose nor quiet output"
-complete $send_opt -xl matches -d "select patches matching PATTERN"
-complete $send_opt -l interactive -d "prompt user interactively"
-complete $send_opt -xl from -d "specify email address"
-complete $send_opt -xl to -d "specify destination email"
-complete $send_opt -xl cc -d "mail results to additional EMAIL(s). Requires --reply"
-complete $send_opt -l sign -d "sign the patch with your gpg key"
-complete $send_opt -xl sign-as -d "sign the patch with a given keyid"
-complete $send_opt -rl sign-ssl -d "sign the patch using openssl with a given private key"
-complete $send_opt -l dont-sign -d "do not sign the patch"
-complete $send_opt -l dry-run -d "don"\'"t actually take the action"
-complete $send_opt -l no-summary -d "don"\'"t summarize changes"
-complete $send_opt -rl context -d "send to context stored in FILENAME"
-complete $send_opt -l edit-description -d "edit the patch bundle description"
-complete $send_opt -l set-default -d "set default repository [DEFAULT]"
-complete $send_opt -l no-set-default -d "don"\'"t set default repository"
-complete $send_opt -rl sendmail-command -d "specify sendmail command"
+complete $send_opt -s v -l verbose -d (_ "Give verbose output")
+complete $send_opt -s q -l quiet -d (_ "Suppress informational output")
+complete $send_opt -xs p -l patches -d (_ "Select patches matching REGEXP")
+complete $send_opt -xs t -l tags -d (_ "Select tags matching REGEXP")
+complete $send_opt -s a -l all -d (_ "Answer yes to all patches")
+complete $send_opt -xs A  -l author -d (_ "Specify author id")
+complete $send_opt -rs o -l output -d (_ "Specify output filename")
+complete $send_opt -s u -l unified -d (_ "Output patch in a darcs-specific format similar to diff -u")
+complete $send_opt -s s -l summary -d (_ "Summarize changes")
+complete $send_opt -l standard-verbosity -d (_ "Neither verbose nor quiet output")
+complete $send_opt -xl matches -d (_ "Select patches matching PATTERN")
+complete $send_opt -l interactive -d (_ "Prompt user interactively")
+complete $send_opt -xl from -d (_ "Specify email address")
+complete $send_opt -xl to -d (_ "Specify destination email")
+complete $send_opt -xl cc -d (_ "Mail results to additional EMAIL(s). Requires --reply")
+complete $send_opt -l sign -d (_ "Sign the patch with your gpg key")
+complete $send_opt -xl sign-as -d (_ "Sign the patch with a given keyid")
+complete $send_opt -rl sign-ssl -d (_ "Sign the patch using openssl with a given private key")
+complete $send_opt -l dont-sign -d (_ "Do not sign the patch")
+complete $send_opt -l dry-run -d (_ "Don't actually take the action")
+complete $send_opt -l no-summary -d (_ "Don't summarize changes")
+complete $send_opt -rl context -d (_ "Send to context stored in FILENAME")
+complete $send_opt -l edit-description -d (_ "Edit the patch bundle description")
+complete $send_opt -l set-default -d (_ "Set default repository [DEFAULT]")
+complete $send_opt -l no-set-default -d (_ "Don't set default repository")
+complete $send_opt -rl sendmail-command -d (_ "Specify sendmail command")
 set -e send_opt
 
 set -- init_opt  -c darcs -n 'contains initialize (commandline -poc)'
-complete $init_opt -l plain-pristine-tree -d "Use a plain pristine tree [DEFAULT]"
-complete $init_opt -l no-pristine-tree -d "Use no pristine tree"
+complete $init_opt -l plain-pristine-tree -d (_ "Use a plain pristine tree [DEFAULT]")
+complete $init_opt -l no-pristine-tree -d (_ "Use no pristine tree")
 set -e init_opt
 
diff --git a/init/completions/date.fish b/init/completions/date.fish
index dc07030b..468464d4 100644
--- a/init/completions/date.fish
+++ b/init/completions/date.fish
@@ -1,11 +1,11 @@
-complete -c date -s d -l date -d "Display date described by string" -x
-complete -c date -s f -l file -d "Display date for each line in file" -r
-complete -c date -s I -l iso-8601 -d "Output in ISO 8601 format" -x -a "date hours minutes seconds"
-complete -c date -s s -l set -d "Set time" -x
-complete -c date -s R -l rfc-2822 -d "Output RFC-2822 compliant date string"
-complete -c date -s r -l reference -d "display the last modification time of file" -r
-complete -c date -s u -l utc -d "print or set Coordinated Universal Time"
-complete -c date -l universal -d "print or set Coordinated Universal Time"
-complete -c date -s h -l help -d "Display help and exit"
-complete -c date -s v -l version -d "Display version and exit"
+complete -c date -s d -l date -d (_ "Display date described by string") -x
+complete -c date -s f -l file -d (_ "Display date for each line in file") -r
+complete -c date -s I -l iso-8601 -d (_ "Output in ISO 8601 format") -x -a "date hours minutes seconds"
+complete -c date -s s -l set -d (_ "Set time") -x
+complete -c date -s R -l rfc-2822 -d (_ "Output RFC-2822 compliant date string")
+complete -c date -s r -l reference -d (_ "display the last modification time of file") -r
+complete -c date -s u -l utc -d (_ "print or set Coordinated Universal Time")
+complete -c date -l universal -d (_ "print or set Coordinated Universal Time")
+complete -c date -s h -l help -d (_ "Display help and exit")
+complete -c date -s v -l version -d (_ "Display version and exit")
 
diff --git a/init/completions/df.fish b/init/completions/df.fish
index 9257f429..dc3b77fb 100644
--- a/init/completions/df.fish
+++ b/init/completions/df.fish
@@ -1,18 +1,18 @@
 complete -y mount
 
-complete -c df -s a -l all -d "Include empty filesystems"
-complete -c df -s B -l block-size -r -d "Block size"
-complete -c df -s h -l human-readable -d "Human readable sizes"
-complete -c df -s H -l si -d "Human readable sizes, powers of 1000"
-complete -c df -s i -l inodes -d "List inode information"
-complete -c df -s k -d "Use 1KB block size"
-complete -c df -s l -l local -d "List only local filesystems"
-complete -c df -l no-sync -d "Do not sync before getting usage info"
-complete -c df -s P -l portability -d "Use Posix format"
-complete -c df -l sync -d "Sync before getting usage info"
-complete -c df -s t -l type -r -d "Filesystem type" -x -a $__fish_filesystems
-complete -c df -s T -l print-type -d "Print filesystem type"
-complete -c df -s x -l exclude-type -d "Excluded filesystem type" -r -x -a $__fish_filesystems
-complete -c df -l help -d "Display help and exit"
-complete -c df -l version -d "Display version and exit"
+complete -c df -s a -l all -d (_ "Include empty filesystems")
+complete -c df -s B -l block-size -r -d (_ "Block size")
+complete -c df -s h -l human-readable -d (_ "Human readable sizes")
+complete -c df -s H -l si -d (_ "Human readable sizes, powers of 1000")
+complete -c df -s i -l inodes -d (_ "List inode information")
+complete -c df -s k -d (_ "Use 1kB block size")
+complete -c df -s l -l local -d (_ "List only local filesystems")
+complete -c df -l no-sync -d (_ "Do not sync before getting usage info")
+complete -c df -s P -l portability -d (_ "Use Posix format")
+complete -c df -l sync -d (_ "Sync before getting usage info")
+complete -c df -s t -l type -r -d (_ "Filesystem type") -x -a $__fish_filesystems
+complete -c df -s T -l print-type -d (_ "Print filesystem type")
+complete -c df -s x -l exclude-type -d (_ "Excluded filesystem type") -r -x -a $__fish_filesystems
+complete -c df -l help -d (_ "Display help and exit")
+complete -c df -l version -d (_ "Display version and exit")
 
diff --git a/init/completions/diff.fish b/init/completions/diff.fish
index d62c9a00..1adbf235 100644
--- a/init/completions/diff.fish
+++ b/init/completions/diff.fish
@@ -1,26 +1,26 @@
 # Completions for diff
-complete -c diff -s i -l ignore-case -d "Ignore case differences"
-complete -c diff -l ignore-file-name-case -d "Ignore case when comparing file names"
-complete -c diff -l no-ignore-file-name-case -d "Consider case when comparing file names"
-complete -c diff -s E -l ignore-tab-expansion -d "Ignore changes due to tab expansion"
-complete -c diff -s b -l ignore-space-change -d "Ignore changes in the amount of white space"
-complete -c diff -s w -l ignore-all-space -d "Ignore all white space"
-complete -c diff -s B -l ignore-blank-lines -d "Ignore changes whose lines are all blank"
-complete -c diff -s I -l ignore-matching-lines -x -d "Ignore changes whose lines match the RE"
-complete -c diff -s a -l text -d "Treat all files as text"
-complete -c diff -s r -l recursive -d "Recursively compare subdirectories"
-complete -c diff -s N -l new-file -d "Treat absent files as empty"
-complete -c diff -s C -l context -x -d "Output NUM lines of copied context"
-complete -c diff -s c -d "Output 3 lines of copied context"
-complete -c diff -s U -l unified -x -d "Output NUM lines of unified context"
-complete -c diff -s u -d "Output 3 lines of unified context"
-complete -c diff -s q -l brief -d "Output only whether the files differ"
-complete -c diff -l normal -d "Output a normal diff"
-complete -c diff -s y -l side-by-side -d "Output in two columns"
-complete -c diff -s W -l width -x -d "Output at most NUM print columns"
-complete -c diff -s d -l minimal -d "Try to find a smaller set of changes"
-complete -c diff -l from-file -r -d "Compare FILE1 to all operands"
-complete -c diff -l to-file -r -d "Compare FILE2 to all operands"
-complete -c diff -s l -l paginate -d "Pass the output through 'pr'"
-complete -c diff -s v -l version -d "Output version info"
-complete -c diff -l help -d "Output usage information"
+complete -c diff -s i -l ignore-case -d (_ "Ignore case differences")
+complete -c diff -l ignore-file-name-case -d (_ "Ignore case when comparing file names")
+complete -c diff -l no-ignore-file-name-case -d (_ "Consider case when comparing file names")
+complete -c diff -s E -l ignore-tab-expansion -d (_ "Ignore changes due to tab expansion")
+complete -c diff -s b -l ignore-space-change -d (_ "Ignore changes in the amount of white space")
+complete -c diff -s w -l ignore-all-space -d (_ "Ignore all white space")
+complete -c diff -s B -l ignore-blank-lines -d (_ "Ignore changes whose lines are all blank")
+complete -c diff -s I -l ignore-matching-lines -x -d (_ "Ignore changes whose lines match the REGEX")
+complete -c diff -s a -l text -d (_ "Treat all files as text")
+complete -c diff -s r -l recursive -d (_ "Recursively compare subdirectories")
+complete -c diff -s N -l new-file -d (_ "Treat absent files as empty")
+complete -c diff -s C -l context -x -d (_ "Output NUM lines of copied context")
+complete -c diff -s c -d (_ "Output 3 lines of copied context")
+complete -c diff -s U -l unified -x -d (_ "Output NUM lines of unified context")
+complete -c diff -s u -d (_ "Output 3 lines of unified context")
+complete -c diff -s q -l brief -d (_ "Output only whether the files differ")
+complete -c diff -l normal -d (_ "Output a normal diff")
+complete -c diff -s y -l side-by-side -d (_ "Output in two columns")
+complete -c diff -s W -l width -x -d (_ "Output at most NUM print columns")
+complete -c diff -s d -l minimal -d (_ "Try to find a smaller set of changes")
+complete -c diff -l from-file -r -d (_ "Compare FILE1 to all operands")
+complete -c diff -l to-file -r -d (_ "Compare FILE2 to all operands")
+complete -c diff -s l -l paginate -d (_ "Pass the output through 'pr'")
+complete -c diff -s v -l version -d (_ "Display version and exit")
+complete -c diff -l help -d (_ "Display help and exit")
diff --git a/init/completions/du.fish b/init/completions/du.fish
index f48930e2..761dd92c 100644
--- a/init/completions/du.fish
+++ b/init/completions/du.fish
@@ -1,20 +1,20 @@
-complete -c du -s a -l all -d "Write size for all files"
-complete -c du -l apparent-size -d "Print file size, not disk usage"
-complete -c du -s B -l block-size -d "Block size"
-complete -c du -s b -l bytes -d "Use 1B block size"
-complete -c du -s c -l total -d "Produce grand total"
-complete -c du -s D -l dereference-args -d "Dereference file symlinks"
-complete -c du -s h -l human-readable -d "Human readable sizes"
-complete -c du -s H -l si -d "Human readable sizes, powers of 1000"
-complete -c du -s k -d "Use iKB block size"
-complete -c du -s l -l count-links -d "Count hard links multiple times"
-complete -c du -s L -l dereference -d "Dereference all symlinks"
-complete -c du -s S -l separate-dirs -d "Do not include subdirectory size"
-complete -c du -s s -l summarize -d "Display only a total for each argument"
-complete -c du -s x -l one-file-system -d "Skip other filesystems"
-complete -c du -s X -l exclude-from -r -d "Exclude files thet match pattern in file"
-complete -c du -l exclude -r -d "Exclude files that match pattern"
-complete -c du -l max-depth -r -d "Recursion limit"
-complete -c du -l help -d "Display help and exit"
-complete -c du -l version -d "Display version and exit"
+complete -c du -s a -l all -d (_ "Write size for all files")
+complete -c du -l apparent-size -d (_ "Print file size, not disk usage")
+complete -c du -s B -l block-size -d (_ "Block size")
+complete -c du -s b -l bytes -d (_ "Use 1B block size")
+complete -c du -s c -l total -d (_ "Produce grand total")
+complete -c du -s D -l dereference-args -d (_ "Dereference file symlinks")
+complete -c du -s h -l human-readable -d (_ "Human readable sizes")
+complete -c du -s H -l si -d (_ "Human readable sizes, powers of 1000")
+complete -c du -s k -d (_ "Use 1kB block size")
+complete -c du -s l -l count-links -d (_ "Count hard links multiple times")
+complete -c du -s L -l dereference -d (_ "Dereference all symlinks")
+complete -c du -s S -l separate-dirs -d (_ "Do not include subdirectory size")
+complete -c du -s s -l summarize -d (_ "Display only a total for each argument")
+complete -c du -s x -l one-file-system -d (_ "Skip other filesystems")
+complete -c du -s X -l exclude-from -r -d (_ "Exclude files thet match pattern in file")
+complete -c du -l exclude -r -d (_ "Exclude files that match pattern")
+complete -c du -l max-depth -r -d (_ "Recursion limit")
+complete -c du -l help -d (_ "Display help and exit")
+complete -c du -l version -d (_ "Display version and exit")
 
diff --git a/init/completions/echo.fish b/init/completions/echo.fish
index d9548497..fa9904d8 100644
--- a/init/completions/echo.fish
+++ b/init/completions/echo.fish
@@ -1,5 +1,5 @@
-complete -c echo -s n -d "No newline"
-complete -c echo -s e -d "Use backslashe-escaped characters"
-complete -c echo -s E -d "Do not use backslash escaped characters"
-complete -c echo -l help -d "Display help and exit"
-complete -c echo -l version -d "Display version and exit"
+complete -c echo -s n -d (_ "No newline")
+complete -c echo -s e -d (_ "Use backslashe-escaped characters")
+complete -c echo -s E -d (_ "Do not use backslash escaped characters")
+complete -c echo -l help -d (_ "Display help and exit")
+complete -c echo -l version -d (_ "Display version and exit")
diff --git a/init/completions/emacs.fish b/init/completions/emacs.fish
index 1ad23b0e..09408aee 100644
--- a/init/completions/emacs.fish
+++ b/init/completions/emacs.fish
@@ -1,10 +1,10 @@
 #
 # These completions are uncomplete
 #
-complete -c emacs -s q -d "Do not load init files"
-complete -c emacs -s u -d "Load users init file" -xa "(__fish_complete_users)"
-complete -c emacs -s t -d "Use file as terminal" -r
-complete -c emacs -s f -d "Execute Lisp function" -x
-complete -c emacs -s l -d "Load Lisp code from file" -r
-complete -c emacs -o nw -d "Do not use X interface"
-complete -uc emacs -s d -o display -d "Create window on the specified display" -x
+complete -c emacs -s q -d (_ "Do not load init files")
+complete -c emacs -s u -d (_ "Load users init file") -xa "(__fish_complete_users)"
+complete -c emacs -s t -d (_ "Use file as terminal") -r
+complete -c emacs -s f -d (_ "Execute Lisp function") -x
+complete -c emacs -s l -d (_ "Load Lisp code from file") -r
+complete -c emacs -o nw -d (_ "Do not use X interface")
+complete -uc emacs -s d -o display -d (_ "Create window on the specified display") -x
diff --git a/init/completions/fish.fish b/init/completions/fish.fish
index 80e665b3..1ade805f 100644
--- a/init/completions/fish.fish
+++ b/init/completions/fish.fish
@@ -1,5 +1,5 @@
-complete -c fish -s c -l "command" -d "Run fish with this command"
-complete -c fish -s h -l help -d "Display help and exit"
-complete -c fish -s v -l version -d "Display version and exit"
-complete -c fish -s i -l interactive -d "Run in interactive mode"
-complete -c fish -s p -l profile -d "Output profiling information to specified file" -f
+complete -c fish -s c -l "command" -d (_ "Run fish with this command")
+complete -c fish -s h -l help -d (_ "Display help and exit")
+complete -c fish -s v -l version -d (_ "Display version and exit")
+complete -c fish -s i -l interactive -d (_ "Run in interactive mode")
+complete -c fish -s p -l profile -d (_ "Output profiling information to specified file") -f
diff --git a/init/completions/function.fish b/init/completions/function.fish
index 7fcaa2ab..54674b2d 100644
--- a/init/completions/function.fish
+++ b/init/completions/function.fish
@@ -1,7 +1,7 @@
-complete -c function -s d -l description -d "Set function description" -x
-complete -c function -xa "(functions -n)" -d "Function"
-complete -c function -xa "(builtin -n)" -d "Builtin"
-complete -c function -s j -l on-job-exit -d "Make the function a job exit event handler" -x
-complete -c function -s p -l on-process-exit -d "Make the function a process exit event handler" -x
-complete -c function -s s -l on-signal -d "Make the function a signal event handler" -x
-complete -c function -s v -l on-variable -d "Make the function a variable update event handler" -x
+complete -c function -s d -l description -d (_ "Set function description") -x
+complete -c function -xa "(functions -n)" -d (_ "Function")
+complete -c function -xa "(builtin -n)" -d (_ "Builtin")
+complete -c function -s j -l on-job-exit -d (_ "Make the function a job exit event handler") -x
+complete -c function -s p -l on-process-exit -d (_ "Make the function a process exit event handler") -x
+complete -c function -s s -l on-signal -d (_ "Make the function a signal event handler") -x
+complete -c function -s v -l on-variable -d (_ "Make the function a variable update event handler") -x
diff --git a/init/completions/functions.fish b/init/completions/functions.fish
index 3a2c0bed..ce534428 100644
--- a/init/completions/functions.fish
+++ b/init/completions/functions.fish
@@ -1,6 +1,6 @@
-complete -c functions -s e -l erase -d "Erase function" -x -a "(functions -n)"
-complete -c functions -xa "(functions -n)" -d "Function"
-complete -c functions -s a -l all -d "Show hidden functions"
-complete -c functions -s h -l help -d "Display help and exit"
-complete -c functions -s d -l description -d "Set function description" -x
+complete -c functions -s e -l erase -d (_ "Erase function") -x -a "(functions -n)"
+complete -c functions -xa "(functions -n)" -d (_ "Function")
+complete -c functions -s a -l all -d (_ "Show hidden functions")
+complete -c functions -s h -l help -d (_ "Display help and exit")
+complete -c functions -s d -l description -d (_ "Set function description") -x
 
diff --git a/init/completions/gcc.fish b/init/completions/gcc.fish
index d752a2c2..2d437bf0 100644
--- a/init/completions/gcc.fish
+++ b/init/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 'Language' -x -a '
+complete -c gcc -s x -d (_ 'Language') -x -a '
 	c
 	c-header
 	cpp-output
@@ -20,16 +20,16 @@ complete -c gcc -s x -d 'Language' -x -a '
 	treelang
 	none
 '
-complete -c gcc -o pass-exit-codes -d 'Pass program exit codes'
-complete -c gcc -s c -d 'Stop after assembler'
-complete -c gcc -s S -d 'Stop after compile'
-complete -c gcc -s E -d 'Stop after preprocesswor'
-complete -c gcc -s o -r -d 'Output file'
-complete -c gcc -s v -d 'Print commands to stderr'
-complete -c gcc -o \#\#\# -d 'Print quoted commands to stderr, do not run'
-complete -c gcc -o pipe -d 'Use pipes'
-complete -c gcc -o ansi -d 'Use ansi mode'
-complete -c gcc -o std -d 'Standard mode' -x -a '
+complete -c gcc -o pass-exit-codes -d (_ 'Pass program exit codes')
+complete -c gcc -s c -d (_ 'Stop after assembler')
+complete -c gcc -s S -d (_ 'Stop after compile')
+complete -c gcc -s E -d (_ 'Stop after preprocesswor')
+complete -c gcc -s o -r -d (_ 'Output file')
+complete -c gcc -s v -d (_ 'Print commands to stderr')
+complete -c gcc -o \#\#\# -d (_ 'Print quoted commands to stderr, do not run')
+complete -c gcc -o pipe -d (_ 'Use pipes')
+complete -c gcc -o ansi -d (_ 'Use ansi mode')
+complete -c gcc -o std -d (_ '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,54 @@ complete -c gcc -o std -d '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 'Write prototypes to file'
-complete -c gcc -o fno-asm -d 'Do not recognize asm, inline or typeof keywords'
-complete -c gcc -o fno-builtin -d 'Do not use builtin functions'
-complete -c gcc -o fhosted -d 'Assert hosted environment'
-complete -c gcc -o ffreestanding -d 'Assert freestanding environment'
-complete -c gcc -o fms-extensions -d 'Use Microsoft extensions'
-complete -c gcc -o trigraphs -d 'Use ANSI trigraphs'
-complete -c gcc -o no-integrated-cpp -d 'Do not use integrated preprocessor'
-complete -c gcc -o funsigned-char -d 'char is unsigned'
-complete -c gcc -o fsigned-char -d 'char is signed'
-complete -c gcc -o funsigned-bitfields -d 'bifield is unsigned'
-complete -c gcc -o fsigned-bitfields -d 'bifield is signed'
-complete -c gcc -o fno-unsigned-bitfields -d 'All bifields are signed'
-complete -c gcc -o fno-signed-bitfields -d 'All bifield are signed'
-complete -c gcc -o fwritable-strings -d 'String constants are not const'
-complete -c gcc -o fabi-version -d 'C++ ABI version' -r -x -a '1 0'
-complete -c gcc -o fno-access-control -d 'Turn off access checking'
-complete -c gcc -o fcheck-new -d 'Check pointer returned by new'
-complete -c gcc -o fconserve-space -d 'Put globals in the common segment'
-complete -c gcc -o fno-const-strings -d 'String constants are not const'
-complete -c gcc -o fdollars-in-identifiers -d 'Accept $ in identifiers'
-complete -c gcc -o fno-dollars-in-identifiers -d 'Reject $ in identifiers'
-complete -c gcc -o fno-elide-constructors -d 'Do not omit unneeded temporarys'
-complete -c gcc -o fno-enforce-eh-specs -d 'Allow exception violations'
-complete -c gcc -o ffor-scope -d 'Do not extend for-loop scope'
-complete -c gcc -o fno-for-scope -d 'Extend for-loop scope'
-complete -c gcc -o fno-gnu-keywords -d 'Do not recognize typeof as keyword'
-complete -c gcc -o fno-implicit-templates -d 'Do not emit code for implicit templates'
-complete -c gcc -o fno-implicit-inline-templates -d 'Do not emit code for implicit inline templates'
-complete -c gcc -o fno-implement-inlines -d 'Do not emit out-of-line code for inline functions'
-complete -c gcc -o fms-extensions -d 'Disable warnings about MFC'
-complete -c gcc -o fno-nonansi-builtins -d 'Disable some built-in functions'
-complete -c gcc -o fno-operator-names -d 'Disable operator keywords'
-complete -c gcc -o fno-optional-diags -d 'Disable optional diagnostics'
-complete -c gcc -o fpermissive -d 'Downgrade some errors to warnings'
-complete -c gcc -o frepo -d 'Enable automatic template instantiation at link time'
-complete -c gcc -o fno-rtti -d 'Disable generation of C++ runtime type information'
-#complete -c gcc -o fstats -d 'Emit front-end usage statistics'
+complete -c gcc -o aux-info -r -d (_ 'Write prototypes to file')
+complete -c gcc -o fno-asm -d (_ 'Do not recognize asm, inline or typeof keywords')
+complete -c gcc -o fno-builtin -d (_ 'Do not use builtin functions')
+complete -c gcc -o fhosted -d (_ 'Assert hosted environment')
+complete -c gcc -o ffreestanding -d (_ 'Assert freestanding environment')
+complete -c gcc -o fms-extensions -d (_ 'Use Microsoft extensions')
+complete -c gcc -o trigraphs -d (_ 'Use ANSI trigraphs')
+complete -c gcc -o no-integrated-cpp -d (_ 'Do not use integrated preprocessor')
+complete -c gcc -o funsigned-char -d (_ 'char is unsigned')
+complete -c gcc -o fsigned-char -d (_ 'char is signed')
+complete -c gcc -o funsigned-bitfields -d (_ 'bifield is unsigned')
+complete -c gcc -o fsigned-bitfields -d (_ 'bifield is signed')
+complete -c gcc -o fno-unsigned-bitfields -d (_ 'All bifields are signed')
+complete -c gcc -o fno-signed-bitfields -d (_ 'All bifield are signed')
+complete -c gcc -o fwritable-strings -d (_ 'String constants are not const')
+complete -c gcc -o fabi-version -d (_ 'C++ ABI version') -r -x -a '1 0'
+complete -c gcc -o fno-access-control -d (_ 'Turn off access checking')
+complete -c gcc -o fcheck-new -d (_ 'Check pointer returned by new')
+complete -c gcc -o fconserve-space -d (_ 'Put globals in the common segment')
+complete -c gcc -o fno-const-strings -d (_ 'String constants are not const')
+complete -c gcc -o fdollars-in-identifiers -d (_ 'Accept $ in identifiers')
+complete -c gcc -o fno-dollars-in-identifiers -d (_ 'Reject $ in identifiers')
+complete -c gcc -o fno-elide-constructors -d (_ 'Do not omit unneeded temporarys')
+complete -c gcc -o fno-enforce-eh-specs -d (_ 'Allow exception violations')
+complete -c gcc -o ffor-scope -d (_ 'Do not extend for-loop scope')
+complete -c gcc -o fno-for-scope -d (_ 'Extend for-loop scope')
+complete -c gcc -o fno-gnu-keywords -d (_ 'Do not recognize typeof as keyword')
+complete -c gcc -o fno-implicit-templates -d (_ 'Do not emit code for implicit templates')
+complete -c gcc -o fno-implicit-inline-templates -d (_ 'Do not emit code for implicit inline templates')
+complete -c gcc -o fno-implement-inlines -d (_ 'Do not emit out-of-line code for inline functions')
+complete -c gcc -o fms-extensions -d (_ 'Disable warnings about MFC')
+complete -c gcc -o fno-nonansi-builtins -d (_ 'Disable some built-in functions')
+complete -c gcc -o fno-operator-names -d (_ 'Disable operator keywords')
+complete -c gcc -o fno-optional-diags -d (_ 'Disable optional diagnostics')
+complete -c gcc -o fpermissive -d (_ 'Downgrade some errors to warnings')
+complete -c gcc -o frepo -d (_ 'Enable automatic template instantiation at link time')
+complete -c gcc -o fno-rtti -d (_ 'Disable generation of C++ runtime type information')
+#complete -c gcc -o fstats -d (_ '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 Set\ maximum\ template\ depth\ to\ $i;
 end;
 
-complete -c gcc -o fno-threadsafe-statistics -d 'Do not emit code for thread-safe initialization of local statics'
-complete -c gcc -o fuse-cxa-atexit -d 'Use __cxa_atexit for destructors'
-complete -c gcc -o fvisibility-inlines-hidden -d 'Hides inline methods from export table'
-complete -c gcc -o fno-weak -d 'Do not use weak symbol support'
+complete -c gcc -o fno-threadsafe-statistics -d (_ 'Do not emit code for thread-safe initialization of local statics')
+complete -c gcc -o fuse-cxa-atexit -d (_ 'Use __cxa_atexit for destructors')
+complete -c gcc -o fvisibility-inlines-hidden -d (_ 'Hides inline methods from export table')
+complete -c gcc -o fno-weak -d (_ 'Do not use weak symbol support')
 # gcc completion listing is incomplete.
-#complete -c gcc -o -d ''
+#complete -c gcc -o -d (_ '')
 
 
diff --git a/init/completions/gprof.fish b/init/completions/gprof.fish
index ae2a72ee..a51aecd4 100644
--- a/init/completions/gprof.fish
+++ b/init/completions/gprof.fish
@@ -1,34 +1,34 @@
-complete -c gprof -s A -l annoted-source -d "Print annotated source"
-complete -c gprof -s b -l brief -d "Do not print explanations"
-complete -c gprof -s C -l exec-counts -d "Print tally"
-complete -c gprof -s i -l file-info -d "Display summary"
-complete -c gprof -s I -l directory-path -d "Search directories for source"
-complete -c gprof -s J -l no-annotated-source -d "No annotated source"
-complete -c gprof -s L -l print-path -d "Print full path of source"
-complete -c gprof -s p -l flat-profile -d "Print flat profile"
-complete -c gprof -s P -l no-flat-profile -d "No flat profile"
-complete -c gprof -s q -l graph -d "Print call graph"
-complete -c gprof -s Q -l no-graph -d "No call graph"
-complete -c gprof -s y -l separate-files -d "Annotate to file"
-complete -c gprof -s Z -l no-exec-counts -d "No tally"
-complete -c gprof -l function-ordering -d "Suggest function ordering"
-complete -rc gprof -l file-ordering -d "Suggest file ordering"
-complete -c gprof -s T -l traditional -d "Traditional mode"
-complete -xc gprof -s w -l width -d "Set width of output"
-complete -c gprof -s x -l all-lines -d "Anotate every line"
-complete -xc gprof -l demangle -d "Set demangling style"
-complete -c gprof -l no-demangle -d "Turn of demangling"
-complete -xc gprof -s a -l no-static -d "Supress static functions"
-complete -xc gprof -s c -l static-call-graph -d ""
-complete -xc gprof -s D -l ignore-non-functions -d "Ignore symbols not known to be functions"
-complete -xc gprof -s k -r -d "Delete arcs from callgraph"
-complete -xc gprof -s l -l line -d "Line by line profiling"
-complete -xc gprof -s m -l min-count -r -d "Supress output when executed less than specified times"
-complete -xc gprof -s n -l time -d "Only propagate times for matching symbols"
-complete -xc gprof -s N -l no-time -d "Do not propagate times for matching symbols"
-complete -xc gprof -s z -l display-unused-functions -d "Mention unused functions in flat profile"
-complete -xc gprof -s d -l debug -d "Specify debugging options"
-complete -xc gprof -s h -l help -d "Print help and exit"
-complete -xc gprof -s v -l version -d "Print version and exit"
-complete -xc gprof -s O -l file-format -x -a "auto bsd 4.4bsd magic prof" -d "Profile data format"
-complete -xc gprof -s s -l sum -d "Print summary"
+complete -c gprof -s A -l annoted-source -d (_ "Print annotated source")
+complete -c gprof -s b -l brief -d (_ "Do not print explanations")
+complete -c gprof -s C -l exec-counts -d (_ "Print tally")
+complete -c gprof -s i -l file-info -d (_ "Display summary")
+complete -c gprof -s I -l directory-path -d (_ "Search directories for source")
+complete -c gprof -s J -l no-annotated-source -d (_ "No annotated source")
+complete -c gprof -s L -l print-path -d (_ "Print full path of source")
+complete -c gprof -s p -l flat-profile -d (_ "Print flat profile")
+complete -c gprof -s P -l no-flat-profile -d (_ "No flat profile")
+complete -c gprof -s q -l graph -d (_ "Print call graph")
+complete -c gprof -s Q -l no-graph -d (_ "No call graph")
+complete -c gprof -s y -l separate-files -d (_ "Annotate to file")
+complete -c gprof -s Z -l no-exec-counts -d (_ "No tally")
+complete -c gprof -l function-ordering -d (_ "Suggest function ordering")
+complete -rc gprof -l file-ordering -d (_ "Suggest file ordering")
+complete -c gprof -s T -l traditional -d (_ "Traditional mode")
+complete -xc gprof -s w -l width -d (_ "Set width of output")
+complete -c gprof -s x -l all-lines -d (_ "Anotate every line")
+complete -xc gprof -l demangle -d (_ "Set demangling style")
+complete -c gprof -l no-demangle -d (_ "Turn of demangling")
+complete -xc gprof -s a -l no-static -d (_ "Supress static functions")
+complete -xc gprof -s c -l static-call-graph 
+complete -xc gprof -s D -l ignore-non-functions -d (_ "Ignore symbols not known to be functions")
+complete -xc gprof -s k -r -d (_ "Delete arcs from callgraph")
+complete -xc gprof -s l -l line -d (_ "Line by line profiling")
+complete -xc gprof -s m -l min-count -r -d (_ "Supress output when executed less than specified times")
+complete -xc gprof -s n -l time -d (_ "Only propagate times for matching symbols")
+complete -xc gprof -s N -l no-time -d (_ "Do not propagate times for matching symbols")
+complete -xc gprof -s z -l display-unused-functions -d (_ "Mention unused functions in flat profile")
+complete -xc gprof -s d -l debug -d (_ "Specify debugging options")
+complete -xc gprof -s h -l help -d (_ "Print help and exit")
+complete -xc gprof -s v -l version -d (_ "Display version and exit and exit")
+complete -xc gprof -s O -l file-format -x -a "auto bsd 4.4bsd magic prof" -d (_ "Profile data format")
+complete -xc gprof -s s -l sum -d (_ "Print summary")
diff --git a/init/completions/grep.fish b/init/completions/grep.fish
index cb4d54de..e6fe23b9 100644
--- a/init/completions/grep.fish
+++ b/init/completions/grep.fish
@@ -1,47 +1,47 @@
 
-complete -c grep -s A -l after-context -d "Print NUM lines of trailing context"
-complete -c grep -s a -l text -d "Process binary file as text"
-complete -c grep -s B -l before-context -d "Print NUM lines of leading context"
-complete -c grep -s C -l context -d "Print NUM lines of context"
-complete -c grep -s b -l byte-offset -d "Print byte offset of matches"
-complete -c grep -l binary-files -d "Assume data type for binary files" -x -a "binary text"
+complete -c grep -s A -l after-context -d (_ "Print NUM lines of trailing context")
+complete -c grep -s a -l text -d (_ "Process binary file as text")
+complete -c grep -s B -l before-context -d (_ "Print NUM lines of leading context")
+complete -c grep -s C -l context -d (_ "Print NUM lines of context")
+complete -c grep -s b -l byte-offset -d (_ "Print byte offset of matches")
+complete -c grep -l binary-files -d (_ "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 "Only print number of matches"
-complete -c grep -s D -l devices -x -a "read skip" -d "Action for devices"
-complete -c grep -s d -l directories -x -a "read skip recurse" -d "Action for directories"
-complete -c grep -s E -l extended-regexp -d "Pattern is extended regexp"
-complete -xc grep -s e -l regexp -d "Pattern is a regexp"
-complete -c grep -s F -l fixed -d "Pattern is a fixed string"
-complete -c grep -s f -l file -r -d "Use pattern from file"
-complete -c grep -s G -l basic-regexp -d "Pattern is basic regex"
-complete -c grep -s H -l with-filename -d "Print filename"
-complete -c grep -s h -l no-filename -d "Supress printing filename"
-complete -c grep -l help -d "Display help and exit"
-complete -c grep -s I -d "Skip binary files"
-complete -c grep -s i -l ignore-case -d "Ignore case"
-complete -c grep -s L -l files-without-match -d "Print first non-matching file"
-complete -c grep -s l -l files-with-match -d "Print first matching file"
-complete -c grep -s m -l max-count -d "Stop reading after NUM matches"
-complete -c grep -l mmap -d "Use the mmap system call to read input"
-complete -c grep -s n -l line-number -d "Print linenumber"
-complete -c grep -s o -l only-matching -d "Show only matching part"
-complete -c grep -l label -d "Rename stdin"
-complete -c grep -l line-buffered -d "Use line buffering"
-complete -c grep -s q -l quiet -d "Do not write anything"
-complete -c grep -l silent -d "Do not write anything"
-complete -c grep -s R -l recursive -d "Read files under each directory"
-complete -c grep -s r -d "Read files under each directory"
-complete -c grep -l include -d "Recurse, search file matching PATTERN"
-complete -c grep -l exclude -d "Recurse, skip file matching PATTERN"
-complete -c grep -s s -l no-messages -d "Suppress error messages"
-complete -c grep -s U -l binary -d "Treat files as binary"
-complete -c grep -s u -l unix-byte-offsets -d "Report Unix-style byte offsets"
-complete -c grep -s V -l version -d "Print the version number"
-complete -c grep -s v -l invert-match -d "Invert the sense of matching"
-complete -c grep -s w -l word-regexp -d "Only whole matching words"
-complete -c grep -s x -l line-regexp -d "Only whole matching lines"
-complete -c grep -s y -d "Synonym for -i"
-complete -c grep -s Z -l null -d "Output a zero byte after filename"
+complete -c grep -s c -l count -d (_ "Only print number of matches")
+complete -c grep -s D -l devices -x -a "read skip" -d (_ "Action for devices")
+complete -c grep -s d -l directories -x -a "read skip recurse" -d (_ "Action for directories")
+complete -c grep -s E -l extended-regexp -d (_ "Pattern is extended regexp")
+complete -xc grep -s e -l regexp -d (_ "Pattern is a regexp")
+complete -c grep -s F -l fixed -d (_ "Pattern is a fixed string")
+complete -c grep -s f -l file -r -d (_ "Use pattern from file")
+complete -c grep -s G -l basic-regexp -d (_ "Pattern is basic regex")
+complete -c grep -s H -l with-filename -d (_ "Print filename")
+complete -c grep -s h -l no-filename -d (_ "Supress printing filename")
+complete -c grep -l help -d (_ "Display help and exit")
+complete -c grep -s I -d (_ "Skip binary files")
+complete -c grep -s i -l ignore-case -d (_ "Ignore case")
+complete -c grep -s L -l files-without-match -d (_ "Print first non-matching file")
+complete -c grep -s l -l files-with-match -d (_ "Print first matching file")
+complete -c grep -s m -l max-count -d (_ "Stop reading after NUM matches")
+complete -c grep -l mmap -d (_ "Use the mmap system call to read input")
+complete -c grep -s n -l line-number -d (_ "Print linenumber")
+complete -c grep -s o -l only-matching -d (_ "Show only matching part")
+complete -c grep -l label -d (_ "Rename stdin")
+complete -c grep -l line-buffered -d (_ "Use line buffering")
+complete -c grep -s q -l quiet -d (_ "Do not write anything")
+complete -c grep -l silent -d (_ "Do not write anything")
+complete -c grep -s R -l recursive -d (_ "Read files under each directory")
+complete -c grep -s r -d (_ "Read files under each directory")
+complete -c grep -l include -d (_ "Recurse, search file matching PATTERN")
+complete -c grep -l exclude -d (_ "Recurse, skip file matching PATTERN")
+complete -c grep -s s -l no-messages -d (_ "Suppress error messages")
+complete -c grep -s U -l binary -d (_ "Treat files as binary")
+complete -c grep -s u -l unix-byte-offsets -d (_ "Report Unix-style byte offsets")
+complete -c grep -s V -l version -d (_ "Print the version number")
+complete -c grep -s v -l invert-match -d (_ "Invert the sense of matching")
+complete -c grep -s w -l word-regexp -d (_ "Only whole matching words")
+complete -c grep -s x -l line-regexp -d (_ "Only whole matching lines")
+complete -c grep -s y -d (_ "Synonym for -i")
+complete -c grep -s Z -l null -d (_ "Output a zero byte after filename")
 
 
diff --git a/init/completions/gunzip.fish b/init/completions/gunzip.fish
index b1bdf158..f15c8d78 100644
--- a/init/completions/gunzip.fish
+++ b/init/completions/gunzip.fish
@@ -1,21 +1,21 @@
-complete -c gunzip -s c -l stdout -d "Compress to stdout"
+complete -c gunzip -s c -l stdout -d (_ "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 "Overwrite"
-complete -c gunzip -s h -l help -d "Display help"
-complete -c gunzip -s l -l list -d "List compression information"
-complete -c gunzip -s L -l license -d "Print license"
-complete -c gunzip -s n -l no-name -d "Do not save/restore filename"
-complete -c gunzip -s N -l name -d "Save/restore filename"
-complete -c gunzip -s q -l quiet -d "Supress warnings"
-complete -c gunzip -s r -l recursive -d "Recurse directories"
-complete -c gunzip -s S -l suffix -r -d "Suffix"
-complete -c gunzip -s t -l test -d "Check integrity"
-complete -c gunzip -s v -l verbose -d "Display compression ratios"
-complete -c gunzip -s V -l version -d "Display version"
+complete -c gunzip -s f -l force -d (_ "Overwrite")
+complete -c gunzip -s h -l help -d (_ "Display help and exit")
+complete -c gunzip -s l -l list -d (_ "List compression information")
+complete -c gunzip -s L -l license -d (_ "Print license")
+complete -c gunzip -s n -l no-name -d (_ "Do not save/restore filename")
+complete -c gunzip -s N -l name -d (_ "Save/restore filename")
+complete -c gunzip -s q -l quiet -d (_ "Supress warnings")
+complete -c gunzip -s r -l recursive -d (_ "Recurse directories")
+complete -c gunzip -s S -l suffix -r -d (_ "Suffix")
+complete -c gunzip -s t -l test -d (_ "Check integrity")
+complete -c gunzip -s v -l verbose -d (_ "Display compression ratios")
+complete -c gunzip -s V -l version -d (_ "Display version and exit")
 
 complete -c gunzip -x -a "(
 	__fish_complete_suffix (commandline -ct) .gz 'Compressed file'
diff --git a/init/completions/gzip.fish b/init/completions/gzip.fish
index 889dd9f8..ca84d8ae 100644
--- a/init/completions/gzip.fish
+++ b/init/completions/gzip.fish
@@ -1,4 +1,4 @@
-complete -c gzip -s c -l stdout -d "Compress to stdout"
+complete -c gzip -s c -l stdout -d (_ "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 "Overwrite"
-complete -c gzip -s h -l help -d "Display help"
-complete -c gzip -s l -l list -d "List compression information"
-complete -c gzip -s L -l license -d "Print license"
-complete -c gzip -s n -l no-name -d "Do not save/restore filename"
-complete -c gzip -s N -l name -d "Save/restore filename"
-complete -c gzip -s q -l quiet -d "Supress warnings"
-complete -c gzip -s r -l recursive -d "Recurse directories"
-complete -c gzip -s S -l suffix -r -d "Suffix"
-complete -c gzip -s t -l test -d "Check integrity"
-complete -c gzip -s v -l verbose -d "Display compression ratios"
-complete -c gzip -s V -l version -d "Display version"
-complete -c gzip -s 1 -l fast -d "Use fast setting"
-complete -c gzip -s 9 -l best -d "Use high compression setting"
+complete -c gzip -s f -l force -d (_ "Overwrite")
+complete -c gzip -s h -l help -d (_ "Display help and exit")
+complete -c gzip -s l -l list -d (_ "List compression information")
+complete -c gzip -s L -l license -d (_ "Print license")
+complete -c gzip -s n -l no-name -d (_ "Do not save/restore filename")
+complete -c gzip -s N -l name -d (_ "Save/restore filename")
+complete -c gzip -s q -l quiet -d (_ "Supress warnings")
+complete -c gzip -s r -l recursive -d (_ "Recurse directories")
+complete -c gzip -s S -l suffix -r -d (_ "Suffix")
+complete -c gzip -s t -l test -d (_ "Check integrity")
+complete -c gzip -s v -l verbose -d (_ "Display compression ratios")
+complete -c gzip -s V -l version -d (_ "Display version and exit")
+complete -c gzip -s 1 -l fast -d (_ "Use fast setting")
+complete -c gzip -s 9 -l best -d (_ "Use high compression setting")
 
diff --git a/init/completions/help.fish b/init/completions/help.fish
index 2889ce80..fc8a369d 100644
--- a/init/completions/help.fish
+++ b/init/completions/help.fish
@@ -3,37 +3,37 @@
 #
 
 for i in (builtin -n)
-	complete -c help -x -a $i -d 'Help for the '$i' builtin'
+	complete -c help -x -a $i -d (printf (_ "Help for the '%s' builtin") $i)
 end
 
 for i in count dirh dirs help mimedb nextd open popd prevd pushd set_color tokenize psub umask type 
-	complete -c help -x -a $i -d 'Help for the '$i' command'
+	complete -c help -x -a $i -d (printf (_ "Help for the '%s' command") $i )
 end
 
 for i in syntax todo bugs history;
-	complete -c help -x -a $i -d 'Help section on '$i
+	complete -c help -x -a $i -d (printf (_ "Help section on %s") $i)
 end
 
-complete -c help -x -a completion -d "Help on how tab-completion works"
-complete -c help -x -a job-control -d "Help on how job control works"
-complete -c help -x -a difference -d "Summary on how fish differs from other shells"
+complete -c help -x -a completion -d (_ "Help on how tab-completion works")
+complete -c help -x -a job-control -d (_ "Help on how job control works")
+complete -c help -x -a difference -d (_ "Summary on how fish differs from other shells")
 
-complete -c help -x -a prompt -d "Help on how to set the prompt"
-complete -c help -x -a title -d "Help on how to set the titlebar message"
-complete -c help -x -a killring -d "Help on how to copy and paste"
-complete -c help -x -a editor -d "Help on editor shortcuts"
-complete -c help -x -a variables -d "Help on environment variables"
-complete -c help -x -a color -d "Help on setting syntax highlighting colors"
-complete -c help -x -a prompt -d "Help on changing the prompt"
-complete -c help -x -a title -d "Help on changing the titlebar messages"
-complete -c help -x -a builtin-overview -d "A short summary of all builtin commands"
-complete -c help -x -a changes -d "The changelog"
+complete -c help -x -a prompt -d (_ "Help on how to set the prompt")
+complete -c help -x -a title -d (_ "Help on how to set the titlebar message")
+complete -c help -x -a killring -d (_ "Help on how to copy and paste")
+complete -c help -x -a editor -d (_ "Help on editor shortcuts")
+complete -c help -x -a variables -d (_ "Help on environment variables")
+complete -c help -x -a color -d (_ "Help on setting syntax highlighting colors")
+complete -c help -x -a prompt -d (_ "Help on changing the prompt")
+complete -c help -x -a title -d (_ "Help on changing the titlebar messages")
+complete -c help -x -a builtin-overview -d (_ "A short summary of all builtin commands")
+complete -c help -x -a changes -d (_ "The changelog")
 
-complete -c help -x -a globbing -d "Help on parameter expansion (Globbing)"
-complete -c help -x -a expand -d "Help on parameter expansion (Globbing)"
-complete -c help -x -a expand-variable -d "Help on variable exapantion \$VARNAME"
-complete -c help -x -a expand-home -d "Help on home directory expansion ~USER"
-complete -c help -x -a expand-brace -d "Help on brace expansion {a,b,c}"
-complete -c help -x -a expand-wildcard -d "Help on wildcard expansion *.*"
-complete -c help -x -a expand-command-substitution -d "Help on command substututions (SUBCOMMAND)"
-complete -c help -x -a expand-process -d "Help on process expansion %JOB"
+complete -c help -x -a globbing -d (_ "Help on parameter expansion (Globbing)")
+complete -c help -x -a expand -d (_ "Help on parameter expansion (Globbing)")
+complete -c help -x -a expand-variable -d (_ "Help on variable exapantion \$VARNAME")
+complete -c help -x -a expand-home -d (_ "Help on home directory expansion ~USER")
+complete -c help -x -a expand-brace -d (_ "Help on brace expansion {a,b,c}")
+complete -c help -x -a expand-wildcard -d (_ "Help on wildcard expansion *.*")
+complete -c help -x -a expand-command-substitution -d (_ "Help on command substututions (SUBCOMMAND)")
+complete -c help -x -a expand-process -d (_ "Help on process expansion %JOB")
diff --git a/init/completions/id.fish b/init/completions/id.fish
index 9b015eb8..9826f434 100644
--- a/init/completions/id.fish
+++ b/init/completions/id.fish
@@ -1,8 +1,8 @@
-complete -c id -s g -l group -d "Print effective group id"
-complete -c id -s G -l groups -d "Print all group ids"
-complete -c id -s n -l name -d "Print name, not number"
-complete -c id -s r -l real -d "Print real ID, not effective"
-complete -c id -s u -l user -d "Print effective user ID"
-complete -c id -l help -d "Display help and exit"
-complete -c id -l version -d "Display version and exit"
+complete -c id -s g -l group -d (_ "Print effective group id")
+complete -c id -s G -l groups -d (_ "Print all group ids")
+complete -c id -s n -l name -d (_ "Print name, not number")
+complete -c id -s r -l real -d (_ "Print real ID, not effective")
+complete -c id -s u -l user -d (_ "Print effective user ID")
+complete -c id -l help -d (_ "Display help and exit")
+complete -c id -l version -d (_ "Display version and exit")
 
diff --git a/init/completions/ifconfig.fish b/init/completions/ifconfig.fish
index 7f8f3346..ab1481e7 100644
--- a/init/completions/ifconfig.fish
+++ b/init/completions/ifconfig.fish
@@ -1,5 +1,5 @@
-complete -x -c ifconfig -a down -d "Stop interface"
-complete -x -c ifconfig -a up -d "Start interface"
+complete -x -c ifconfig -a down -d (_ "Stop interface")
+complete -x -c ifconfig -a up -d (_ "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 "Network interface"
+complete -x -c ifconfig -a "(__fish_print_interfaces)" -d (_ "Network interface")
diff --git a/init/completions/jobs.fish b/init/completions/jobs.fish
index 68c31b3e..52f4151b 100644
--- a/init/completions/jobs.fish
+++ b/init/completions/jobs.fish
@@ -1,6 +1,6 @@
 
 
-complete -c jobs -s p -l pid -d 'Show the process id of each process in the job'
-complete -c jobs -s g -l group -d 'Show group id of job'
-complete -c jobs -s c -l command -d 'Show commandname of each job'
-complete -c jobs -s l -l last -d 'Show status for last be started'
+complete -c jobs -s p -l pid -d (_ "Show the process id of each process in the job")
+complete -c jobs -s g -l group -d (_ "Show group id of job")
+complete -c jobs -s c -l command -d (_ "Show commandname of each job")
+complete -c jobs -s l -l last -d (_ "Show status for last be started")
diff --git a/init/completions/kill.fish b/init/completions/kill.fish
index 8e5f7013..7098736e 100644
--- a/init/completions/kill.fish
+++ b/init/completions/kill.fish
@@ -31,5 +31,5 @@ else
 end
 
 complete -c kill -xa '(__fish_complete_pids)'
-complete -c kill -s l -d "List names of available signals"
+complete -c kill -s l -d (_ "List names of available signals")
 
diff --git a/init/completions/less.fish b/init/completions/less.fish
index 0b55e4e5..e53e800d 100644
--- a/init/completions/less.fish
+++ b/init/completions/less.fish
@@ -1,52 +1,52 @@
-complete -c less -s \? -l help -d "Display help and exit"
-complete -c less -s a -l search-skip-screen -d "Search after end of screen"
-complete -c less -s b -l buffers -r -d "Buffer space"
-complete -c less -s B -l auto-buffers -d "Disable automtic buffer allocation"
-complete -c less -s c -l clear-screen -d "Repaint from top"
-complete -c less -s C -l CLEAR-SCREEN -d "Clear and repaint from top"
-complete -c less -s d -l dumb -d "Supress error for lacking terminal capability"
-complete -c less -s e -l quit-at-eof -d "Exit on second EOF"
-complete -c less -s E -l QUIT-AT-EOF -d "Exit on EOF"
-complete -c less -s f -l force -d "Open non-regular files"
-complete -c less -s F -l quit-if-one-screen -d "Quit if file shorter than one screen"
-complete -c less -s g -l hilite-search -d "Hilight one search target"
-complete -c less -s G -l HILITE-SEARCH -d "No search highlighting"
-complete -c less -s h -l max-back-scroll -d "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 "Search ignores lowercase case"
-complete -c less -s I -l IGNORE-CASE -d "Search ignores all case"
-complete -c less -s j -l jump-target -d "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 "Display status column"
-complete -c less -s k -l lesskey-file -d "Specify key bindings file" -r
+complete -c less -s \? -l help -d (_ "Display help and exit")
+complete -c less -s a -l search-skip-screen -d (_ "Search after end of screen")
+complete -c less -s b -l buffers -r -d (_ "Buffer space")
+complete -c less -s B -l auto-buffers -d (_ "Disable automtic buffer allocation")
+complete -c less -s c -l clear-screen -d (_ "Repaint from top")
+complete -c less -s C -l CLEAR-SCREEN -d (_ "Clear and repaint from top")
+complete -c less -s d -l dumb -d (_ "Supress error for lacking terminal capability")
+complete -c less -s e -l quit-at-eof -d (_ "Exit on second EOF")
+complete -c less -s E -l QUIT-AT-EOF -d (_ "Exit on EOF")
+complete -c less -s f -l force -d (_ "Open non-regular files")
+complete -c less -s F -l quit-if-one-screen -d (_ "Quit if file shorter than one screen")
+complete -c less -s g -l hilite-search -d (_ "Hilight one search target")
+complete -c less -s G -l HILITE-SEARCH -d (_ "No search highlighting")
+complete -c less -s h -l max-back-scroll -d (_ "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 (_ "Search ignores lowercase case")
+complete -c less -s I -l IGNORE-CASE -d (_ "Search ignores all case")
+complete -c less -s j -l jump-target -d (_ "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 (_ "Display status column")
+complete -c less -s k -l lesskey-file -d (_ "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 "Prompt with percentage"
-complete -c less -s M -l LONG-PROMPT -d "Verbose prompt"
-complete -c less -s n -l line-numbers -d "Display line number"
-complete -c less -s N -l LINE-NUMBERS -d "Display line number for each line"
-complete -c less -s o -l log-file -d "Log input to file" -r
-complete -c less -s O -l LOG-FILE -d "Log to file, overwrite" -r
-complete -c less -s p -l pattern -d "Start at first occorance of pattern" -r
-complete -c less -s P -l prompt -d "Prompt string" -r
-complete -c less -s q -l quiet -d "Silent mode"
-complete -c less -l silent -d "Silent mode"
-complete -c less -s Q -l QUIET -d "Completly silent mode"
-complete -c less -l SILENT -d "Completly silent mode"
-complete -c less -s r -l raw-control-chars -d "Display control chars"
-complete -c less -s R -l RAW-CONTROL-CHARS -d "Display control chars, guess screen appearance"
-complete -c less -s s -l squeeze-blank-lines -d "Miltiple blank lines sqeezed"
-complete -c less -s S -l chop-long-lines -d "Do not fold long lines"
-complete -c less -s t -l tag -d "Edit tag" -r
-complete -c less -s T -l tag-file -d "Set tag file" -r
-complete -c less -s u -l underline-special -d "Allow backspace and carriage return"
-complete -c less -s U -l UNDERLINE-SPECIAL -d "Allow backspace, tab and carriage return"
-complete -c less -s V -l version -d "Display version and exit"
-complete -c less -s w -l hilite-unread -d "Flash first unread line on new page"
-complete -c less -s W -l HILITE-UNREAD -d "Flash first unread line on any movement"
-complete -c less -s x -l tabs -d "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 "No termcap init"
-complete -c less -l no-keypad -d "No keypad init"
-complete -c less -s y -l max-forw-scroll -d "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 "Max scroll window" -r -d "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 "Set quote char" -r
-complete -c less -s \~ -l tilde -d "Lines after EOF are blank"
-complete -c less -s \# -l shift -d "Scroll on 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 -d (_ "Prompt with percentage")
+complete -c less -s M -l LONG-PROMPT -d (_ "Verbose prompt")
+complete -c less -s n -l line-numbers -d (_ "Display line number")
+complete -c less -s N -l LINE-NUMBERS -d (_ "Display line number for each line")
+complete -c less -s o -l log-file -d (_ "Log input to file") -r
+complete -c less -s O -l LOG-FILE -d (_ "Log to file, overwrite") -r
+complete -c less -s p -l pattern -d (_ "Start at first occorance of pattern") -r
+complete -c less -s P -l prompt -d (_ "Prompt string") -r
+complete -c less -s q -l quiet -d (_ "Silent mode")
+complete -c less -l silent -d (_ "Silent mode")
+complete -c less -s Q -l QUIET -d (_ "Completly silent mode")
+complete -c less -l SILENT -d (_ "Completly silent mode")
+complete -c less -s r -l raw-control-chars -d (_ "Display control chars")
+complete -c less -s R -l RAW-CONTROL-CHARS -d (_ "Display control chars, guess screen appearance")
+complete -c less -s s -l squeeze-blank-lines -d (_ "Miltiple blank lines sqeezed")
+complete -c less -s S -l chop-long-lines -d (_ "Do not fold long lines")
+complete -c less -s t -l tag -d (_ "Edit tag") -r
+complete -c less -s T -l tag-file -d (_ "Set tag file") -r
+complete -c less -s u -l underline-special -d (_ "Allow backspace and carriage return")
+complete -c less -s U -l UNDERLINE-SPECIAL -d (_ "Allow backspace, tab and carriage return")
+complete -c less -s V -l version -d (_ "Display version and exit")
+complete -c less -s w -l hilite-unread -d (_ "Flash first unread line on new page")
+complete -c less -s W -l HILITE-UNREAD -d (_ "Flash first unread line on any movement")
+complete -c less -s x -l tabs -d (_ "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 (_ "No termcap init")
+complete -c less -l no-keypad -d (_ "No keypad init")
+complete -c less -s y -l max-forw-scroll -d (_ "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 (_ "Max scroll window") -r -d (_ "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 (_ "Set quote char") -r
+complete -c less -s \~ -l tilde -d (_ "Lines after EOF are blank")
+complete -c less -s \# -l shift -d (_ "Scroll on arrows") -a "0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19"
 
diff --git a/init/completions/ls.fish b/init/completions/ls.fish
index d15c5f6a..df5e0caf 100644
--- a/init/completions/ls.fish
+++ b/init/completions/ls.fish
@@ -1,47 +1,47 @@
 
 for i in ls ll la
 
-	complete -c $i -s a -l all -d "Show hidden"
-	complete -c $i -s A -l almost-all -d "Show hidden except . and .."
-	complete -c $i -l author -d "Print author"
-	complete -c $i -s b -l escape -d "Octal escapes for non graphic"
-	complete -c $i -l blocksize -x -d "Use SIZE-byte blocks"
-	complete -c $i -s B -l ignore-backups -d "Ignore files ending with ~"
-	complete -c $i -s c -d "Show and sort by ctime"
-	complete -c $i -s C -d "List by columns"
-	complete -c $i -l color -f -a "never always auto" -d "Show colors"
-	complete -c $i -s d -l directory -d "List directories"
-	complete -c $i -s D -l dired -d "Generate dired output"
-	complete -c $i -s f -d "Do not sort"
-	complete -c $i -s F -l classify -d "Append filetype indicator"
-	complete -c $i -l format -x -a "across commas horizontal long single-column verbose vertical" -d "List format"
-	complete -c $i -l full-time -d "Long forma, full-iso time"
-	complete -c $i -s g -d "Long format without owner"
-	complete -c $i -s G -l no-group -d "Do not print group information"
-	complete -c $i -s h -l human-readable -d "Human readable size"
-	complete -c $i -l si -d "Human readable size, base 1000"
-	complete -c $i -s H -l dereference-command-line -d "Follow symlinks"
-	complete -c $i -l dereference-command-line-symlink-to-dir #-d "Follow directory symlinks from command line"
-	complete -c $i -l indicator-style -x -a "none classify file-type" -d "Append indicator to entry"
-	complete -c $i -s i -l inode -d "Print index number of files"
-	complete -c $i -s I -l ignore -r -d "Skip entries matching pattern"
-	complete -c $i -s k -d "like --block-size=1K"
-	complete -c $i -s l -d "Long format"
-	complete -c $i -s L -l dereference -d "Follow symlinks"
-	complete -c $i -s m -d "Comma separated format"
-	complete -c $i -s n -l numeric-uid-gid -d "Long format, numeric IDs"
-	complete -c $i -s N -l literal -d "Print raw entry names"
-	complete -c $i -s o -d "Long format without groups"
-	complete -c $i -s p -l file-type -d "Append indicator"
-	complete -c $i -s q -l hide-control-chars -d "? fo non graphic"
-	complete -c $i -l show-control-chars -d "Non graphic as-is"
-	complete -c $i -s Q -l quote-name -d "Enclose entry in quotes"
-	complete -c $i -l quoting-style -x -a "literal locale shell shell-always c escape" -d "Select quoting style"
-	complete -c $i -s r -l reverse -d "Reverse sort order"
-	complete -c $i -s R -l recursive -d "List subdirectory recursively"
-	complete -c $i -s s -l size -d "Print size of files"
-	complete -c $i -s S -d "Sort by size"
-	complete -c $i -l sort -x -d "Sort criteria" -a "
+	complete -c $i -s a -l all -d (_ "Show hidden")
+	complete -c $i -s A -l almost-all -d (_ "Show hidden except . and ..")
+	complete -c $i -l author -d (_ "Print author")
+	complete -c $i -s b -l escape -d (_ "Octal escapes for non graphic")
+	complete -c $i -l blocksize -x -d (_ "Use SIZE-byte blocks")
+	complete -c $i -s B -l ignore-backups -d (_ "Ignore files ending with ~")
+	complete -c $i -s c -d (_ "Show and sort by ctime")
+	complete -c $i -s C -d (_ "List by columns")
+	complete -c $i -l color -f -a "never always auto" -d (_ "Show colors")
+	complete -c $i -s d -l directory -d (_ "List directories")
+	complete -c $i -s D -l dired -d (_ "Generate dired output")
+	complete -c $i -s f -d (_ "Do not sort")
+	complete -c $i -s F -l classify -d (_ "Append filetype indicator")
+	complete -c $i -l format -x -a "across commas horizontal long single-column verbose vertical" -d (_ "List format")
+	complete -c $i -l full-time -d (_ "Long forma, full-iso time")
+	complete -c $i -s g -d (_ "Long format without owner")
+	complete -c $i -s G -l no-group -d (_ "Do not print group information")
+	complete -c $i -s h -l human-readable -d (_ "Human readable size")
+	complete -c $i -l si -d (_ "Human readable size, base 1000")
+	complete -c $i -s H -l dereference-command-line -d (_ "Follow symlinks")
+	complete -c $i -l dereference-command-line-symlink-to-dir #-d (_ "Follow directory symlinks from command line")
+	complete -c $i -l indicator-style -x -a "none classify file-type" -d (_ "Append indicator to entry")
+	complete -c $i -s i -l inode -d (_ "Print index number of files")
+	complete -c $i -s I -l ignore -r -d (_ "Skip entries matching pattern")
+	complete -c $i -s k -d (_ "like --block-size=1K")
+	complete -c $i -s l -d (_ "Long format")
+	complete -c $i -s L -l dereference -d (_ "Follow symlinks")
+	complete -c $i -s m -d (_ "Comma separated format")
+	complete -c $i -s n -l numeric-uid-gid -d (_ "Long format, numeric IDs")
+	complete -c $i -s N -l literal -d (_ "Print raw entry names")
+	complete -c $i -s o -d (_ "Long format without groups")
+	complete -c $i -s p -l file-type -d (_ "Append indicator")
+	complete -c $i -s q -l hide-control-chars -d (_ "? fo non graphic")
+	complete -c $i -l show-control-chars -d (_ "Non graphic as-is")
+	complete -c $i -s Q -l quote-name -d (_ "Enclose entry in quotes")
+	complete -c $i -l quoting-style -x -a "literal locale shell shell-always c escape" -d (_ "Select quoting style")
+	complete -c $i -s r -l reverse -d (_ "Reverse sort order")
+	complete -c $i -s R -l recursive -d (_ "List subdirectory recursively")
+	complete -c $i -s s -l size -d (_ "Print size of files")
+	complete -c $i -s S -d (_ "Sort by size")
+	complete -c $i -l sort -x -d (_ "Sort criteria") -a "
 	extension\t'Sort by file extension'
 	none\t'Do not sort'
 		size\t'Sort by size'
@@ -52,24 +52,24 @@ for i in ls ll la
 		access\t'Sort by access time'
 		use\t'Sort by access time'
 	"
-	complete -c $i -l time -x -d "Show time type" -a "
+	complete -c $i -l time -x -d (_ "Show time type") -a "
 		time\t'Sort by modification time'
 		access\t'Sort by access time'
 		use\t'Sort by use time'
 		ctime\t'Sort by file status modification time'
 		status\t'Sort by status time'
 	"
-	complete -c $i -l time-style -x -a "full-iso long-iso iso locale" -d "Select time style"
-	complete -c $i -s t -d "Sort by modification time"
-	complete -c $i -s T -l tabsize -x -a "1 2 3 4 5 6 7 8 9 10 11 12" -d "Assume tab stops at each COLS"
-	complete -c $i -s u -d "Show access time"
-	complete -c $i -s U -d "Do not sort"
-	complete -c $i -s v -d "Sort by version"
-	complete -c $i -s w -l width -x -d "Assume screen width"
-	complete -c $i -s x -d "List entries by lines"
-	complete -c $i -s X -d "sort by extension"
-	complete -c $i -s 1 -d "List one file per line"
-	complete -c $i -l help -d "Display help and exit"
-	complete -c $i -l version -d "Display version and exit"
+	complete -c $i -l time-style -x -a "full-iso long-iso iso locale" -d (_ "Select time style")
+	complete -c $i -s t -d (_ "Sort by modification time")
+	complete -c $i -s T -l tabsize -x -a "1 2 3 4 5 6 7 8 9 10 11 12" -d (_ "Assume tab stops at each COLS")
+	complete -c $i -s u -d (_ "Show access time")
+	complete -c $i -s U -d (_ "Do not sort")
+	complete -c $i -s v -d (_ "Sort by version")
+	complete -c $i -s w -l width -x -d (_ "Assume screen width")
+	complete -c $i -s x -d (_ "List entries by lines")
+	complete -c $i -s X -d (_ "sort by extension")
+	complete -c $i -s 1 -d (_ "List one file per line")
+	complete -c $i -l help -d (_ "Display help and exit")
+	complete -c $i -l version -d (_ "Display version and exit")
 
 end
diff --git a/init/completions/make.fish b/init/completions/make.fish
index 7427fdeb..a8191cef 100644
--- a/init/completions/make.fish
+++ b/init/completions/make.fish
@@ -2,28 +2,28 @@
 
 function __fish_print_make_targets
 	set files Makefile makefile GNUmakefile
-	grep -h -E '^[^#%=$[:space:]][^#%=$]*:([^=]|$)' $files | cut -d ":" -f 1 | sed -e 's/^ *//;s/ *$//;s/  */\n/g' ^/dev/null
+	grep -h -E '^[^#%=$[:space:]][^#%=$]*:([^=]|$)' $files | cut -d (_ ":") -f 1 | sed -e 's/^ *//;s/ *$//;s/  */\n/g' ^/dev/null
 end
 
-complete -x -c make -a "(__fish_print_make_targets)" -d "Target"
-complete -r -c make -s f -d "Use file as makefile" -r
-complete -x -c make -s C -x -a "(__fish_complete_directory (commandline -ct))" -d "Change directory"
-complete -c make -s d -d "Debug"
-complete -c make -s e -d "Environment before makefile"
-complete -c make -s i -d "Ignore errors"
-complete -x -c make -s I -d "Search directory for Makefile" -a "(__fish_complete_directory (commandline -ct))"
-complete -x -c make -s j -d "Number of jobs"
-complete -c make -s k -d "Continue after an error"
-complete -c make -s l -d "Start when load drops"
-complete -c make -s n -d "Do not execute commands"
-complete -c make -s o -r -d "Ignore specified file"
-complete -c make -s p -d "Print database"
-complete -c make -s q -d "Question mode"
-complete -c make -s r -d "Eliminate implicit rules"
-complete -c make -s s -d "Silent operation"
-complete -c make -s S -d "Cancel the effect of -k"
-complete -c make -s t -d "Touch files, dont run commands"
-complete -c make -s v -d "Print version"
-complete -c make -s w -d "Print working directory"
-complete -c make -s W -r -d "Pretend file is modified"
+complete -x -c make -a "(__fish_print_make_targets)" -d (_ "Target")
+complete -r -c make -s f -d (_ "Use file as makefile") -r
+complete -x -c make -s C -x -a "(__fish_complete_directory (commandline -ct))" -d (_ "Change directory")
+complete -c make -s d -d (_ "Debug")
+complete -c make -s e -d (_ "Environment before makefile")
+complete -c make -s i -d (_ "Ignore errors")
+complete -x -c make -s I -d (_ "Search directory for Makefile") -a "(__fish_complete_directory (commandline -ct))"
+complete -x -c make -s j -d (_ "Number of jobs")
+complete -c make -s k -d (_ "Continue after an error")
+complete -c make -s l -d (_ "Start when load drops")
+complete -c make -s n -d (_ "Do not execute commands")
+complete -c make -s o -r -d (_ "Ignore specified file")
+complete -c make -s p -d (_ "Print database")
+complete -c make -s q -d (_ "Question mode")
+complete -c make -s r -d (_ "Eliminate implicit rules")
+complete -c make -s s -d (_ "Silent operation")
+complete -c make -s S -d (_ "Cancel the effect of -k")
+complete -c make -s t -d (_ "Touch files, dont run commands")
+complete -c make -s v -d (_ "Display version and exit")
+complete -c make -s w -d (_ "Print working directory")
+complete -c make -s W -r -d (_ "Pretend file is modified")
 
diff --git a/init/completions/makedepend.fish b/init/completions/makedepend.fish
index f5455b8e..534a1885 100644
--- a/init/completions/makedepend.fish
+++ b/init/completions/makedepend.fish
@@ -1,13 +1,13 @@
-complete -c makedepend -s D -r -d "Define"
-complete -c makedepend -s I -r -d "Include directory"
-complete -c makedepend -s Y -r -d "Replace include directories"
-complete -c makedepend -s a -d "Append dependencies to makefile"
-complete -c makedepend -s f -r -d "Specify makefile"
-complete -c makedepend -o include -r -d "Prepend file to input"
-complete -c makedepend -s o -r -d "Object file suffix"
-complete -c makedepend -s p -r -d "Object file prefix"
-complete -c makedepend -s s -r -d "Starting string delimiter"
-complete -c makedepend -s w -r -d "Line width"
-complete -c makedepend -s v -d "Verbose mode"
-complete -c makedepend -s m -d "Warn about multiple inclusion"
+complete -c makedepend -s D -r -d (_ "Define")
+complete -c makedepend -s I -r -d (_ "Include directory")
+complete -c makedepend -s Y -r -d (_ "Replace include directories")
+complete -c makedepend -s a -d (_ "Append dependencies to makefile")
+complete -c makedepend -s f -r -d (_ "Specify makefile")
+complete -c makedepend -o include -r -d (_ "Prepend file to input")
+complete -c makedepend -s o -r -d (_ "Object file suffix")
+complete -c makedepend -s p -r -d (_ "Object file prefix")
+complete -c makedepend -s s -r -d (_ "Starting string delimiter")
+complete -c makedepend -s w -r -d (_ "Line width")
+complete -c makedepend -s v -d (_ "Verbose mode")
+complete -c makedepend -s m -d (_ "Warn about multiple inclusion")
 
diff --git a/init/completions/man.fish b/init/completions/man.fish
index 6c7a9779..8c0e3a4a 100644
--- a/init/completions/man.fish
+++ b/init/completions/man.fish
@@ -29,36 +29,36 @@ end
 
 complete -xc man -a "(__fish_complete_man)"
 
-complete -xc man -a 1 -d "Program section"
-complete -xc man -a 2 -d "Syscall section"
-complete -xc man -a 3 -d "Library section"
-complete -xc man -a 4 -d "Device section"
-complete -xc man -a 5 -d "File format section"
-complete -xc man -a 6 -d "Games section"
-complete -xc man -a 7 -d "Misc section"
-complete -xc man -a 8 -d "Admin section"
-complete -xc man -a 9 -d "Kernel section"
-complete -xc man -a tcl -d "Tcl section"
-complete -xc man -a n -d "New section"
-complete -xc man -a l -d "Local section"
+complete -xc man -a 1 -d (_ "Program section")
+complete -xc man -a 2 -d (_ "Syscall section")
+complete -xc man -a 3 -d (_ "Library section")
+complete -xc man -a 4 -d (_ "Device section")
+complete -xc man -a 5 -d (_ "File format section")
+complete -xc man -a 6 -d (_ "Games section")
+complete -xc man -a 7 -d (_ "Misc section")
+complete -xc man -a 8 -d (_ "Admin section")
+complete -xc man -a 9 -d (_ "Kernel section")
+complete -xc man -a tcl -d (_ "Tcl section")
+complete -xc man -a n -d (_ "New section")
+complete -xc man -a l -d (_ "Local section")
 complete -xc man -a p
-complete -xc man -a o -d "Old section"
-complete -rc man -s C -d "Configuration file"
-complete -xc man -s M -a "(__fish_complete_directory (commandline -ct))" -d "Manpath"
-complete -rc man -s P -d "Pager"
-complete -xc man -s S -d "Manual sections"
-complete -c man -s a -d "Display all matches"
-complete -c man -s c -d "Always reformat"
-complete -c man -s d -d "Debug"
-complete -c man -s D -d "Debug and run"
-complete -c man -s f -d "Whatis"
-complete -c man -s F -l preformat -d "Format only"
-complete -c man -s h -d "Display help and exit"
-complete -c man -s k -d "Apropos"
-complete -c man -s K -d "Search in all man pages"
-complete -xc man -s m -d "Set system"
-complete -xc man -s p -d "Preprocessors"
-complete -c man -s t -d "Format for printing"
-complete -c man -s w -l path -d "Only print locations"
-complete -c man -s W -d "Only print locations"
+complete -xc man -a o -d (_ "Old section")
+complete -rc man -s C -d (_ "Configuration file")
+complete -xc man -s M -a "(__fish_complete_directory (commandline -ct))" -d (_ "Manpath")
+complete -rc man -s P -d (_ "Pager")
+complete -xc man -s S -d (_ "Manual sections")
+complete -c man -s a -d (_ "Display all matches")
+complete -c man -s c -d (_ "Always reformat")
+complete -c man -s d -d (_ "Debug")
+complete -c man -s D -d (_ "Debug and run")
+complete -c man -s f -d (_ "Whatis")
+complete -c man -s F -l preformat -d (_ "Format only")
+complete -c man -s h -d (_ "Display help and exit")
+complete -c man -s k -d (_ "Apropos")
+complete -c man -s K -d (_ "Search in all man pages")
+complete -xc man -s m -d (_ "Set system")
+complete -xc man -s p -d (_ "Preprocessors")
+complete -c man -s t -d (_ "Format for printing")
+complete -c man -s w -l path -d (_ "Only print locations")
+complete -c man -s W -d (_ "Only print locations")
 
diff --git a/init/completions/mimedb.fish b/init/completions/mimedb.fish
index a7bc6930..8d0f1324 100644
--- a/init/completions/mimedb.fish
+++ b/init/completions/mimedb.fish
@@ -1,9 +1,9 @@
-complete -c mimedb -s t -l input-file-data -d "Input is a file, use name and contents to determine mimetype"
-complete -c mimedb -s f -l input-filename -d "Input is a file, use name to determine mimetype"
-complete -c mimedb -s i -l input-mime -d "Input is a mimetype"
-complete -c mimedb -s m -l output-mime -d "Output mimetype"
-complete -c mimedb -s d -l output-description -d "Output description of mimetype"
-complete -c mimedb -s a -l output-action -d "Output default action for mimetype"
-complete -c mimedb -s l -l launch -d "Launch default action for each file"
-complete -c mimedb -s h -l help -d "Display help and exit"
-complete -c mimedb -s v -l version -d "Display version and exit"
+complete -c mimedb -s t -l input-file-data -d (_ "Input is a file, use name and contents to determine mimetype")
+complete -c mimedb -s f -l input-filename -d (_ "Input is a file, use name to determine mimetype")
+complete -c mimedb -s i -l input-mime -d (_ "Input is a mimetype")
+complete -c mimedb -s m -l output-mime -d (_ "Output mimetype")
+complete -c mimedb -s d -l output-description -d (_ "Output description of mimetype")
+complete -c mimedb -s a -l output-action -d (_ "Output default action for mimetype")
+complete -c mimedb -s l -l launch -d (_ "Launch default action for each file")
+complete -c mimedb -s h -l help -d (_ "Display help and exit")
+complete -c mimedb -s v -l version -d (_ "Display version and exit")
diff --git a/init/completions/modprobe.fish b/init/completions/modprobe.fish
index 566d00b6..40074839 100644
--- a/init/completions/modprobe.fish
+++ b/init/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 "Print messages about what the program is doing"
-complete -c modprobe -s C -l config -d "Configuration file" -r
-complete -c modprobe -s c -l showconfig -d "Dump configuration file"
-complete -c modprobe -s n -l dry-run -d "Do not actually insert/remove module"
-complete -c modprobe -s i -l ingnore-install -d "Ignore install and remove commands in configuration file"
-complete -c modprobe -l ingnore-remove -d "Ignore install and remove commands in configuration file"
-complete -c modprobe -s q -l quiet -d "Ignore bogus module names"
-complete -c modprobe -s r -l remove -d "Remove modules"
-complete -c modprobe -s V -l version -d "Display version and exit"
-complete -c modprobe -s f -l force -d "Ignore all version information"
-complete -c modprobe -l force-vermagic -d "Ignore version magic information"
-complete -c modprobe -l force-modversion -d "Ignore module interface version"
-complete -c modprobe -s l -l list -d "List all modules matching the given wildcard" 
-complete -c modprobe -s a -l all -d "Insert modules matching the given wildcard"
-complete -c modprobe -s t -l type -d "Restrict wildcards to specified directory"
-complete -c modprobe -s s -l syslog -d "Send error messages through syslog"
-complete -c modprobe -l set-version -d "Specify kernel version"
-complete -c modprobe -l show-depends -d "List dependencies of module"
-complete -c modprobe -s o -l name -d "Rename module"
-complete -c modprobe -l first-time -d "Fail if inserting already loaded module"
+complete -c modprobe -s v -l verbose -d (_ "Print messages about what the program is doing")
+complete -c modprobe -s C -l config -d (_ "Configuration file") -r
+complete -c modprobe -s c -l showconfig -d (_ "Dump configuration file")
+complete -c modprobe -s n -l dry-run -d (_ "Do not actually insert/remove module")
+complete -c modprobe -s i -l ingnore-install -d (_ "Ignore install and remove commands in configuration file")
+complete -c modprobe -l ingnore-remove -d (_ "Ignore install and remove commands in configuration file")
+complete -c modprobe -s q -l quiet -d (_ "Ignore bogus module names")
+complete -c modprobe -s r -l remove -d (_ "Remove modules")
+complete -c modprobe -s V -l version -d (_ "Display version and exit")
+complete -c modprobe -s f -l force -d (_ "Ignore all version information")
+complete -c modprobe -l force-vermagic -d (_ "Ignore version magic information")
+complete -c modprobe -l force-modversion -d (_ "Ignore module interface version")
+complete -c modprobe -s l -l list -d (_ "List all modules matching the given wildcard") 
+complete -c modprobe -s a -l all -d (_ "Insert modules matching the given wildcard")
+complete -c modprobe -s t -l type -d (_ "Restrict wildcards to specified directory")
+complete -c modprobe -s s -l syslog -d (_ "Send error messages through syslog")
+complete -c modprobe -l set-version -d (_ "Specify kernel version")
+complete -c modprobe -l show-depends -d (_ "List dependencies of module")
+complete -c modprobe -s o -l name -d (_ "Rename module")
+complete -c modprobe -l first-time -d (_ "Fail if inserting already loaded module")
 
diff --git a/init/completions/mount.fish b/init/completions/mount.fish
index 0cd73c38..f94c0e7b 100644
--- a/init/completions/mount.fish
+++ b/init/completions/mount.fish
@@ -42,26 +42,26 @@ set -g __fish_filesystems '
 '
 
 # Completions for mount
-complete -x -c mount -a '(cat /etc/fstab|sed -e "s/^\([^ \t]*\)[ \t]*\([^ \t]*\).*/\1\n\2/"|grep "^/")' -d 'Mount point'
-complete -c mount -s V -d 'Display version and exit'
-complete -c mount -s h -d 'Display help and exit'
-complete -c mount -s v -d 'Verbose mode'
-complete -c mount -s a -d 'Mount filesystems in fstab'
-complete -c mount -s F -d 'Fork process for each mount'
-complete -c mount -s f -d 'Fake mounting'
-complete -c mount -s l -d 'Add label to output'
-complete -c mount -s n -d 'Do not write mtab'
-complete -c mount -s s -d 'Tolerate sloppy mount options'
-complete -c mount -s r -d 'Read only'
-complete -c mount -s w -d 'Read/Write mode'
-complete -x -c mount -s L -d 'Mount partition with specified label'
-complete -x -c mount -s U -d 'Mount partition with specified UID'
-complete -c mount -s O -x -d 'Exclude filesystems'
-complete -c mount -l bind -f -d 'Remount a subtree to a second position'
-complete -c mount -l move -f -d 'Move a subtree to a new position'
-complete -c mount -x -s t -d 'Filesystem' -a $__fish_filesystems
+complete -x -c mount -a '(cat /etc/fstab|sed -e "s/^\([^ \t]*\)[ \t]*\([^ \t]*\).*/\1\n\2/"|grep "^/")' -d (_ 'Mount point')
+complete -c mount -s V -d (_ 'Display version and exit')
+complete -c mount -s h -d (_ 'Display help and exit')
+complete -c mount -s v -d (_ 'Verbose mode')
+complete -c mount -s a -d (_ 'Mount filesystems in fstab')
+complete -c mount -s F -d (_ 'Fork process for each mount')
+complete -c mount -s f -d (_ 'Fake mounting')
+complete -c mount -s l -d (_ 'Add label to output')
+complete -c mount -s n -d (_ 'Do not write mtab')
+complete -c mount -s s -d (_ 'Tolerate sloppy mount options')
+complete -c mount -s r -d (_ 'Read only')
+complete -c mount -s w -d (_ 'Read/Write mode')
+complete -x -c mount -s L -d (_ 'Mount partition with specified label')
+complete -x -c mount -s U -d (_ 'Mount partition with specified UID')
+complete -c mount -s O -x -d (_ 'Exclude filesystems')
+complete -c mount -l bind -f -d (_ 'Remount a subtree to a second position')
+complete -c mount -l move -f -d (_ 'Move a subtree to a new position')
+complete -c mount -x -s t -d (_ 'Filesystem') -a $__fish_filesystems
 
-complete -c mount -x -s o -d 'Mount option' -a '(__fish_append , $__fish_mount_opts)'
+complete -c mount -x -s o -d (_ 'Mount option') -a '(__fish_append , $__fish_mount_opts)'
 
 set -g __fish_mount_opts async\tUse\ asynchronous\ I/O atime\tUpdate\ time\ on\ each\ access auto\tMounted\ with\ -a defaults\tUse\ default\ options dev\tInterpret\ character/block\ special\ devices exec\tPermit\ executables _netdev\tFilesystem\ uses\network noatime\tDo\ not\ update\ time\ on\ each\ access noauto\tNot\ mounted\ by\ -a nodev\tDo\ not\ interpret\ character/block\ special\ devices noexec\tDo\ not\ permit\ executables nosuid\tIgnore\ suid\ bits nouser\tOnly\ root\ may\ mount remount\tRemount\ read-only\ filesystem ro\tMount\ read-only rw\tMount\ read-write suid\tAllow\ suid\ bits sync\tUse\ synchronous\ I/O dirsync\tUse\ synchronous\ directory\ operations user\tAny\ user\ may\ mount users\tAny\ user\ may\ mount\ and\ unmount
 
diff --git a/init/completions/mplayer.fish b/init/completions/mplayer.fish
index ace11432..f4325b34 100644
--- a/init/completions/mplayer.fish
+++ b/init/completions/mplayer.fish
@@ -24,62 +24,62 @@ set mplayer_lang "
 	se\Swedish
 "
 
-complete -c mplayer -o autoq -d "Dynamically change postprocessing" -x
-complete -c mplayer -o autosync -x -d "A/V sync speed"
-complete -c mplayer -o framedrop -d "Skip frames to maintain A/V sync"
-complete -c mplayer -s h -o help -d "Show help and exit"
-complete -c mplayer -o hardframedrop -d "Skip frames to maintain A/V sync"
-complete -c mplayer -o loop -x -d "Loop playback" -r -a "0 1 2 3 4 5 6 7 8 9"
-complete -c mplayer -o shuffle -d "Play in random order"
+complete -c mplayer -o autoq -d (_ "Dynamically change postprocessing") -x
+complete -c mplayer -o autosync -x -d (_ "A/V sync speed")
+complete -c mplayer -o framedrop -d (_ "Skip frames to maintain A/V sync")
+complete -c mplayer -s h -o help -d (_ "Show help and exit")
+complete -c mplayer -o hardframedrop -d (_ "Skip frames to maintain A/V sync")
+complete -c mplayer -o loop -x -d (_ "Loop playback") -r -a "0 1 2 3 4 5 6 7 8 9"
+complete -c mplayer -o shuffle -d (_ "Play in random order")
 
-complete -c mplayer -s h -o help -d "Display help and exit"
-complete -c mplayer -o fs -d "Full screen"
-complete -c mplayer -o playlist -d "Set playlist"-r
-complete -c mplayer -o alang -d "Audio language" -x -a $mplayer_lang
-complete -c mplayer -o audiofile -d "Play audio from file" -r
-complete -c mplayer -o cdrom-device -d "Set default CD-ROM drive"
-complete -c mplayer -o channels -d "Set number of audio channels" -x -a "2 4 6"
-complete -c mplayer -o chapter -d "Set start chapter" -x
-complete -c mplayer -o dvd-device -d "Set default DVD-ROM drive"
-complete -c mplayer -o dvdangle -d "Set dvd viewing angle" -x -a "1 2 3 4 5 6 7 8"
-complete -c mplayer -o forceidx -d "Force rebuilding index"
-complete -c mplayer -o fps -d "Override framerate" -x -a "24 25 30"
-complete -c mplayer -o idx -d "Rebuild index if unavailable"
-complete -c mplayer -o loadidx -d "Load index from file" -r
-complete -c mplayer -o ni -d "Force non-interleaved AVI parser"
-complete -c mplayer -o saveidx -d "Rebuild index and save to file" -r
-complete -c mplayer -o ss -d "Seek to give time position" -x
-complete -c mplayer -o tv -d "TV capture mode"
-complete -c mplayer -o slang -d "Subtitle language" -x -a $mplayer_lang
-complete -c mplayer -o sub -d "Subtitle file" -r
-complete -c mplayer -o unicode -d "Handle subtitlefile as unicode"
-complete -c mplayer -o utf8 -d "Handle subtitlefile as utf8"
+complete -c mplayer -s h -o help -d (_ "Display help and exit")
+complete -c mplayer -o fs -d (_ "Full screen")
+complete -c mplayer -o playlist -d (_ "Set playlist")-r
+complete -c mplayer -o alang -d (_ "Audio language") -x -a $mplayer_lang
+complete -c mplayer -o audiofile -d (_ "Play audio from file") -r
+complete -c mplayer -o cdrom-device -d (_ "Set default CD-ROM drive")
+complete -c mplayer -o channels -d (_ "Set number of audio channels") -x -a "2 4 6"
+complete -c mplayer -o chapter -d (_ "Set start chapter") -x
+complete -c mplayer -o dvd-device -d (_ "Set default DVD-ROM drive")
+complete -c mplayer -o dvdangle -d (_ "Set dvd viewing angle") -x -a "1 2 3 4 5 6 7 8"
+complete -c mplayer -o forceidx -d (_ "Force rebuilding index")
+complete -c mplayer -o fps -d (_ "Override framerate") -x -a "24 25 30"
+complete -c mplayer -o idx -d (_ "Rebuild index if unavailable")
+complete -c mplayer -o loadidx -d (_ "Load index from file") -r
+complete -c mplayer -o ni -d (_ "Force non-interleaved AVI parser")
+complete -c mplayer -o saveidx -d (_ "Rebuild index and save to file") -r
+complete -c mplayer -o ss -d (_ "Seek to give time position") -x
+complete -c mplayer -o tv -d (_ "TV capture mode")
+complete -c mplayer -o slang -d (_ "Subtitle language") -x -a $mplayer_lang
+complete -c mplayer -o sub -d (_ "Subtitle file") -r
+complete -c mplayer -o unicode -d (_ "Handle subtitlefile as unicode")
+complete -c mplayer -o utf8 -d (_ "Handle subtitlefile as utf8")
 
-complete -c mplayer -o vo -x -d "Video output" -a "
+complete -c mplayer -o vo -x -d (_ "Video output") -a "
 (
 	mplayer -vo help|grep \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 "Audio output" -a "
+complete -c mplayer -o ao -x -d (_ "Audio output") -a "
 (
 	mplayer -ao help|grep \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 "Audio output" -a "
+complete -c mplayer -o afm -x -d (_ "Audio output") -a "
 (
 	__fish_append ',' (mplayer -afm help|grep \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 "Video output" -a "
+complete -c mplayer -o vfm -x -d (_ "Video output") -a "
 (
 	__fish_append ',' (mplayer -vfm help|grep \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 "Display help and exit"
-complete -c mplayer -l version -d "Display version and exit"
+complete -c mplayer -l help -d (_ "Display help and exit")
+complete -c mplayer -l version -d (_ "Display version and exit")
 
 set -e mplayer_lang
diff --git a/init/completions/mv.fish b/init/completions/mv.fish
index dbb6aed2..b1038587 100644
--- a/init/completions/mv.fish
+++ b/init/completions/mv.fish
@@ -1,12 +1,12 @@
-complete -c mv -s b -l backup -d "Make backup of each existing destination file"
-complete -c mv -s f -l force -d "Do not prompt before overwriting"
-complete -c mv -s i -l interactive -d "Prompt before overwrite"
-complete -c mv -l reply -x -a "yes no query" -d "Answer for overwrite questions"
-complete -c mv -l strip-trailing-slashes -d "Remove trailing slashes from source"
-complete -c mv -s S -l suffix -r -d "Backup suffix"
-complete -c mv -l target-directory -d "Target directory" -x -a "(__fish_complete_directory (commandline -ct) 'Target directory')"
-complete -c mv -s u -l update -d "Do not overwrite newer files"
-complete -c mv -s v -l vervose -d "Explain what is done"
-complete -c mv -l help -d "Display help and exit"
-complete -c mv -l version -d "Display version and exit"
+complete -c mv -s b -l backup -d (_ "Make backup of each existing destination file")
+complete -c mv -s f -l force -d (_ "Do not prompt before overwriting")
+complete -c mv -s i -l interactive -d (_ "Prompt before overwrite")
+complete -c mv -l reply -x -a "yes no query" -d (_ "Answer for overwrite questions")
+complete -c mv -l strip-trailing-slashes -d (_ "Remove trailing slashes from source")
+complete -c mv -s S -l suffix -r -d (_ "Backup suffix")
+complete -c mv -l target-directory -d (_ "Target directory") -x -a "(__fish_complete_directory (commandline -ct) 'Target directory')"
+complete -c mv -s u -l update -d (_ "Do not overwrite newer files")
+complete -c mv -s v -l vervose -d (_ "Explain what is done")
+complete -c mv -l help -d (_ "Display help and exit")
+complete -c mv -l version -d (_ "Display version and exit")
 
diff --git a/init/completions/nextd.fish b/init/completions/nextd.fish
index be515cc5..1f6e0631 100644
--- a/init/completions/nextd.fish
+++ b/init/completions/nextd.fish
@@ -1 +1 @@
-complete -c nextd -s l -d "Also print directory history"
+complete -c nextd -s l -d (_ "Also print directory history")
diff --git a/init/completions/nice.fish b/init/completions/nice.fish
index 2f7bfda9..e7b67035 100644
--- a/init/completions/nice.fish
+++ b/init/completions/nice.fish
@@ -1,5 +1,5 @@
 
-complete -c nice -s n -l adjustment -r -d "Increment priority by specified number first"
-complete -c nice -l help -d "Display help and exit"
-complete -c nice -l version -d "Display version and exit"
+complete -c nice -s n -l adjustment -r -d (_ "Increment priority by specified number first")
+complete -c nice -l help -d (_ "Display help and exit")
+complete -c nice -l version -d (_ "Display version and exit")
 
diff --git a/init/completions/perl.fish b/init/completions/perl.fish
index caa5a44e..9bfe7280 100644
--- a/init/completions/perl.fish
+++ b/init/completions/perl.fish
@@ -1,20 +1,20 @@
-complete -c perl -s 0 -d 'Specify record separator'
-complete -c perl -s a -d 'Feed input to split'
-complete -c perl -s c -d 'Check syntax'
-complete -c perl -s d -d 'Debugger'
-complete -c perl -s D -x -d 'Debug option'
-complete -c perl -s e -x -d 'Execute command'
-complete -c perl -s F -d 'Set regexp used to split input'
-complete -c perl -s i -d 'Edit files in-place'
-complete -c perl -s I -d 'Include path'
-complete -c perl -s l -d 'Line ending processing'
-complete -c perl -s n -d 'Loop script'
-complete -c perl -s p -d 'Loop script, print $_'
-complete -c perl -s P -d 'Invoke CPP'
-complete -c perl -s s -d 'Define custom switches'
-complete -c perl -s S -d 'Search $PATH for script'
-complete -c perl -s T -d 'Taint checking'
-complete -c perl -s U -d 'Unsafe mode'
-complete -c perl -s v -d 'Display version'
-complete -c perl -s x -d 'Extract script'
+complete -c perl -s 0 -d (_ 'Specify record separator')
+complete -c perl -s a -d (_ 'Feed input to split')A
+complete -c perl -s c -d (_ 'Check syntax')
+complete -c perl -s d -d (_ 'Debugger')
+complete -c perl -s D -x -d (_ 'Debug option')
+complete -c perl -s e -x -d (_ 'Execute command')
+complete -c perl -s F -d (_ 'Set regexp used to split input')
+complete -c perl -s i -d (_ 'Edit files in-place')
+complete -c perl -s I -d (_ 'Include path')
+complete -c perl -s l -d (_ 'Line ending processing')
+complete -c perl -s n -d (_ 'Loop script')
+complete -c perl -s p -d (_ 'Loop script, print $_')
+complete -c perl -s P -d (_ 'Invoke CPP')
+complete -c perl -s s -d (_ 'Define custom switches')
+complete -c perl -s S -d (_ 'Search $PATH for script')
+complete -c perl -s T -d (_ 'Taint checking')
+complete -c perl -s U -d (_ 'Unsafe mode')
+complete -c perl -s v -d (_ 'Display version and exit')
+complete -c perl -s x -d (_ 'Extract script')
 
diff --git a/init/completions/pine.fish b/init/completions/pine.fish
index 655804ea..7c4e4512 100644
--- a/init/completions/pine.fish
+++ b/init/completions/pine.fish
@@ -1,19 +1,19 @@
-complete -c pine -s f -d "Open folder" -a "(cd ~/.Mail; ls -d *)"
-complete -c pine -s F -d "Open file" -r
-complete -c pine -s h -d "Display help and exit"
-complete -c pine -s i -d "Start in folder index"
-complete -c pine -s I -d "Initial set of keystrokes" -x
-complete -c pine -s k -d "Use function keys for commands"
-complete -c pine -s l -d "Expand collections in FOLDER LIST display"
-complete -c pine -s n -d "Start with specified current message number" -x
-complete -c pine -s o -d "Open folder read-only"
-complete -c pine -s p -d "Set configuration file" -r
-complete -c pine -s P -d "Set global configuration file"
-complete -c pine -s r -d "Restricted mode"
-complete -c pine -s z -d "Enable suspention support"
-complete -c pine -o conf -d "Produce a sample global configuration file"
-complete -c pine -o pinerc -d "Produce sample configuration file" -r
-complete -c pine -o sort -d "Set mail sort order" -a "
+complete -c pine -s f -d (_ "Open folder") -a "(cd ~/.Mail; ls -d *)"
+complete -c pine -s F -d (_ "Open file") -r
+complete -c pine -s h -d (_ "Display help and exit")
+complete -c pine -s i -d (_ "Start in folder index")
+complete -c pine -s I -d (_ "Initial set of keystrokes") -x
+complete -c pine -s k -d (_ "Use function keys for commands")
+complete -c pine -s l -d (_ "Expand collections in FOLDER LIST display")
+complete -c pine -s n -d (_ "Start with specified current message number") -x
+complete -c pine -s o -d (_ "Open folder read-only")
+complete -c pine -s p -d (_ "Set configuration file") -r
+complete -c pine -s P -d (_ "Set global configuration file")
+complete -c pine -s r -d (_ "Restricted mode")
+complete -c pine -s z -d (_ "Enable suspention support")
+complete -c pine -o conf -d (_ "Produce a sample global configuration file")
+complete -c pine -o pinerc -d (_ "Produce sample configuration file") -r
+complete -c pine -o sort -d (_ "Set mail sort order") -a "
 	arrival
 	subject
 	from
@@ -23,4 +23,4 @@ complete -c pine -o sort -d "Set mail sort order" -a "
 	reverse
 "
 
-complete -c pine -o option -d "Config option" -x
+complete -c pine -o option -d (_ "Config option") -x
diff --git a/init/completions/ping.fish b/init/completions/ping.fish
index 13c80e7e..0418b13f 100644
--- a/init/completions/ping.fish
+++ b/init/completions/ping.fish
@@ -1,30 +1,30 @@
 complete -c ping -a "(__fish_print_hostnames)" -x
-complete -c ping -s a -d "Audible ping"
-complete -c ping -s A -d "Adaptive ping"
-complete -c ping -s b -d "Allow pinging a broadcast address"
-complete -c ping -s B -d "Do not allow ping to change source address of probes"
-complete -c ping -s c -d "Stop after sending count ECHO_REQUEST packets" -x
-complete -c ping -s d -d "Set the SO_DEBUG option on the socket being used"
-complete -c ping -s F -d "Allocate and set 20 bit flow label on echo request packets" -x
-complete -c ping -s f -d "Flood ping"
-complete -c ping -s i -d "Wait  interval  seconds  between sending each packet" -x
-complete -c ping -s I -d "Set source address to specified interface address" -x -a "(__fish_print_interfaces; fish_print_addresses)"
-complete -c ping -s l -d "If preload is specified, ping sends that many packets not waiting for reply" -x
-complete -c ping -s L -d "Suppress loopback of multicast packets"
-complete -c ping -s n -d "Numeric output only"
-complete -c ping -s p -d "You may specify up to 16 ‘‘pad’’ bytes to fill out the packet you send" -x
-complete -c ping -s Q -d "Set Quality of Service -related bits in ICMP datagrams" -x 
-complete -c ping -s q -d "Quiet output"
-complete -c ping -s R -d "Record route"
-complete -c ping -s r -d "Bypass  the  normal routing tables and send directly to a host on an attached interface"
-complete -c ping -s s -d "Specifies  the  number of data bytes to be sent" -x
-complete -c ping -s S -d "Set socket sndbuf" -x
-complete -c ping -s t -d "Set the IP Time to Live" -x
-complete -c ping -s T -d "Set special IP timestamp options" -x
-complete -c ping -s M -d "Select  Path  MTU  Discovery  strategy" -x -a "do want dont"
-complete -c ping -s U -d "Print full user-to-user latency"
-complete -c ping -s v -d "Verbose output"
-complete -c ping -s V -d "Show version and exit"
-complete -c ping -s w -d "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 "Time to wait for a response, in seconds" -x
+complete -c ping -s a -d (_ "Audible ping")
+complete -c ping -s A -d (_ "Adaptive ping")
+complete -c ping -s b -d (_ "Allow pinging a broadcast address")
+complete -c ping -s B -d (_ "Do not allow ping to change source address of probes")
+complete -c ping -s c -d (_ "Stop after sending count ECHO_REQUEST packets") -x
+complete -c ping -s d -d (_ "Set the SO_DEBUG option on the socket being used")
+complete -c ping -s F -d (_ "Allocate and set 20 bit flow label on echo request packets") -x
+complete -c ping -s f -d (_ "Flood ping")
+complete -c ping -s i -d (_ "Wait  interval  seconds  between sending each packet") -x
+complete -c ping -s I -d (_ "Set source address to specified interface address") -x -a "(__fish_print_interfaces; fish_print_addresses)"
+complete -c ping -s l -d (_ "If preload is specified, ping sends that many packets not waiting for reply") -x
+complete -c ping -s L -d (_ "Suppress loopback of multicast packets")
+complete -c ping -s n -d (_ "Numeric output only")
+complete -c ping -s p -d (_ "You may specify up to 16 'pad' bytes to fill out the packet you send") -x
+complete -c ping -s Q -d (_ "Set Quality of Service -related bits in ICMP datagrams") -x 
+complete -c ping -s q -d (_ "Quiet mode")
+complete -c ping -s R -d (_ "Record route")
+complete -c ping -s r -d (_ "Bypass  the  normal routing tables and send directly to a host on an attached interface")
+complete -c ping -s s -d (_ "Specifies  the  number of data bytes to be sent") -x
+complete -c ping -s S -d (_ "Set socket sndbuf") -x
+complete -c ping -s t -d (_ "Set the IP Time to Live") -x
+complete -c ping -s T -d (_ "Set special IP timestamp options") -x
+complete -c ping -s M -d (_ "Select  Path  MTU  Discovery  strategy") -x -a "do want dont"
+complete -c ping -s U -d (_ "Print full user-to-user latency")
+complete -c ping -s v -d (_ "Verbose output")
+complete -c ping -s V -d (_ "Show version and exit")
+complete -c ping -s w -d (_ "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 (_ "Time to wait for a response, in seconds") -x
 
diff --git a/init/completions/prevd.fish b/init/completions/prevd.fish
index 96cad294..2ef6873b 100644
--- a/init/completions/prevd.fish
+++ b/init/completions/prevd.fish
@@ -1 +1 @@
-complete -c prevd -s l -d "Also print directory history"
+complete -c prevd -s l -d (_ "Also print directory history")
diff --git a/init/completions/ps.fish b/init/completions/ps.fish
index 02ca0bfa..7f999dbd 100644
--- a/init/completions/ps.fish
+++ b/init/completions/ps.fish
@@ -1,37 +1,37 @@
 # Completions for ps
 
-complete -c ps -s A -d "Select all"
-complete -c ps -s N -d "Invert selection"
-complete -c ps -s a -d "Select all processes except session leaders and terminal-less"
-complete -c ps -s d -d "Select all processes except session leaders"
-complete -c ps -s e -d "Select all"
-complete -c ps -l deselect -d "Deselect all processes that do not fulfill conditions"
+complete -c ps -s A -d (_ "Select all")
+complete -c ps -s N -d (_ "Invert selection")
+complete -c ps -s a -d (_ "Select all processes except session leaders and terminal-less")
+complete -c ps -s d -d (_ "Select all processes except session leaders")
+complete -c ps -s e -d (_ "Select all")
+complete -c ps -l deselect -d (_ "Deselect all processes that do not fulfill conditions")
 
-complete -c ps -s C -d "Select by command" -r
-complete -c ps -s G -l Group -d "Select by group" -x -a "(__fish_complete_groups)"
+complete -c ps -s C -d (_ "Select by command") -r
+complete -c ps -s G -l Group -d (_ "Select by group") -x -a "(__fish_complete_groups)"
 
-complete -c ps -s U -l User -d "Select by user" -x -a "(__fish_complete_users)"
-complete -c ps -s u -l user -d "Select by user" -x -a "(__fish_complete_users)"
-complete -c ps -s g -l group -d "Select by group/session" -x -a "(__fish_complete_groups)"
-complete -c ps -s p -l pid -d "Select by PID" -x -a "(__fish_complete_pids)"
-complete -c ps -l ppid -d "Select by parent PID" -x -a "(__fish_complete_pids)"
-complete -c ps -s s -l sid -d "Select by session ID" -x -a "(__fish_complete_pids)"
-complete -c ps -s t -l tty -d "Select by tty" -r
-complete -c ps -s F -d "Extra full format"
-complete -c ps -s O -d "User defined format" -x
-complete -c ps -s M -d "Add column for security data"
-complete -c ps -s f -d "Full format"
-complete -c ps -s j -d "Jobs format"
-complete -c ps -s l -d "Long format"
-complete -c ps -s o -l format -d "User defined format" -x
-complete -c ps -s y -d "Do not show flags"
-complete -c ps -s Z -l context -d "Display security context format"
-complete -c ps -s H -l forest -d "Show hierarchy"
-complete -c ps -s n -d "Set namelist file" -r
-complete -c ps -s w -d "Wide output"
-complete -c ps -s L -d "Show threads"
-complete -c ps -s T -d "Show threads"
-complete -c ps -s V -l version -d "Display vesrion and exit"
-complete -c ps -l help -d "Display help and exit"
-complete -c ps -l info -d "Display debugging info"
+complete -c ps -s U -l User -d (_ "Select by user") -x -a "(__fish_complete_users)"
+complete -c ps -s u -l user -d (_ "Select by user") -x -a "(__fish_complete_users)"
+complete -c ps -s g -l group -d (_ "Select by group/session") -x -a "(__fish_complete_groups)"
+complete -c ps -s p -l pid -d (_ "Select by PID") -x -a "(__fish_complete_pids)"
+complete -c ps -l ppid -d (_ "Select by parent PID") -x -a "(__fish_complete_pids)"
+complete -c ps -s s -l sid -d (_ "Select by session ID") -x -a "(__fish_complete_pids)"
+complete -c ps -s t -l tty -d (_ "Select by tty") -r
+complete -c ps -s F -d (_ "Extra full format")
+complete -c ps -s O -d (_ "User defined format") -x
+complete -c ps -s M -d (_ "Add column for security data")
+complete -c ps -s f -d (_ "Full format")
+complete -c ps -s j -d (_ "Jobs format")
+complete -c ps -s l -d (_ "Long format")
+complete -c ps -s o -l format -d (_ "User defined format") -x
+complete -c ps -s y -d (_ "Do not show flags")
+complete -c ps -s Z -l context -d (_ "Display security context format")
+complete -c ps -s H -l forest -d (_ "Show hierarchy")
+complete -c ps -s n -d (_ "Set namelist file") -r
+complete -c ps -s w -d (_ "Wide output")
+complete -c ps -s L -d (_ "Show threads")
+complete -c ps -s T -d (_ "Show threads")
+complete -c ps -s V -l version -d (_ "Display vesrion and exit")
+complete -c ps -l help -d (_ "Display help and exit")
+complete -c ps -l info -d (_ "Display debugging info")
 
diff --git a/init/completions/python.fish b/init/completions/python.fish
index 198efb6d..a2d219b8 100644
--- a/init/completions/python.fish
+++ b/init/completions/python.fish
@@ -1,14 +1,14 @@
-complete -c python -s c -x -d "Execute argument as command"
-complete -c python -s d -d "Debug on"
-complete -c python -s E -d "Ignore environment variables"
-complete -c python -s h -d "Display help and exit"
-complete -c python -s i -d "Interactive mode after executing commands"
-complete -c python -s O -d "Enable optimizations"
-complete -c python -s Q -x -a "old new" -d "Division control"
-complete -c python -s S -d "Disable import of site module"
-complete -c python -s t -d "Warn on mixed tabs and spaces"
-complete -c python -s u -d "Unbuffered inputg and output"
-complete -c python -s v -d "Verbose mode"
-complete -c python -s V -d "Display version and exit"
-complete -c python -s W -x -d "Warning control" -a "ignore default all module once error"
-complete -c python -s x -d "Skip first line of input"
+complete -c python -s c -x -d (_ "Execute argument as command")
+complete -c python -s d -d (_ "Debug on")
+complete -c python -s E -d (_ "Ignore environment variables")
+complete -c python -s h -d (_ "Display help and exit")
+complete -c python -s i -d (_ "Interactive mode after executing commands")
+complete -c python -s O -d (_ "Enable optimizations")
+complete -c python -s Q -x -a "old new" -d (_ "Division control")
+complete -c python -s S -d (_ "Disable import of site module")
+complete -c python -s t -d (_ "Warn on mixed tabs and spaces")
+complete -c python -s u -d (_ "Unbuffered inputg and output")
+complete -c python -s v -d (_ "Verbose mode")
+complete -c python -s V -d (_ "Display version and exit")
+complete -c python -s W -x -d (_ "Warning control") -a "ignore default all module once error"
+complete -c python -s x -d (_ "Skip first line of input")
diff --git a/init/completions/read.fish b/init/completions/read.fish
index c37d01c2..cb9bf842 100644
--- a/init/completions/read.fish
+++ b/init/completions/read.fish
@@ -1,7 +1,7 @@
-complete -c read -s h -l help -d "Display help and exit"
-complete -c read -s p -l prompt -d "Set prompt command" -x
-complete -c read -s x -l export -d "Export variable to subprocess"
-complete -c read -s g -l global -d "Make variable scope global"
-complete -c read -s l -l local -d "Make variable scope local"
-complete -c read -s u -l unexport -d "Do not export variable to subprocess"
+complete -c read -s h -l help -d (_ "Display help and exit")
+complete -c read -s p -l prompt -d (_ "Set prompt command") -x
+complete -c read -s x -l export -d (_ "Export variable to subprocess")
+complete -c read -s g -l global -d (_ "Make variable scope global")
+complete -c read -s l -l local -d (_ "Make variable scope local")
+complete -c read -s u -l unexport -d (_ "Do not export variable to subprocess")
 
diff --git a/init/completions/renice.fish b/init/completions/renice.fish
index 89926868..65b88a68 100644
--- a/init/completions/renice.fish
+++ b/init/completions/renice.fish
@@ -1,4 +1,4 @@
 
-complete -c renice -s p -d "Force following parameters to be process ID’s (The default)"
-complete -c renice -s g -d "Force following parameters to be interpreted as process group ID’s"
-complete -c renice -s u -d "Force following parameters to be interpreted as user names"
+complete -c renice -s p -d (_ "Force following parameters to be process ID's (The default)")
+complete -c renice -s g -d (_ "Force following parameters to be interpreted as process group ID's")
+complete -c renice -s u -d (_ "Force following parameters to be interpreted as user names")
diff --git a/init/completions/rm.fish b/init/completions/rm.fish
index a8f8a94c..55b78441 100644
--- a/init/completions/rm.fish
+++ b/init/completions/rm.fish
@@ -1,11 +1,11 @@
 #Completions for rm
-complete -c rm -s d -l directory -d "Unlink directory (Only by superuser)"
-complete -c rm -s f -l force -d "Never prompt before removal"
-complete -c rm -s i -l interactive -d "Prompt before removal"
-complete -c rm -s r -l recursive -d "Remove content of subdirectories"
-complete -c rm -s R -d "Remove content of subdirectories"
-complete -c rm -s v -l verbose -d "Explain what is done"
-complete -c rm -s h -l help -d "Display help and exit"
-complete -c rm -l version -d "Display version and exit"
+complete -c rm -s d -l directory -d (_ "Unlink directory (Only by superuser)")
+complete -c rm -s f -l force -d (_ "Never prompt before removal")
+complete -c rm -s i -l interactive -d (_ "Prompt before removal")
+complete -c rm -s r -l recursive -d (_ "Remove content of subdirectories")
+complete -c rm -s R -d (_ "Remove content of subdirectories")
+complete -c rm -s v -l verbose -d (_ "Explain what is done")
+complete -c rm -s h -l help -d (_ "Display help and exit")
+complete -c rm -l version -d (_ "Display version and exit")
 
 
diff --git a/init/completions/rmdir.fish b/init/completions/rmdir.fish
index fcbd6c27..fb9f9667 100644
--- a/init/completions/rmdir.fish
+++ b/init/completions/rmdir.fish
@@ -1,8 +1,8 @@
 #Completions for rmdir
 complete -x -c rmdir -a "(__fish_complete_directory (commandline -ct))"
-complete -c rmdir -l ignore-fail-on-non-empty -d "Ignore errors from non-empty directories"
-complete -c rmdir -s p -l parents -d "Remove each component of path"
-complete -c rmdir -s v -l verbose -d "Explain what is done"
-complete -c rmdir -l help -d "Display help and exit"
-complete -c rmdir -l version -d "Display version and exit"
+complete -c rmdir -l ignore-fail-on-non-empty -d (_ "Ignore errors from non-empty directories")
+complete -c rmdir -s p -l parents -d (_ "Remove each component of path")
+complete -c rmdir -s v -l verbose -d (_ "Explain what is done")
+complete -c rmdir -l help -d (_ "Display help and exit")
+complete -c rmdir -l version -d (_ "Display version and exit")
 
diff --git a/init/completions/rpm.fish b/init/completions/rpm.fish
index 01e73411..073a00e2 100644
--- a/init/completions/rpm.fish
+++ b/init/completions/rpm.fish
@@ -1,135 +1,134 @@
 # 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 "Print help and exit"
-complete -c rpm -l version -d "Print version and exit"
-complete -c rpm -l quiet -d "Be less verbose"
-complete -c rpm -s v -d "Be more verbose"
-complete -c rpm -l rcfile -d "List of rpm configuration files" -f
-complete -c rpm -l pipe -d "Pipe output through specified command" -r
-complete -c rpm -l dbpath -d "Specify directory for rpm database" -a "
+complete -c rpm -s "?" -l help -d (_ "Print help and exit")
+complete -c rpm -l version -d (_ "Display version and exit and exit")
+complete -c rpm -l quiet -d (_ "Be less verbose")
+complete -c rpm -s v -d (_ "Be more verbose")
+complete -c rpm -l rcfile -d (_ "List of rpm configuration files") -f
+complete -c rpm -l pipe -d (_ "Pipe output through specified command") -r
+complete -c rpm -l dbpath -d (_ "Specify directory for rpm database") -a "
 (
 	__fish_complete_directory (commandline -ct) 'Rpm database directory'
 )
 "
-complete -c rpm -l root -d "Specify root directory for rpm operations" -a "
+complete -c rpm -l root -d (_ "Specify root directory for rpm operations") -a "
 (
 	__fish_complete_directory (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 "Add suggested packages to the transaction set when needed"
-complete $rpm_install -l allfiles -d "Installs or upgrades all the missing ok files in the package, regardless if they exist"
-complete $rpm_install -l badreloc -d "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 aid -d 'Add suggested packages to the transaction set when needed'
-complete $rpm_install -l allfiles -d 'Installs or upgrades all the missingok files in the package, regardless if they exist'
-complete $rpm_install -l badreloc -d '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 'Dont install files whose name begins with OLDPATH' -xa "(__fish_complete_directory (commandline -ct) 'Skip installation of files in this directory')"
-complete $rpm_install -l excludedocs -d 'Dont install any files which are marked as documentation (which includes man pages and texinfo documents)'
-complete $rpm_install -l force -d 'Same as using --replacepkgs, --replacefiles, and --oldpackage'
-complete $rpm_install -s h -l hash -d 'Print 50 hash marks as the package archive is unpacked. Use with -v or --verbose for a nicer display'
-complete $rpm_install -l ignoresize -d 'Dont check mount file systems for sufficient disk space before installing this package'
-complete $rpm_install -l ignorearch -d 'Allow installation or upgrading even if the architectures of the binary package and host dont match'
-complete $rpm_install -l ignoreos -d 'Allow installation or upgrading even if the operating systems of the binary package and host dont match'
-complete $rpm_install -l includedocs -d 'Install documentation files. This is the default behavior'
-complete $rpm_install -l justdb -d 'Update only the database, not the filesystem'
-complete $rpm_install -l nodigest -d 'Dont verify package or header digests when reading'
-complete $rpm_install -l nosignature -d 'Dont verify package or header signatures when reading'
-complete $rpm_install -l nodeps -d 'Dont do a dependency check before installing or upgrading a package'
-complete $rpm_install -l nosuggest -d 'Dont suggest package(s) that provide a missing dependency'
-complete $rpm_install -l noorder -d 'Dont reorder the packages for an install. The list of packages would normally be reordered to satisfy dependencies'
-complete $rpm_install -l noscripts -d 'Dont execute scripts'
-complete $rpm_install -l nopre -d 'Dont execute pre scripts'
-complete $rpm_install -l nopost -d 'Dont execute post scripts'
-complete $rpm_install -l nopreun -d 'Dont execute preun scripts'
-complete $rpm_install -l nopostun -d 'Dont execute postun scripts'
-complete $rpm_install -l notriggers -d 'Dont execute trigger scriptlets'
-complete $rpm_install -l notriggerin -d 'Dont execute triggerin scriptlets'
-complete $rpm_install -l notriggerun -d 'Dont execute triggerun scriptlets'
-complete $rpm_install -l notriggerpostun -d 'Dont execute triggerpostun scriptlets'
-complete $rpm_install -l oldpackage -d 'Allow an upgrade to replace a newer package with an older one'
-complete $rpm_install -l percent -d '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 '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_directory (commandline -ct) 'Directory prefix for relocatable packages')"
-complete $rpm_install -l relocate -x -d 'For relocatable binary packages, translate all file paths that start with OLDPATH in the package relocation hint(s) to NEWPATH. This option can be used repeatedly if several OLDPATH’s in the package are to be relocated'
-complete $rpm_install -l repackage -d 'Re-package the files before erasing. The previously installed package will be named according to the macro %_repackage_name_fmt and will be created in the directory named by the macro %_repackage_dir (default value is /var/spool/repackage)'
-complete $rpm_install -l replacefiles -d 'Install the packages even if they replace files from other, already installed, packages'
-complete $rpm_install -l replacepkgs -d 'Install the packages even if some of them are already installed on this system'
-complete $rpm_install -l test -d 'Do not install the package, simply check for and report potential conflicts'
+complete $rpm_install -l aid -d (_ "Add suggested packages to the transaction set when needed")
+complete $rpm_install -l allfiles -d (_ "Installs or upgrades all the missing ok files in the package, regardless if they exist")
+complete $rpm_install -l badreloc -d (_ "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 aid -d (_ 'Add suggested packages to the transaction set when needed')
+complete $rpm_install -l allfiles -d (_ 'Installs or upgrades all the missingok files in the package, regardless if they exist')
+complete $rpm_install -l badreloc -d (_ '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 (_ "Don't install files whose name begins with OLDPATH") -xa "(__fish_complete_directory (commandline -ct) 'Skip installation of files in this directory')"
+complete $rpm_install -l excludedocs -d (_ "Don't install any files which are marked as documentation (which includes man pages and texinfo documents)")
+complete $rpm_install -l force -d (_ 'Same as using --replacepkgs, --replacefiles, and --oldpackage')
+complete $rpm_install -s h -l hash -d (_ 'Print 50 hash marks as the package archive is unpacked. Use with -v or --verbose for a nicer display')
+complete $rpm_install -l ignoresize -d (_ "Don't check mount file systems for sufficient disk space before installing this package")
+complete $rpm_install -l ignorearch -d (_ "Allow installation or upgrading even if the architectures of the binary package and host don't match")
+complete $rpm_install -l ignoreos -d (_ "Allow installation or upgrading even if the operating systems of the binary package and host don't match")
+complete $rpm_install -l includedocs -d (_ 'Install documentation files. This is the default behavior')
+complete $rpm_install -l justdb -d (_ 'Update only the database, not the filesystem')
+complete $rpm_install -l nodigest -d (_ "Don't verify package or header digests when reading")
+complete $rpm_install -l nosignature -d (_ "Don't verify package or header signatures when reading")
+complete $rpm_install -l nodeps -d (_ "Don't do a dependency check before installing or upgrading a package")
+complete $rpm_install -l nosuggest -d (_ "Don't suggest package(s) that provide a missing dependency")
+complete $rpm_install -l noorder -d (_ "Don't reorder the packages for an install. The list of packages would normally be reordered to satisfy dependencies")
+complete $rpm_install -l noscripts -d (_ "Don't execute scripts")
+complete $rpm_install -l nopre -d (_ "Don't execute pre scripts")
+complete $rpm_install -l nopost -d (_ "Don't execute post scripts")
+complete $rpm_install -l nopreun -d (_ "Don't execute preun scripts")
+complete $rpm_install -l nopostun -d (_ "Don't execute postun scripts")
+complete $rpm_install -l notriggers -d (_ "Don't execute trigger scriptlets")
+complete $rpm_install -l notriggerin -d (_ "Don't execute triggerin scriptlets")
+complete $rpm_install -l notriggerun -d (_ "Don't execute triggerun scriptlets")
+complete $rpm_install -l notriggerpostun -d (_ "Don't execute triggerpostun scriptlets")
+complete $rpm_install -l oldpackage -d (_ 'Allow an upgrade to replace a newer package with an older one')
+complete $rpm_install -l percent -d (_ '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 (_ '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_directory (commandline -ct) 'Directory prefix for relocatable packages')"
+complete $rpm_install -l relocate -x -d (_ 'For relocatable binary packages, translate all file paths that start with OLDPATH in the package relocation hint(s) to NEWPATH. This option can be used repeatedly if several OLDPATH’s in the package are to be relocated')
+complete $rpm_install -l repackage -d (_ 'Re-package the files before erasing. The previously installed package will be named according to the macro %_repackage_name_fmt and will be created in the directory named by the macro %_repackage_dir (default value is /var/spool/repackage)')
+complete $rpm_install -l replacefiles -d (_ 'Install the packages even if they replace files from other, already installed, packages')
+complete $rpm_install -l replacepkgs -d (_ 'Install the packages even if some of them are already installed on this system')
+complete $rpm_install -l test -d (_ "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 'Display change information for the package'
-complete $rpm_query -s c -l configfiles -d 'List only configuration files (implies -l)'
-complete $rpm_query -s d -l docfiles -d 'List only documentation files (implies -l)'
-complete $rpm_query -l dump -d 'Dump file information. Must be used with at least one of -l, -c, -d'
-complete $rpm_query -l filesbypkg -d 'List all the files in each selected package'
-complete $rpm_query -s i -l info -d 'Display package information, including name, version, and description. This uses the --queryformat if one was specified'
-complete $rpm_query -l last -d 'Orders the package listing by install time such that the latest packages are at the top'
-complete $rpm_query -s l -l list -d 'List files in package'
-complete $rpm_query -l provides -d 'List capabilities this package provides'
-complete $rpm_query -s R -l requires -d 'List packages on which this package depends'
-complete $rpm_query -l scripts -d 'List the package specific scriptlet(s) that are used as part of the installation and uninstallation processes'
-complete $rpm_query -s s -l state -d 'Display the states of files in the package (implies -l). The state of each file is one of normal, not installed, or replaced'
-complete $rpm_query -l triggers -d 'Display the trigger scripts, if any, which are contained in the package'
-complete $rpm_query -l triggerscripts -d 'Display the trigger scripts, if any, which are contained in the package'
+complete $rpm_query -l changelog -d (_ 'Display change information for the package')
+complete $rpm_query -s c -l configfiles -d (_ 'List only configuration files (implies -l)')
+complete $rpm_query -s d -l docfiles -d (_ 'List only documentation files (implies -l)')
+complete $rpm_query -l dump -d (_ 'Dump file information. Must be used with at least one of -l, -c, -d')
+complete $rpm_query -l filesbypkg -d (_ 'List all the files in each selected package')
+complete $rpm_query -s i -l info -d (_ 'Display package information, including name, version, and description. This uses the --queryformat if one was specified')
+complete $rpm_query -l last -d (_ 'Orders the package listing by install time such that the latest packages are at the top')
+complete $rpm_query -s l -l list -d (_ 'List files in package')
+complete $rpm_query -l provides -d (_ 'List capabilities this package provides')
+complete $rpm_query -s R -l requires -d (_ 'List packages on which this package depends')
+complete $rpm_query -l scripts -d (_ 'List the package specific scriptlet(s) that are used as part of the installation and uninstallation processes')
+complete $rpm_query -s s -l state -d (_ 'Display the states of files in the package (implies -l). The state of each file is one of normal, not installed, or replaced')
+complete $rpm_query -l triggers -d (_ 'Display the trigger scripts, if any, which are contained in the package')
+complete $rpm_query -l triggerscripts -d (_ 'Display the trigger scripts, if any, which are 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 'Query all installed packages'
-complete $rpm_select -s f -l file -d 'Query package owning FILE' -r
-complete $rpm_select -l fileid -d '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 'Query packages with the group of GROUP' -x
-complete $rpm_select -l hdrid -d '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 'Query an (uninstalled) package PACKAGE_FILE' -xa "(__fish_complete_suffix (commandline -ct) .rpm 'Query package file')"
-complete $rpm_select -l pkgid -d '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 'Parse and query SPECFILE as if it were a package' -xa "(__fish_complete_suffix (commandline -ct) .spec 'Query package spec file')"
-complete $rpm_select -l tid -d 'Query package(s) that have a given TID transaction identifier' -x
-complete $rpm_select -l triggeredby -d 'Query packages that are triggered by package(s) PACKAGE_NAME' -x -a "(__fish_print_packages)"
-complete $rpm_select -l whatprovides -d 'Query all packages that provide the CAPABILITY capability' -x
-complete $rpm_select -l whatrequires -d 'Query all packages that requires CAPABILITY for proper functioning' -x
+complete $rpm_select -s a -l all -d (_ 'Query all installed packages')
+complete $rpm_select -s f -l file -d (_ 'Query package owning FILE') -r
+complete $rpm_select -l fileid -d (_ '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 (_ 'Query packages with the group of GROUP') -x
+complete $rpm_select -l hdrid -d (_ '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 (_ 'Query an (uninstalled) package PACKAGE_FILE') -xa "(__fish_complete_suffix (commandline -ct) .rpm 'Query package file')"
+complete $rpm_select -l pkgid -d (_ '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 (_ 'Parse and query SPECFILE as if it were a package') -xa "(__fish_complete_suffix (commandline -ct) .spec 'Query package spec file')"
+complete $rpm_select -l tid -d (_ 'Query package(s) that have a given TID transaction identifier') -x
+complete $rpm_select -l triggeredby -d (_ 'Query packages that are triggered by package(s) PACKAGE_NAME') -x -a "(__fish_print_packages)"
+complete $rpm_select -l whatprovides -d (_ 'Query all packages that provide the CAPABILITY capability') -x
+complete $rpm_select -l whatrequires -d (_ 'Query all packages that requires CAPABILITY for proper functioning') -x
 set -e rpm_select
 
 set -- rpm_verify -c rpm -n "__fish_contains_opt -s V verify"
-complete $rpm_verify -l nodeps -d 'Dont verify dependencies of packages'
-complete $rpm_verify -l nodigest -d 'Dont verify package or header digests when reading'
-complete $rpm_verify -l nofiles -d 'Dont verify any attributes of package files'
-complete $rpm_verify -l noscripts -d 'Dont execute the %verifyscript scriptlet (if any)'
-complete $rpm_verify -l nosignature -d 'Don’t verify package or header signatures when reading'
-complete $rpm_verify -l nolinkto -d 'Dont verify linkto attribute'
-complete $rpm_verify -l nomd5 -d 'Dont verify md5 attribute'
-complete $rpm_verify -l nosize -d 'Dont verify size attribute'
-complete $rpm_verify -l nouser -d 'Dont verify user attribute'
-complete $rpm_verify -l nogroup -d 'Dont verify group attribute'
-complete $rpm_verify -l nomtime -d 'Dont verify time attribute'
-complete $rpm_verify -l nomode -d 'Dont verify mode attribute'
-complete $rpm_verify -l nordev -d 'Dont verify dev attribute'
+complete $rpm_verify -l nodeps -d (_ "Don't verify dependencies of packages")
+complete $rpm_verify -l nodigest -d (_ "Don't verify package or header digests when reading")
+complete $rpm_verify -l nofiles -d (_ "Don't verify any attributes of package files")
+complete $rpm_verify -l noscripts -d (_ "Don't execute the %verifyscript scriptlet (if any)")
+complete $rpm_verify -l nosignature -d (_ 'Don’t verify package or header signatures when reading')
+complete $rpm_verify -l nolinkto -d (_ "Don't verify linkto attribute")
+complete $rpm_verify -l nomd5 -d (_ "Don't verify md5 attribute")
+complete $rpm_verify -l nosize -d (_ "Don't verify size attribute")
+complete $rpm_verify -l nouser -d (_ "Don't verify user attribute")
+complete $rpm_verify -l nogroup -d (_ "Don't verify group attribute")
+complete $rpm_verify -l nomtime -d (_ "Don't verify time attribute")
+complete $rpm_verify -l nomode -d (_ "Don't verify mode attribute")
+complete $rpm_verify -l nordev -d (_ "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 'Remove all versions of the package which match PACKAGE_NAME. Normally an error is issued if PACKAGE_NAME matches multiple packages'
-complete $rpm_erase -l nodeps -d 'Don’t check dependencies before uninstalling the packages'
-complete $rpm_erase -l noscripts -d 'Dont execute scriplets'
-complete $rpm_erase -l nopreun -d 'Dont execute preun scriptlet'
-complete $rpm_erase -l nopostun -d 'Dont execute postun scriptlet'
-complete $rpm_erase -l notriggers -d 'Dont execute trigger scriptlets'
-complete $rpm_erase -l notriggerun -d 'Dont execute triggerun scriptlets'
-complete $rpm_erase -l notriggerpostun -d 'Dont execute triggerpostun scriptlets'
-complete $rpm_erase -l repackage -d 'Re-package the files before erasing'
-complete $rpm_erase -l test -d 'Dont really uninstall anything, just go through the motions'
+complete $rpm_erase -l allmatches -d (_ 'Remove all versions of the package which match PACKAGE_NAME. Normally an error is issued if PACKAGE_NAME matches multiple packages')
+complete $rpm_erase -l nodeps -d (_ 'Don’t check dependencies before uninstalling the packages')
+complete $rpm_erase -l noscripts -d (_ "Don't execute scriplets")
+complete $rpm_erase -l nopreun -d (_ "Don't execute preun scriptlet")
+complete $rpm_erase -l nopostun -d (_ "Don't execute postun scriptlet")
+complete $rpm_erase -l notriggers -d (_ "Don't execute trigger scriptlets")
+complete $rpm_erase -l notriggerun -d (_ "Don't execute triggerun scriptlets")
+complete $rpm_erase -l notriggerpostun -d (_ "Don't execute triggerpostun scriptlets")
+complete $rpm_erase -l repackage -d (_ 'Re-package the files before erasing')
+complete $rpm_erase -l test -d (_ "Don't really uninstall anything, just go through the motions")
 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 'Install new package'
-complete $rpm_mode -s U -l upgrade -d 'Upgrade existing package'
-complete $rpm_mode -s F -l freshen -d 'Upgrade package if already installed'
-complete $rpm_mode -s q -l query -d 'Query installed packages'
-complete $rpm_mode -s V -l verify -d 'Verify package integrety'
-complete $rpm_mode -s e -l erase -d 'Erase package'
+complete $rpm_mode -s i -l install -d (_ 'Install new package')
+complete $rpm_mode -s U -l upgrade -d (_ 'Upgrade existing package')
+complete $rpm_mode -s F -l freshen -d (_ 'Upgrade package if already installed')
+complete $rpm_mode -s q -l query -d (_ 'Query installed packages')
+complete $rpm_mode -s V -l verify -d (_ 'Verify package integrety')
+complete $rpm_mode -s e -l erase -d (_ 'Erase package')
 set -e rpm_mode
 
-complete -c rpm -xa '(__fish_complete_suffix (commandline -ct) .rpm "RPM package")'
-
+complete -c rpm -xa '(__fish_complete_suffix (commandline -ct) .rpm (_ "RPM package") )'
diff --git a/init/completions/ruby.fish b/init/completions/ruby.fish
index 6dc81b96..e5a71cdc 100644
--- a/init/completions/ruby.fish
+++ b/init/completions/ruby.fish
@@ -1,25 +1,25 @@
 #Completions for ruby
-complete -c ruby -s 0 -d 'Specify record separator'
-complete -c ruby -s a -d 'Feed input to split'
-complete -c ruby -s c -d 'Check syntax'
-complete -c ruby -s K -d 'Kanji code-set'
-complete -c ruby -s d -l debug -d 'Debugger'
-complete -c ruby -s e -x -d 'Execute command'
-complete -c ruby -s h -l help -d 'Display help'
-complete -c ruby -s F -d 'Set regexp used to split input'
-complete -c ruby -s i -d 'Edit files in-place'
-complete -c ruby -s I -d 'Include path'
-complete -c ruby -s l -d 'Line ending processing'
-complete -c ruby -s n -d 'Loop script'
-complete -c ruby -s p -d 'Loop script, print $_'
-complete -c ruby -s r -r -d 'Require file'
-complete -c ruby -s s -d 'Define custom switches'
-complete -c ruby -s S -d 'Search $PATH for script'
-complete -c ruby -s T -d 'Taint checking'
-complete -c ruby -s v -l verbose -d 'Verbose mode'
-complete -c ruby -s w -d 'Verbose mode without message'
-complete -c ruby -l version -d 'Display version'
-complete -c ruby -s x -d 'Extract script'
-complete -c ruby -s X -x -a '(__fish_complete_directory (commandline -ct))' -d 'Directory'
-complete -c ruby -s y -l yydebug -d 'Compiler debug mode'
+complete -c ruby -s 0 -d (_ 'Specify record separator')
+complete -c ruby -s a -d (_ 'Feed input to split')
+complete -c ruby -s c -d (_ 'Check syntax')
+complete -c ruby -s K -d (_ 'Kanji code-set')
+complete -c ruby -s d -l debug -d (_ 'Debugger')
+complete -c ruby -s e -x -d (_ 'Execute command')
+complete -c ruby -s h -l help -d (_ 'Display help')
+complete -c ruby -s F -d (_ 'Set regexp used to split input')
+complete -c ruby -s i -d (_ 'Edit files in-place')
+complete -c ruby -s I -d (_ 'Include path')
+complete -c ruby -s l -d (_ 'Line ending processing')
+complete -c ruby -s n -d (_ 'Loop script')
+complete -c ruby -s p -d (_ 'Loop script, print $_')
+complete -c ruby -s r -r -d (_ 'Require file')
+complete -c ruby -s s -d (_ 'Define custom switches')
+complete -c ruby -s S -d (_ 'Search $PATH for script')
+complete -c ruby -s T -d (_ 'Taint checking')
+complete -c ruby -s v -l verbose -d (_ 'Verbose mode')
+complete -c ruby -s w -d (_ 'Verbose mode without message')
+complete -c ruby -l version -d (_ 'Display version and exit')
+complete -c ruby -s x -d (_ 'Extract script')
+complete -c ruby -s X -x -a '(__fish_complete_directory (commandline -ct))' -d (_ 'Directory')
+complete -c ruby -s y -l yydebug -d (_ 'Compiler debug mode')
 
diff --git a/init/completions/scp.fish b/init/completions/scp.fish
index 61cd3fda..3b87979a 100644
--- a/init/completions/scp.fish
+++ b/init/completions/scp.fish
@@ -25,11 +25,11 @@ complete -c scp -d Hostname -a "
 (__fish_print_users)@
 
 "
-complete -c scp -s B -d "Batch mode"
-complete -c scp -s l -x -d "Bandwidth limit"
-complete -c scp -s P -x -d "Port"
-complete -c scp -s p -d "Preserves modification times, access times, and modes from the original file"
-complete -c scp -s q -d "Disable progress meter"
-complete -c scp -s r -d "Recursively copy"
-complete -c scp -s S -d "Encyption program"
+complete -c scp -s B -d (_ "Batch mode")
+complete -c scp -s l -x -d (_ "Bandwidth limit")
+complete -c scp -s P -x -d (_ "Port")
+complete -c scp -s p -d (_ "Preserves modification times, access times, and modes from the original file")
+complete -c scp -s q -d (_ "Disable progress meter")
+complete -c scp -s r -d (_ "Recursively copy")
+complete -c scp -s S -d (_ "Encyption program")
 
diff --git a/init/completions/screen.fish b/init/completions/screen.fish
index 16620857..eb4ad311 100644
--- a/init/completions/screen.fish
+++ b/init/completions/screen.fish
@@ -1,4 +1,4 @@
-function __fish_complete_screen -d "Print a list of running screen sessions"
+function __fish_complete_screen -d (_ "Print a list of running screen sessions")
 	screen -list |grep \^\t.\*\(.\*\)|sed -e 's/\t\(.*\)\t(\(.*\))/\1\tScreen: \2/'
 end
 
diff --git a/init/completions/sed.fish b/init/completions/sed.fish
index 27ee7d6c..54c2c952 100644
--- a/init/completions/sed.fish
+++ b/init/completions/sed.fish
@@ -1,12 +1,12 @@
-complete -c sed -s n -l quiet -d "Silent mode"
-complete -c sed -l silent -d "Silent mode"
-complete -c sed -s e -l expression -x -d "Evaluate expression"
-complete -c sed -s f -l file -r -d "Evalute file"
-complete -c sed -s i -l in-place -d "Edit files in place"
-complete -c sed -s l -l line-length -x -d "Specify line-length"
-complete -c sed -l posix -d "Disable all GNU extensions"
-complete -c sed -s r -l regexp-extended -d "Use extended regexp"
-complete -c sed -s s -l separate -d "Consider files as separate"
-complete -c sed -s u -l unbuffered -d "Use minimal IO buffers"
-complete -c sed -l help -d "Display help and exit"
-complete -c sed -s V -l version -d "Display version and exit"
+complete -c sed -s n -l quiet -d (_ "Silent mode")
+complete -c sed -l silent -d (_ "Silent mode")
+complete -c sed -s e -l expression -x -d (_ "Evaluate expression")
+complete -c sed -s f -l file -r -d (_ "Evalute file")
+complete -c sed -s i -l in-place -d (_ "Edit files in place")
+complete -c sed -s l -l line-length -x -d (_ "Specify line-length")
+complete -c sed -l posix -d (_ "Disable all GNU extensions")
+complete -c sed -s r -l regexp-extended -d (_ "Use extended regexp")
+complete -c sed -s s -l separate -d (_ "Consider files as separate")
+complete -c sed -s u -l unbuffered -d (_ "Use minimal IO buffers")
+complete -c sed -l help -d (_ "Display help and exit")
+complete -c sed -s V -l version -d (_ "Display version and exit")
diff --git a/init/completions/service.fish b/init/completions/service.fish
index 878b6aab..e4d40a6d 100644
--- a/init/completions/service.fish
+++ b/init/completions/service.fish
@@ -1,6 +1,6 @@
 
 # Fist argument is the names of the service, i.e. a file in /etc/init.d
-complete -c service -n "test (count (commandline -poc)) = 1" -xa "(command ls /etc/init.d)" -d "Service name"
+complete -c service -n "test (count (commandline -poc)) = 1" -xa "(command ls /etc/init.d)" -d (_ "Service name")
 
 #The second argument is what action to take with the service
 complete -c service -n "test (count (commandline -poc)) -gt 1" -xa '$__fish_service_commands'
diff --git a/init/completions/set.fish b/init/completions/set.fish
index d1bee0fe..5d9bc605 100644
--- a/init/completions/set.fish
+++ b/init/completions/set.fish
@@ -1,14 +1,14 @@
 
 complete -y set_color
 
-complete -c set -s e -l erase -d "Erase variable"
-complete -c set -s x -l export -d "Export variable to subprocess"
-complete -c set -s u -l unexport -d "Do not export variable to subprocess"
-complete -c set -s g -l global -d "Make variable scope global"
-complete -c set -s l -l local -d "Make variable scope local"
-complete -c set -s U -l universal -d "Make variable scope universal, i.e. shared between all fish terminals"
-complete -c set -s q -l query -d "Test if variable is defined"
-complete -c set -s h -l help -d "Display help and exit"
+complete -c set -s e -l erase -d (_ "Erase variable")
+complete -c set -s x -l export -d (_ "Export variable to subprocess")
+complete -c set -s u -l unexport -d (_ "Do not export variable to subprocess")
+complete -c set -s g -l global -d (_ "Make variable scope global")
+complete -c set -s l -l local -d (_ "Make variable scope local")
+complete -c set -s U -l universal -d (_ "Make variable scope universal, i.e. shared between all fish terminals")
+complete -c set -s q -l query -d (_ "Test if variable is defined")
+complete -c set -s h -l help -d (_ "Display help and exit")
 
 function __fish_set_is_first -d 'Test if no non-switch argument has been specified yet'
 	set -- cmd (commandline -poc)
@@ -43,4 +43,4 @@ function __fish_set_is_color -d 'Test if We are specifying a color value for the
 	end	
 end
 
-complete -c set -n '__fish_set_is_color' -x -a '(set_color --print-colors)' -d Color
+complete -c set -n '__fish_set_is_color' -x -a '(set_color --print-colors)' -d (_ Color)
diff --git a/init/completions/set_color.fish b/init/completions/set_color.fish
index aead79b3..cb42c933 100644
--- a/init/completions/set_color.fish
+++ b/init/completions/set_color.fish
@@ -1,3 +1,3 @@
-complete -c set_color -x -d "Color" -a '(set_color --print-colors)'
-complete -c set_color -s b -l background -x -a '(set_color --print-colors)' -d "Change background color"
-complete -c set_color -s o -l bold -d 'Make font bold'
+complete -c set_color -x -d (_ "Color") -a '(set_color --print-colors)'
+complete -c set_color -s b -l background -x -a '(set_color --print-colors)' -d (_ "Change background color")
+complete -c set_color -s o -l bold -d (_ 'Make font bold')
diff --git a/init/completions/sort.fish b/init/completions/sort.fish
index d4145562..2b5b8144 100644
--- a/init/completions/sort.fish
+++ b/init/completions/sort.fish
@@ -1,21 +1,21 @@
-complete -c sort -s b -l ignore-leading-blanks -d "Ignore leading blanks"
-complete -c sort -s d -l dictionary-order -d "Consider only blanks and alphanumerics"
-complete -c sort -s f -l ignore-case -d "Ignore case"
-complete -c sort -s g -l general-numeric-sort -d "Compare general numeric value"
-complete -c sort -s i -l ignore-nonprinting -d "Consider only printable"
-complete -c sort -s M -l month-sort -d "Compare month names"
-complete -c sort -s n -l numeric-sort -d "Compare string numerical value"
-complete -c sort -s r -l reverse -d "Reverse results"
-complete -c sort -s c -l check -d "Only check if sorted"
-complete -c sort -s k -l key -d "Define key"
-complete -c sort -s m -l merge -d "Merge sorted files"
-complete -c sort -s o -l output -f -d "Write to file"
-complete -c sort -s s -l stable -d "Stabilize sort"
-complete -c sort -s S -l buffer-size -r -d "Set main memory buffer"
-complete -c sort -s t -l field-separator -d "Field separator"
-complete -c sort -s T -l temporary-directory -r -d "Set temporary directory"
-complete -c sort -s u -l unique -d "Output only first of equal lines"
-complete -c sort -s z -l zero-terminated -d "Lines end with 0 byte"
-complete -c sort -l help -d "Display help and exit"
-complete -c sort -l version -d "Display version and exit"
+complete -c sort -s b -l ignore-leading-blanks -d (_ "Ignore leading blanks")
+complete -c sort -s d -l dictionary-order -d (_ "Consider only blanks and alphanumerics")
+complete -c sort -s f -l ignore-case -d (_ "Ignore case")
+complete -c sort -s g -l general-numeric-sort -d (_ "Compare general numeric value")
+complete -c sort -s i -l ignore-nonprinting -d (_ "Consider only printable")
+complete -c sort -s M -l month-sort -d (_ "Compare month names")
+complete -c sort -s n -l numeric-sort -d (_ "Compare string numerical value")
+complete -c sort -s r -l reverse -d (_ "Reverse results")
+complete -c sort -s c -l check -d (_ "Only check if sorted")
+complete -c sort -s k -l key -d (_ "Define key")
+complete -c sort -s m -l merge -d (_ "Merge sorted files")
+complete -c sort -s o -l output -f -d (_ "Write to file")
+complete -c sort -s s -l stable -d (_ "Stabilize sort")
+complete -c sort -s S -l buffer-size -r -d (_ "Set main memory buffer")
+complete -c sort -s t -l field-separator -d (_ "Field separator")
+complete -c sort -s T -l temporary-directory -r -d (_ "Set temporary directory")
+complete -c sort -s u -l unique -d (_ "Output only first of equal lines")
+complete -c sort -s z -l zero-terminated -d (_ "Lines end with 0 byte")
+complete -c sort -l help -d (_ "Display help and exit")
+complete -c sort -l version -d (_ "Display version and exit")
 
diff --git a/init/completions/ssh.fish b/init/completions/ssh.fish
index cf126066..a72d1f13 100644
--- a/init/completions/ssh.fish
+++ b/init/completions/ssh.fish
@@ -3,15 +3,15 @@
 #
 
 for i in ssh scp
-	complete -c $i -s 1 -d "Protocall version 1 only"
-	complete -c $i -s 2 -d "Protocall version 2 only"
-	complete -c $i -s 4 -d "IPv4 addresses only"
-	complete -c $i -s 6 -d "IPv6 addresses only"
-	complete -c $i -s C -d "Compress all data"
-	complete -xc $i -s c -d "Encryption algorithm" -a "blowfish 3des des"
-	complete -r -c $i -s F -d "Configuration file"
-	complete -r -c $i -s i -d "Identity file"
-	complete -x -c $i -s o -d "Options" -a "
+	complete -c $i -s 1 -d (_ "Protocall version 1 only")
+	complete -c $i -s 2 -d (_ "Protocall version 2 only")
+	complete -c $i -s 4 -d (_ "IPv4 addresses only")
+	complete -c $i -s 6 -d (_ "IPv6 addresses only")
+	complete -c $i -s C -d (_ "Compress all data")
+	complete -xc $i -s c -d (_ "Encryption algorithm") -a "blowfish 3des des"
+	complete -r -c $i -s F -d (_ "Configuration file")
+	complete -r -c $i -s i -d (_ "Identity file")
+	complete -x -c $i -s o -d (_ "Options") -a "
 		AddressFamily
 		BatchMode
 		BindAddress
@@ -58,7 +58,7 @@ for i in ssh scp
 		UserKnownHostsFile
 		VerifyHostKeyDNS
 	"
-	complete -c $i -s v -d "Verbose mode"
+	complete -c $i -s v -d (_ "Verbose mode")
 end;
 
 #
@@ -77,30 +77,30 @@ complete -x -c ssh -d Hostname -a "
 (__fish_print_users)@
 "
 
-complete -c ssh -s a -d "Disables forwarding of the authentication agent"
-complete -c ssh -s A -d "Enables forwarding of the authentication agent"
-complete -x -c ssh -s b -d "Interface to transmit from" -a "
+complete -c ssh -s a -d (_ "Disables forwarding of the authentication agent")
+complete -c ssh -s A -d (_ "Enables forwarding of the authentication agent")
+complete -x -c ssh -s b -d (_ "Interface to transmit from") -a "
 (
 	cat /proc/net/arp ^/dev/null| grep -v '^IP'|cut -d ' ' -f 1 ^/dev/null
 )
 "
 
-complete -x -c ssh -s e -d "Escape character" -a "^ none"
-complete -c ssh -s f -d "Go to background"
-complete -c ssh -s g -d "Allow remote host to connect to local forwarded ports"
-complete -c ssh -s I -d "Smartcard device"
-complete -c ssh -s k -d "Disable forwarding of Kerberos tickets"
-complete -c ssh -s l -x -a "(__fish_complete_users)" -d "User"
-complete -c ssh -s m -d "MAC algorithm"
-complete -c ssh -s n -d "Prevent reading from stdin"
-complete -c ssh -s N -d "Do not execute remote command"
-complete -c ssh -s p -x -d "Port"
-complete -c ssh -s q -d "Quiet mode"
-complete -c ssh -s s -d "Subsystem"
-complete -c ssh -s t -d "Force pseudo-tty allocation"
-complete -c ssh -s T -d "Disable pseudo-tty allocation"
-complete -c ssh -s x -d "Disable X11 forwarding"
-complete -c ssh -s X -d "Enable X11 forwarding"
-complete -c ssh -s L -d "Locally forwarded ports"
-complete -c ssh -s R -d "Remotely forwarded ports"
-complete -c ssh -s D -d "Dynamic port forwarding"
+complete -x -c ssh -s e -d (_ "Escape character") -a "^ none"
+complete -c ssh -s f -d (_ "Go to background")
+complete -c ssh -s g -d (_ "Allow remote host to connect to local forwarded ports")
+complete -c ssh -s I -d (_ "Smartcard device")
+complete -c ssh -s k -d (_ "Disable forwarding of Kerberos tickets")
+complete -c ssh -s l -x -a "(__fish_complete_users)" -d (_ "User")
+complete -c ssh -s m -d (_ "MAC algorithm")
+complete -c ssh -s n -d (_ "Prevent reading from stdin")
+complete -c ssh -s N -d (_ "Do not execute remote command")
+complete -c ssh -s p -x -d (_ "Port")
+complete -c ssh -s q -d (_ "Quiet mode")
+complete -c ssh -s s -d (_ "Subsystem")
+complete -c ssh -s t -d (_ "Force pseudo-tty allocation")
+complete -c ssh -s T -d (_ "Disable pseudo-tty allocation")
+complete -c ssh -s x -d (_ "Disable X11 forwarding")
+complete -c ssh -s X -d (_ "Enable X11 forwarding")
+complete -c ssh -s L -d (_ "Locally forwarded ports")
+complete -c ssh -s R -d (_ "Remotely forwarded ports")
+complete -c ssh -s D -d (_ "Dynamic port forwarding")
diff --git a/init/completions/su.fish b/init/completions/su.fish
index 6f89c18c..fa64aebe 100644
--- a/init/completions/su.fish
+++ b/init/completions/su.fish
@@ -1,12 +1,12 @@
 # Completions for su
 
 complete -x -c su -a "(__fish_complete_users)"
-complete -c su -s l -l login -d "Make login shell"
-complete -r -c su -s c -l command -d "Pass command to shell"
-complete -c su -s f -l fast -d "Pass -f to the shell"
-complete -c su -s m -l preserve_environment -d "Preserve environment"
-complete -c su -s p -d "Preserve environment"
+complete -c su -s l -l login -d (_ "Make login shell")
+complete -r -c su -s c -l command -d (_ "Pass command to shell")
+complete -c su -s f -l fast -d (_ "Pass -f to the shell")
+complete -c su -s m -l preserve_environment -d (_ "Preserve environment")
+complete -c su -s p -d (_ "Preserve environment")
 complete -x -c su -s s -l shell -a "(cat /etc/shells)"
-complete -c su -l help -d "Display help and exit"
-complete -c su -l version -d "Display version and exit"
+complete -c su -l help -d (_ "Display help and exit")
+complete -c su -l version -d (_ "Display version and exit")
 
diff --git a/init/completions/tar.fish b/init/completions/tar.fish
index adce7b40..b84cc1b9 100644
--- a/init/completions/tar.fish
+++ b/init/completions/tar.fish
@@ -1,62 +1,62 @@
-complete -c tar -s A -l catenate -d "Append archive to archive"
-complete -c tar -l concatenate -d "Append archive to archive"
-complete -c tar -s c -l create -d "Create archive"
-complete -c tar -s d -l diff -d "Compare archive and filesystem"
-complete -c tar -l compare -d "Compare archive and filesystem"
-complete -c tar -l delete -d "Delete from archive"
-complete -c tar -s r -l append -d "Append files to archive"
-complete -c tar -s t -l list -d "List archive"
-complete -c tar -s u -l update -d "Append new files"
-complete -c tar -s x -l extract -d "Extract from archive"
-complete -c tar -l get -d "Extract from archive"
-complete -c tar -l atime-preserve -d "Keep access time"
-complete -c tar -s b -l block-size -d "Block size"
-complete -c tar -s B -l read-full-blocks -d "Reblock while reading"
-complete -c tar -s C -l directory -r -d "Change directory"
-complete -c tar -l checkpoint -d "Print directory names"
-complete -c tar -s f -l file -r -d "Archive file"
-complete -c tar -l force-local -d "Archive is local"
-complete -c tar -s F -l info-script -d "Run script at end of tape"
-complete -c tar -s G -l incremental -d "Use old incremental GNU format"
-complete -c tar -s g -l listed-incremental -d "Use new incremental GNU format"
-complete -c tar -s h -l dereference -d "Derefrerence symlinks"
-complete -c tar -s i -l ignore-zeros -d "Ignore zero bloch in archive"
-complete -c tar -s j -l bzip -d "Filter through bzip2"
-complete -c tar -l ignore-failed-read -d "Dont exit on unreadable files"
-complete -c tar -s k -l keep-old-files -d "Do not overwrite"
-complete -c tar -s K -l starting-file -r -d "Starting file in archive"
-complete -c tar -s l -l one-file-system -d "Stay in local filesystem"
-complete -c tar -s L -l tape-length -r -d "Tape length"
-complete -c tar -s m -l modification-time -d "Dont extract modification time"
-complete -c tar -s M -l multi-volume -d "Multi volume archive"
-complete -c tar -s N -l after-date -r -d "Only store newer files"
-complete -c tar -s o -l old-archive -d "Use V7 format"
-complete -c tar -l portability -d "Use V7 format"
-complete -c tar -s O -l to-stdout -d "Extract to stdout"
-complete -c tar -s p -l same-permissions -d "Extract all permissions"
-complete -c tar -l preserve-permissions -d "Extract all permissions"
-complete -c tar -s P -l absolute-paths -d "Dont strip leading /"
-complete -c tar -l preserve -d "Preserve all permissions and do not sort file arguments"
-complete -c tar -s R -l record-number -d "Show record number"
-complete -c tar -l remove-files -d "Remove files after adding to archive"
-complete -c tar -s s -l same-order -d "Do not sort file arguments"
-complete -c tar -l preserve-order -d "Do not sort file arguments"
-complete -c tar -l same-owner -d "Preserve file ownership"
-complete -c tar -s S -l sparse -d "Handle sparse files"
-complete -c tar -s T -l files-from -r -d "Extract file from file"
-complete -c tar -l null -d "-T has null-terminated names"
-complete -c tar -l totals -d "Print total bytes written"
-complete -c tar -s v -l verbose -d "Vorbose mode"
-complete -c tar -s V -l label -r -d "Set volume name"
-complete -c tar -l version -d "Display version and exit"
-complete -c tar -s w -l interactive -d "Ask for confirmation"
-complete -c tar -l confirmation -d "Ask for confirmation"
-complete -c tar -s W -l vevrify -d "Verify archive"
-complete -c tar -l exclude -r -d "Exclude file"
-complete -c tar -s X -l exclude-from -r -d "Exclude files listed in specified file"
-complete -c tar -s Z -l compress -d "Filter through compress"
-complete -c tar -l uncompress -d "Filter through compress"
-complete -c tar -s z -l gzip -d "Filter through gzip"
-complete -c tar -l gunzip -d "Filter through gzip"
-complete -c tar -l use-compress-program -r -d "Filter through specified program"
+complete -c tar -s A -l catenate -d (_ "Append archive to archive")
+complete -c tar -l concatenate -d (_ "Append archive to archive")
+complete -c tar -s c -l create -d (_ "Create archive")
+complete -c tar -s d -l diff -d (_ "Compare archive and filesystem")
+complete -c tar -l compare -d (_ "Compare archive and filesystem")
+complete -c tar -l delete -d (_ "Delete from archive")
+complete -c tar -s r -l append -d (_ "Append files to archive")
+complete -c tar -s t -l list -d (_ "List archive")
+complete -c tar -s u -l update -d (_ "Append new files")
+complete -c tar -s x -l extract -d (_ "Extract from archive")
+complete -c tar -l get -d (_ "Extract from archive")
+complete -c tar -l atime-preserve -d (_ "Keep access time")
+complete -c tar -s b -l block-size -d (_ "Block size")
+complete -c tar -s B -l read-full-blocks -d (_ "Reblock while reading")
+complete -c tar -s C -l directory -r -d (_ "Change directory")
+complete -c tar -l checkpoint -d (_ "Print directory names")
+complete -c tar -s f -l file -r -d (_ "Archive file")
+complete -c tar -l force-local -d (_ "Archive is local")
+complete -c tar -s F -l info-script -d (_ "Run script at end of tape")
+complete -c tar -s G -l incremental -d (_ "Use old incremental GNU format")
+complete -c tar -s g -l listed-incremental -d (_ "Use new incremental GNU format")
+complete -c tar -s h -l dereference -d (_ "Derefrerence symlinks")
+complete -c tar -s i -l ignore-zeros -d (_ "Ignore zero bloch in archive")
+complete -c tar -s j -l bzip -d (_ "Filter through bzip2")
+complete -c tar -l ignore-failed-read -d (_ "Dont exit on unreadable files")
+complete -c tar -s k -l keep-old-files -d (_ "Do not overwrite")
+complete -c tar -s K -l starting-file -r -d (_ "Starting file in archive")
+complete -c tar -s l -l one-file-system -d (_ "Stay in local filesystem")
+complete -c tar -s L -l tape-length -r -d (_ "Tape length")
+complete -c tar -s m -l modification-time -d (_ "Dont extract modification time")
+complete -c tar -s M -l multi-volume -d (_ "Multi volume archive")
+complete -c tar -s N -l after-date -r -d (_ "Only store newer files")
+complete -c tar -s o -l old-archive -d (_ "Use V7 format")
+complete -c tar -l portability -d (_ "Use V7 format")
+complete -c tar -s O -l to-stdout -d (_ "Extract to stdout")
+complete -c tar -s p -l same-permissions -d (_ "Extract all permissions")
+complete -c tar -l preserve-permissions -d (_ "Extract all permissions")
+complete -c tar -s P -l absolute-paths -d (_ "Dont strip leading /")
+complete -c tar -l preserve -d (_ "Preserve all permissions and do not sort file arguments")
+complete -c tar -s R -l record-number -d (_ "Show record number")
+complete -c tar -l remove-files -d (_ "Remove files after adding to archive")
+complete -c tar -s s -l same-order -d (_ "Do not sort file arguments")
+complete -c tar -l preserve-order -d (_ "Do not sort file arguments")
+complete -c tar -l same-owner -d (_ "Preserve file ownership")
+complete -c tar -s S -l sparse -d (_ "Handle sparse files")
+complete -c tar -s T -l files-from -r -d (_ "Extract file from file")
+complete -c tar -l null -d (_ "-T has null-terminated names")
+complete -c tar -l totals -d (_ "Print total bytes written")
+complete -c tar -s v -l verbose -d (_ "Vorbose mode")
+complete -c tar -s V -l label -r -d (_ "Set volume name")
+complete -c tar -l version -d (_ "Display version and exit")
+complete -c tar -s w -l interactive -d (_ "Ask for confirmation")
+complete -c tar -l confirmation -d (_ "Ask for confirmation")
+complete -c tar -s W -l vevrify -d (_ "Verify archive")
+complete -c tar -l exclude -r -d (_ "Exclude file")
+complete -c tar -s X -l exclude-from -r -d (_ "Exclude files listed in specified file")
+complete -c tar -s Z -l compress -d (_ "Filter through compress")
+complete -c tar -l uncompress -d (_ "Filter through compress")
+complete -c tar -s z -l gzip -d (_ "Filter through gzip")
+complete -c tar -l gunzip -d (_ "Filter through gzip")
+complete -c tar -l use-compress-program -r -d (_ "Filter through specified program")
 
diff --git a/init/completions/test.fish b/init/completions/test.fish
index 2039fce5..0bbd8c67 100644
--- a/init/completions/test.fish
+++ b/init/completions/test.fish
@@ -1,39 +1,39 @@
 
-complete -c test -l help -d "Display help and exit"
-complete -c test -l version -d "Display version and exit"
-complete -c test -a ! -d "Negate expression"
-complete -c test -s a -d "Logical and"
-complete -c test -s o -d "Logical or"
-complete -c test -s n -d "String length is non-zero"
-complete -c test -s z -d "String length is zero"
-complete -c test -a = -d "Strings are equal"
-complete -c test -a != -d "Strings are not equal"
-complete -c test -o eq -d "Integers are equal"
-complete -c test -o ge -d "Left integer larger than or equal to right integer"
-complete -c test -o gt -d "Left integer larger than right integer"
-complete -c test -o le -d "Left integer less than or equal to right integer"
-complete -c test -o lt -d "Left integer less than right integer"
-complete -c test -o ne -d "Left integer not equal to right integer"
-complete -c test -o ef -d "Left file equal to right file"
-complete -c test -o nt -d "Left file newer than right file"
-complete -c test -o ot -d "Left file older than right file"
-complete -c test -s b -d "File is block device"
-complete -c test -s c -d "File is character device"
-complete -c test -s d -d "File is directory"
-complete -c test -s e -d "File exists"
-complete -c test -s f -d "File is regular"
-complete -c test -s g -d "File is set-group-ID"
-complete -c test -s h -d "File is symlink"
-complete -c test -s G -d "File owned by effective group ID"
-complete -c test -s k -d "File has sticky bit set"
-complete -c test -s L -d "File is symlink"
-complete -c test -s O -d "File owned by effective user ID"
-complete -c test -s p -d "File is named pipe"
-complete -c test -s r -d "File is readable"
-complete -c test -s s -d "File size is non-zero"
-complete -c test -s S -d "File is socket"
-complete -c test -s t -d "FD is terminal"
-complete -c test -s u -d "File set-user-ID bit is set"
-complete -c test -s w -d "File is writable"
-complete -c test -s x -d "File is executable"
+complete -c test -l help -d (_ "Display help and exit")
+complete -c test -l version -d (_ "Display version and exit")
+complete -c test -a ! -d (_ "Negate expression")
+complete -c test -s a -d (_ "Logical and")
+complete -c test -s o -d (_ "Logical or")
+complete -c test -s n -d (_ "String length is non-zero")
+complete -c test -s z -d (_ "String length is zero")
+complete -c test -a = -d (_ "Strings are equal")
+complete -c test -a != -d (_ "Strings are not equal")
+complete -c test -o eq -d (_ "Integers are equal")
+complete -c test -o ge -d (_ "Left integer larger than or equal to right integer")
+complete -c test -o gt -d (_ "Left integer larger than right integer")
+complete -c test -o le -d (_ "Left integer less than or equal to right integer")
+complete -c test -o lt -d (_ "Left integer less than right integer")
+complete -c test -o ne -d (_ "Left integer not equal to right integer")
+complete -c test -o ef -d (_ "Left file equal to right file")
+complete -c test -o nt -d (_ "Left file newer than right file")
+complete -c test -o ot -d (_ "Left file older than right file")
+complete -c test -s b -d (_ "File is block device")
+complete -c test -s c -d (_ "File is character device")
+complete -c test -s d -d (_ "File is directory")
+complete -c test -s e -d (_ "File exists")
+complete -c test -s f -d (_ "File is regular")
+complete -c test -s g -d (_ "File is set-group-ID")
+complete -c test -s h -d (_ "File is symlink")
+complete -c test -s G -d (_ "File owned by effective group ID")
+complete -c test -s k -d (_ "File has sticky bit set")
+complete -c test -s L -d (_ "File is symlink")
+complete -c test -s O -d (_ "File owned by effective user ID")
+complete -c test -s p -d (_ "File is named pipe")
+complete -c test -s r -d (_ "File is readable")
+complete -c test -s s -d (_ "File size is non-zero")
+complete -c test -s S -d (_ "File is socket")
+complete -c test -s t -d (_ "FD is terminal")
+complete -c test -s u -d (_ "File set-user-ID bit is set")
+complete -c test -s w -d (_ "File is writable")
+complete -c test -s x -d (_ "File is executable")
 
diff --git a/init/completions/tex.fish b/init/completions/tex.fish
index 9134fa56..615f1dea 100644
--- a/init/completions/tex.fish
+++ b/init/completions/tex.fish
@@ -1,6 +1,6 @@
 for i in {,e}tex {,e}latex pdf{,e}latex pdf{,e}tex omega
-	complete -c $i -o help -d "Display help and exit"
-	complete -c $i -o version -d "Display version and exit"
+	complete -c $i -o help -d (_ "Display help and exit")
+	complete -c $i -o version -d (_ "Display version and exit")
 	complete -c $i -x -a "(
 		__fish_complete_suffix (commandline -ct) .tex '(La)TeX file'
 	)"
diff --git a/init/completions/tokenize.fish b/init/completions/tokenize.fish
index 242f434c..a6a6f5df 100644
--- a/init/completions/tokenize.fish
+++ b/init/completions/tokenize.fish
@@ -1,3 +1,3 @@
-complete -c tokenize -s e -l with-empty -d "Allow empty tokens"
-complete -c tokenize -s n -l no-empty -d "Ignore empty tokens"
-complete -c tokenize -s d -l delimiter -d "Delimiters for tokenization"
+complete -c tokenize -s e -l with-empty -d (_ "Allow empty tokens")
+complete -c tokenize -s n -l no-empty -d (_ "Ignore empty tokens")
+complete -c tokenize -s d -l delimiter -d (_ "Delimiters for tokenization")
diff --git a/init/completions/top.fish b/init/completions/top.fish
index e19d45ee..b247dafe 100644
--- a/init/completions/top.fish
+++ b/init/completions/top.fish
@@ -1,14 +1,14 @@
 # Completions for top
-complete -c top -s b -d "Batch mode"
-complete -c top -s c -d "Toggle command line/program name"
-complete -c top -s d -d "Update interval" -x
-complete -c top -s h -d "Display help and exit"
-complete -c top -s i -d "Toggle idle processes"
-complete -c top -s n -d "Maximium iterations" -x
-complete -c top -s u -d "Monitor effective UID" -x -a "(__fish_complete_users)"
-complete -c top -s U -d "Monitor user" -x -a "(__fish_complete_users)"
-complete -c top -s p -d "Monitor PID" -x -a "(__fish_complete_pids)"
-complete -c top -s s -d "Secure mode"
-complete -c top -s S -d "Cumulative mode"
-complete -c top -s v -d "Display version and exit"
+complete -c top -s b -d (_ "Batch mode")
+complete -c top -s c -d (_ "Toggle command line/program name")
+complete -c top -s d -d (_ "Update interval") -x
+complete -c top -s h -d (_ "Display help and exit")
+complete -c top -s i -d (_ "Toggle idle processes")
+complete -c top -s n -d (_ "Maximium iterations") -x
+complete -c top -s u -d (_ "Monitor effective UID") -x -a "(__fish_complete_users)"
+complete -c top -s U -d (_ "Monitor user") -x -a "(__fish_complete_users)"
+complete -c top -s p -d (_ "Monitor PID") -x -a "(__fish_complete_pids)"
+complete -c top -s s -d (_ "Secure mode")
+complete -c top -s S -d (_ "Cumulative mode")
+complete -c top -s v -d (_ "Display version and exit")
 
diff --git a/init/completions/touch.fish b/init/completions/touch.fish
index 383ce6ba..ef8aa64f 100644
--- a/init/completions/touch.fish
+++ b/init/completions/touch.fish
@@ -1,11 +1,11 @@
-complete -c touch -s a -d "Change access time"
-complete -c touch -s B -l backward -x -d "Set date back"
-complete -c touch -s c -l no-create -d "Do not create file"
-complete -c touch -s d -l date -x -d "Set date"
-complete -c touch -s f -l forward -x -d "Set date forward"
-complete -c touch -s m -d "Change modification time"
-complete -c touch -s r -l reference -d "Use this files times"
-complete -c touch -s t -d "Set date"
-complete -c touch -l time -x -d "Set time"
-complete -c touch -l help -d "Display help and exit"
-complete -c touch -l version -d "Display version nd exit"
+complete -c touch -s a -d (_ "Change access time")
+complete -c touch -s B -l backward -x -d (_ "Set date back")
+complete -c touch -s c -l no-create -d (_ "Do not create file")
+complete -c touch -s d -l date -x -d (_ "Set date")
+complete -c touch -s f -l forward -x -d (_ "Set date forward")
+complete -c touch -s m -d (_ "Change modification time")
+complete -c touch -s r -l reference -d (_ "Use this files times")
+complete -c touch -s t -d (_ "Set date")
+complete -c touch -l time -x -d (_ "Set time")
+complete -c touch -l help -d (_ "Display help and exit")
+complete -c touch -l version -d (_ "Display version nd exit")
diff --git a/init/completions/trap.fish b/init/completions/trap.fish
index 823830ee..5cdd0a5f 100644
--- a/init/completions/trap.fish
+++ b/init/completions/trap.fish
@@ -1,4 +1,4 @@
 
-complete -c trap -s l -l list-signals -d 'Display names of all signals'
-complete -c trap -s p -l print -d 'Display all currently defined trap handlers'
-complete -c trap -s h -l help -d 'Display help and exit'
+complete -c trap -s l -l list-signals -d (_ 'Display names of all signals')
+complete -c trap -s p -l print -d (_ 'Display all currently defined trap handlers')
+complete -c trap -s h -l help -d (_ 'Display help and exit')
diff --git a/init/completions/type.fish b/init/completions/type.fish
index f1651bc6..69891a7a 100644
--- a/init/completions/type.fish
+++ b/init/completions/type.fish
@@ -1,7 +1,7 @@
 
-complete -c type -s h -l help -d "Print this message"
-complete -c type -s a -l all -d "Print all possible definitions of the specified name"
-complete -c type -s f -l no-functions -d "Supress function and builtin lookup"
-complete -c type -s t -l type -d "Print command type"
-complete -c type -s p -l path -d "Print path to command, or nothing if name is not a command"
-complete -c type -s P -l force-path -d "Print path to command"
+complete -c type -s h -l help -d (_ "Print this message")
+complete -c type -s a -l all -d (_ "Print all possible definitions of the specified name")
+complete -c type -s f -l no-functions -d (_ "Supress function and builtin lookup")
+complete -c type -s t -l type -d (_ "Print command type")
+complete -c type -s p -l path -d (_ "Print path to command, or nothing if name is not a command")
+complete -c type -s P -l force-path -d (_ "Print path to command")
diff --git a/init/completions/ulimit.fish b/init/completions/ulimit.fish
index 2b040566..e5055818 100644
--- a/init/completions/ulimit.fish
+++ b/init/completions/ulimit.fish
@@ -1,13 +1,13 @@
 
-complete -c ulimit -s a -l all -d "Set or get all current limits"
-complete -c ulimit -s c -l core-size -d "Maximum size of core files created"
-complete -c ulimit -s d -l data-size -d "Maximum size of a process’s data segment"
-complete -c ulimit -s f -l file-size -d "Maximum size of files created by the shell"
-complete -c ulimit -s l -l lock-size -d "Maximum size that may be locked into memory"
-complete -c ulimit -s m -l resident-set-size -d "Maximum resident set size"
-complete -c ulimit -s n -l file-descriptor-count -d "Maximum number of open file descriptors"
-complete -c ulimit -s s -l stack-size -d "Maximum stack size"
-complete -c ulimit -s t -l cpu-time -d "Maximum amount of cpu time in seconds"
-complete -c ulimit -s u -l process-count -d "Maximum number of processes available to a single user"
-complete -c ulimit -s v -l virtual-memory-size -d "Maximum amount of virtual memory available to the shell"
-complete -c ulimit -s h -l help -d "Display help and exit"
+complete -c ulimit -s a -l all -d (_ "Set or get all current limits")
+complete -c ulimit -s c -l core-size -d (_ "Maximum size of core files created")
+complete -c ulimit -s d -l data-size -d (_ "Maximum size of a process's data segment")
+complete -c ulimit -s f -l file-size -d (_ "Maximum size of files created by the shell")
+complete -c ulimit -s l -l lock-size -d (_ "Maximum size that may be locked into memory")
+complete -c ulimit -s m -l resident-set-size -d (_ "Maximum resident set size")
+complete -c ulimit -s n -l file-descriptor-count -d (_ "Maximum number of open file descriptors")
+complete -c ulimit -s s -l stack-size -d (_ "Maximum stack size")
+complete -c ulimit -s t -l cpu-time -d (_ "Maximum amount of cpu time in seconds")
+complete -c ulimit -s u -l process-count -d (_ "Maximum number of processes available to a single user")
+complete -c ulimit -s v -l virtual-memory-size -d (_ "Maximum amount of virtual memory available to the shell")
+complete -c ulimit -s h -l help -d (_ "Display help and exit")
diff --git a/init/completions/umount.fish b/init/completions/umount.fish
index 4ba33a8d..9ee1126c 100644
--- a/init/completions/umount.fish
+++ b/init/completions/umount.fish
@@ -10,18 +10,18 @@ complete -y mount
 #
 # Find all mountpoints
 #
-complete -c umount -d "Mount point" -x -a '(cat /etc/mtab | cut -d " " -f 1-2|tr " " \n|sed -e "s/[0-9\.]*:\//\//"|grep "^/")'
+complete -c umount -d (_ "Mount point") -x -a '(cat /etc/mtab | cut -d " " -f 1-2|tr " " \n|sed -e "s/[0-9\.]*:\//\//"|grep "^/")'
 
-complete -c umount -s V -d "Display version and exit"
-complete -c umount -s h -d "Display help and exit"
-complete -c umount -s v -d "Verbose mode"
-complete -c umount -s n -d "Unmount without writing in /etc/mtab"
-complete -c umount -s r -d "In case unmounting fails, try to remount read-only"
-complete -c umount -s d -d "In case the unmounted device was a loop device, also free this loop device"
-complete -c umount -s i -d "Don"\'"t call the /sbin/umount.<filesystem> helper even if it exists"
-complete -c umount -s a -d "All of the file systems described in /etc/mtab are unmounted"
-complete -c umount -s t -d "Actions should only be taken on file systems of the specified type" -xa $__fish_filesystems
-complete -c umount -s O -d "Indicate  that  the  actions should only be taken on file systems with the specified options in /etc/fstab" -xa '(cat /etc/mtab | cut -d " " -f 4)\t"Mount option"'
-complete -c umount -s f -d "Force unmount (in case of an unreachable NFS system)"
-complete -c umount -s l -d "Detach the filesystem from the filesystem hierarchy now, and cleanup all references to the filesystem as soon as it is not busy"
+complete -c umount -s V -d (_ "Display version and exit")
+complete -c umount -s h -d (_ "Display help and exit")
+complete -c umount -s v -d (_ "Verbose mode")
+complete -c umount -s n -d (_ "Unmount without writing in /etc/mtab")
+complete -c umount -s r -d (_ "In case unmounting fails, try to remount read-only")
+complete -c umount -s d -d (_ "In case the unmounted device was a loop device, also free this loop device")
+complete -c umount -s i -d (_ "Don't call the /sbin/umount.<filesystem> helper even if it exists")
+complete -c umount -s a -d (_ "All of the file systems described in /etc/mtab are unmounted")
+complete -c umount -s t -d (_ "Actions should only be taken on file systems of the specified type") -xa $__fish_filesystems
+complete -c umount -s O -d (_ "Indicate  that  the  actions should only be taken on file systems with the specified options in /etc/fstab") -xa '(cat /etc/mtab | cut -d " " -f 4)\t"Mount option"'
+complete -c umount -s f -d (_ "Force unmount (in case of an unreachable NFS system)")
+complete -c umount -s l -d (_ "Detach the filesystem from the filesystem hierarchy now, and cleanup all references to the filesystem as soon as it is not busy")
 
diff --git a/init/completions/uname.fish b/init/completions/uname.fish
index 3193b177..c3f5b3d2 100644
--- a/init/completions/uname.fish
+++ b/init/completions/uname.fish
@@ -1,11 +1,11 @@
-complete -c uname -s a -l all -d "Print all"
-complete -c uname -s s -l kernel-name -d "Print kernel name"
-complete -c uname -s n -l nodename -d "Print network node hostname"
-complete -c uname -s r -l kernel-release -d "Print kernel release"
-complete -c uname -s v -l kernel-version -d "Print kernel version"
-complete -c uname -s m -l machine -d "Print machine name"
-complete -c uname -s p -l processor -d "Print procssor"
-complete -c uname -s i -l hardware-platform -d "Print harware platform"
-complete -c uname -s o -l operating-system -d "Print operating system"
-complete -c uname -l help -d "Print help"
-complete -c uname -l verion -d "Print version"
+complete -c uname -s a -l all -d (_ "Print all")
+complete -c uname -s s -l kernel-name -d (_ "Print kernel name")
+complete -c uname -s n -l nodename -d (_ "Print network node hostname")
+complete -c uname -s r -l kernel-release -d (_ "Print kernel release")
+complete -c uname -s v -l kernel-version -d (_ "Print kernel version")
+complete -c uname -s m -l machine -d (_ "Print machine name")
+complete -c uname -s p -l processor -d (_ "Print procssor")
+complete -c uname -s i -l hardware-platform -d (_ "Print harware platform")
+complete -c uname -s o -l operating-system -d (_ "Print operating system")
+complete -c uname -l help -d (_ "Print help")
+complete -c uname -l verion -d (_ "Display version and exit")
diff --git a/init/completions/uniq.fish b/init/completions/uniq.fish
index a574212a..51b748f3 100644
--- a/init/completions/uniq.fish
+++ b/init/completions/uniq.fish
@@ -1,15 +1,15 @@
-complete -c uniq -s c -l count -d "Print number of occurences"
-complete -c uniq -s d -l repeated -d "Only print duplicates"
-complete -c uniq -s D -l all-repeated -d "Remove non-suplicate lines" -f -x -a "
+complete -c uniq -s c -l count -d (_ "Print number of occurences")
+complete -c uniq -s d -l repeated -d (_ "Only print duplicates")
+complete -c uniq -s D -l all-repeated -d (_ "Remove non-suplicate lines") -f -x -a "
 	none\t'Remove none-duplicate lines'
 	prepend\t'Remove non-duplicate lines and print an empty line before each non-duplicate'
 	separate\t'Remove non-duplicate lines and print an empty line between each non-duplicate'
 "
-complete -c uniq -s f -l skip-fields -d "Avoid comparing first N fields" -r
-complete -c uniq -s i -l ignore-case -d "Case insensitive"
-complete -c uniq -s s -l skip-chars -d "Avoid comparing first N characters" -r
-complete -c uniq -s u -l unique -d "Only print unique lines"
-complete -c uniq -s w -l check-chars -d "Compare only N characters" -r
-complete -c uniq -l help -d "Display help and exit"
-complete -c uniq -l version -d "Display version and exit"
+complete -c uniq -s f -l skip-fields -d (_ "Avoid comparing first N fields") -r
+complete -c uniq -s i -l ignore-case -d (_ "Case insensitive")
+complete -c uniq -s s -l skip-chars -d (_ "Avoid comparing first N characters") -r
+complete -c uniq -s u -l unique -d (_ "Only print unique lines")
+complete -c uniq -s w -l check-chars -d (_ "Compare only N characters") -r
+complete -c uniq -l help -d (_ "Display help and exit")
+complete -c uniq -l version -d (_ "Display version and exit")
 
diff --git a/init/completions/valgrind.fish b/init/completions/valgrind.fish
index f8fd1333..dc6cfe2f 100644
--- a/init/completions/valgrind.fish
+++ b/init/completions/valgrind.fish
@@ -9,7 +9,7 @@ else
 	set -g skin tool
 end
 
-complete -xc valgrind -l $skin -d "Skin" -a "
+complete -xc valgrind -l $skin -d (_ "Skin") -a "
 	memcheck\tHeavyweight\ memory\ checker
 	cachegrind\tCache-miss\ profiler
 	addrcheck\tLightweight\ memory\ checker
@@ -21,54 +21,54 @@ eval function __fish_valgrind_skin\; contains -- --$skin=\$argv \(commandline -c
 
 set -e $skin
 
-complete -c valgrind -l help -d "Display help and exit"
-complete -c valgrind -l help-debug -d "Display help and debug options"
-complete -c valgrind -l version -d "Print version"
-complete -c valgrind -s q -l quiet -d "Run silently"
-complete -c valgrind -s v -l verbose -d "Verbose mode"
-complete -xc valgrind -l trace-children -d "Valgrind-ise children" -a "yes no"
-complete -xc valgrind -l track-fds -d "Track file descriptors" -a "yes no"
-complete -xc valgrind -l logfile-fd -d "Log to file descriptor" -a "0 1 2 3 4 5 6 7 8 9"
-complete -rc valgrind -l logfile -d "Log to file"
-complete -xc valgrind -l logsocket -d "Log to socket"
+complete -c valgrind -l help -d (_ "Display help and exit")
+complete -c valgrind -l help-debug -d (_ "Display help and debug options")
+complete -c valgrind -l version -d (_ "Display version and exit")
+complete -c valgrind -s q -l quiet -d (_ "Run silently")
+complete -c valgrind -s v -l verbose -d (_ "Verbose mode")
+complete -xc valgrind -l trace-children -d (_ "Valgrind-ise children") -a "yes no"
+complete -xc valgrind -l track-fds -d (_ "Track file descriptors") -a "yes no"
+complete -xc valgrind -l logfile-fd -d (_ "Log to file descriptor") -a "0 1 2 3 4 5 6 7 8 9"
+complete -rc valgrind -l logfile -d (_ "Log to file")
+complete -xc valgrind -l logsocket -d (_ "Log to socket")
 complete -c valgrind -l demangle -xd "Demangle C++ names" -a "yes no"
-complete -xc valgrind -l num-callers -d "Callers in stack trace"
-complete -xc valgrind -l error-limit -d "Stop showing errors if too many" -a "yes no"
-complete -xc valgrind -l show-below-main -d "Continue trace below main()" -a "yes no"
-complete -rc valgrind -l supressions -d "Supress errors from file"
-complete -c valgrind -l gen-supressions -d "Print suppressions for detected errors"
-complete -xc valgrind -l db-attach -d "Start debugger on error" -a "yes no"
-complete -rc valgrind -l db-command -d "Debugger command"
-complete -xc valgrind -l input-fd -d "File descriptor for input" -a "0 1 2 3 4 5 6 7 8 9"
+complete -xc valgrind -l num-callers -d (_ "Callers in stack trace")
+complete -xc valgrind -l error-limit -d (_ "Stop showing errors if too many") -a "yes no"
+complete -xc valgrind -l show-below-main -d (_ "Continue trace below main()") -a "yes no"
+complete -rc valgrind -l supressions -d (_ "Supress errors from file")
+complete -c valgrind -l gen-supressions -d (_ "Print suppressions for detected errors")
+complete -xc valgrind -l db-attach -d (_ "Start debugger on error") -a "yes no"
+complete -rc valgrind -l db-command -d (_ "Debugger command")
+complete -xc valgrind -l input-fd -d (_ "File descriptor for input") -a "0 1 2 3 4 5 6 7 8 9"
 
 
 # Memcheck-specific options
-complete -n "__fish_valgrind_skin memcheck" -xc valgrind -l leak-check -d "Check for memory leaks" -a "no\t'Do not check for memory leaks' summary\t'Show a leak summary' full\t'Describe memory leaks in detail'"
-complete -n "__fish_valgrind_skin memcheck" -xc valgrind -l show-reachable -d "Show reachable leaked memory" -a "yes\t'Show reachable leaked memory' no\t'Do not show reachable leaked memory'"
-complete -n "__fish_valgrind_skin memcheck" -xc valgrind -l leak-resolution -d "Determines how willing Memcheck is to consider different backtraces to be the same" -a "low\t'Two entries need to match' med\t'Four entries need to match' high\t'All entries need to match'"
-complete -n "__fish_valgrind_skin memcheck" -xc valgrind -l freelist-vol -d "Set size of freed memory pool"
+complete -n "__fish_valgrind_skin memcheck" -xc valgrind -l leak-check -d (_ "Check for memory leaks") -a "no\t'Do not check for memory leaks' summary\t'Show a leak summary' full\t'Describe memory leaks in detail'"
+complete -n "__fish_valgrind_skin memcheck" -xc valgrind -l show-reachable -d (_ "Show reachable leaked memory") -a "yes\t'Show reachable leaked memory' no\t'Do not show reachable leaked memory'"
+complete -n "__fish_valgrind_skin memcheck" -xc valgrind -l leak-resolution -d (_ "Determines how willing Memcheck is to consider different backtraces to be the same") -a "low\t'Two entries need to match' med\t'Four entries need to match' high\t'All entries need to match'"
+complete -n "__fish_valgrind_skin memcheck" -xc valgrind -l freelist-vol -d (_ "Set size of freed memory pool")
 complete -n "__fish_valgrind_skin memcheck" -xc valgrind -l partial-loads-ok -d 'How to handle loads of words that are partially addressible' -a 'yes\t"Do not emit errors on partial loads" no\t"Emit errors on partial loads"'
 complete -n "__fish_valgrind_skin memcheck" -xc valgrind -l avoid-strlen-errors -d 'Whether to skip error reporting for the strlen function' -a 'yes no'
 
 
 # Addrcheck-specific options
-complete -n "__fish_valgrind_skin addrcheck" -xc valgrind -l leak-check -d "Check for memory leaks" -a "no\t'Do not check for memory leaks' summary\t'Show a leak summary' full\t'Describe memory leaks in detail'"
-complete -n "__fish_valgrind_skin addrcheck" -xc valgrind -l show-reachable -d "Show reachable leaked memory" -a "yes\t'Show reachable leaked memory' no\t'Do not show reachable leaked memory'"
-complete -n "__fish_valgrind_skin addrcheck" -xc valgrind -l leak-resolution -d "Determines how willing Addrcheck is to consider different backtraces to be the same" -a "low\t'Two entries need to match' med\t'Four entries need to match' high\t'All entries need to match'"
-complete -n "__fish_valgrind_skin addrcheck" -xc valgrind -l freelist-vol -d "Set size of freed memory pool"
+complete -n "__fish_valgrind_skin addrcheck" -xc valgrind -l leak-check -d (_ "Check for memory leaks") -a "no\t'Do not check for memory leaks' summary\t'Show a leak summary' full\t'Describe memory leaks in detail'"
+complete -n "__fish_valgrind_skin addrcheck" -xc valgrind -l show-reachable -d (_ "Show reachable leaked memory") -a "yes\t'Show reachable leaked memory' no\t'Do not show reachable leaked memory'"
+complete -n "__fish_valgrind_skin addrcheck" -xc valgrind -l leak-resolution -d (_ "Determines how willing Addrcheck is to consider different backtraces to be the same") -a "low\t'Two entries need to match' med\t'Four entries need to match' high\t'All entries need to match'"
+complete -n "__fish_valgrind_skin addrcheck" -xc valgrind -l freelist-vol -d (_ "Set size of freed memory pool")
 complete -n "__fish_valgrind_skin addrcheck" -xc valgrind -l partial-loads-ok -d 'How to handle loads of words that are partially addressible' -a 'yes\t"Do not emit errors on partial loads" no\t"Emit errors on partial loads"'
 complete -n "__fish_valgrind_skin addrcheck" -xc valgrind -l avoid-strlen-errors -d 'Whether to skip error reporting for the strlen function' -a 'yes no'
 
 # Cachegrind-specific options
-complete -n "__fish_valgrind_skin cachegrind" -xc valgrind -l I1 -d "Type of L1 instruction cache"
-complete -n "__fish_valgrind_skin cachegrind" -xc valgrind -l D1 -d "Type of L1 data cache"
-complete -n "__fish_valgrind_skin cachegrind" -xc valgrind -l L2 -d "Type of L2 cache"
+complete -n "__fish_valgrind_skin cachegrind" -xc valgrind -l I1 -d (_ "Type of L1 instruction cache")
+complete -n "__fish_valgrind_skin cachegrind" -xc valgrind -l D1 -d (_ "Type of L1 data cache")
+complete -n "__fish_valgrind_skin cachegrind" -xc valgrind -l L2 -d (_ "Type of L2 cache")
 
 
 # Massif-specific options
-complete -c valgrind -n "__fish_valgrind_skin massif" -l alloc-fn -d "Specify a function that allocates memory" -x
+complete -c valgrind -n "__fish_valgrind_skin massif" -l alloc-fn -d (_ "Specify a function that allocates memory") -x
 complete -c valgrind -n "__fish_valgrind_skin massif" -x -l heap -d 'Profile heap usage' -a 'yes\t"Profile heap usage" no\t"Do not profile heap usage"'
-complete -c valgrind -n "__fish_valgrind_skin massif" -x -l heap-admin -d "The number of bytes of heap overhead per allocation"
-complete -c valgrind -n "__fish_valgrind_skin massif" -x -l stacks -d "Profile stack usage" -a 'yes\t"Profile stack usage" no\t"Do not profile stack usage"'
-complete -c valgrind -n "__fish_valgrind_skin massif" -x -l depth -d "Depth of call chain"
-complete -c valgrind -n "__fish_valgrind_skin massif" -x -l format -d "Profiling output format" -a "html\t'Produce html output' text\t'Produce text output'"
+complete -c valgrind -n "__fish_valgrind_skin massif" -x -l heap-admin -d (_ "The number of bytes of heap overhead per allocation")
+complete -c valgrind -n "__fish_valgrind_skin massif" -x -l stacks -d (_ "Profile stack usage") -a 'yes\t"Profile stack usage" no\t"Do not profile stack usage"'
+complete -c valgrind -n "__fish_valgrind_skin massif" -x -l depth -d (_ "Depth of call chain")
+complete -c valgrind -n "__fish_valgrind_skin massif" -x -l format -d (_ "Profiling output format") -a "html\t'Produce html output' text\t'Produce text output'"
diff --git a/init/completions/vared.fish b/init/completions/vared.fish
index fea93201..02210082 100644
--- a/init/completions/vared.fish
+++ b/init/completions/vared.fish
@@ -1,3 +1,3 @@
 complete -c vared -x -a "(set|sed -e 's/ /\tVariable: /')"
-complete -c vared -s h -l help -d "Display help and exit"
+complete -c vared -s h -l help -d (_ "Display help and exit")
 
diff --git a/init/completions/w.fish b/init/completions/w.fish
index 54abe5d1..f53bcbd7 100644
--- a/init/completions/w.fish
+++ b/init/completions/w.fish
@@ -1,6 +1,6 @@
-complete -c w -s h -d "Dont print header"
-complete -c w -s u -d "Ignore username for time calculations"
-complete -c w -s s -d "Short format"
-complete -c w -s f -d "Toggle printing of remote hostname"
-complete -c w -s V -d "Display version and exit"
-complete -c w -x -a "(__fish_complete_users)" -d "Username"
+complete -c w -s h -d (_ "Dont print header")
+complete -c w -s u -d (_ "Ignore username for time calculations")
+complete -c w -s s -d (_ "Short format")
+complete -c w -s f -d (_ "Toggle printing of remote hostname")
+complete -c w -s V -d (_ "Display version and exit")
+complete -c w -x -a "(__fish_complete_users)" -d (_ "Username")
diff --git a/init/completions/wc.fish b/init/completions/wc.fish
index a9c2dcc3..f4e5c1e6 100644
--- a/init/completions/wc.fish
+++ b/init/completions/wc.fish
@@ -1,7 +1,7 @@
-complete -c wc -s c -l bytes -d "Print byte counts"
-complete -c wc -s m -l chars -d "Print character counts"
-complete -c wc -s l -l lines -d "Print newline counts"
-complete -c wc -s L -l max-line-length -d "Print length of longest line"
-complete -c wc -s w -l words -d "Print word counts"
-complete -c wc -l help -d "Display help and exit"
-complete -c wc -l version -d "Display version and exit"
+complete -c wc -s c -l bytes -d (_ "Print byte counts")
+complete -c wc -s m -l chars -d (_ "Print character counts")
+complete -c wc -s l -l lines -d (_ "Print newline counts")
+complete -c wc -s L -l max-line-length -d (_ "Print length of longest line")
+complete -c wc -s w -l words -d (_ "Print word counts")
+complete -c wc -l help -d (_ "Display help and exit")
+complete -c wc -l version -d (_ "Display version and exit")
diff --git a/init/completions/wget.fish b/init/completions/wget.fish
index 6189461f..bd351143 100644
--- a/init/completions/wget.fish
+++ b/init/completions/wget.fish
@@ -2,112 +2,112 @@
 # Completions for the wget command
 #
 
-complete -c wget -s V -l version -d "Display version and exit"
-complete -c wget -s h -l help -d "Display help and exit"
-complete -c wget -s b -l background -d "Go to background immediately after startup"
-complete -c wget -s e -l execute -d "Execute command as if part of .wgetrc" -x
-complete -c wget -s o -l output-file -d "Log all messages to logfile" -f
-complete -c wget -s a -l append-output -d "Append all messages to logfile"
-complete -c wget -s d -l debug -d "Turn on debug output"
-complete -c wget -s q -l quiet -d "Turn off Wget"\’"s output"
-complete -c wget -s v -l verbose -d "Turn on verbose output"
-complete -c wget -l non-verbose -d "Turn off verbose without being completely quiet"
-complete -c wget -o nv -d "Turn off verbose without being completely quiet"
-complete -c wget -s i -l input-file -d "Read URLs from file" -f
-complete -c wget -s F -l force-html -d "Force input to be treated as HTML"
-complete -c wget -s B -l base -d "Prepend string to relative links" -x
-complete -c wget -l bind-adress -d "Bind address on local machine" -xa "(__fish_print_addresses; __fish_print_hostnames)"
-complete -c wget -s t -l tries -d "Set number of retries to number" -xa "0 1 2 4 8 16 32 64 128"
-complete -c wget -s O -l output-document -d "Concatenate output to file" -f
-complete -c wget -l no-clobber -d "Never overwrite files with same name"
-complete -c wget -o nc  -d "Never overwrite files with same name"
-complete -c wget -s c -l continue -d "Continue getting a partially-downloaded file"
-complete -c wget -l progress -d "Select progress meter type" -a "
+complete -c wget -s V -l version -d (_ "Display version and exit")
+complete -c wget -s h -l help -d (_ "Display help and exit")
+complete -c wget -s b -l background -d (_ "Go to background immediately after startup")
+complete -c wget -s e -l execute -d (_ "Execute command as if part of .wgetrc") -x
+complete -c wget -s o -l output-file -d (_ "Log all messages to logfile") -f
+complete -c wget -s a -l append-output -d (_ "Append all messages to logfile")
+complete -c wget -s d -l debug -d (_ "Turn on debug output")
+complete -c wget -s q -l quiet -d (_ "Turn off Wget's output")
+complete -c wget -s v -l verbose -d (_ "Turn on verbose output")
+complete -c wget -l non-verbose -d (_ "Turn off verbose without being completely quiet")
+complete -c wget -o nv -d (_ "Turn off verbose without being completely quiet")
+complete -c wget -s i -l input-file -d (_ "Read URLs from file") -f
+complete -c wget -s F -l force-html -d (_ "Force input to be treated as HTML")
+complete -c wget -s B -l base -d (_ "Prepend string to relative links") -x
+complete -c wget -l bind-adress -d (_ "Bind address on local machine") -xa "(__fish_print_addresses; __fish_print_hostnames)"
+complete -c wget -s t -l tries -d (_ "Set number of retries to number") -xa "0 1 2 4 8 16 32 64 128"
+complete -c wget -s O -l output-document -d (_ "Concatenate output to file") -f
+complete -c wget -l no-clobber -d (_ "Never overwrite files with same name")
+complete -c wget -o nc  -d (_ "Never overwrite files with same name")
+complete -c wget -s c -l continue -d (_ "Continue getting a partially-downloaded file")
+complete -c wget -l progress -d (_ "Select progress meter type") -a "
 	dot\t'Print one dot for every kB of data, 50 dots per line'
 	dot:default\t'Print one dot for every kB of data, 50 dots per line'
 	dot:binary\t'Print one dot for every 8 kB of data, 48 dots per line'
 	dot:mega\t'Print one dot for every 64 kB of data, 48 dots per line'
 	bar\t'Print progress bar'
 "
-complete -c wget -s N -l timestamping -d "Turn on time-stamping"
-complete -c wget -s S -l server-response -d "Print the headers/responses sent by servers"
-complete -c wget -l spider -d "Do not download the pages, just check that they are there"
-complete -c wget -s T -l timeout -d "Set the network timeout" -x
-complete -c wget -l dns-timeout -d "Set the DNS lookup timeout" -x
-complete -c wget -l connect-timeout -d "Set the connect timeout" -x
-complete -c wget -l read-timeout -d "Set the read (and write) timeout" -x
-complete -c wget -l limit-rate -d "Limit the download speed" -x
-complete -c wget -s w -l wait -d "Wait the specified number of seconds between the retrievals" -x
-complete -c wget -l waitretry -d "Wait time between retries" -x
-complete -c wget -l random-wait -d "Wait random amount of time between retrievals"
-complete -c wget -s Y -l proxy -d "Toggle proxy support" -xa "on off"
-complete -c wget -s Q -l quota -d "Specify download quota for automatic retrievals" -x
-complete -c wget -l dns-cache -d "Turn off caching of DNS lookups" -xa "off"
-complete -c wget -l restrict-file-names -d "Change which characters found in remote URLs may show up in local file names" -a "
+complete -c wget -s N -l timestamping -d (_ "Turn on time-stamping")
+complete -c wget -s S -l server-response -d (_ "Print the headers/responses sent by servers")
+complete -c wget -l spider -d (_ "Do not download the pages, just check that they are there")
+complete -c wget -s T -l timeout -d (_ "Set the network timeout") -x
+complete -c wget -l dns-timeout -d (_ "Set the DNS lookup timeout") -x
+complete -c wget -l connect-timeout -d (_ "Set the connect timeout") -x
+complete -c wget -l read-timeout -d (_ "Set the read (and write) timeout") -x
+complete -c wget -l limit-rate -d (_ "Limit the download speed") -x
+complete -c wget -s w -l wait -d (_ "Wait the specified number of seconds between the retrievals") -x
+complete -c wget -l waitretry -d (_ "Wait time between retries") -x
+complete -c wget -l random-wait -d (_ "Wait random amount of time between retrievals")
+complete -c wget -s Y -l proxy -d (_ "Toggle proxy support") -xa "on off"
+complete -c wget -s Q -l quota -d (_ "Specify download quota for automatic retrievals") -x
+complete -c wget -l dns-cache -d (_ "Turn off caching of DNS lookups") -xa "off"
+complete -c wget -l restrict-file-names -d (_ "Change which characters found in remote URLs may show up in local file names") -a "
 	unix\t'Escape slash and non-printing characters'
 	windows\t'Escape most non-alphabetical characters'
 "
 
 # HTTP options
 
-complete -c wget -l no-directories -d "Do not create a hierarchy of directories"
-complete -c wget -o nd -d "Do not create a hierarchy of directories"
-complete -c wget -s x -l force-directories -d "Force creation of a hierarchy of directories"
-complete -c wget -l no-host-directories -d "Disable generation of host-prefixed directories"
-complete -c wget -o nH -d "Disable generation of host-prefixed directories"
-complete -c wget -l protocal-directories -d "Use the protocol name as a directory component"
-complete -c wget -l cut-dirs -d "Ignore specified number of directory components" -xa "1 2 3 4 5"
-complete -c wget -s P -l directory-prefix -d "Set directory prefix" -f
-complete -c wget -s E -l html-extension -d "Force html files to have html extension"
-complete -c wget -l http-user -d "Specify the http username" -xa "(__fish_complete_users)"
-complete -c wget -l http-passwd -d "Specify the http password" -x
-complete -c wget -l no-cache -d "Disable server-side cache"
-complete -c wget -l no-cookies -d "Disable the use of cookies"
-complete -c wget -l load-cookies -d "Load cookies from file" -f
-complete -c wget -l save-cookies -d "Save cookies to file"
-complete -c wget -l keep-session-cookies -d "Save session cookies"
-complete -c wget -l ignore-length -d "Ignore 'Content-Length' header"
-complete -c wget -l header -d "Define an additional-header to be passed to the HTTP servers" -x
-complete -c wget -l proxy-user -d "Specify the proxy username" -xa "(__fish_complete_users)"
-complete -c wget -l proxy-password -d "Specify the proxy password" -x
-complete -c wget -l referer -d "Set referer URL" -x
-complete -c wget -l save-headers -d "Save the headers sent by the HTTP server"
-complete -c wget -s U -l user-agent -d "Identify as agent-string" -x
-complete -c wget -l post-data -d "Use POST as the method for all HTTP requests and send the specified data in the request body" -x
-complete -c wget -l post-file -d "Use POST as the method for all HTTP requests and send the specified data in the request body" -f
-complete -c wget -l no-http-keep-alive -d "Turn off keep-alive for http downloads"
+complete -c wget -l no-directories -d (_ "Do not create a hierarchy of directories")
+complete -c wget -o nd -d (_ "Do not create a hierarchy of directories")
+complete -c wget -s x -l force-directories -d (_ "Force creation of a hierarchy of directories")
+complete -c wget -l no-host-directories -d (_ "Disable generation of host-prefixed directories")
+complete -c wget -o nH -d (_ "Disable generation of host-prefixed directories")
+complete -c wget -l protocal-directories -d (_ "Use the protocol name as a directory component")
+complete -c wget -l cut-dirs -d (_ "Ignore specified number of directory components") -xa "1 2 3 4 5"
+complete -c wget -s P -l directory-prefix -d (_ "Set directory prefix") -f
+complete -c wget -s E -l html-extension -d (_ "Force html files to have html extension")
+complete -c wget -l http-user -d (_ "Specify the http username") -xa "(__fish_complete_users)"
+complete -c wget -l http-passwd -d (_ "Specify the http password") -x
+complete -c wget -l no-cache -d (_ "Disable server-side cache")
+complete -c wget -l no-cookies -d (_ "Disable the use of cookies")
+complete -c wget -l load-cookies -d (_ "Load cookies from file") -f
+complete -c wget -l save-cookies -d (_ "Save cookies to file")
+complete -c wget -l keep-session-cookies -d (_ "Save session cookies")
+complete -c wget -l ignore-length -d (_ "Ignore 'Content-Length' header")
+complete -c wget -l header -d (_ "Define an additional-header to be passed to the HTTP servers") -x
+complete -c wget -l proxy-user -d (_ "Specify the proxy username") -xa "(__fish_complete_users)"
+complete -c wget -l proxy-password -d (_ "Specify the proxy password") -x
+complete -c wget -l referer -d (_ "Set referer URL") -x
+complete -c wget -l save-headers -d (_ "Save the headers sent by the HTTP server")
+complete -c wget -s U -l user-agent -d (_ "Identify as agent-string") -x
+complete -c wget -l post-data -d (_ "Use POST as the method for all HTTP requests and send the specified data in the request body") -x
+complete -c wget -l post-file -d (_ "Use POST as the method for all HTTP requests and send the specified data in the request body") -f
+complete -c wget -l no-http-keep-alive -d (_ "Turn off keep-alive for http downloads")
 
 #FTP options
 
-complete -c wget -l no-remove-listing -d "Don"\’"t remove the temporary .listing files generated"
-complete -c wget -l no-glob -d "Turn off FTP globbing"
-complete -c wget -l passive-ftp -d "Use the passive FTP retrieval scheme"
-complete -c wget -l retr-symlinks -d "Traverse symlinks and retrive pointed-to files"
+complete -c wget -l no-remove-listing -d (_ "Don't remove the temporary .listing files generated")
+complete -c wget -l no-glob -d (_ "Turn off FTP globbing")
+complete -c wget -l passive-ftp -d (_ "Use the passive FTP retrieval scheme")
+complete -c wget -l retr-symlinks -d (_ "Traverse symlinks and retrive pointed-to files")
 
 # Recursive options
 
-complete -c wget -s r -l recursive -d "Turn on recursive retrieving"
-complete -c wget -n '__fish_contains_opt -s r recursive' -s l -l level -d "Specify recursion maximum depth" -x
-complete -c wget -l delete-after -d "delete every single file downloaded"
-complete -c wget -s k -l convert-links -d "convert the links in the document to make them suitable for local viewing"
-complete -c wget -s K -l backup-converted -d "Back up the original version"
-complete -c wget -s m -l mirror -d "Turn on options suitable for mirroring"
-complete -c wget -s p -l page-requisites -d "download all the files that are necessary to properly display a given HTML page"
-complete -c wget -l strict-comments -d "Turn on strict parsing of HTML comments"
+complete -c wget -s r -l recursive -d (_ "Turn on recursive retrieving")
+complete -c wget -n '__fish_contains_opt -s r recursive' -s l -l level -d (_ "Specify recursion maximum depth") -x
+complete -c wget -l delete-after -d (_ "delete every single file downloaded")
+complete -c wget -s k -l convert-links -d (_ "convert the links in the document to make them suitable for local viewing")
+complete -c wget -s K -l backup-converted -d (_ "Back up the original version")
+complete -c wget -s m -l mirror -d (_ "Turn on options suitable for mirroring")
+complete -c wget -s p -l page-requisites -d (_ "download all the files that are necessary to properly display a given HTML page")
+complete -c wget -l strict-comments -d (_ "Turn on strict parsing of HTML comments")
 
 #Recursive accept/reject options
 
-complete -c wget -s A -l accept -d "comma-separated lists of file name suffixes or patterns to accept" -x
-complete -c wget -s R -l reject -d "comma-separated lists of file name suffixes or patterns to reject" -x
-complete -c wget -s D -l domains -d "Set domains to be followed" -x
-complete -c wget -l exclude-domains -d "Specify the domains that are not to be followed" -x
-complete -c wget -l follow-ftp -d "Follow FTP links from HTML documents"
-complete -c wget -l follow-tags -d "HTML tags to follow" -x
-complete -c wget -l ignore-tags -d "HTML tags to ignore" -x
-complete -c wget -s H -l span-hosts -d "Enable spanning across hosts"
-complete -c wget -s L -l relative -d "Follow relative links only"
-complete -c wget -s I -l include-directories -d "Specify a comma-separated list of directories you wish to follow" -x
-complete -c wget -s X -l exclude-directories -d "Specify a comma-separated list of directories you wish to exclude" -x
-complete -c wget -l no-parent -d "Do not ever ascend to the parent directory"
-complete -c wget -o np  -d "Do not ever ascend to the parent directory"
+complete -c wget -s A -l accept -d (_ "comma-separated lists of file name suffixes or patterns to accept") -x
+complete -c wget -s R -l reject -d (_ "comma-separated lists of file name suffixes or patterns to reject") -x
+complete -c wget -s D -l domains -d (_ "Set domains to be followed") -x
+complete -c wget -l exclude-domains -d (_ "Specify the domains that are not to be followed") -x
+complete -c wget -l follow-ftp -d (_ "Follow FTP links from HTML documents")
+complete -c wget -l follow-tags -d (_ "HTML tags to follow") -x
+complete -c wget -l ignore-tags -d (_ "HTML tags to ignore") -x
+complete -c wget -s H -l span-hosts -d (_ "Enable spanning across hosts")
+complete -c wget -s L -l relative -d (_ "Follow relative links only")
+complete -c wget -s I -l include-directories -d (_ "Specify a comma-separated list of directories you wish to follow") -x
+complete -c wget -s X -l exclude-directories -d (_ "Specify a comma-separated list of directories you wish to exclude") -x
+complete -c wget -l no-parent -d (_ "Do not ever ascend to the parent directory")
+complete -c wget -o np  -d (_ "Do not ever ascend to the parent directory")
 
diff --git a/init/completions/who.fish b/init/completions/who.fish
index 1d788453..8b79bcb7 100644
--- a/init/completions/who.fish
+++ b/init/completions/who.fish
@@ -1,20 +1,20 @@
-complete -c who -s a -l all -d "Same as -b -d --login -p -r -t -T -u"
-complete -c who -s b -l boot -d "Print time of last boot"
-complete -c who -s d -l dead -d "Print dead processes"
-complete -c who -s H -l heading -d "Print line of headings"
-complete -c who -s i -l idle -d "Print idle time"
-complete -c who -s l -l login -d "Print login process"
-complete -c who -l lookup -d "Canonicalize hostnames via DNS"
-complete -c who -s m -d "Print hostname and user for stdin"
-complete -c who -s p -l process -d "Print active processes spawned by init"
-complete -c who -s q -l count -d "Print all login names and number of users logged on"
-complete -c who -s r -l runlevel -d "Print current runlevel"
-complete -c who -s s -l short -d "Print name, line, and time"
-complete -c who -s t -l time -d "Print last system clock change"
-complete -c who -s T -l mesg -d "Print users message status as +, - or ?"
-complete -c who -s w -l writable -d "Print users message status as +, - or ?"
-complete -c who -l message -d "Print users message status as +, - or ?"
-complete -c who -s u -l users -d "List users logged in"
-complete -c who -l help -d "Print help and exit"
-complete -c who -l version -d "Print version and exit"
+complete -c who -s a -l all -d (_ "Same as -b -d --login -p -r -t -T -u")
+complete -c who -s b -l boot -d (_ "Print time of last boot")
+complete -c who -s d -l dead -d (_ "Print dead processes")
+complete -c who -s H -l heading -d (_ "Print line of headings")
+complete -c who -s i -l idle -d (_ "Print idle time")
+complete -c who -s l -l login -d (_ "Print login process")
+complete -c who -l lookup -d (_ "Canonicalize hostnames via DNS")
+complete -c who -s m -d (_ "Print hostname and user for stdin")
+complete -c who -s p -l process -d (_ "Print active processes spawned by init")
+complete -c who -s q -l count -d (_ "Print all login names and number of users logged on")
+complete -c who -s r -l runlevel -d (_ "Print current runlevel")
+complete -c who -s s -l short -d (_ "Print name, line, and time")
+complete -c who -s t -l time -d (_ "Print last system clock change")
+complete -c who -s T -l mesg -d (_ "Print users message status as +, - or ?")
+complete -c who -s w -l writable -d (_ "Print users message status as +, - or ?")
+complete -c who -l message -d (_ "Print users message status as +, - or ?")
+complete -c who -s u -l users -d (_ "List users logged in")
+complete -c who -l help -d (_ "Print help and exit")
+complete -c who -l version -d (_ "Display version and exit and exit")
 
diff --git a/init/completions/xprop.fish b/init/completions/xprop.fish
index 058d20c7..743cb378 100644
--- a/init/completions/xprop.fish
+++ b/init/completions/xprop.fish
@@ -1,29 +1,29 @@
 
-complete -c xprop -o help -d "Display help and exit"
-complete -c xprop -o grammar -d "Display grammar and exit"
-complete -c xprop -o id -x -d "Select window by id"
-complete -c xprop -o name -d "Select window by name"
-complete -c xprop -o font -x -d "Display font properties"
-complete -c xprop -o root -d "Select root window"
-complete -c xprop -o display -d "Specify X server"
-complete -c xprop -o len -x -d "Maximum display length"
-complete -c xprop -o notype -d "Do not show property type"
-complete -c xprop -o fs -r -d "Set format file"
-complete -c xprop -o frame -d "Select window manager frame"
-complete -c xprop -o remove -d "Remove property" -x -a "
+complete -c xprop -o help -d (_ "Display help and exit")
+complete -c xprop -o grammar -d (_ "Display grammar and exit")
+complete -c xprop -o id -x -d (_ "Select window by id")
+complete -c xprop -o name -d (_ "Select window by name")
+complete -c xprop -o font -x -d (_ "Display font properties")
+complete -c xprop -o root -d (_ "Select root window")
+complete -c xprop -o display -d (_ "Specify X server")
+complete -c xprop -o len -x -d (_ "Maximum display length")
+complete -c xprop -o notype -d (_ "Do not show property type")
+complete -c xprop -o fs -r -d (_ "Set format file")
+complete -c xprop -o frame -d (_ "Select window manager frame")
+complete -c xprop -o remove -d (_ "Remove property") -x -a "
 (
 	xprop -root -notype|cut -d ' ' -f 1|cut -d \t -f 1
 )
 "
 
-complete -c xprop -o set -d "Set property" -x -a "
+complete -c xprop -o set -d (_ "Set property") -x -a "
 (
 	xprop -root -notype|cut -d ' ' -f 1|cut -d \t -f 1
 )
 "
 
-complete -c xprop -o spy -d "Examine property updates forever"
-complete -c xprop -o f -d "Set format"
+complete -c xprop -o spy -d (_ "Examine property updates forever")
+complete -c xprop -o f -d (_ "Set format")
 complete -c xprop -d Property -x -a "
 (
 	xprop -root -notype|cut -d ' ' -f 1|cut -d \t -f 1
diff --git a/init/completions/xsel.fish b/init/completions/xsel.fish
index 958c4f87..acdca663 100644
--- a/init/completions/xsel.fish
+++ b/init/completions/xsel.fish
@@ -1,18 +1,18 @@
-complete -c xsel -s a -l append -d "Append input to selection"
-complete -c xsel -s f -l follow -d "Append to selection as input grows"
-complete -c xsel -s i -l input -d "Read into selection"
-complete -c xsel -s o -l output -d "Write selection"
-complete -c xsel -s c -l clear -d "Clear selection"
-complete -c xsel -s d -l delete -d "Delete selection"
-complete -c xsel -s p -l primary -d "Use primary selection"
-complete -c xsel -s s -l secondary -d "Use secondary selection"
-complete -c xsel -s b -l clipboard -d "Use clipboard selection"
-complete -c xsel -s k -l keep -d "Make current selections persistent after program exit"
-complete -c xsel -s x -l exchange -d "Exchange primary and secondary selections"
-complete -c xsel -l display -x -d "X server display"
-complete -c xsel -s t -l selectionTimeout -d "Timeout for retrieving selection"
-complete -c xsel -s l -l logfile -f -d "Error log"
-complete -c xsel -s n -l nodetach -d "Do not detach from the controlling terminal"
-complete -c xsel -s h -l help -d "Display help and exit"
-complete -c xsel -s v -l verbose -d "Print informative messages"
-complete -c xsel -l version -d "Display version and exit"
+complete -c xsel -s a -l append -d (_ "Append input to selection")
+complete -c xsel -s f -l follow -d (_ "Append to selection as input grows")
+complete -c xsel -s i -l input -d (_ "Read into selection")
+complete -c xsel -s o -l output -d (_ "Write selection")
+complete -c xsel -s c -l clear -d (_ "Clear selection")
+complete -c xsel -s d -l delete -d (_ "Delete selection")
+complete -c xsel -s p -l primary -d (_ "Use primary selection")
+complete -c xsel -s s -l secondary -d (_ "Use secondary selection")
+complete -c xsel -s b -l clipboard -d (_ "Use clipboard selection")
+complete -c xsel -s k -l keep -d (_ "Make current selections persistent after program exit")
+complete -c xsel -s x -l exchange -d (_ "Exchange primary and secondary selections")
+complete -c xsel -l display -x -d (_ "X server display")
+complete -c xsel -s t -l selectionTimeout -d (_ "Timeout for retrieving selection")
+complete -c xsel -s l -l logfile -f -d (_ "Error log")
+complete -c xsel -s n -l nodetach -d (_ "Do not detach from the controlling terminal")
+complete -c xsel -s h -l help -d (_ "Display help and exit")
+complete -c xsel -s v -l verbose -d (_ "Print informative messages")
+complete -c xsel -l version -d (_ "Display version and exit")
diff --git a/init/completions/yum.fish b/init/completions/yum.fish
index 5c4b7e5f..0f6330df 100644
--- a/init/completions/yum.fish
+++ b/init/completions/yum.fish
@@ -46,21 +46,21 @@ complete -c yum -n '__fish_yum_has_command' -xa "
 
 complete -c yum -n '__fish_yum_package_ok' -a "(__fish_print_packages)"
 
-complete -c yum -s h -l help -d "Display help and exit" 
-complete -c yum -s y -d "Assume yes to all questions" 
-complete -c yum -s c -d "Configuration file" -r 
-complete -c yum -s d -d "Set debug level" -x 
-complete -c yum -s e -d "Set error level" -x 
-complete -c yum -s t -l tolerant -d "Be tolerant of errors in commandline" 
-complete -c yum -s R -d "Set maximum delay between commands" -x
-complete -c yum -s c -d "Run commands from cache" 
-complete -c yum -l version -d "Display version and exit" 
-complete -c yum -l installroot -d "Specify installroot" -r 
-complete -c yum -l enablerepo -d "Enable repository" -r 
-complete -c yum -l disablerepo -d "Disable repository" -r
-complete -c yum -l obsoletes -d "Enables obsolets processing logic" 
-complete -c yum -l rss-filename -d "Output rss-data to file" -r 
-complete -c yum -l exclude -d "Exclude specified package from updates" -a "(__fish_print_packages)" 
+complete -c yum -s h -l help -d (_ "Display help and exit") 
+complete -c yum -s y -d (_ "Assume yes to all questions") 
+complete -c yum -s c -d (_ "Configuration file") -r 
+complete -c yum -s d -d (_ "Set debug level") -x 
+complete -c yum -s e -d (_ "Set error level") -x 
+complete -c yum -s t -l tolerant -d (_ "Be tolerant of errors in commandline") 
+complete -c yum -s R -d (_ "Set maximum delay between commands") -x
+complete -c yum -s c -d (_ "Run commands from cache") 
+complete -c yum -l version -d (_ "Display version and exit") 
+complete -c yum -l installroot -d (_ "Specify installroot") -r 
+complete -c yum -l enablerepo -d (_ "Enable repository") -r 
+complete -c yum -l disablerepo -d (_ "Disable repository") -r
+complete -c yum -l obsoletes -d (_ "Enables obsolets processing logic") 
+complete -c yum -l rss-filename -d (_ "Output rss-data to file") -r 
+complete -c yum -l exclude -d (_ "Exclude specified package from updates") -a "(__fish_print_packages)" 
 
 complete -c yum -n 'contains list (commandline -poc)' -a "
 	all\t'List all packages'
diff --git a/init/completions/zcat.fish b/init/completions/zcat.fish
index 7cab174f..ef0923d3 100644
--- a/init/completions/zcat.fish
+++ b/init/completions/zcat.fish
@@ -3,8 +3,8 @@ complete -c zcat -x -a "(
 	__fish_complete_suffix (commandline -ct) .tgz 'Compressed archive'
 )
 "
-complete -c zcat -s f -l force -d "Overwrite"
-complete -c zcat -s h -l help -d "Display help"
-complete -c zcat -s L -l license -d "Print license"
-complete -c zcat -s V -l version -d "Display version"
+complete -c zcat -s f -l force -d (_ "Overwrite")
+complete -c zcat -s h -l help -d (_ "Display help and exit")
+complete -c zcat -s L -l license -d (_ "Print license")
+complete -c zcat -s V -l version -d (_ "Display version and exit")
 
diff --git a/init/completions/zip.fish b/init/completions/zip.fish
index f00298e1..8f32d534 100644
--- a/init/completions/zip.fish
+++ b/init/completions/zip.fish
@@ -1,32 +1,32 @@
 # Completions for zip
-complete -c zip -s f -d "Freshen: only changed files"
-complete -c zip -s d -d "Delete entries in zipfile"
-complete -c zip -s u -d "Update: only changed or newer files"
-complete -c zip -s m -d "Move into zipfile (delete files)"
-complete -c zip -s r -d "Recurse into directories"
-complete -c zip -s j -d "Junk directory names"
-complete -c zip -s 0 -d "Store only"
-complete -c zip -s l -d "Convert LF to CR LF"
-complete -c zip -o ll -d "Convert CR LF to LF"
-complete -c zip -s 1 -d "Compress faster"
-complete -c zip -s 9 -d "Compress better"
-complete -c zip -s q -d "Quiet operation"
-complete -c zip -s v -d "Verbose operation"
-complete -c zip -s c -d "Add one-line comments"
-complete -c zip -s z -d "Add zipfile comments"
-complete -c zip -s @ -d "Read names from stdin"
-complete -c zip -s o -d "Make zipfile as old as the latest entry"
-complete -c zip -s x -r -d "Exclude the following names"
-complete -c zip -s i -r -d "Include only the following names"
-complete -c zip -s F -d "Fix zipfile"
-complete -c zip -o FF -d "Fix zipfile (try harder)"
-complete -c zip -s A -d "Adjust self-extracting exe"
-complete -c zip -s J -d "Junk zipfile prefix"
-complete -c zip -s T -d "Test zipfile integrity"
-complete -c zip -s X -d "Exclude extra file attributes"
-complete -c zip -s y -d "Store symbolic links as links"
-complete -c zip -s R -d "PKZIP recursion"
-complete -c zip -s e -d "Encrypt"
-complete -c zip -s n -r -d "Don\'t compress these suffixes"
-complete -c zip -s h -d "Usage"
+complete -c zip -s f -d (_ "Freshen: only changed files")
+complete -c zip -s d -d (_ "Delete entries in zipfile")
+complete -c zip -s u -d (_ "Update: only changed or newer files")
+complete -c zip -s m -d (_ "Move into zipfile (delete files)")
+complete -c zip -s r -d (_ "Operate recursively")
+complete -c zip -s j -d (_ "Do not store directory names")
+complete -c zip -s 0 -d (_ "Do not compress at all")
+complete -c zip -s l -d (_ "Convert LF to CR LF")
+complete -c zip -o ll -d (_ "Convert CR LF to LF")
+complete -c zip -s 1 -d (_ "Compress faster")
+complete -c zip -s 9 -d (_ "Compress better")
+complete -c zip -s q -d (_ "Quiet mode")
+complete -c zip -s v -d (_ "Verbose mode")
+complete -c zip -s c -d (_ "Add one-line comments")
+complete -c zip -s z -d (_ "Add zipfile comments")
+complete -c zip -s @ -d (_ "Read names from stdin")
+complete -c zip -s o -d (_ "Make zipfile as old as the latest entry")
+complete -c zip -s x -r -d (_ "Exclude the following names")
+complete -c zip -s i -r -d (_ "Include only the following names")
+complete -c zip -s F -d (_ "Fix zipfile")
+complete -c zip -o FF -d (_ "Fix zipfile (try harder)")
+complete -c zip -s A -d (_ "Adjust offsets to suit self-extracting exe")
+complete -c zip -s J -d (_ "Strip prepended data")
+complete -c zip -s T -d (_ "Test zipfile integrity")
+complete -c zip -s X -d (_ "Exclude extra file attributes")
+complete -c zip -s y -d (_ "Store symbolic links as links")
+complete -c zip -s R -d (_ "PKZIP recursion")
+complete -c zip -s e -d (_ "Encrypt")
+complete -c zip -s n -r -d (_ "Don\'t compress these suffixes")
+complete -c zip -s h -d (_ "Display help and exit")