Minor completion description tweaks, try to use the same description for the same situation in multiple commands, to decrease number of strings to translate

darcs-hash:20060109144730-ac50b-02c888d17745b5406e099040e12130fb2a419276.gz

36 files changed, 66 insertions, 70 deletions

diff --git a/init/completions/apropos.fish b/init/completions/apropos.fish
index 0a4e2ae8..263be075 100644
--- a/init/completions/apropos.fish
+++ b/init/completions/apropos.fish
@@ -10,7 +10,7 @@ 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")
-complete -f -c apropos -s v -l verbose -d (_ "Print verbose warning")
+complete -f -c apropos -s v -l verbose -d (_ "Verbose mode")
 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")
diff --git a/init/completions/apt-build.fish b/init/completions/apt-build.fish
index 5934cbd3..606ec7da 100644
--- a/init/completions/apt-build.fish
+++ b/init/completions/apt-build.fish
@@ -22,8 +22,8 @@ complete -f -c apt-build -l reinstall -d (_ "Rebuild and install an installed pk
 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 -s y -l yes -d (_ "Assume yes to all questions")
 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 -f -c apt-build -s v -l version -d (_ "Display version and exit")
diff --git a/init/completions/apt-cache.fish b/init/completions/apt-cache.fish
index 7d3444e5..99f7154a 100644
--- a/init/completions/apt-cache.fish
+++ b/init/completions/apt-cache.fish
@@ -25,7 +25,7 @@ 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 -f -c apt-cache -s v -l version -d (_ "Display version and exit")
 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 59b268cf..137f35b5 100644
--- a/init/completions/apt-cdrom.fish
+++ b/init/completions/apt-cdrom.fish
@@ -8,6 +8,6 @@ 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 -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")
 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 26dd5e27..1e910bce 100644
--- a/init/completions/apt-config.fish
+++ b/init/completions/apt-config.fish
@@ -2,6 +2,6 @@
 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 -f -c apt-config -s v -l version -d (_ "Display version and exit")
 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-file.fish b/init/completions/apt-file.fish
index 50589309..b36fdddc 100644
--- a/init/completions/apt-file.fish
+++ b/init/completions/apt-file.fish
@@ -5,11 +5,11 @@ 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 -f -c apt-file -s v -l verbose -d (_ "Verbose mode")
 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 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")
diff --git a/init/completions/apt-get.fish b/init/completions/apt-get.fish
index 27b67a63..59cff4f4 100644
--- a/init/completions/apt-get.fish
+++ b/init/completions/apt-get.fish
@@ -20,7 +20,7 @@ end
 
 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 -c apt-get -s h -l help -d (_ 'Display help and exit')
 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')
@@ -37,7 +37,7 @@ 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 s -l simulate -d (_ 'Perform a simulation')
 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')
@@ -58,7 +58,7 @@ 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 -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')
 complete -r -c apt-get -s o -l option -d (_ 'Set a config option')
 
diff --git a/init/completions/apt-listbugs.fish b/init/completions/apt-listbugs.fish
index 44fa579c..c08ee314 100644
--- a/init/completions/apt-listbugs.fish
+++ b/init/completions/apt-listbugs.fish
@@ -1,7 +1,7 @@
 #apt-listbugs
-complete -c apt-listbugs -s h -l help -d (_ "Apt-listbugs command help")
+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 (_ "Targs you want to see")
+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 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")
@@ -18,8 +18,8 @@ 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 -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 rss -d (_ "List bugs in rss format")
 
diff --git a/init/completions/apt-listchanges.fish b/init/completions/apt-listchanges.fish
index cbb388ca..05a35cad 100644
--- a/init/completions/apt-listchanges.fish
+++ b/init/completions/apt-listchanges.fish
@@ -1,7 +1,7 @@
 #apt-listchanges
-complete -c apt-listchanges -l help -d (_ "Apt-listchanges command help")
+complete -c apt-listchanges -l help -d (_ "Display help and exit")
 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 v -l verbose -d (_ "Verbose mode")
 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")
diff --git a/init/completions/apt-proxy-import.fish b/init/completions/apt-proxy-import.fish
index 1529936e..ab838594 100644
--- a/init/completions/apt-proxy-import.fish
+++ b/init/completions/apt-proxy-import.fish
@@ -1,7 +1,7 @@
 #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 -c apt-proxy-import -s h -l help -d (_ 'Display help and exit')
+complete -f -c apt-proxy-import -s V -l version -d (_ 'Display version and exit')
+complete -f -c apt-proxy-import -s v -l verbose -d (_ 'Verbose mode')
 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')
diff --git a/init/completions/apt-rdepends.fish b/init/completions/apt-rdepends.fish
index c3e649db..e30267a6 100644
--- a/init/completions/apt-rdepends.fish
+++ b/init/completions/apt-rdepends.fish
@@ -1,5 +1,5 @@
 #apt-rdepends
-complete -c apt-rdepends -l help -d (_ "Apt-rdepends command help")
+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 d -l dotty -d (_ "Generate a dotty graph")
 complete -f -c apt-rdepends -s p -l print-state -d (_ "Show state of deps")
@@ -9,5 +9,5 @@ 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 -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 ad9ab452..57d347eb 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 -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 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 -l version-only -d (_ 'Display version and exit 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 -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 5c1b5f56..d3ad04d8 100644
--- a/init/completions/apt-show-versions.fish
+++ b/init/completions/apt-show-versions.fish
@@ -1,5 +1,5 @@
 #apt-show-versions
-complete -c apt-show-source -s h -l help -d (_ 'Apt-show-versions command help')
+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')
diff --git a/init/completions/apt-sortpkgs.fish b/init/completions/apt-sortpkgs.fish
index 9c47f91f..d2b4bb08 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 -c apt-sortpkgs -s h -l help -d (_ "Display help and exit")
 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 -f -c apt-sortpkgs -s v -l version -d (_ "Display version and exit")
 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 971daf4d..73665bc4 100644
--- a/init/completions/apt-spy.fish
+++ b/init/completions/apt-spy.fish
@@ -1,5 +1,5 @@
 #apt-spy
-complete -c apt-spy -s h -d (_ "Apt-spy command help")
+complete -c apt-spy -s h -d (_ "Display help and exit")
 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")
diff --git a/init/completions/apt-src.fish b/init/completions/apt-src.fish
index a3fd9324..cbfbafd5 100644
--- a/init/completions/apt-src.fish
+++ b/init/completions/apt-src.fish
@@ -1,5 +1,5 @@
 #apt-src
-complete -c apt-src -s h -l help -d (_ "Apt-src command help")
+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")
diff --git a/init/completions/apt-zip-inst.fish b/init/completions/apt-zip-inst.fish
index 4fbf840a..04517f19 100644
--- a/init/completions/apt-zip-inst.fish
+++ b/init/completions/apt-zip-inst.fish
@@ -1,6 +1,6 @@
 #apt-zip-inst
 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 -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")
diff --git a/init/completions/apt-zip-list.fish b/init/completions/apt-zip-list.fish
index cdb3f6ef..b5f4373b 100644
--- a/init/completions/apt-zip-list.fish
+++ b/init/completions/apt-zip-list.fish
@@ -1,6 +1,6 @@
 #apt-zip-list
 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 -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")
diff --git a/init/completions/atq.fish b/init/completions/atq.fish
index 8bb45235..4ef4c03d 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 V -d (_ "Display version and exit")
 complete -f -c atq -s q -d (_ "Use specified queue")
 
diff --git a/init/completions/atrm.fish b/init/completions/atrm.fish
index 3930eedc..e92c88a7 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 (_ "Display version and exit")
diff --git a/init/completions/configure.fish b/init/completions/configure.fish
index 5e9c7f64..8325b573 100644
--- a/init/completions/configure.fish
+++ b/init/completions/configure.fish
@@ -1,6 +1,6 @@
 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 -s q -l quiet -d (_ "Quiet mode")
 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")
diff --git a/init/completions/darcs.fish b/init/completions/darcs.fish
index 0de106f9..deda8dc9 100644
--- a/init/completions/darcs.fish
+++ b/init/completions/darcs.fish
@@ -61,7 +61,7 @@ complete -c darcs -n '__fish_use_subcommand' -xa 'repair\t"'(_ "Repair the corru
 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 v -l verbose -d (_ "Verbose mode")
 
 #
 # Here follows a huge list of subcommand-specific completions
@@ -134,7 +134,6 @@ 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")
@@ -146,7 +145,7 @@ complete $apply_opt -l dont-set-scripts-executable -d (_ "Don't make scripts exe
 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 v -l verbose -d (_ "Verbose mode")
 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")
@@ -158,13 +157,13 @@ 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 -s v -l verbose -d (_ "Verbose mode")
 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 v -l verbose -d (_ "Verbose mode")
 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")
diff --git a/init/completions/gcc.fish b/init/completions/gcc.fish
index 77ba7362..8ddf1507 100644
--- a/init/completions/gcc.fish
+++ b/init/completions/gcc.fish
@@ -51,12 +51,12 @@ 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 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')
@@ -83,7 +83,7 @@ complete -c gcc -o fno-rtti -d (_ 'Disable generation of C++ runtime type inform
 #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;
+	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')
diff --git a/init/completions/grep.fish b/init/completions/grep.fish
index e6fe23b9..b29493b3 100644
--- a/init/completions/grep.fish
+++ b/init/completions/grep.fish
@@ -37,7 +37,7 @@ 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 version -d (_ "Display version and exit")
 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")
diff --git a/init/completions/help.fish b/init/completions/help.fish
index fc8a369d..bbbd0a5a 100644
--- a/init/completions/help.fish
+++ b/init/completions/help.fish
@@ -24,14 +24,11 @@ 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-variable -d (_ "Help on variable expansion \$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 *.*")
diff --git a/init/completions/mplayer.fish b/init/completions/mplayer.fish
index f4325b34..7c38df53 100644
--- a/init/completions/mplayer.fish
+++ b/init/completions/mplayer.fish
@@ -27,7 +27,7 @@ set mplayer_lang "
 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 -s h -o help -d (_ "Display 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")
diff --git a/init/completions/ping.fish b/init/completions/ping.fish
index 0418b13f..b7689d52 100644
--- a/init/completions/ping.fish
+++ b/init/completions/ping.fish
@@ -23,8 +23,8 @@ 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 v -d (_ "Verbose mode")
+complete -c ping -s V -d (_ "Display 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/ps.fish b/init/completions/ps.fish
index 7f999dbd..8c041843 100644
--- a/init/completions/ps.fish
+++ b/init/completions/ps.fish
@@ -31,7 +31,7 @@ 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 -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")
 
diff --git a/init/completions/rpm.fish b/init/completions/rpm.fish
index 78759c86..2f9b6498 100644
--- a/init/completions/rpm.fish
+++ b/init/completions/rpm.fish
@@ -3,8 +3,8 @@
 
 complete -c rpm -s "?" -l help -d (_ "Display help and exit")
 complete -c rpm -l version -d (_ "Display 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 quiet -d (_ "Quiet mode")
+complete -c rpm -s v -d (_ "Verbose mode")
 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 "
@@ -51,7 +51,7 @@ 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 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')
@@ -97,7 +97,7 @@ 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 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")
@@ -111,7 +111,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 nodeps -d (_ 'Don’t check dependencies before uninstalling the 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")
diff --git a/init/completions/ruby.fish b/init/completions/ruby.fish
index e5a71cdc..f3dbf8fd 100644
--- a/init/completions/ruby.fish
+++ b/init/completions/ruby.fish
@@ -5,7 +5,7 @@ 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 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')
diff --git a/init/completions/screen.fish b/init/completions/screen.fish
index eb4ad311..2208bc47 100644
--- a/init/completions/screen.fish
+++ b/init/completions/screen.fish
@@ -30,7 +30,7 @@ complete -c screen -s s -r -d 'Set shell'
 complete -c screen -s S -x -d 'Session name'
 complete -c screen -s t -x -d 'Session title'
 complete -c screen -s U -d 'UTF-8 mode'
-complete -c screen -s v -d 'Display version'
+complete -c screen -s v -d 'Display version and exit'
 complete -c screen -o wipe -d 'Wipe dead sessions'
 complete -c screen -s x -d 'Multi attach'
 complete -c screen -s X -r -d 'Send command'
diff --git a/init/completions/ssh.fish b/init/completions/ssh.fish
index a72d1f13..a57b4992 100644
--- a/init/completions/ssh.fish
+++ b/init/completions/ssh.fish
@@ -3,8 +3,8 @@
 #
 
 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 1 -d (_ "Protocoll version 1 only")
+	complete -c $i -s 2 -d (_ "Protocoll 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")
diff --git a/init/completions/touch.fish b/init/completions/touch.fish
index ef8aa64f..423730fd 100644
--- a/init/completions/touch.fish
+++ b/init/completions/touch.fish
@@ -8,4 +8,4 @@ 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 -l version -d (_ "Display version and exit")
diff --git a/init/completions/type.fish b/init/completions/type.fish
index 69891a7a..d1bbc98a 100644
--- a/init/completions/type.fish
+++ b/init/completions/type.fish
@@ -1,5 +1,5 @@
 
-complete -c type -s h -l help -d (_ "Print this message")
+complete -c type -s h -l help -d (_ "Display help and exit")
 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")
diff --git a/init/completions/uname.fish b/init/completions/uname.fish
index c3f5b3d2..f2e33e8e 100644
--- a/init/completions/uname.fish
+++ b/init/completions/uname.fish
@@ -4,8 +4,8 @@ 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 p -l processor -d (_ "Print processor")
 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 help -d (_ "Display help and exit")
 complete -c uname -l verion -d (_ "Display version and exit")
diff --git a/init/completions/wget.fish b/init/completions/wget.fish
index 3c67c160..524bfe61 100644
--- a/init/completions/wget.fish
+++ b/init/completions/wget.fish
@@ -10,7 +10,7 @@ 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 -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")
 complete -c wget -s i -l input-file -d (_ "Read URLs from file") -f