Yet another batch of description tweaks, as well as the last major checkin of translations to swedish (updated patch)

darcs-hash:20060111141735-ac50b-b6a9ac5d5d9eb8eac28dd39968cd28f99044e8f5.gz

42 files changed, 255 insertions, 259 deletions

diff --git a/init/completions/apropos.fish b/init/completions/apropos.fish
index 263be075..e0332dbc 100644
--- a/init/completions/apropos.fish
+++ b/init/completions/apropos.fish
@@ -6,7 +6,7 @@ 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 (_ "Display help and exit")
 complete -f -c apropos -s d -l debug -d (_ "Print debugging info")
@@ -16,6 +16,6 @@ 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 -x -c apropos -s C -l config-file -d (_ "Specify a configuration 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 606ec7da..9a1387cb 100644
--- a/init/completions/apt-build.fish
+++ b/init/completions/apt-build.fish
@@ -4,21 +4,21 @@ 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 install -d (_ "Build and install a new package")
+complete -x -c apt-build -a source -d (_ "Download and extract a source")
+complete -x -c apt-build -a info -d (_ "Info on a package")
 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 clean-build -d (_ "Erase built packages")
+complete -x -c apt-build -a build-source -d (_ "Build source without install")
+complete -x -c apt-build -a clean-sources -d (_ "Clean source directories")
+complete -x -c apt-build -a update-source -d (_ "Update source and rebuild")
 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 -f -c apt-build -l reinstall -d (_ "Rebuild and install an installed package")
 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")
diff --git a/init/completions/apt-cache.fish b/init/completions/apt-cache.fish
index 99f7154a..ea8c90fe 100644
--- a/init/completions/apt-cache.fish
+++ b/init/completions/apt-cache.fish
@@ -6,20 +6,20 @@ 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 -f -c apt-cache -a unmet -d (_ "List unmet dependencies 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 -x -c apt-cache -a search -d (_ "Search packagename 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 -l names-only -a search -d (_ "Search packagename only")
+complete -x -c apt-cache -a depends -d (_ "List dependencies for the package")
+complete -x -c apt-cache -a rdepends -d (_ "List reverse dependencies 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 -r -c apt-cache -s p -l pkg-cache -d (_ "Select file to store package cache")
+complete -r -c apt-cache -s s -l src-cache -d (_ "Select file to store source 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 i -l important -d (_ "Print important dependencies")
 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")
diff --git a/init/completions/apt-cdrom.fish b/init/completions/apt-cdrom.fish
index 137f35b5..83aead2c 100644
--- a/init/completions/apt-cdrom.fish
+++ b/init/completions/apt-cdrom.fish
@@ -6,7 +6,7 @@ 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 a -l thorough -d (_ "Thorough package scan")
 complete -f -c apt-cdrom -s n -l no-act -d (_ "No changes")
 complete -f -c apt-cdrom -s v -l version -d (_ "Display version and exit")
 complete -r -c apt-cdrom -s c -l config-file -d (_ "Specify config file")
diff --git a/init/completions/apt-file.fish b/init/completions/apt-file.fish
index b36fdddc..62d2f1b0 100644
--- a/init/completions/apt-file.fish
+++ b/init/completions/apt-file.fish
@@ -1,8 +1,8 @@
 #apt-file
 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 update -d (_ "Resync package contents from source")
+complete -r -c apt-file -a search -d (_ "Search package containing pattern")
+complete -r -c apt-file -a list -d (_ "List contents of a package 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 (_ "Verbose mode")
@@ -12,6 +12,6 @@ complete -f -c apt-file -s x -l regexp -d (_ "Pattern is regexp")
 complete -f -c apt-file -s V -l version -d (_ "Display version and exit")
 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 l -l package-only -d (_ "Only display package 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 1e7e1195..556cd877 100644
--- a/init/completions/apt-ftparchive.fish
+++ b/init/completions/apt-ftparchive.fish
@@ -1,6 +1,6 @@
 #apt-ftparchive
 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 packages -d (_ "Generate package 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")
diff --git a/init/completions/apt-get.fish b/init/completions/apt-get.fish
index 59cff4f4..de6e3013 100644
--- a/init/completions/apt-get.fish
+++ b/init/completions/apt-get.fish
@@ -29,11 +29,11 @@ complete -f -n '__fish_apt_no_subcommand' -c apt-get -a 'install' -d (_ 'Install
 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 'check' -d (_ 'Update cache and check dependencies')
 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 f -l fix-broken -d (_ 'Correct broken dependencies')
 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')
@@ -44,7 +44,7 @@ complete -c apt-get -s V -l verbose-versions -d (_ 'Show full versions for packa
 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 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')
@@ -56,7 +56,7 @@ 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 arch-only -d (_ 'Only process arch-dependant build-dependencies')
 complete -c apt-get -l allow-unauthenticated -d (_ 'Ignore non-authenticated packages')
 complete -c apt-get -s v -l version -d (_ 'Display version and exit')
 complete -r -c apt-get -s c -l config-file -d (_ 'Specify a config file')
diff --git a/init/completions/apt-listbugs.fish b/init/completions/apt-listbugs.fish
index c08ee314..7c2175dd 100644
--- a/init/completions/apt-listbugs.fish
+++ b/init/completions/apt-listbugs.fish
@@ -2,10 +2,10 @@
 complete -c apt-listbugs -s h -l help -d (_ "Display help and exit")
 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 (_ "Tags 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 S -l stats -a "outstanding 'pending upload' resolved done open" -d (_ "Bug-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 g -l showgreater -d (_ "Ignore newer bugs than upgrade packages")
+complete -f -c apt-listbugs -s D -l show-downgrade -d (_ "Bugs for downgrade packages")
 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")
@@ -20,6 +20,6 @@ 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 yes to all questions")
 complete -f -c apt-listbugs -s n -l force-no -d (_ "Assume no to all questions")
-complete -c apt-listbugs -a list -d (_ "List bugs from pkgs")
+complete -c apt-listbugs -a list -d (_ "List bugs from packages")
 complete -c apt-listbugs -a rss -d (_ "List bugs in rss format")
 
diff --git a/init/completions/apt-move.fish b/init/completions/apt-move.fish
index 57bf43e3..31941ccc 100644
--- a/init/completions/apt-move.fish
+++ b/init/completions/apt-move.fish
@@ -1,23 +1,22 @@
 #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 -c apt-move -a getlocal -d (_ "Alias for 'get'")
+complete -f -c apt-move -a move -d (_ "Move packages to local tree")
+complete -f -c apt-move -a delete -d (_ "Delete obsolete package 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 update -d (_ "Move packages from cache to local mirror")
+complete -f -c apt-move -a local -d (_ "Alias for 'move delete packages'")
+complete -f -c apt-move -a localupdate -d (_ "Alias for 'update'")
+complete -f -c apt-move -a mirror -d (_ "Download package missing from mirror")
+complete -f -c apt-move -a sync -d (_ "Sync packages 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 -a movefile -d (_ "Move file specified on commandline")
+complete -f -c apt-move -a listbin -d (_ "List packags that may serve as input to mirrorbin or mirrorsource" )
+complete -f -c apt-move -a mirrorbin -d (_ "Fetch package from STDIN")
+complete -f -c apt-move -a mirrorsrc -d (_ "Fetch source package from STDIN")
+complete -f -c apt-move -s a -d (_ "Process all packages")
 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-rdepends.fish b/init/completions/apt-rdepends.fish
index e30267a6..6ff0cecf 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 (_ "Display help and exit")
-complete -f -c apt-rdepends -s b -l build-depends -d (_ "Show bulid deps")
+complete -f -c apt-rdepends -s b -l build-depends -d (_ "Show bulid dependencies")
 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 -s p -l print-state -d (_ "Show state of dependencies")
+complete -f -c apt-rdepends -s r -l reverse -d (_ "List packages depending on")
+complete -r -f -c apt-rdepends -s f -l follow -d (_ "Comma-separated list of dependancy types to follow recursively")
+complete -r -f -c apt-rdepends -s s -l show -d (_ "Comma-separated list of dependancy types to show")
+complete -r -f -c apt-rdepends -l state-follow -d (_ "Comma-separated list of package installation states to follow recursively")
+complete -r -f -c apt-rdepends -l state-show -d (_ "Comma-separated list of package installation states to show")
 complete -f -c apt-rdepends -l man -d (_ "Display man page")
 complete -f -c apt-rdepends -l version -d (_ "Display version and exit")
 
diff --git a/init/completions/apt-show-source.fish b/init/completions/apt-show-source.fish
index 7b702a69..6c875f9c 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 (_ 'Display help and exit')
-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 status-file -d (_ 'Read package from file') -f
+complete -r -c apt-show-source -o stf -d (_ 'Read package 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 (_ 'Display version and exit')
-complete -f -c apt-show-source -s a -l all -d (_ 'Print all src pkgs with version')
+complete -f -c apt-show-source -s a -l all -d (_ 'Print all source packages with version')
 complete -f -c apt-show-source -s v -l verbose -d (_ 'Verbose mode')
diff --git a/init/completions/apt-show-versions.fish b/init/completions/apt-show-versions.fish
index d3ad04d8..f4ee6c60 100644
--- a/init/completions/apt-show-versions.fish
+++ b/init/completions/apt-show-versions.fish
@@ -2,13 +2,13 @@
 complete -c apt-show-source -s h -l help -d (_ 'Display help and exit')
 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 u -l upgradeable -d (_ 'Print only upgradeable packages')
 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 b -l brief -d (_ 'Print package 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 status-file -d (_ 'Read package from file')
+complete -r -c apt-show-versions -o stf -d (_ 'Read package 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-src.fish b/init/completions/apt-src.fish
index cbfbafd5..98cda50b 100644
--- a/init/completions/apt-src.fish
+++ b/init/completions/apt-src.fish
@@ -1,17 +1,17 @@
 #apt-src
 complete -c apt-src -s h -l help -d (_ "Display help and exit")
-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 -a "update" -d (_ "Update list of source packages")
+complete -f -c apt-src -a "install" -d (_ "Install source packages")
+complete -f -c apt-src -a "upgrade" -d (_ "Upgrade source packages")
+complete -f -c apt-src -a "remove" -d (_ "Remove source packages")
+complete -f -c apt-src -a "build" -d (_ "Build source packages")
+complete -f -c apt-src -a "clean" -d (_ "Clean source packages")
+complete -f -c apt-src -a "import" -d (_ "Detect known source tree")
+complete -f -c apt-src -a "list" -d (_ "List installed source package\(s\)")
+complete -f -c apt-src -a "location" -d (_ "Root source tree")
+complete -f -c apt-src -a "version" -d (_ "Version of source package")
+complete -f -c apt-src -a "name" -d (_ "Name of the source package")
+complete -f -c apt-src -s b -l build -d (_ "Build source packages")
 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")
diff --git a/init/completions/apt-zip-inst.fish b/init/completions/apt-zip-inst.fish
index 04517f19..34a302ef 100644
--- a/init/completions/apt-zip-inst.fish
+++ b/init/completions/apt-zip-inst.fish
@@ -3,7 +3,7 @@ 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 (_ "Display version and exit")
 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 -c apt-zip-inst -s p -l packages -d (_ "List of packages 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 b5f4373b..d62e2133 100644
--- a/init/completions/apt-zip-list.fish
+++ b/init/completions/apt-zip-list.fish
@@ -3,7 +3,7 @@ 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 (_ "Display version and exit")
 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 -c apt-zip-list -s p -l packages -d (_ "List of packages 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")
diff --git a/init/completions/commandline.fish b/init/completions/commandline.fish
index 70924c9e..337f0185 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 a -l append -d (_ "Add text to the end of the selected area")
 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 r -l replace -d (_ "Replace selected part")
 
-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 (_ "Select job under cursor")
+complete -c commandline -s p -l current-process  -d (_ "Select process under cursor")
+complete -c commandline -s t -l current-token -d (_ "Select token under cursor")
+complete -c commandline -s b -l current-buffer -d (_ "Select entire command line (default)")
 
-complete -c commandline -s c -l cut-at-cursor -d (_ "Only return part of commandline before the cursor")
+complete -c commandline -s c -l cut-at-cursor -d (_ "Only return that part of the command line before the cursor")
 complete -c commandline -s f -l function -d (_ "Inject readline functions to reader")
 
diff --git a/init/completions/cvs.fish b/init/completions/cvs.fish
index 26102247..4512c454 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 (_ '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 -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 (_ '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
+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/gcc.fish b/init/completions/gcc.fish
index 8ddf1507..d19cf251 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 (_ 'bitfield is unsigned')
-complete -c gcc -o fsigned-bitfields -d (_ 'bitfield is signed')
-complete -c gcc -o fno-unsigned-bitfields -d (_ 'All bitfields are signed')
-complete -c gcc -o fno-signed-bitfields -d (_ 'All bitfields are unsigned')
-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 (_ "bitfield is unsigned")
+complete -c gcc -o fsigned-bitfields -d (_ "bitfield is signed")
+complete -c gcc -o fno-unsigned-bitfields -d (_ "All bitfields are signed")
+complete -c gcc -o fno-signed-bitfields -d (_ "All bitfields are unsigned")
+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 (printf (_ "Set maximum template depth to %s") $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 31cbb898..959ef207 100644
--- a/init/completions/gprof.fish
+++ b/init/completions/gprof.fish
@@ -29,6 +29,6 @@ complete -xc gprof -s N -l no-time -d (_ "Do not propagate times for matching sy
 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 (_ "Display help and exit")
-complete -xc gprof -s v -l version -d (_ "Display version and exit and exit")
+complete -xc gprof -s v -l version -d (_ "Display 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")
diff --git a/init/completions/help.fish b/init/completions/help.fish
index bbbd0a5a..853a9ba8 100644
--- a/init/completions/help.fish
+++ b/init/completions/help.fish
@@ -6,7 +6,7 @@ for i in (builtin -n)
 	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 
+for i in count dirh dirs help mimedb nextd open popd prevd pushd set_color psub umask type 
 	complete -c help -x -a $i -d (printf (_ "Help for the '%s' command") $i )
 end
 
diff --git a/init/completions/jobs.fish b/init/completions/jobs.fish
index 52f4151b..c3a0cb6c 100644
--- a/init/completions/jobs.fish
+++ b/init/completions/jobs.fish
@@ -3,4 +3,4 @@
 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 l -l last -d (_ "Only show status for last job to be started")
diff --git a/init/completions/ls.fish b/init/completions/ls.fish
index 512bc3fa..af45e224 100644
--- a/init/completions/ls.fish
+++ b/init/completions/ls.fish
@@ -12,12 +12,12 @@ for i in ls ll la
 	complete -c $i -l color -f -a "never always auto" -d (_ "Use colors")
 	complete -c $i -s d -l directory -d (_ "List directories, not their content")
 	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 -d (_ "Don't 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 format, 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 G -l no-group -d (_ "Don't print group information")
 	complete -c $i -s h -l human-readable -d (_ "Human readable sizes")
 	complete -c $i -l si -d (_ "Human readable sizes, powers of 1000")
 	complete -c $i -s H -l dereference-command-line -d (_ "Follow symlinks")
@@ -43,7 +43,7 @@ for i in ls ll la
 	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'
+	none\tDon't\ sort
 		size\t'Sort by size'
 		time\t'Sort by modification time'
 		version\t'Sort by version'
diff --git a/init/completions/man.fish b/init/completions/man.fish
index 8c0e3a4a..1a2bbaa2 100644
--- a/init/completions/man.fish
+++ b/init/completions/man.fish
@@ -51,10 +51,10 @@ 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 -d (_ "Show whatis information")
 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 (_ "Show apropos information")
 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")
diff --git a/init/completions/mplayer.fish b/init/completions/mplayer.fish
index 7c38df53..653aa530 100644
--- a/init/completions/mplayer.fish
+++ b/init/completions/mplayer.fish
@@ -44,7 +44,7 @@ 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 idx -d (_ "Build 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
diff --git a/init/completions/mv.fish b/init/completions/mv.fish
index b1038587..9f57f59f 100644
--- a/init/completions/mv.fish
+++ b/init/completions/mv.fish
@@ -6,7 +6,7 @@ complete -c mv -l strip-trailing-slashes -d (_ "Remove trailing slashes from sou
 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 -s v -l vervose -d (_ "Verbose mode")
 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/perl.fish b/init/completions/perl.fish
index 9bfe7280..62f49b07 100644
--- a/init/completions/perl.fish
+++ b/init/completions/perl.fish
@@ -1,5 +1,5 @@
 complete -c perl -s 0 -d (_ 'Specify record separator')
-complete -c perl -s a -d (_ 'Feed input to split')A
+complete -c perl -s a -d (_ 'Turn on autosplit mode')
 complete -c perl -s c -d (_ 'Check syntax')
 complete -c perl -s d -d (_ 'Debugger')
 complete -c perl -s D -x -d (_ 'Debug option')
@@ -7,7 +7,7 @@ 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 l -d (_ 'Automatic 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')
diff --git a/init/completions/ping.fish b/init/completions/ping.fish
index b7689d52..b222a446 100644
--- a/init/completions/ping.fish
+++ b/init/completions/ping.fish
@@ -3,25 +3,25 @@ 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 c -d (_ "Stop after specified number of 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 (_ "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 (_ "Wait specified interval of 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 (_ "Send the specified number of packets without 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 p -d (_ "Pad packet with empty bytes") -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 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 buffer size") -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 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 mode")
 complete -c ping -s V -d (_ "Display version and exit")
diff --git a/init/completions/ps.fish b/init/completions/ps.fish
index 8c041843..30eb974b 100644
--- a/init/completions/ps.fish
+++ b/init/completions/ps.fish
@@ -25,7 +25,7 @@ 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 Z -l context -d (_ "Add column for security data")
 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")
@@ -33,5 +33,5 @@ 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 version and exit")
 complete -c ps -l help -d (_ "Display help and exit")
-complete -c ps -l info -d (_ "Display debugging info")
+complete -c ps -l info -d (_ "Display debug info")
 
diff --git a/init/completions/python.fish b/init/completions/python.fish
index a2d219b8..1e94a60f 100644
--- a/init/completions/python.fish
+++ b/init/completions/python.fish
@@ -7,8 +7,8 @@ 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 u -d (_ "Unbuffered input 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 x -d (_ "Ignore first line of input")
diff --git a/init/completions/rm.fish b/init/completions/rm.fish
index 55b78441..f869fdbd 100644
--- a/init/completions/rm.fish
+++ b/init/completions/rm.fish
@@ -2,8 +2,8 @@
 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 r -l recursive -d (_ "Recursively remove subdirectories")
+complete -c rm -s R -d (_ "Recursively remove 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 fb9f9667..9cb6a691 100644
--- a/init/completions/rmdir.fish
+++ b/init/completions/rmdir.fish
@@ -2,7 +2,7 @@
 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 -s v -l verbose -d (_ "Verbose mode")
 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 2f9b6498..ed7fe721 100644
--- a/init/completions/rpm.fish
+++ b/init/completions/rpm.fish
@@ -20,25 +20,22 @@ complete -c rpm -l root -d (_ "Specify root directory for rpm operations") -a "
 
 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 allfiles -d (_ "Installs or upgrades all the files in the package, even if they aren't needed (missingok) and don't exist")
 complete $rpm_install -l badreloc -d (_ "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 excludepath -d (_ "Don't install files whose name begins with specified path") -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")
 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 -s h -l hash -d (_ 'Print 50 hash marks as the package archive is unpacked')
+complete $rpm_install -l ignoresize -d (_ "Don't check for sufficient disk space before installation"
 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 includedocs -d (_ 'Install documentation files (default)')
 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 nodeps -d (_ "Don't do a dependency check")
 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 noorder -d (_ "Don't change the package installation order" )
 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")
@@ -51,8 +48,8 @@ complete $rpm_install -l notriggerpostun -d (_ "Don't execute triggerpostun scri
 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 relocate -x -d (_ "Translate all paths that start with first half of following parameter to second half of following parameter" )
+complete $rpm_install -l repackage -d (_ 'Re-package the files before erasing')
 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")
@@ -64,39 +61,39 @@ complete $rpm_query -s c -l configfiles -d (_ 'List only configuration files (im
 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 i -l info -d (_ 'Display package information, including name, version, and description. Uses --queryformat if specified')
+complete $rpm_query -l last -d (_ 'Orders the package listing by install time')
 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 scripts -d (_ 'List the package specific scriptlets')
+complete $rpm_query -s s -l state -d (_ 'Display the states of files in the package. The state of each file is one of normal, not installed, or replaced')
+complete $rpm_query -l triggers -d (_ 'Display the trigger scripts contained in the package')
+complete $rpm_query -l triggerscripts -d (_ 'Display the trigger scripts contained in the package')
 set -e rpm_query
 
 set -- rpm_select -c rpm -n "__fish_contains_opt -s q -s V query verify"
 
 complete $rpm_select -a "(__fish_print_packages)"
 complete $rpm_select -s a -l all -d (_ 'Query all installed packages')
-complete $rpm_select -s f -l file -d (_ 'Query package owning FILE') -r
+complete $rpm_select -s f -l file -d (_ 'Query package owning specified 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 -s g -l group -d (_ 'Query packages with the specified 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 -s p -l package -d (_ 'Query an (uninstalled) package in specified 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 -l specfile -d (_ 'Parse and query specified spec-file as if it were a package') -xa "(__fish_complete_suffix (commandline -ct) .spec 'Query package spec file')"
+complete $rpm_select -l tid -d (_ 'Query package(s) that have the specified TID (transaction identifier)') -x
+complete $rpm_select -l triggeredby -d (_ 'Query packages that are triggered by the specified packages') -x -a "(__fish_print_packages)"
+complete $rpm_select -l whatprovides -d (_ 'Query all packages that provide the specified capability') -x
+complete $rpm_select -l whatrequires -d (_ 'Query all packages that requires the specified capability for functioning') -x
 set -e rpm_select
 
 set -- rpm_verify -c rpm -n "__fish_contains_opt -s V verify"
 complete $rpm_verify -l nodeps -d (_ "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 noscripts -d (_ "Don't execute the %verifyscript scriptlet")
 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")
@@ -110,7 +107,7 @@ 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 allmatches -d (_ 'Remove all versions of the package which match specified string')
 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")
@@ -119,7 +116,7 @@ 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")
+complete $rpm_erase -l test -d (_ "Don't really uninstall anything" )
 set -e rpm_erase
 
 set -- rpm_mode -c rpm -n '__fish_contains_opt -s e -s i -s F -s V -s U -s q erase install freshen verify upgrade query; if test $status = 0; false; else; true; end'
diff --git a/init/completions/ruby.fish b/init/completions/ruby.fish
index f3dbf8fd..08a061ef 100644
--- a/init/completions/ruby.fish
+++ b/init/completions/ruby.fish
@@ -1,6 +1,6 @@
 #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 a -d (_ 'Turn on autosplit mode')
 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')
@@ -9,7 +9,7 @@ complete -c ruby -s h -l help -d (_ 'Display help and exit')
 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 l -d (_ 'Automatic 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')
diff --git a/init/completions/set.fish b/init/completions/set.fish
index 5d9bc605..f7ddbf3d 100644
--- a/init/completions/set.fish
+++ b/init/completions/set.fish
@@ -6,7 +6,7 @@ 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 U -l universal -d (_ "Make variable scope universal, i.e. share variable with all the users fish processes on this computer")
 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")
 
diff --git a/init/completions/sort.fish b/init/completions/sort.fish
index 2b5b8144..0fa9c170 100644
--- a/init/completions/sort.fish
+++ b/init/completions/sort.fish
@@ -11,7 +11,7 @@ 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 S -l buffer-size -r -d (_ "Set memory buffer size")
 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")
diff --git a/init/completions/tar.fish b/init/completions/tar.fish
index b84cc1b9..41c8034e 100644
--- a/init/completions/tar.fish
+++ b/init/completions/tar.fish
@@ -20,14 +20,14 @@ 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 i -l ignore-zeros -d (_ "Ignore zero block 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 -l ignore-failed-read -d (_ "Don't exit on unreadable files")
+complete -c tar -s k -l keep-old-files -d (_ "Don't 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 modification-time -d (_ "Don't 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")
@@ -35,7 +35,7 @@ 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 -s P -l absolute-paths -d (_ "Don't 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")
@@ -46,7 +46,7 @@ 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 verbose -d (_ "Verbose 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")
diff --git a/init/completions/umount.fish b/init/completions/umount.fish
index 9ee1126c..79a60524 100644
--- a/init/completions/umount.fish
+++ b/init/completions/umount.fish
@@ -19,9 +19,9 @@ 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 a -d (_ "Unmount all of the file systems described in /etc/mtab")
 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 O -d (_ "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 f2e33e8e..d62106b0 100644
--- a/init/completions/uname.fish
+++ b/init/completions/uname.fish
@@ -1,4 +1,4 @@
-complete -c uname -s a -l all -d (_ "Print all")
+complete -c uname -s a -l all -d (_ "Print all information")
 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")
diff --git a/init/completions/uniq.fish b/init/completions/uniq.fish
index 51b748f3..fc218e06 100644
--- a/init/completions/uniq.fish
+++ b/init/completions/uniq.fish
@@ -1,6 +1,6 @@
 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 D -l all-repeated -d (_ "Remove non-duplicate lines") -f -x -a "
 	none\t'Remove none-duplicate lines'
 	prepend\t'Remove non-duplicate lines and print an empty line before each non-duplicate'
 	separate\t'Remove non-duplicate lines and print an empty line between each non-duplicate'
@@ -9,7 +9,7 @@ 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 -s w -l check-chars -d (_ "Compare only specified number of 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 dc6cfe2f..aa4317bf 100644
--- a/init/completions/valgrind.fish
+++ b/init/completions/valgrind.fish
@@ -24,7 +24,7 @@ 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 (_ "Display version and exit")
-complete -c valgrind -s q -l quiet -d (_ "Run silently")
+complete -c valgrind -s q -l quiet -d (_ "Quiet mode")
 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"
@@ -43,7 +43,7 @@ complete -xc valgrind -l input-fd -d (_ "File descriptor for input") -a "0 1 2 3
 
 
 # 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 leak-check -d (_ "Check for memory leaks") -a "no\tDon't\ check\ for\ memory\ leaks summary\t'Show a leak summary' full\t'Describe memory leaks in detail'"
 complete -n "__fish_valgrind_skin memcheck" -xc valgrind -l show-reachable -d (_ "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")
diff --git a/init/completions/wget.fish b/init/completions/wget.fish
index 524bfe61..08be77e1 100644
--- a/init/completions/wget.fish
+++ b/init/completions/wget.fish
@@ -9,7 +9,7 @@ complete -c wget -s e -l execute -d (_ "Execute command as if part of .wgetrc")
 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 q -l quiet -d (_ "Quiet mode")
 complete -c wget -s v -l verbose -d (_ "Verbose mode")
 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")
diff --git a/init/completions/xprop.fish b/init/completions/xprop.fish
index 743cb378..cdef3022 100644
--- a/init/completions/xprop.fish
+++ b/init/completions/xprop.fish
@@ -9,7 +9,7 @@ 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 frame -d (_ "Select a window by clicking on its frame" )
 complete -c xprop -o remove -d (_ "Remove property") -x -a "
 (
 	xprop -root -notype|cut -d ' ' -f 1|cut -d \t -f 1