diff --git a/share/completions/and.fish b/share/completions/and.fish
index d35499645..da0d54a32 100644
--- a/share/completions/and.fish
+++ b/share/completions/and.fish
@@ -1,2 +1,2 @@
 
-complete -c and -s h -l help -d (N_ "Display help and exit" )
+complete -c and -s h -l help --description 'Display help and exit'
diff --git a/share/completions/apt-move.fish b/share/completions/apt-move.fish
index 1870bd3e6..6d53ed8bf 100644
--- a/share/completions/apt-move.fish
+++ b/share/completions/apt-move.fish
@@ -12,7 +12,7 @@ complete -f -c apt-move -a mirror --description "Download package missing from m
 complete -f -c apt-move -a sync --description "Sync packages installed"
 complete -f -c apt-move -a exclude -d 'test $LOCALDIR/.exclude file'
 complete -c apt-move -a movefile --description "Move file specified on commandline"
-complete -f -c apt-move -a listbin -d (N_ "List packages that may serve as input to mirrorbin or mirrorsource" )
+complete -f -c apt-move -a listbin --description 'List packages that may serve as input to mirrorbin or mirrorsource'
 complete -f -c apt-move -a mirrorbin --description "Fetch package from STDIN"
 complete -f -c apt-move -a mirrorsrc --description "Fetch source package from STDIN"
 complete -f -c apt-move -s a --description "Process all packages"
diff --git a/share/completions/bg.fish b/share/completions/bg.fish
index 626601527..d3ef78454 100644
--- a/share/completions/bg.fish
+++ b/share/completions/bg.fish
@@ -1,2 +1,2 @@
 
-complete -c bg -s h -l help -d (N_ "Display help and exit" )
+complete -c bg -s h -l help --description 'Display help and exit'
diff --git a/share/completions/bind.fish b/share/completions/bind.fish
index 39a4ce5cc..0a4f23fdf 100644
--- a/share/completions/bind.fish
+++ b/share/completions/bind.fish
@@ -1,3 +1,3 @@
 
-complete -c bind -s h -l help -d (N_ "Display help and exit" 
-complete -c bind -s M -l set-mode -d (N_ "Change input mode" )
+complete -c bind -s h -l help --description "Display help and exit" 
+complete -c bind -s M -l set-mode --description 'Change input mode'
diff --git a/share/completions/block.fish b/share/completions/block.fish
index 389f7e947..1d6e021a4 100644
--- a/share/completions/block.fish
+++ b/share/completions/block.fish
@@ -1,5 +1,5 @@
 
-complete -c block -s h -l help -d (N_ "Display help and exit" )
-complete -c block -s e -l erase -d (N_ "Remove the topmost global event block" )
-complete -c block -s l -l local -d (N_ "Create a local (automatically erased) event block" )
-complete -c block -s g -l global -d (N_ "Create a global (manually erased) event block" )
+complete -c block -s h -l help --description 'Display help and exit'
+complete -c block -s e -l erase --description 'Remove the topmost global event block'
+complete -c block -s l -l local --description 'Create a local (automatically erased) event block'
+complete -c block -s g -l global --description 'Create a global (manually erased) event block'
diff --git a/share/completions/break.fish b/share/completions/break.fish
index 3da5aa1b7..a13a37f66 100644
--- a/share/completions/break.fish
+++ b/share/completions/break.fish
@@ -1,2 +1,2 @@
 
-complete -c break -s h -l help -d (N_ "Display help and exit" )
+complete -c break -s h -l help --description 'Display help and exit'
diff --git a/share/completions/builtin.fish b/share/completions/builtin.fish
index 240e4dc35..7640cf367 100644
--- a/share/completions/builtin.fish
+++ b/share/completions/builtin.fish
@@ -1,3 +1,3 @@
 
-complete -c builtin -s h -l help -d (N_ "Display help and exit" )
-complete -c builtin -s n -l names -d (N_ "Print names of all existing builtins" )
+complete -c builtin -s h -l help --description 'Display help and exit'
+complete -c builtin -s n -l names --description 'Print names of all existing builtins'
diff --git a/share/completions/case.fish b/share/completions/case.fish
index 474d84174..55d0129b4 100644
--- a/share/completions/case.fish
+++ b/share/completions/case.fish
@@ -1,2 +1,2 @@
 
-complete -c case -s h -l help -d (N_ "Display help and exit" )
+complete -c case -s h -l help --description 'Display help and exit'
diff --git a/share/completions/cd.fish b/share/completions/cd.fish
index 1b8ac9796..75a0d06c0 100644
--- a/share/completions/cd.fish
+++ b/share/completions/cd.fish
@@ -1,3 +1,3 @@
 
 complete -x -c cd -a "(__fish_complete_cd)"
-complete -c cd -s h -l help -d (N_ "Display help and exit" )
+complete -c cd -s h -l help --description 'Display help and exit'
diff --git a/share/completions/command.fish b/share/completions/command.fish
index a96220ca3..1de6e495c 100644
--- a/share/completions/command.fish
+++ b/share/completions/command.fish
@@ -1,2 +1,2 @@
 
-complete -c command -s h -l help -d (N_ "Display help and exit" )
+complete -c command -s h -l help --description 'Display help and exit'
diff --git a/share/completions/continue.fish b/share/completions/continue.fish
index ba2715796..c8e51e542 100644
--- a/share/completions/continue.fish
+++ b/share/completions/continue.fish
@@ -1,3 +1,3 @@
 
-complete -c continue -s h -l help -d (N_ "Display help and exit" )
+complete -c continue -s h -l help --description 'Display help and exit'
 
diff --git a/share/completions/eval.fish b/share/completions/eval.fish
index 36f346d7f..42abd6738 100644
--- a/share/completions/eval.fish
+++ b/share/completions/eval.fish
@@ -1,2 +1,2 @@
 
-complete -c eval -s h -l help -d (N_ "Display help and exit" )
+complete -c eval -s h -l help --description 'Display help and exit'
diff --git a/share/completions/exec.fish b/share/completions/exec.fish
index 5fbd4ce54..b0bd268aa 100644
--- a/share/completions/exec.fish
+++ b/share/completions/exec.fish
@@ -1,2 +1,2 @@
 
-complete -c exec -s h -l help -d (N_ "Display help and exit" )
+complete -c exec -s h -l help --description 'Display help and exit'
diff --git a/share/completions/exit.fish b/share/completions/exit.fish
index 25b84e665..4202a5115 100644
--- a/share/completions/exit.fish
+++ b/share/completions/exit.fish
@@ -1,4 +1,4 @@
 
-complete -c exit -s h -l help -d (N_ "Display help and exit" )
+complete -c exit -s h -l help --description 'Display help and exit'
 complete -c exit -x -a 0 -d "Quit with normal exit status"
 complete -c exit -x -a 1 -d "Quit with abnormal exit status"
diff --git a/share/completions/fg.fish b/share/completions/fg.fish
index 4da3db54a..04ddff22d 100644
--- a/share/completions/fg.fish
+++ b/share/completions/fg.fish
@@ -1,2 +1,2 @@
 
-complete -c fg -s h -l help -d (N_ "Display help and exit" )
+complete -c fg -s h -l help --description 'Display help and exit'
diff --git a/share/completions/gpg.fish b/share/completions/gpg.fish
index 69be51328..ce43266ce 100644
--- a/share/completions/gpg.fish
+++ b/share/completions/gpg.fish
@@ -79,13 +79,13 @@ complete -c gpg -l delete-secret-and-public-key -xa "(__fish_complete_gpg_user_i
 complete -c gpg -l gen-revoke -xa "(__fish_complete_gpg_user_id)" --description "Generate a revocation certificate for the complete key" 
 complete -c gpg -l desig-revoke -xa "(__fish_complete_gpg_user_id)" --description "Generate a designated revocation certificate for a key"
 
-complete -c gpg -l export -xa "(__fish_append , (__fish_complete_gpg_user_id))" -d (N_ "Export all or the given keys from all keyrings" )
+complete -c gpg -l export -xa "(__fish_append , (__fish_complete_gpg_user_id))" --description 'Export all or the given keys from all keyrings'
 complete -c gpg -l send-keys -xa "(__fish_append , (__fish_complete_gpg_user_id))" --description "Same as --export but sends the keys to a keyserver"
 complete -c gpg -l export-secret-keys -xa "(__fish_complete_gpg_user_id)" --description "Same as --export, but exports the secret keys instead"
 complete -c gpg -l export-secret-subkeys -xa "(__fish_complete_gpg_user_id)" --description "Same as --export, but exports the secret keys instead"
 
-complete -c gpg -l import -xa "(__fish_complete_gpg_user_id)" -d (N_ "Import/merge keys" )
-complete -c gpg -l fast-import -xa "(__fish_complete_gpg_user_id)" -d (N_ "Import/merge keys" )
+complete -c gpg -l import -xa "(__fish_complete_gpg_user_id)" --description 'Import/merge keys'
+complete -c gpg -l fast-import -xa "(__fish_complete_gpg_user_id)" --description 'Import/merge keys'
 
 complete -c gpg -l recv-keys -xa "(__fish_complete_gpg_key_id)" --description "Import the keys with the given key IDs from a keyserver"
 complete -c gpg -l refresh-keys -xa "(__fish_complete_gpg_key_id)" --description "Request updates from a keyserver for keys that already exist on the local keyring"
@@ -228,7 +228,7 @@ complete -c gpg -l s2k-cipher-algo -xa "(__fish_print_gpg_algo Cipher)" --descri
 complete -c gpg -l s2k-digest-algo -xa "(__fish_print_gpg_algo Hash)" --description "Use specified digest algorithm to mangle the passphrases"
 complete -c gpg -l s2k-mode -xa "0\t'Plain passphrase' 1\t'Salted passphrase' 3\t'Repeated salted mangling'" --description "Selects how passphrases are mangled"
 
-complete -c gpg -l simple-sk-checksum -d (N_ "Integrity protect secret keys by using a SHA-1 checksum" )
+complete -c gpg -l simple-sk-checksum --description 'Integrity protect secret keys by using a SHA-1 checksum'
 
 complete -c gpg -l disable-cipher-algo -xa "(__fish_print_gpg_algo Cipher)" --description "Never allow the use of specified cipher algorithm"
 complete -c gpg -l disable-pubkey-algo -xa "(__fish_print_gpg_algo Pubkey)" --description "Never allow the use of specified public key algorithm"
diff --git a/share/completions/help.fish b/share/completions/help.fish
index 770c88ed7..120934889 100644
--- a/share/completions/help.fish
+++ b/share/completions/help.fish
@@ -6,10 +6,10 @@ for i in case (sed -n < $__fish_help_dir/commands.html -e "s/.*<h2><a class=\"an
 	complete -c help -x -a $i --description "Help for the specified command"
 end
 
-complete -c help -x -a syntax -d (N_ "Introduction to the fish syntax" )
-complete -c help -x -a todo -d (N_ "Incomplete aspects of fish" )
-complete -c help -x -a bugs -d (N_ "Known fish bugs" )
-complete -c help -x -a history -d (N_ "Help on how to reuse previously entered commands" )
+complete -c help -x -a syntax --description 'Introduction to the fish syntax'
+complete -c help -x -a todo --description 'Incomplete aspects of fish'
+complete -c help -x -a bugs --description 'Known fish bugs'
+complete -c help -x -a history --description 'Help on how to reuse previously entered commands'
 
 complete -c help -x -a completion --description "Help on how tab-completion works"
 complete -c help -x -a job-control --description "Help on how job control works"
diff --git a/share/completions/jobs.fish b/share/completions/jobs.fish
index 64bf19fd0..f2f5f6fe2 100644
--- a/share/completions/jobs.fish
+++ b/share/completions/jobs.fish
@@ -1,6 +1,6 @@
 
 
-complete -c jobs -s h -l help -d (N_ "Display help and exit" )
+complete -c jobs -s h -l help --description 'Display help and exit'
 complete -c jobs -s p -l pid --description "Show the process id of each process in the job"
 complete -c jobs -s g -l group --description "Show group id of job"
 complete -c jobs -s c -l command --description "Show commandname of each job"
diff --git a/share/completions/not.fish b/share/completions/not.fish
index c58220ba0..cb3e3efbe 100644
--- a/share/completions/not.fish
+++ b/share/completions/not.fish
@@ -1,2 +1,2 @@
 
-complete -c not -s h -l help -d (N_ "Display help and exit" )
+complete -c not -s h -l help --description 'Display help and exit'
diff --git a/share/completions/or.fish b/share/completions/or.fish
index 20fa6c13e..f01db8db0 100644
--- a/share/completions/or.fish
+++ b/share/completions/or.fish
@@ -1,2 +1,2 @@
 
-complete -c or -s h -l help -d (N_ "Display help and exit" )
+complete -c or -s h -l help --description 'Display help and exit'
diff --git a/share/completions/random.fish b/share/completions/random.fish
index 297e14d4f..788ec8e4c 100644
--- a/share/completions/random.fish
+++ b/share/completions/random.fish
@@ -1,2 +1,2 @@
 
-complete -c random -s h -l help -d (N_ "Display help and exit" )
+complete -c random -s h -l help --description "Display help and exit"
diff --git a/share/completions/return.fish b/share/completions/return.fish
index 21fd97849..ed48ff6e9 100644
--- a/share/completions/return.fish
+++ b/share/completions/return.fish
@@ -1,4 +1,4 @@
 
-complete -c return -s h -l help -d (N_ "Display help and exit" )
+complete -c return -s h -l help --description "Display help and exit"
 complete -c return -x -a 0 -d "Return from function with normal exit status"
 complete -c return -x -a 1 -d "Return from function with abnormal exit status"
diff --git a/share/completions/rpm.fish b/share/completions/rpm.fish
index 75aa7967f..eda36734e 100644
--- a/share/completions/rpm.fish
+++ b/share/completions/rpm.fish
@@ -35,7 +35,7 @@ complete $rpm_install -l nodigest --description "Don't verify package or header
 complete $rpm_install -l nosignature --description "Don't verify package or header signatures when reading"
 complete $rpm_install -l nodeps --description "Don't do a dependency check"
 complete $rpm_install -l nosuggest --description "Don't suggest package(s) that provide a missing dependency"
-complete $rpm_install -l noorder -d (N_ "Don't change the package installation order" )
+complete $rpm_install -l noorder --description "Don't change the package installation order"
 complete $rpm_install -l noscripts --description "Don't execute scripts"
 complete $rpm_install -l nopre --description "Don't execute pre scripts"
 complete $rpm_install -l nopost --description "Don't execute post scripts"
@@ -48,7 +48,7 @@ complete $rpm_install -l notriggerpostun --description "Don't execute triggerpos
 complete $rpm_install -l oldpackage --description 'Allow an upgrade to replace a newer package with an older one'
 complete $rpm_install -l percent --description 'Print percentages as files are unpacked from the package archive. This is intended to make rpm easy to run from other tools'
 complete $rpm_install -l prefix --description 'For relocatable binary packages, translate all file paths that start with the installation prefix in the package relocation hint(s) to NEWPATH' -xa "(__fish_complete_directories (commandline -ct) 'Directory prefix for relocatable packages')"
-complete $rpm_install -l relocate -x -d (N_ "Translate all paths that start with first half of following parameter to second half of following parameter" )
+complete $rpm_install -l relocate -x --description "Translate all paths that start with first half of following parameter to second half of following parameter"
 complete $rpm_install -l repackage --description 'Re-package the files before erasing'
 complete $rpm_install -l replacefiles --description 'Install the packages even if they replace files from other, already installed, packages'
 complete $rpm_install -l replacepkgs --description 'Install the packages even if some of them are already installed on this system'
@@ -116,7 +116,7 @@ complete $rpm_erase -l notriggers --description "Don't execute trigger scriptlet
 complete $rpm_erase -l notriggerun --description "Don't execute triggerun scriptlets"
 complete $rpm_erase -l notriggerpostun --description "Don't execute triggerpostun scriptlets"
 complete $rpm_erase -l repackage --description 'Re-package the files before erasing'
-complete $rpm_erase -l test -d (N_ "Don't really uninstall anything" )
+complete $rpm_erase -l test --description "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/share/completions/set.fish b/share/completions/set.fish
index 386fd780a..b306822b6 100644
--- a/share/completions/set.fish
+++ b/share/completions/set.fish
@@ -70,7 +70,7 @@ complete -c set -n '__fish_is_first_token' -s n -l names --description "List the
 complete -c set -n '__fish_is_first_token' -x -a "(set|sed -e 's/ /'\t'Variable: /')"
 
 # Color completions
-complete -c set -n '__fish_set_is_color' -x -a '(set_color --print-colors)' -d (N_ Color)
+complete -c set -n '__fish_set_is_color' -x -a '(set_color --print-colors)' --description Color
 complete -c set -n '__fish_set_is_color' -s b -l background -x -a '(set_color --print-colors)' --description "Change background color"
 complete -c set -n '__fish_set_is_color' -s o -l bold --description 'Make font bold'
 
diff --git a/share/completions/status.fish b/share/completions/status.fish
index 3228ce059..cb4040321 100644
--- a/share/completions/status.fish
+++ b/share/completions/status.fish
@@ -1,5 +1,5 @@
 
-complete -c status -s h -l help -d (N_ "Display help and exit" )
+complete -c status -s h -l help --description "Display help and exit"
 complete -c status -l is-command-substitution --description "Test if a command substitution is currently evaluated"
 complete -c status -l is-block --description "Test if a code block is currently evaluated"
 complete -c status -l is-interactive --description "Test if this is an interactive shell"
diff --git a/share/completions/unrar.fish b/share/completions/unrar.fish
index 8bf24190b..c457936b8 100644
--- a/share/completions/unrar.fish
+++ b/share/completions/unrar.fish
@@ -2,14 +2,14 @@
 # Peek inside of archives and list all files
 complete -c unrar -a "(__fish_complete_unrar)"
 
-complete -x -c unrar -n '__fish_use_subcommand' -a e -d (N_  "Extract files to current directory")
-complete -x -c unrar -n '__fish_use_subcommand' -a l -d (N_ "List archive" )
-complete -x -c unrar -n '__fish_use_subcommand' -a lt -d (N_ "List archive (technical)" )
-complete -x -c unrar -n '__fish_use_subcommand' -a lb -d (N_ "List archive (bare)" )
-complete -x -c unrar -n '__fish_use_subcommand' -a p -d (N_  "Print file to stdout")
-complete -x -c unrar -n '__fish_use_subcommand' -a t -d (N_  "Test archive files")
-complete -x -c unrar -n '__fish_use_subcommand' -a v -d (N_  "Verbosely list archive")
-complete -x -c unrar -n '__fish_use_subcommand' -a vt -d (N_  "Verbosely list archive (technical)")
-complete -x -c unrar -n '__fish_use_subcommand' -a vb -d (N_  "Verbosely list archive (bare)")
-complete -x -c unrar -n '__fish_use_subcommand' -a x -d (N_  "Extract files with full path")
+complete -x -c unrar -n '__fish_use_subcommand' -a e --description "Extract files to current directory"
+complete -x -c unrar -n '__fish_use_subcommand' -a l --description "List archive" 
+complete -x -c unrar -n '__fish_use_subcommand' -a lt --description "List archive (technical)" 
+complete -x -c unrar -n '__fish_use_subcommand' -a lb --description "List archive (bare)" 
+complete -x -c unrar -n '__fish_use_subcommand' -a p --description "Print file to stdout"
+complete -x -c unrar -n '__fish_use_subcommand' -a t --description "Test archive files"
+complete -x -c unrar -n '__fish_use_subcommand' -a v --description "Verbosely list archive"
+complete -x -c unrar -n '__fish_use_subcommand' -a vt --description "Verbosely list archive (technical)"
+complete -x -c unrar -n '__fish_use_subcommand' -a vb --description "Verbosely list archive (bare)"
+complete -x -c unrar -n '__fish_use_subcommand' -a x --description "Extract files with full path"
 
diff --git a/share/completions/wajig.fish b/share/completions/wajig.fish
index 36591595f..19aa2fc1b 100644
--- a/share/completions/wajig.fish
+++ b/share/completions/wajig.fish
@@ -22,118 +22,118 @@ complete -c wajig -s n -l noauth --description 'Allow packages from unathenticat
 complete -c wajig -s s -l simulate --description 'Trace but don\'t execute the sequence of underlying commands.'
 complete -c wajig -s t -l teaching --description 'Trace the sequence of commands performed.'
 complete -c wajig -s y -l yes --description 'Assume yes for any questions asked.'
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'addcdrom' -d(N_ 'Add a CD-ROM to the list of available sources of packages')
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'auto-alts' -d(N_ 'Mark the alternative to be auto set (using set priorities)')
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'auto-clean' -d(N_ 'Remove superseded deb files from the download cache')
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'auto-download' -d(N_ 'Do an update followed by a download of all updated packages')
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'auto-install' -d(N_ 'Perform an install without asking questions (non-interactive)')
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'available' -d(N_ 'List versions of packages available for installation')
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'bug' -d(N_ 'Check reported bugs in package using the Debian Bug Tracker')
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'build' -d(N_ 'Retrieve/unpack sources and build .deb for the named packages')
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'build-depend' -d(N_ 'Retrieve packages required to build listed packages')
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'changelog' -d(N_ 'Retrieve latest changelog for the package')
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'clean' -d(N_ 'Remove all deb files from the download cache')
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'commands' -d(N_ 'List all the JIG commands and one line descriptions for each')
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'daily-upgrade' -d(N_ 'Perform an update then a dist-upgrade')
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'dependents' -d(N_ 'List of packages which depend/recommend/suggest the package')
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'describe' -d(N_ 'One line description of packages (-v and -vv for more detail)')
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'describe-new' -d(N_ 'One line description of new packages')
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'detail' -d(N_ 'Provide a detailed description of package (describe -vv)')
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'detail-new' -d(N_ 'Provide a detailed description of new packages (describe -vv)')
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'dist-upgrade' -d(N_ 'Upgrade to new distribution (installed and new rqd packages)')
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'docs' -d(N_ 'Equivalent to help with -verbose=2')
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'download' -d(N_ 'Download package files ready for an install')
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'file-download' -d(N_ 'Download packages listed in file ready for an install')
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'file-install' -d(N_ 'Install packages listed in a file')
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'file-remove' -d(N_ 'Remove packages listed in a file')
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'find-file' -d(N_ 'Search for a file within installed packages')
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'find-pkg' -d(N_ 'Search for an unofficial Debian package at apt-get.org')
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'fix-configure' -d(N_ 'Perform dpkg --configure -a (to fix interrupted configure)')
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'fix-install' -d(N_ 'Perform apt-get -f install (to fix broken dependencies)')
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'fix-missing' -d(N_ 'Perform apt-get --fix-missing upgrade')
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'force' -d(N_ 'Install packages and ignore file overwrites and depends')
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'help' -d(N_ 'Print documentation (detail depends on --verbose)')
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'hold' -d(N_ 'Place listed packages on hold so they are not upgraded')
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'init' -d(N_ 'Initialise or reset the JIG archive files')
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'install' -d(N_ 'Install (or upgrade) one or more packages or .deb files')
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'installr' -d(N_ 'Install package and associated recommended packages')
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'installrs' -d(N_ 'Install package and recommended and suggested packages')
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'installs' -d(N_ 'Install package and associated suggested packages')
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'integrity' -d(N_ 'Check the integrity of installed packages (through checksums)')
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'large' -d(N_ 'List size of all large (>10MB) installed packages')
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'last-update' -d(N_ 'Identify when an update was last performed')
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'list' -d(N_ 'List the status and description of installed packages')
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'list-all' -d(N_ 'List a one line description of given or all packages')
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'list-alts' -d(N_ 'List the objects that can have alternatives configured')
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'list-cache' -d(N_ 'List the contents of the download cache')
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'list-commands' -d(N_ 'List all the JIG commands and one line descriptions for each')
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'list-daemons' -d(N_ 'List the daemons that JIG can start/stop/restart')
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'list-files' -d(N_ 'List the files that are supplied by the named package')
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'list-hold' -d(N_ 'List those packages on hold')
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'list-installed' -d(N_ 'List packages (with optional argument substring) installed')
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'list-log' -d(N_ 'List the contents of the install/remove log file (filtered)')
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'list-names' -d(N_ 'List all known packages or those containing supplied string')
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'list-orphans' -d(N_ 'List libraries not required by any installed package')
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'list-scripts' -d(N_ 'List the control scripts of the package of deb file')
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'list-section' -d(N_ 'List packages that belong to a specific section')
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'list-section' -d(N_ 'List the sections that are available')
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'list-status' -d(N_ 'Same as list but only prints first two columns, not truncated')
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'list-wide' -d(N_ 'Same as list but avoids truncating package names')
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'local-dist-upgrade' -d(N_ 'Dist-upgrade using packages already downloaded')
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'local-upgrade' -d(N_ 'Upgrade using packages already downloaded, but not any others')
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'madison' -d(N_ 'Runs the madison command of apt-cache.')
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'move' -d(N_ 'Move packages in the download cache to a local Debian mirror')
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'new' -d(N_ 'List packages that became available since last update')
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'news' -d(N_ 'Obtain the latest news about the package')
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'new-upgrades' -d(N_ 'List packages newly available for upgrading')
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'non-free' -d(N_ 'List installed packages that do not meet the DFSG')
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'orphans' -d(N_ 'List libraries not required by any installed package')
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'package' -d(N_ 'Generate a .deb file for an installed package')
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'policy' -d(N_ 'From preferences file show priorities/policy (available)')
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'purge' -d(N_ 'Remove one or more packages and configuration files')
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'purge-depend' -d(N_ 'Purge package and those it depend on and not required by others')
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'purge-orphans' -d(N_ 'Purge orphaned libraries (not required by installed packages)')
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'readme' -d(N_ 'Display the package\'s README file from /usr/share/doc')
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'recursive' -d(N_ 'Download package and any packages it depends on')
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'recommended' -d(N_ 'Install package and associated recommended packages')
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'reconfigure' -d(N_ 'Reconfigure the named installed packages or run gkdebconf')
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'reinstall' -d(N_ 'Reinstall each of the named packages')
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'reload' -d(N_ 'Reload daemon configs, e.g., gdm, apache (see list-daemons)')
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'remove' -d(N_ 'Remove one or more packages (see also purge)')
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'remove-depend' -d(N_ 'Remove package and its dependees not required by others')
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'remove-orphans' -d(N_ 'Remove orphaned libraries (not required by installed packages)')
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'repackage' -d(N_ 'Generate a .deb file for an installed package')
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'reset' -d(N_ 'Initialise or reset the JIG archive files')
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'restart' -d(N_ 'Stop then start a daemon, e.g., gdm, apache (see list-daemons)')
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'rpminstall' -d(N_ 'Install a RedHat .rpm package')
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'rpmtodeb' -d(N_ 'Convert a RedHat .rpm file to a Debian .deb file')
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'search' -d(N_ 'Search for packages containing listed words')
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'search-apt' -d(N_ 'Find local Debian archives suitable for sources.list')
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'setup' -d(N_ 'Configure the sources.list file which locates Debian archives')
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'show' -d(N_ 'Provide a detailed description of package [same as detail]')
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'showdistupgrade' -d(N_ 'Trace the steps that a dist-upgrade would perform')
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'showinstall' -d(N_ 'Trace the steps that an install would perform')
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'showremove' -d(N_ 'Trace the steps that a remove would perform')
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'showupgrade' -d(N_ 'Trace the steps that an upgrade would perform')
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'size' -d(N_ 'Print out the size (in K) of all, or listed, installed packages')
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'sizes' -d(N_ 'Print out the size (in K) of all, or listed, installed packages')
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'snapshot' -d(N_ 'Generates list of package=version for all installed packages')
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'source' -d(N_ 'Retrieve and unpack sources for the named packages')
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'start' -d(N_ 'Start a daemon, e.g., gdm, apache (see list-daemons)')
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'status' -d(N_ 'Show the version and available version of packages')
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'status-match' -d(N_ 'Show the version and available version of matching packages')
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'status-search' -d(N_ 'Show the version and available version of matching packages')
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'stop' -d(N_ 'Stop a daemon, e.g., gdm, apache (see list-daemons)')
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'suggested' -d(N_ 'Install package and associated suggested packages')
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'tasksel' -d(N_ 'Run the Gnome task selector to install groups of packages')
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'toupgrade' -d(N_ 'List packages with newer versions available for upgrading')
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'unhold' -d(N_ 'Remove listed packages from hold so they are again upgraded')
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'unofficial' -d(N_ 'Search for an unofficial Debian package at apt-get.org')
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'update' -d(N_ 'Update the list of down-loadable packages')
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'update-alts' -d(N_ 'Update default alternative for things like x-window-manager')
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'update-pci-ids' -d(N_ 'Updates the local list of PCI ids from the internet master list')
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'update-usb-ids' -d(N_ 'Updates the local list of USB ids from the internet master list')
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'upgrade' -d(N_ 'Upgrade all of the installed packages or just those listed')
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'versions' -d(N_ 'List version and distribution of (all) packages.')
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'whatis' -d(N_ 'A synonym for describe')
-complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'whichpkg' -d(N_ 'Find the package that supplies the given command or file')
+complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'addcdrom' --description 'Add a CD-ROM to the list of available sources of packages'
+complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'auto-alts' --description 'Mark the alternative to be auto set (using set priorities)'
+complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'auto-clean' --description 'Remove superseded deb files from the download cache'
+complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'auto-download' --description 'Do an update followed by a download of all updated packages'
+complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'auto-install' --description 'Perform an install without asking questions (non-interactive)'
+complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'available' --description 'List versions of packages available for installation'
+complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'bug' --description 'Check reported bugs in package using the Debian Bug Tracker'
+complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'build' --description 'Retrieve/unpack sources and build .deb for the named packages'
+complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'build-depend' --description 'Retrieve packages required to build listed packages'
+complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'changelog' --description 'Retrieve latest changelog for the package'
+complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'clean' --description 'Remove all deb files from the download cache'
+complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'commands' --description 'List all the JIG commands and one line descriptions for each'
+complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'daily-upgrade' --description 'Perform an update then a dist-upgrade'
+complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'dependents' --description 'List of packages which depend/recommend/suggest the package'
+complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'describe' --description 'One line description of packages (-v and -vv for more detail)'
+complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'describe-new' --description 'One line description of new packages'
+complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'detail' --description 'Provide a detailed description of package (describe -vv)'
+complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'detail-new' --description 'Provide a detailed description of new packages (describe -vv)'
+complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'dist-upgrade' --description 'Upgrade to new distribution (installed and new rqd packages)'
+complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'docs' --description 'Equivalent to help with -verbose=2'
+complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'download' --description 'Download package files ready for an install'
+complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'file-download' --description 'Download packages listed in file ready for an install'
+complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'file-install' --description 'Install packages listed in a file'
+complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'file-remove' --description 'Remove packages listed in a file'
+complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'find-file' --description 'Search for a file within installed packages'
+complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'find-pkg' --description 'Search for an unofficial Debian package at apt-get.org'
+complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'fix-configure' --description 'Perform dpkg --configure -a (to fix interrupted configure)'
+complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'fix-install' --description 'Perform apt-get -f install (to fix broken dependencies)'
+complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'fix-missing' --description 'Perform apt-get --fix-missing upgrade'
+complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'force' --description 'Install packages and ignore file overwrites and depends'
+complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'help' --description 'Print documentation (detail depends on --verbose)'
+complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'hold' --description 'Place listed packages on hold so they are not upgraded'
+complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'init' --description 'Initialise or reset the JIG archive files'
+complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'install' --description 'Install (or upgrade) one or more packages or .deb files'
+complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'installr' --description 'Install package and associated recommended packages'
+complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'installrs' --description 'Install package and recommended and suggested packages'
+complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'installs' --description 'Install package and associated suggested packages'
+complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'integrity' --description 'Check the integrity of installed packages (through checksums)'
+complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'large' --description 'List size of all large (>10MB) installed packages'
+complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'last-update' --description 'Identify when an update was last performed'
+complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'list' --description 'List the status and description of installed packages'
+complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'list-all' --description 'List a one line description of given or all packages'
+complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'list-alts' --description 'List the objects that can have alternatives configured'
+complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'list-cache' --description 'List the contents of the download cache'
+complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'list-commands' --description 'List all the JIG commands and one line descriptions for each'
+complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'list-daemons' --description 'List the daemons that JIG can start/stop/restart'
+complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'list-files' --description 'List the files that are supplied by the named package'
+complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'list-hold' --description 'List those packages on hold'
+complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'list-installed' --description 'List packages (with optional argument substring) installed'
+complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'list-log' --description 'List the contents of the install/remove log file (filtered)'
+complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'list-names' --description 'List all known packages or those containing supplied string'
+complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'list-orphans' --description 'List libraries not required by any installed package'
+complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'list-scripts' --description 'List the control scripts of the package of deb file'
+complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'list-section' --description 'List packages that belong to a specific section'
+complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'list-section' --description 'List the sections that are available'
+complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'list-status' --description 'Same as list but only prints first two columns, not truncated'
+complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'list-wide' --description 'Same as list but avoids truncating package names'
+complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'local-dist-upgrade' --description 'Dist-upgrade using packages already downloaded'
+complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'local-upgrade' --description 'Upgrade using packages already downloaded, but not any others'
+complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'madison' --description 'Runs the madison command of apt-cache.'
+complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'move' --description 'Move packages in the download cache to a local Debian mirror'
+complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'new' --description 'List packages that became available since last update'
+complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'news' --description 'Obtain the latest news about the package'
+complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'new-upgrades' --description 'List packages newly available for upgrading'
+complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'non-free' --description 'List installed packages that do not meet the DFSG'
+complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'orphans' --description 'List libraries not required by any installed package'
+complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'package' --description 'Generate a .deb file for an installed package'
+complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'policy' --description 'From preferences file show priorities/policy (available)'
+complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'purge' --description 'Remove one or more packages and configuration files'
+complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'purge-depend' --description 'Purge package and those it depend on and not required by others'
+complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'purge-orphans' --description 'Purge orphaned libraries (not required by installed packages)'
+complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'readme' --description 'Display the package\'s README file from /usr/share/doc'
+complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'recursive' --description 'Download package and any packages it depends on'
+complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'recommended' --description 'Install package and associated recommended packages'
+complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'reconfigure' --description 'Reconfigure the named installed packages or run gkdebconf'
+complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'reinstall' --description 'Reinstall each of the named packages'
+complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'reload' --description 'Reload daemon configs, e.g., gdm, apache (see list-daemons)'
+complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'remove' --description 'Remove one or more packages (see also purge)'
+complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'remove-depend' --description 'Remove package and its dependees not required by others'
+complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'remove-orphans' --description 'Remove orphaned libraries (not required by installed packages)'
+complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'repackage' --description 'Generate a .deb file for an installed package'
+complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'reset' --description 'Initialise or reset the JIG archive files'
+complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'restart' --description 'Stop then start a daemon, e.g., gdm, apache (see list-daemons)'
+complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'rpminstall' --description 'Install a RedHat .rpm package'
+complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'rpmtodeb' --description 'Convert a RedHat .rpm file to a Debian .deb file'
+complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'search' --description 'Search for packages containing listed words'
+complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'search-apt' --description 'Find local Debian archives suitable for sources.list'
+complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'setup' --description 'Configure the sources.list file which locates Debian archives'
+complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'show' --description 'Provide a detailed description of package [same as detail]'
+complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'showdistupgrade' --description 'Trace the steps that a dist-upgrade would perform'
+complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'showinstall' --description 'Trace the steps that an install would perform'
+complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'showremove' --description 'Trace the steps that a remove would perform'
+complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'showupgrade' --description 'Trace the steps that an upgrade would perform'
+complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'size' --description 'Print out the size (in K) of all, or listed, installed packages'
+complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'sizes' --description 'Print out the size (in K) of all, or listed, installed packages'
+complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'snapshot' --description 'Generates list of package=version for all installed packages'
+complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'source' --description 'Retrieve and unpack sources for the named packages'
+complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'start' --description 'Start a daemon, e.g., gdm, apache (see list-daemons)'
+complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'status' --description 'Show the version and available version of packages'
+complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'status-match' --description 'Show the version and available version of matching packages'
+complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'status-search' --description 'Show the version and available version of matching packages'
+complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'stop' --description 'Stop a daemon, e.g., gdm, apache (see list-daemons)'
+complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'suggested' --description 'Install package and associated suggested packages'
+complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'tasksel' --description 'Run the Gnome task selector to install groups of packages'
+complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'toupgrade' --description 'List packages with newer versions available for upgrading'
+complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'unhold' --description 'Remove listed packages from hold so they are again upgraded'
+complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'unofficial' --description 'Search for an unofficial Debian package at apt-get.org'
+complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'update' --description 'Update the list of down-loadable packages'
+complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'update-alts' --description 'Update default alternative for things like x-window-manager'
+complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'update-pci-ids' --description 'Updates the local list of PCI ids from the internet master list'
+complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'update-usb-ids' --description 'Updates the local list of USB ids from the internet master list'
+complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'upgrade' --description 'Upgrade all of the installed packages or just those listed'
+complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'versions' --description 'List version and distribution of (all) packages.'
+complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'whatis' --description 'A synonym for describe'
+complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'whichpkg' --description 'Find the package that supplies the given command or file'
diff --git a/share/completions/xprop.fish b/share/completions/xprop.fish
index 41fc4d23c..612f42eaf 100644
--- a/share/completions/xprop.fish
+++ b/share/completions/xprop.fish
@@ -9,7 +9,7 @@ complete -c xprop -o display --description "Specify X server"
 complete -c xprop -o len -x --description "Maximum display length"
 complete -c xprop -o notype --description "Do not show property type"
 complete -c xprop -o fs -r --description "Set format file"
-complete -c xprop -o frame -d (N_ "Select a window by clicking on its frame" )
+complete -c xprop -o frame --description "Select a window by clicking on its frame" 
 complete -c xprop -o remove --description "Remove property" -x -a "
 (
 	xprop -root -notype|cut -d ' ' -f 1|cut -d \t -f 1