Bump version number

darcs-hash:20060309120008-ac50b-071e0ba004f208993cc09f1494dcae7b8be17a25.gz

INSTALL

@@ -3,8 +3,8 @@ Known issues
 ============
 
 Fish currently requires a semi-modern GCC version to
-compile. Specifically, GCC 2.95.* won't compile fish, but GCC 3.23
-should work. Fish has not been coded with an C99- or GNU-specific
+compile. Specifically, GCC 2.95.* won't compile fish, but GCC 3.2.3 is
+known to work. Fish has not been coded with an C99- or GNU-specific
 features in mind, so it is hoped that it should be possible to make
 fish work with other compilers. Patches are welcome.
 
@@ -52,7 +52,7 @@ Local install procedure
 =======================
 
 If you have downloaded the darcs repository of fish, you need to run
-autoconf first.
+autoconf to generate the configure script.
 
 To install fish in your own home directory (typically as non-root),
 type:

Makefile.in

@@ -36,8 +36,22 @@
 CC := @CC@
 INSTALL:=@INSTALL@
 
-# Compiler flags
-CFLAGS:=@CFLAGS@ -Wall -std=gnu99 -fno-strict-aliasing
+#
+# Compiler flags:
+#
+#
+# -fno-optimize-sibling-calls seems to work around a bug where sending
+# a SIGWINCH to fish on NetBSD causes fish to exit when compiled with
+# GCC 3.3.3. This is probably either a compiler bug or a libc bug, but
+# adding this flag seems to fix things for now. Long term, the real
+# problem should be tracked down and truly fixed, at which point we
+# can remove this silly flag. This bug has been verified to not exist
+# on Linux using GCC 3.3.3.
+#
+# -Wall is there to keep me on my toes
+#
+
+CFLAGS:=@CFLAGS@ -Wall -fno-optimize-sibling-calls
 CPPFLAGS=@CPPFLAGS@
 LDFLAGS:= @LIBS@ @LDFLAGS@ 
 
@@ -57,7 +71,7 @@ ETC_DIR_INSTALL = etc/fish_interactive.fish
 # Set to 1 if we have gettext
 HAVE_GETTEXT=@HAVE_GETTEXT@
 
-CORE_OBJS := util.o common.o halloc.o halloc_util.o 
+CORE_OBJS := util.o common.o halloc.o halloc_util.o fallback.o
 
 # All objects used by fish, that are compiled from an ordinary .c file
 # using an ordinary .h file.
@@ -94,7 +108,7 @@ FISHD_OBJS := fishd.o env_universal_common.o wutil.o	\
 
 # All objects needed to build mimedb
 MIME_OBJS := mimedb.o xdgmimealias.o xdgmime.o xdgmimeglob.o		\
-	xdgmimeint.o xdgmimemagic.o xdgmimeparent.o wutil.o
+	xdgmimeint.o xdgmimemagic.o xdgmimeparent.o wutil.o $(CORE_OBJS)
 
 #
 # Files containing documentation for builtins. Should be listed
@@ -197,7 +211,7 @@ all: $(PROGRAMS) user_doc
 .PHONY: all
 
 debug:
-	make fish CFLAGS="-O0 -Wno-unused -Werror -g -Wall -std=gnu99 -fno-strict-aliasing"
+	make fish CFLAGS="-O0 -Wno-unused -Werror -g -Wall -fno-optimize-sibling-calls"
 .PHONY: debug
 
 # User documentation, describing the features of the fish shell.
@@ -268,8 +282,8 @@ doc.h:$(BUILTIN_DOC_SRC) $(CMD_DOC_SRC) doc_src/doc.hdr
 # Create a template translation object
 messages.pot: *.c *.h etc/*.in share/fish share/completions/*.fish share/functions/*.fish seq
 	if test $(HAVE_GETTEXT) = 1;then \
-		xgettext -k_ -kN_ -kcomplete_desc *.c *.h -o messages.pot; \
-		if ! xgettext -j -k_ -LShell etc/*.in share/fish share/completions/*.fish share/functions/*.fish seq -o messages.pot; then \
+		xgettext -k_ -kN_ *.c *.h -o messages.pot; \
+		if ! xgettext -j -k_ -kN_ -LShell etc/*.in share/fish share/completions/*.fish share/functions/*.fish seq -o messages.pot; then \
 			echo "Your xgettext version is too old to build the messages.pot file"\
 			rm messages.pot\
 			false;\
@@ -447,6 +461,7 @@ uninstall-legacy: uninstall
 	fi;
 	rmdir $(DESTDIR)$(sysconfdir)/fish.d/completions; true
 	rmdir $(DESTDIR)$(sysconfdir)/fish.d; true
+	@echo The previous fish installation has been removed. 
 
 install-translations: $(TRANSLATIONS)
 	if test $(HAVE_GETTEXT) = 1; then \
@@ -483,8 +498,8 @@ fish_tests: $(FISH_TESTS_OBJS)
 	$(CC) $(FISH_TESTS_OBJS) $(LDFLAGS) -o $@
 
 
-mimedb: $(MIME_OBJS) util.o common.o doc_src/mimedb.c
-	$(CC) ${MIME_OBJS} util.o common.o doc_src/mimedb.c $(LDFLAGS) -o $@
+mimedb: $(MIME_OBJS) doc_src/mimedb.c
+	$(CC) ${MIME_OBJS} doc_src/mimedb.c $(LDFLAGS) -o $@
 
 set_color: set_color.o doc_src/set_color.c 
 	$(CC) set_color.o doc_src/set_color.c $(LDFLAGS) -o $@
@@ -553,7 +568,7 @@ rpm: fish-@PACKAGE_VERSION@.tar.bz2
 
 distclean: clean
 	rm -f fish.spec doc_src/fish.1 doc_src/Doxyfile 
-	rm -f etc/fish etc/fish_interactive.fish share/fish
+	rm -f etc/fish etc/fish_interactive.fish seq
 	rm -f config.status config.log config.h Makefile
 .PHONY: distclean
 
@@ -561,7 +576,7 @@ clean:
 	rm -f *.o doc.h doc_src/*.doxygen doc_src/*.c builtin_help.c 
 	rm -f tests/tmp.err tests/tmp.out tests/tmp.status tests/foo.txt
 	rm -f tokenizer_test fish key_reader set_color gen_hdr2 mimedb
-	rm -f fishd fish_pager count 
+	rm -f fishd fish_pager count fish_tests 
 	rm -f fish-@PACKAGE_VERSION@.tar 
 	rm -f fish-@PACKAGE_VERSION@.tar.gz 
 	rm -f fish-@PACKAGE_VERSION@.tar.bz2

builtin.c

@@ -38,7 +38,10 @@
 #include <time.h>
 
 #include "config.h"
+
+#include "fallback.h"
 #include "util.h"
+
 #include "wutil.h"
 #include "builtin.h"
 #include "function.h"

builtin_commandline.c

@@ -12,7 +12,10 @@ Functions used for implementing the commandline builtin.
 #include <signal.h>
 
 #include "config.h"
+
+#include "fallback.h"
 #include "util.h"
+
 #include "wutil.h"
 #include "builtin.h"
 #include "common.h"

builtin_complete.c

@@ -12,7 +12,10 @@ Functions used for implementing the complete builtin.
 #include <signal.h>
 
 #include "config.h"
+
+#include "fallback.h"
 #include "util.h"
+
 #include "wutil.h"
 #include "builtin.h"
 #include "common.h"

builtin_set.c

@@ -12,7 +12,10 @@ Functions used for implementing the set builtin.
 #include <signal.h>
 
 #include "config.h"
+
+#include "fallback.h"
 #include "util.h"
+
 #include "wutil.h"
 #include "builtin.h"
 #include "env.h"

builtin_ulimit.c

@@ -13,7 +13,10 @@ Functions used for implementing the ulimit builtin.
 #include <errno.h>
 
 #include "config.h"
+
+#include "fallback.h"
 #include "util.h"
+
 #include "builtin.h"
 #include "common.h"
 #include "wgetopt.h"

common.c

@@ -6,6 +6,7 @@ parts of fish.
 
 #include "config.h"
 
+
 #include <stdlib.h>
 #include <termios.h>
 #include <wchar.h>
@@ -50,7 +51,9 @@ parts of fish.
 #include <ncurses/term.h>
 #endif
 
+#include "fallback.h"
 #include "util.h"
+
 #include "wutil.h"
 #include "common.h"
 #include "expand.h"
@@ -297,19 +300,14 @@ char *wcs2str_internal( const wchar_t *in, char *out )
 		{
 			res = wcrtomb( &out[out_pos], in[in_pos], &state );
 			
-			switch( res )
+			if( res == (size_t)(-1) )
 			{
-				case (size_t)(-1):
-					{
-						debug( 1, L"Wide character has no narrow representation" );
-						memset( &state, 0, sizeof(state) );
-						break;
-					}
-				default:
-				{
-					out_pos += res;
-					break;
-				}
+				debug( 1, L"Wide character has no narrow representation" );
+				memset( &state, 0, sizeof(state) );
+			}
+			else
+			{
+				out_pos += res;
 			}
 		}
 		in_pos++;
@@ -1156,6 +1154,7 @@ wchar_t *unescape( const wchar_t * orig, int unescape_special )
 				{
 					switch( in[++in_pos] )
 					{
+						case '\\':
 						case L'\'':
 						{
 							in[out_pos]=in[in_pos];
@@ -1213,6 +1212,7 @@ wchar_t *unescape( const wchar_t * orig, int unescape_special )
 								return 0;
 							}
 							
+							case '\\':
 							case L'$':
 							case '"':
 							{

complete.c

@@ -21,7 +21,10 @@
 #include <wchar.h>
 
 #include "config.h"
+
+#include "fallback.h"
 #include "util.h"
+
 #include "tokenizer.h"
 #include "wildcard.h"
 #include "proc.h"
@@ -1557,7 +1560,7 @@ static int complete_param( wchar_t *cmd_orig,
 				{
 					use_common &= ((o->result_mode & NO_COMMON )==0);
 					use_files &= ((o->result_mode & NO_FILES )==0);
-					complete_from_args( arg, o->comp, o->desc, comp_out );
+					complete_from_args( arg, o->comp, _(o->desc), comp_out );
 				}
 
 			}
@@ -1581,7 +1584,7 @@ static int complete_param( wchar_t *cmd_orig,
 						found_old = 1;
 						use_common &= ((o->result_mode & NO_COMMON )==0);
 						use_files &= ((o->result_mode & NO_FILES )==0);
-						complete_from_args( str, o->comp, o->desc, comp_out );
+						complete_from_args( str, o->comp, _(o->desc), comp_out );
 					}
 				}
 			}
@@ -1607,7 +1610,7 @@ static int complete_param( wchar_t *cmd_orig,
 					{
 						use_common &= ((o->result_mode & NO_COMMON )==0);
 						use_files &= ((o->result_mode & NO_FILES )==0);
-						complete_from_args( str, o->comp, o->desc, comp_out );
+						complete_from_args( str, o->comp, _(o->desc), comp_out );
 
 					}
 				}
@@ -1631,7 +1634,7 @@ static int complete_param( wchar_t *cmd_orig,
 				if( (o->short_opt == L'\0' ) && (o->long_opt[0]==L'\0'))
 				{
 					use_files &= ((o->result_mode & NO_FILES )==0);
-					complete_from_args( str, o->comp, o->desc, comp_out );
+					complete_from_args( str, o->comp, _(o->desc), comp_out );
 				}
 
 				if( wcslen(str) > 0 )
@@ -1642,15 +1645,16 @@ static int complete_param( wchar_t *cmd_orig,
 					if( o->short_opt != L'\0' &&
 						short_ok( str, o->short_opt, i->short_opt_str ) )
 					{
+						const wchar_t *desc = _(o->desc );
 						wchar_t *next_opt =
-							malloc( sizeof(wchar_t)*(3 + wcslen(o->desc)));
+							malloc( sizeof(wchar_t)*(3 + wcslen(desc)));
 						if( !next_opt )
 							die_mem();
 
 						next_opt[0]=o->short_opt;
 						next_opt[1]=COMPLETE_SEP;
 						next_opt[2]=L'\0';
-						wcscat( next_opt, o->desc );
+						wcscat( next_opt, desc );
 						al_push( comp_out, next_opt );
 					}
 
@@ -1678,7 +1682,7 @@ static int complete_param( wchar_t *cmd_orig,
 								al_push( comp_out,
 										 wcsdupcat2( &((wchar_t *)whole_opt.buff)[wcslen(str)], 
 													 COMPLETE_SEP_STR, 
-													 o->desc, 
+													 _(o->desc), 
 													 (void *)0) );
 							}
 
@@ -1688,7 +1692,7 @@ static int complete_param( wchar_t *cmd_orig,
 										 wcsdupcat2( &((wchar_t *)whole_opt.buff)[wcslen(str)], 
 													 L"=", 
 													 COMPLETE_SEP_STR, 
-													 o->desc, 
+													 _(o->desc), 
 													 (void *)0) );
 							}
 						}
@@ -2116,7 +2120,7 @@ void complete_print( string_buffer_t *out )
 
 			append_switch( out,
 						   L"description",
-						   o->desc );
+						   _(o->desc) );
 
 			append_switch( out,
 						   L"arguments",

config.sub

@@ -1,9 +1,10 @@
 #! /bin/sh
 # Configuration validation subroutine script.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
+#   Inc.
 
-timestamp='2003-06-18'
+timestamp='2006-02-27'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -21,14 +22,15 @@ timestamp='2003-06-18'
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
-
+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+# 02110-1301, USA.
+#
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
 # configuration script generated by Autoconf, you may include it under
 # the same distribution terms that you use for the rest of that program.
 
+
 # Please send patches to <config-patches@gnu.org>.  Submit a context
 # diff and a properly formatted ChangeLog entry.
 #
@@ -70,7 +72,7 @@ Report bugs and patches to <config-patches@gnu.org>."
 version="\
 GNU config.sub ($timestamp)
 
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
@@ -83,11 +85,11 @@ Try \`$me --help' for more information."
 while test $# -gt 0 ; do
   case $1 in
     --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit 0 ;;
+       echo "$timestamp" ; exit ;;
     --version | -v )
-       echo "$version" ; exit 0 ;;
+       echo "$version" ; exit ;;
     --help | --h* | -h )
-       echo "$usage"; exit 0 ;;
+       echo "$usage"; exit ;;
     -- )     # Stop option processing
        shift; break ;;
     - )	# Use stdin as input.
@@ -99,7 +101,7 @@ while test $# -gt 0 ; do
     *local*)
        # First pass through any local machine types.
        echo $1
-       exit 0;;
+       exit ;;
 
     * )
        break ;;
@@ -118,7 +120,9 @@ esac
 # Here we must recognize all the valid KERNEL-OS combinations.
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
-  nto-qnx* | linux-gnu* | freebsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
+  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
+  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
+  storm-chaos* | os2-emx* | rtmk-nova*)
     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
     ;;
@@ -144,7 +148,7 @@ case $os in
 	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
 	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
 	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-	-apple | -axis)
+	-apple | -axis | -knuth | -cray)
 		os=
 		basic_machine=$1
 		;;
@@ -169,6 +173,10 @@ case $os in
 	-hiux*)
 		os=-hiuxwe2
 		;;
+	-sco6)
+		os=-sco5v6
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
 	-sco5)
 		os=-sco3.2v5
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
@@ -185,6 +193,10 @@ case $os in
 		# Don't forget version if it is 3.2v4 or newer.
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
 		;;
+	-sco5v6*)
+		# Don't forget version if it is 3.2v4 or newer.
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
 	-sco*)
 		os=-sco3.2v2
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
@@ -228,14 +240,16 @@ case $basic_machine in
 	| a29k \
 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
+	| am33_2.0 \
 	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
+	| bfin \
 	| c4x | clipper \
 	| d10v | d30v | dlx | dsp16xx \
 	| fr30 | frv \
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 	| i370 | i860 | i960 | ia64 \
-	| ip2k \
-	| m32r | m68000 | m68k | m88k | mcore \
+	| ip2k | iq2000 \
+	| m32r | m32rle | m68000 | m68k | m88k | maxq | mb | microblaze | mcore \
 	| mips | mipsbe | mipseb | mipsel | mipsle \
 	| mips16 \
 	| mips64 | mips64el \
@@ -244,31 +258,38 @@ case $basic_machine in
 	| mips64vr4100 | mips64vr4100el \
 	| mips64vr4300 | mips64vr4300el \
 	| mips64vr5000 | mips64vr5000el \
+	| mips64vr5900 | mips64vr5900el \
 	| mipsisa32 | mipsisa32el \
 	| mipsisa32r2 | mipsisa32r2el \
 	| mipsisa64 | mipsisa64el \
+	| mipsisa64r2 | mipsisa64r2el \
 	| mipsisa64sb1 | mipsisa64sb1el \
 	| mipsisa64sr71k | mipsisa64sr71kel \
 	| mipstx39 | mipstx39el \
 	| mn10200 | mn10300 \
+	| mt \
 	| msp430 \
+	| nios | nios2 \
 	| ns16k | ns32k \
-	| openrisc | or32 \
+	| or32 \
 	| pdp10 | pdp11 | pj | pjl \
 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
 	| pyramid \
-	| s390 | s390x \
-	| sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
+	| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
 	| sh64 | sh64le \
-	| sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \
+	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
+	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
 	| strongarm \
 	| tahoe | thumb | tic4x | tic80 | tron \
 	| v850 | v850e \
 	| we32k \
-	| x86 | xscale | xstormy16 | xtensa \
+	| x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
 	| z8k)
 		basic_machine=$basic_machine-unknown
 		;;
+	m32c)
+		basic_machine=$basic_machine-unknown
+		;;
 	m6811 | m68hc11 | m6812 | m68hc12)
 		# Motorola 68HC11/12.
 		basic_machine=$basic_machine-unknown
@@ -276,6 +297,9 @@ case $basic_machine in
 		;;
 	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
 		;;
+	ms1)
+		basic_machine=mt-unknown
+		;;
 
 	# We use `pc' rather than `unknown'
 	# because (1) that's what they normally are, and
@@ -296,19 +320,19 @@ case $basic_machine in
 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
 	| avr-* \
-	| bs2000-* \
+	| bfin-* | bs2000-* \
 	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
-	| clipper-* | cydra-* \
+	| clipper-* | craynv-* | cydra-* \
 	| d10v-* | d30v-* | dlx-* \
 	| elxsi-* \
 	| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
 	| h8300-* | h8500-* \
 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
 	| i*86-* | i860-* | i960-* | ia64-* \
-	| ip2k-* \
-	| m32r-* \
+	| ip2k-* | iq2000-* \
+	| m32r-* | m32rle-* \
 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-	| m88110-* | m88k-* | mcore-* \
+	| m88110-* | m88k-* | maxq-* | mcore-* \
 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
 	| mips16-* \
 	| mips64-* | mips64el-* \
@@ -317,34 +341,41 @@ case $basic_machine in
 	| mips64vr4100-* | mips64vr4100el-* \
 	| mips64vr4300-* | mips64vr4300el-* \
 	| mips64vr5000-* | mips64vr5000el-* \
+	| mips64vr5900-* | mips64vr5900el-* \
 	| mipsisa32-* | mipsisa32el-* \
 	| mipsisa32r2-* | mipsisa32r2el-* \
 	| mipsisa64-* | mipsisa64el-* \
+	| mipsisa64r2-* | mipsisa64r2el-* \
 	| mipsisa64sb1-* | mipsisa64sb1el-* \
 	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
 	| mipstx39-* | mipstx39el-* \
+	| mmix-* \
+	| mt-* \
 	| msp430-* \
-	| none-* | np1-* | nv1-* | ns16k-* | ns32k-* \
+	| nios-* | nios2-* \
+	| none-* | np1-* | ns16k-* | ns32k-* \
 	| orion-* \
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
 	| pyramid-* \
 	| romp-* | rs6000-* \
-	| s390-* | s390x-* \
-	| sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
+	| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \
 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
-	| sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
-	| sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
+	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
+	| sparclite-* \
+	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
 	| tahoe-* | thumb-* \
 	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
 	| tron-* \
 	| v850-* | v850e-* | vax-* \
 	| we32k-* \
-	| x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
-	| xtensa-* \
+	| x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
+	| xstormy16-* | xtensa-* \
 	| ymp-* \
 	| z8k-*)
 		;;
+	m32c-*)
+		;;
 	# Recognize the various machine names and aliases which stand
 	# for a CPU type and a company and sometimes even an OS.
 	386bsd)
@@ -361,6 +392,9 @@ case $basic_machine in
 		basic_machine=a29k-amd
 		os=-udi
 		;;
+    	abacus)
+		basic_machine=abacus-unknown
+		;;
 	adobe68k)
 		basic_machine=m68010-adobe
 		os=-scout
@@ -378,6 +412,9 @@ case $basic_machine in
 	amd64)
 		basic_machine=x86_64-pc
 		;;
+	amd64-*)
+		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
 	amdahl)
 		basic_machine=580-amdahl
 		os=-sysv
@@ -437,12 +474,27 @@ case $basic_machine in
 		basic_machine=j90-cray
 		os=-unicos
 		;;
+	craynv)
+		basic_machine=craynv-cray
+		os=-unicosmp
+		;;
+	cr16c)
+		basic_machine=cr16c-unknown
+		os=-elf
+		;;
 	crds | unos)
 		basic_machine=m68k-crds
 		;;
+	crisv32 | crisv32-* | etraxfs*)
+		basic_machine=crisv32-axis
+		;;
 	cris | cris-* | etrax*)
 		basic_machine=cris-axis
 		;;
+	crx)
+		basic_machine=crx-unknown
+		os=-elf
+		;;
 	da30 | da30-*)
 		basic_machine=m68k-da30
 		;;
@@ -465,6 +517,10 @@ case $basic_machine in
 		basic_machine=m88k-motorola
 		os=-sysv3
 		;;
+	djgpp)
+		basic_machine=i586-pc
+		os=-msdosdjgpp
+		;;
 	dpx20 | dpx20-*)
 		basic_machine=rs6000-bull
 		os=-bosx
@@ -643,10 +699,6 @@ case $basic_machine in
 	mips3*)
 		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
 		;;
-	mmix*)
-		basic_machine=mmix-knuth
-		os=-mmixware
-		;;
 	monitor)
 		basic_machine=m68k-rom68k
 		os=-coff
@@ -659,6 +711,9 @@ case $basic_machine in
 		basic_machine=i386-pc
 		os=-msdos
 		;;
+	ms1-*)
+		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
+		;;
 	mvs)
 		basic_machine=i370-ibm
 		os=-mvs
@@ -727,10 +782,6 @@ case $basic_machine in
 	np1)
 		basic_machine=np1-gould
 		;;
-	nv1)
-		basic_machine=nv1-cray
-		os=-unicosmp
-		;;
 	nsr-tandem)
 		basic_machine=nsr-tandem
 		;;
@@ -738,9 +789,12 @@ case $basic_machine in
 		basic_machine=hppa1.1-oki
 		os=-proelf
 		;;
-	or32 | or32-*)
+	openrisc | openrisc-*)
 		basic_machine=or32-unknown
-		os=-coff
+		;;
+	os400)
+		basic_machine=powerpc-ibm
+		os=-os400
 		;;
 	OSE68000 | ose68000)
 		basic_machine=m68000-ericsson
@@ -767,6 +821,12 @@ case $basic_machine in
 	pc532 | pc532-*)
 		basic_machine=ns32k-pc532
 		;;
+	pc98)
+		basic_machine=i386-pc
+		;;
+	pc98-*)
+		basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
 	pentium | p5 | k5 | k6 | nexgen | viac3)
 		basic_machine=i586-pc
 		;;
@@ -823,6 +883,10 @@ case $basic_machine in
 		basic_machine=i586-unknown
 		os=-pw32
 		;;
+	rdos)
+		basic_machine=i386-pc
+		os=-rdos
+		;;
 	rom68k)
 		basic_machine=m68k-rom68k
 		os=-coff
@@ -833,6 +897,12 @@ case $basic_machine in
 	rtpc | rtpc-*)
 		basic_machine=romp-ibm
 		;;
+	s390 | s390-*)
+		basic_machine=s390-ibm
+		;;
+	s390x | s390x-*)
+		basic_machine=s390x-ibm
+		;;
 	sa29200)
 		basic_machine=a29k-amd
 		os=-udi
@@ -956,6 +1026,10 @@ case $basic_machine in
 	tower | tower-32)
 		basic_machine=m68k-ncr
 		;;
+	tpf)
+		basic_machine=s390x-ibm
+		os=-tpf
+		;;
 	udi29k)
 		basic_machine=a29k-amd
 		os=-udi
@@ -999,6 +1073,10 @@ case $basic_machine in
 		basic_machine=hppa1.1-winbond
 		os=-proelf
 		;;
+	xbox)
+		basic_machine=i686-pc
+		os=-mingw32
+		;;
 	xps | xps100)
 		basic_machine=xps100-honeywell
 		;;
@@ -1029,6 +1107,9 @@ case $basic_machine in
 	romp)
 		basic_machine=romp-ibm
 		;;
+	mmix)
+		basic_machine=mmix-knuth
+		;;
 	rs6000)
 		basic_machine=rs6000-ibm
 		;;
@@ -1045,13 +1126,10 @@ case $basic_machine in
 	we32k)
 		basic_machine=we32k-att
 		;;
-	sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele)
+	sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
 		basic_machine=sh-unknown
 		;;
-	sh64)
-		basic_machine=sh64-unknown
-		;;
-	sparc | sparcv9 | sparcv9b)
+	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
 		basic_machine=sparc-sun
 		;;
 	cydra)
@@ -1124,19 +1202,23 @@ case $os in
 	      | -aos* \
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-	      | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
-	      | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
+	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
+	      | -openbsd* | -solidbsd* \
+	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
+	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
 	      | -chorusos* | -chorusrdb* \
 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
+	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
+	      | -uxpv* | -beos* | -mpeix* | -udk* \
 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
-	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei*)
+	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
+	      | -skyos* | -haiku* | -rdos*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@@ -1154,12 +1236,15 @@ case $os in
 		os=`echo $os | sed -e 's|nto|nto-qnx|'`
 		;;
 	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
-	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
+	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
 	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
 		;;
 	-mac*)
 		os=`echo $os | sed -e 's|mac|macos|'`
 		;;
+	-linux-dietlibc)
+		os=-linux-dietlibc
+		;;
 	-linux*)
 		os=`echo $os | sed -e 's|linux|linux-gnu|'`
 		;;
@@ -1172,6 +1257,9 @@ case $os in
 	-opened*)
 		os=-openedition
 		;;
+        -os400*)
+		os=-os400
+		;;
 	-wince*)
 		os=-wince
 		;;
@@ -1193,6 +1281,9 @@ case $os in
 	-atheos*)
 		os=-atheos
 		;;
+	-syllable*)
+		os=-syllable
+		;;
 	-386bsd)
 		os=-bsd
 		;;
@@ -1215,6 +1306,9 @@ case $os in
 	-sinix*)
 		os=-sysv4
 		;;
+        -tpf*)
+		os=-tpf
+		;;
 	-triton*)
 		os=-sysv3
 		;;
@@ -1251,6 +1345,9 @@ case $os in
 	-kaos*)
 		os=-kaos
 		;;
+	-zvmoe)
+		os=-zvmoe
+		;;
 	-none)
 		;;
 	*)
@@ -1282,9 +1379,9 @@ case $basic_machine in
 	arm*-semi)
 		os=-aout
 		;;
-	c4x-* | tic4x-*)
-		os=-coff
-		;;
+    c4x-* | tic4x-*)
+        os=-coff
+        ;;
 	# This must come before the *-dec entry.
 	pdp10-*)
 		os=-tops20
@@ -1328,9 +1425,15 @@ case $basic_machine in
 	*-be)
 		os=-beos
 		;;
+	*-haiku)
+		os=-haiku
+		;;
 	*-ibm)
 		os=-aix
 		;;
+    	*-knuth)
+		os=-mmixware
+		;;
 	*-wec)
 		os=-proelf
 		;;
@@ -1463,9 +1566,15 @@ case $basic_machine in
 			-mvs* | -opened*)
 				vendor=ibm
 				;;
+			-os400*)
+				vendor=ibm
+				;;
 			-ptx*)
 				vendor=sequent
 				;;
+			-tpf*)
+				vendor=ibm
+				;;
 			-vxsim* | -vxworks* | -windiss*)
 				vendor=wrs
 				;;
@@ -1490,7 +1599,7 @@ case $basic_machine in
 esac
 
 echo $basic_machine$os
-exit 0
+exit
 
 # Local variables:
 # eval: (add-hook 'write-file-hooks 'time-stamp)

configure.ac

@@ -1,14 +1,55 @@
 # Process this file with autoconf to produce a configure script.
-AC_INIT(fish,1.21.0,fish-users@lists.sf.net)
+AC_INIT(fish,1.21.2,fish-users@lists.sf.net)
 
+# If needed, run autoconf to regenerate the configure file
+AC_MSG_CHECKING([if autoconf needs to be run])
+if test configure -ot configure.ac; then
+	AC_MSG_RESULT([yes])
+	if which autoconf >/dev/null; then
+		AC_MSG_NOTICE([running autoconf])
+		if autoconf; then
+			./configure $@
+		fi
+		exit			
+	else
+		AC_MSG_ERROR( [cannot find the autoconf program in your path.
+This program is needs to be run whenever the configure.ac file is modified.
+Please install it and try again.])
+	fi
+else
+	AC_MSG_RESULT([no])
+fi
+
+
+# If needed, run autoheader to regenerate config.h.in
+AC_MSG_CHECKING([if autoheader needs to be run])
+if test ! -f ./config.h.in -o config.h.in -ot configure.ac; then
+	AC_MSG_RESULT([yes])
+	if which autoheader >/dev/null; then
+		AC_MSG_NOTICE([running autoheader])
+		autoheader
+	else
+		AC_MSG_ERROR( [cannot find the autoheader program in your path.
+This program is needs to be run whenever the configure.ac file is modified.
+Please install it and try again.])
+	fi
+else
+	AC_MSG_RESULT([no])
+fi
+
+
+# Detect directories which may contain additional headers, libraries
+# and commands. This needs to be done early - before Autoconf starts
+# to mess with CFLAGS and all the other environemnt variables.
 for i in /usr/pkg /sw /opt /opt/local; do
 
 	AC_MSG_CHECKING([for $i/include include directory])
 	if test -d $i/include; then
 		AC_MSG_RESULT(yes)
 		CPPFLAGS="$CPPFLAGS -I$i/include/"
+		CFLAGS="$CFLAGS -I$i/include/"
 	else
-    	AC_MSG_RESULT(no)
+   	AC_MSG_RESULT(no)
 	fi
 
 	AC_MSG_CHECKING([for $i/lib library directory])
@@ -31,22 +72,6 @@ done
 
 AC_SUBST( optbindirs, $optbindirs )
 
-# If needed, run autoheader automatically
-AC_MSG_CHECKING([if autoheader needs to be run])
-if test ! -f ./config.h.in -o config.h.in -ot configure.ac; then
-	AC_MSG_RESULT([yes])
-	if which autoheader >/dev/null; then
-		AC_MSG_NOTICE([running autoheader])
-		autoheader
-	else
-		AC_MSG_ERROR( [cannot find the autoheader program in your path.
-This program is needed because the configure.ac file has been modified.
-Please install it and try again.])
-	fi
-else
-	AC_MSG_RESULT([no])
-fi
-
 # Tell autoconf to create config.h header 
 AC_CONFIG_HEADERS(config.h)
 
@@ -64,10 +89,11 @@ This program is needed to build fish.
 Please install it and try again.])
 fi
 
-# Check for seq program. If missing, install fallback shellscript implementation
+# Check for seq command. If missing, make sure fallback shellscript
+# implementation is installed
 AC_CHECK_PROG( SEQ_FALLBACK, seq, [ ], [seq])
 
-# Optionally drop xsel
+# Optionally drop xsel command
 AC_ARG_WITH( xsel, 
 			 AC_HELP_STRING([--without-xsel],
              [do not build the xsel program needed for X clipboard integration]),
@@ -94,7 +120,10 @@ fi
 AC_DEFINE_UNQUOTED([CPU],[L"$target_cpu"],[CPU type])
 
 
-# Set up installation directories
+# Set up PREFIX and related preprocessor symbols. Fish needs to know
+# where it will be installed. One of the reasons for this is so that
+# it can make sure the fish installation directory is in the path
+# during startup.
 if [[ "$prefix" = NONE ]]; then
 	AC_DEFINE_UNQUOTED( [PREFIX], L"/usr/local", [Installation directory])
 	AC_SUBST( PREFIX, /usr/local)
@@ -103,7 +132,14 @@ else
 	AC_DEFINE_UNQUOTED( [PREFIX], L"$prefix", [Installation directory])
 	AC_SUBST( PREFIX, [$prefix])
 fi
+AC_DEFINE_UNQUOTED( SYSCONFDIR, [L"$(eval echo $sysconfdir)"], [System configuration directory] )
+AC_DEFINE_UNQUOTED( DATADIR, [L"$(eval echo $datadir)"], [System configuration directory] )
+AC_SUBST( SYSCONFDIR, ["$(eval echo $sysconfdir)"] )
+AC_SUBST( DATADIR, ["$(eval echo $datadir)"] )
 
+
+# Set up the directory where the documentation files should be
+# installed
 AC_ARG_VAR( [docdir], [Documentation direcotry] )
 
 if test -z $docdir; then
@@ -111,18 +147,94 @@ if test -z $docdir; then
 fi
 
 AC_DEFINE_UNQUOTED( DOCDIR, [L"$(eval echo $docdir)"], [Documentation directory] )
-AC_DEFINE_UNQUOTED( SYSCONFDIR, [L"$(eval echo $sysconfdir)"], [System configuration directory] )
-AC_DEFINE_UNQUOTED( DATADIR, [L"$(eval echo $datadir)"], [System configuration directory] )
-AC_SUBST( SYSCONFDIR, ["$(eval echo $sysconfdir)"] )
-AC_SUBST( DATADIR, ["$(eval echo $datadir)"] )
 
-# Set up locale directory
+
+# Set up locale directory. This is where the .po files will be
+# installed.
 AC_DEFINE_UNQUOTED( [LOCALEDIR], "$(eval echo $datadir)/locale", [Locale directory])
 AC_SUBST( [LOCALEDIR], [$datadir/locale])
 
-# See if Linux procfs is present
+# See if Linux procfs is present. This is used to get extra
+# information about running processes.
 AC_CHECK_FILES([/proc/self/stat])
 
+# Check for presense of various libraries
+AC_SEARCH_LIBS( gettext, intl, AC_SUBST( HAVE_GETTEXT, [1] ), AC_SUBST( HAVE_GETTEXT, [0] ) )
+AC_SEARCH_LIBS( connect, socket, , [AC_MSG_ERROR([Cannot find the socket library, needed to build this package.] )] )
+AC_SEARCH_LIBS( nanosleep, rt, , [AC_MSG_ERROR([Cannot find the rt library, needed to build this package.] )] )
+AC_SEARCH_LIBS( setupterm, [ncurses curses], , [AC_MSG_ERROR([Could not find a curses implementation, needed to build fish])] )
+
+# Check for presense of various header files
+AC_CHECK_HEADERS([getopt.h termio.h sys/resource.h term.h ncurses/term.h libintl.h ncurses.h curses.h])
+
+AC_CHECK_HEADER([regex.h],
+				[AC_DEFINE([HAVE_REGEX_H], [1], [Define to 1 if you have the <regex.h> header file.])],
+				[AC_MSG_ERROR([Could not find the header regex.h, needed to build fish])])
+
+# Check for presense of various functions
+AC_CHECK_FUNCS( wcsdup wcsndup wcslen wcscasecmp wcsncasecmp gettext fwprintf )
+AC_CHECK_FUNCS( futimes wcwidth wcswidth getopt_long wcstok fputwc fgetwc )
+AC_CHECK_FUNCS( wcstol dcgettext )
+
+# Here follows a list of small programs used to test for various
+# features that Autoconf doesn't tell us about
+
+# Check if realpath accepts null for its second argument
+AC_MSG_CHECKING([if realpath accepts null for its second argument])
+AC_RUN_IFELSE(
+	[AC_LANG_PROGRAM([
+#include <limits.h>
+#include <errno.h>
+#include <stdlib.h>],
+		[int status; char *res; res = realpath( "somefile", 0 ); status = !(res != 0 || errno == ENOENT); exit( status );])], 
+	[have_realpath_null=yes], 
+	[have_realpath_null=no] )
+
+if test "$have_realpath_null" = yes; then
+	AC_MSG_RESULT(yes)
+	AC_DEFINE([HAVE_REALPATH_NULL], [1],
+		[Define to 1 if realpath accepts null for its second argument.])
+else
+	AC_MSG_RESULT(no)
+fi
+
+if test "$ac_cv_func_fwprintf" = yes; then
+
+	# Check if fwprintf is broken
+	AC_MSG_CHECKING([if fwprintf is broken])
+	AC_RUN_IFELSE(
+		[AC_LANG_PROGRAM([
+#include <stdlib.h>
+#include <stdio.h>
+#include <locale.h>
+#include <wchar.h>
+			],
+			[
+				setlocale( LC_ALL, "" );
+				fwprintf( stderr, L"%ls%ls", L"", L"fish:" );
+			])],
+	    [
+			AC_MSG_RESULT(no)
+		],
+	    [
+			AC_MSG_RESULT([yes])
+			AC_DEFINE([HAVE_BROKEN_FWPRINTF], [1], [Define to 1 one if the implemented fwprintf is broken])
+		] )
+
+fi
+
+# Check for RLIMIT_NPROC in sys/resource.h.
+AC_MSG_CHECKING([for RLIMIT_NPROC in sys/resource.h])
+AC_TRY_COMPILE([#include <sys/resource.h>],
+[int tmp; tmp=RLIMIT_NPROC;], have_rlimit_as=yes, have_rlimit_as=no)
+if test "$have_rlimit_as" = yes; then
+    AC_MSG_RESULT(yes)
+	AC_DEFINE([HAVE_RLIMIT_NPROC], [1],
+			  [Define to 1 if HAVE_RLIMIT_NPROC is defined in <sys/resource.h>.])
+else
+    AC_MSG_RESULT(no)
+fi
+
 # Check for RLIMIT_AS in sys/resource.h.
 AC_MSG_CHECKING([for RLIMIT_AS in sys/resource.h])
 AC_TRY_COMPILE([#include <sys/resource.h>],
@@ -159,62 +271,9 @@ else
     AC_MSG_RESULT(no)
 fi
 
-
-# Check for RLIMIT_NPROC in sys/resource.h.
-AC_MSG_CHECKING([for RLIMIT_NPROC in sys/resource.h])
-AC_TRY_COMPILE([#include <sys/resource.h>],
-[int tmp; tmp=RLIMIT_NPROC;], have_rlimit_as=yes, have_rlimit_as=no)
-if test "$have_rlimit_as" = yes; then
-    AC_MSG_RESULT(yes)
-	AC_DEFINE([HAVE_RLIMIT_NPROC], [1],
-			  [Define to 1 if HAVE_RLIMIT_NPROC is defined in <sys/resource.h>.])
-else
-    AC_MSG_RESULT(no)
-fi
-
-# Check if realpath accepts null for its second argument
-AC_MSG_CHECKING([if realpath accepts null for its second argument])
-AC_RUN_IFELSE(
-	[AC_LANG_PROGRAM([#include <limits.h>
-#include <errno.h>
-#include <stdlib.h>],
-		[int status; char *res; res = realpath( "somefile", 0 ); status = !(res != 0 || errno == ENOENT); exit( status );])], 
-	[have_realpath_null=yes], 
-	[have_realpath_null=no] )
-
-if test "$have_realpath_null" = yes; then
-	AC_MSG_RESULT(yes)
-	AC_DEFINE([HAVE_REALPATH_NULL], [1],
-		[Define to 1 if realpath accepts null for its second argument.])
-else
-	AC_MSG_RESULT(no)
-fi
-
-
-# Check for libraries
-AC_CHECK_LIB(socket, connect)
-AC_CHECK_LIB(rt, nanosleep)
-AC_CHECK_LIB(intl, gettext)
-
-# Check for various header files
-AC_CHECK_HEADERS([getopt.h termio.h sys/resource.h term.h ncurses/term.h libintl.h ncurses.h curses.h])
-
-AC_CHECK_HEADER([regex.h],
-				[AC_DEFINE([HAVE_REGEX_H], [1], [Define to 1 if you have the <regex.h> header file.])],
-				[AC_MSG_ERROR([Could not find the header regex.h, needed to build fish])])
-
-
-# Check for various functions, and insert results into config.h
-AC_CHECK_FUNCS( wcsdup wcsndup wcslen wcscasecmp wcsncasecmp gettext fwprintf )
-AC_CHECK_FUNCS( futimes wcwidth wcswidth getopt_long wcstok fputwc fgetwc )
-AC_CHECK_FUNCS( wcstol dcgettext )
-
 AC_DEFINE([HAVE_TRANSLATE_H], [1],
 			  [Define to 1 if the wgettext function should be used for translating strings.])
 
-# Check again for gettext library, and insert results into the Makefile
-AC_CHECK_FUNC(gettext, AC_SUBST(HAVE_GETTEXT,1), AC_SUBST(HAVE_GETTEXT,0) )
-
 # Check for _nl_msg_cat_cntr symbol
 AC_MSG_CHECKING([for _nl_msg_cat_cntr symbol])
 AC_TRY_LINK([#if HAVE_LIBINTL_H]
@@ -223,18 +282,17 @@ AC_TRY_LINK([#if HAVE_LIBINTL_H]
 [extern int  _nl_msg_cat_cntr;]
 [int tmp = _nl_msg_cat_cntr; exit(tmp);], have__nl_msg_cat_cntr=yes, have__nl_msg_cat_cntr=no)
 if test "$have__nl_msg_cat_cntr" = yes; then
-    AC_MSG_RESULT(yes)
+	AC_MSG_RESULT(yes)
 	AC_DEFINE([HAVE__NL_MSG_CAT_CNTR], [1],
 	          [Define to 1 if the _nl_msg_cat_cntr symbol is exported.])	
 else
     AC_MSG_RESULT(no)
 fi
 
-# Check if we have ncurses, and use it rather than curses if possible.
-AC_SEARCH_LIBS( setupterm, [ncurses curses], [ AC_MSG_NOTICE([Found curses implementation])], [AC_MSG_ERROR([Could not find a curses implementation, needed to build fish])] )
-
+# Tell the world what we know
 AC_CONFIG_FILES([Makefile fish.spec doc_src/fish.1 doc_src/Doxyfile etc/fish etc/fish_interactive.fish seq])
 AC_OUTPUT
 
+echo "fish is now configured."
 echo "Now run 'make' and 'make install' to built and install fish."
 echo "Good luck!"

doc_src/doc.hdr

@@ -72,10 +72,11 @@ quoted string, <a href='#expand-variable'>variable expansion</a> still
 takes place. Other than that, a quoted parameter will not be parameter
 expanded, may contain spaces, and escape sequences are ignored. The
 only backslash escape accepted within single quotes is \\', which
-escapes a single quote. The only backslash escapes accepted within
-double quotes are \\", which escapes a double quote, and \\$, which
-escapes a dollar character. Single quotes have no special meaning
-withing double quotes and vice versa.
+escapes a single quote and \\\\, which escapes the backslash
+symbol. The only backslash escapes accepted within double quotes are
+\\", which escapes a double quote, \\$, which escapes a dollar
+character, and \\\\, which escapes the backslash symbol. Single quotes
+have no special meaning withing double quotes and vice versa.
 
 Example:
 
@@ -450,22 +451,22 @@ personalized Japanese greeting.
 
 The {$USER}san syntax might need a bit of an elaboration.  Posix
 shells allow you to specify a variable name using '$VARNAME' or
-'${VARNAME}'. Fish only supports the former, but has no support
-whatsoever for the latter or anything remotely like it. So what is
-'{$VARNAME}' then? Well, '{WHATEVER}' is <a href='#brace'>brace
-expansion</a>, the same as supported by Posix shells, i.e.  'a{b,c}d'
--> 'abd acd' works both in bash and on fish. So '{$VARNAME}' is a
-bracket-expansion with only a single element, i.e.  it becomes
-expanded to '$VARNAME', which will be variable expanded to the value
-of the variable 'VARNAME'. So you might think that the brackets don't
-actually do anything, and that is nearly the truth. The snag is that
-there once along the way was a '}' in there somewhere, and } is not a
-valid character in a variable name.  So anything after the otherwise
-pointless bracket expansion becomes NOT a part of the variable name,
-even if it happens to be a legal variable name character. That's why
-'{$USER}san' looks for the variable '$USER' and not for the variable
-'$USERsan'. It's a case of one syntax lending itself nicely to
-solving an unrelated problem in it's spare time.
+'${VARNAME}'. Fish supports the former, and has no support whatsoever
+for the latter or anything like it. So what is '{$VARNAME}' then?
+Well, '{WHATEVER}' is <a href='#brace'>brace expansion</a>, identical
+to that supported by Posix shells, i.e.  'a{b,c}d' -> 'abd acd' works
+both in bash and on fish. So '{$VARNAME}' is a bracket-expansion with
+only a single element, i.e.  it becomes expanded to '$VARNAME', which
+will be variable expanded to the value of the variable 'VARNAME'. So
+you might think that the brackets don't actually do anything, and that
+is nearly the truth. The snag is that there once along the way was a
+'}' in there somewhere, and } is not a valid character in a variable
+name.  So anything after the otherwise pointless bracket expansion
+becomes explicitly NOT a part of the variable name, even if it happens
+to be a legal variable name character. That's why '{$USER}san' looks
+for the variable '$USER' and not for the variable '$USERsan'. It's
+simply a case of one syntax lending itself nicely to solving an
+unrelated problem in it's spare time.
 
 Variable expansion is the only type of expansion performed on double
 quoted strings. There is, however, an important difference in how
@@ -479,6 +480,29 @@ result in exactly one argument. Undefined variables will expand to the
 empty string, and array variables will be concatenated using the space
 character.
 
+There is one further notable feature of fish variable
+expansion. Consider the following code snippet:
+
+<pre>
+set foo a b c
+set a 10; set b 20; set c 30
+for i in (seq (count $$foo))
+	echo $$foo[$i]
+end
+# Output is:
+# 10
+# 20
+# 30
+</pre>
+
+The above code demonstrates how to use multiple '$' symbols to expand
+the value of a variable as a variable name. One can simply think of
+the $-symbol as a variable dereference operator. When using this
+feature together with array brackets, the brackets will always match
+the innermost $ dereference. Thus, $$foo[5] will always mean the fift
+element of the foo variable should be dereferenced and never that the fift
+element of the doubly dereferenced variable foo. The latter can
+instead be expressed as $$foo[1][5].
 
 \subsection expand-home Home directory expansion
 
@@ -1137,11 +1161,10 @@ href='fish-users@lists.sf.net'>fish-users@lists.sf.net</a>.
 \subsection todo-features Missing features
 
 - Complete vi-mode key bindings
-- next-history-complete
 - More completions (for example xterm, vim, 
-konsole, gnome-terminal, dcop, cdrecord, cron, xargs
+konsole, gnome-terminal, dcop, cron,
 rlogin, telnet, rsync, arch, finger, nice, locate, 
-bibtex, patch, aspell, xpdf,
+bibtex, aspell, xpdf,
 compress, wine, xmms, dig, wine, batch, cron, 
 g++, javac, java, gcj, lpr, doxygen, whois, find)
 - Undo support
@@ -2407,4 +2430,4 @@ href='mailto:fish-users@lists.sf.net'>fish mailing list</a>, and
 hopefully this can be resolved.
 
 
-*/
+*/

env.c

@@ -33,7 +33,10 @@
 
 #include <errno.h>
 
+
+#include "fallback.h"
 #include "util.h"
+
 #include "wutil.h"
 #include "proc.h"
 #include "common.h"
@@ -889,7 +892,10 @@ wchar_t *env_get( const wchar_t *key )
 			wchar_t *next = history_get( i-add_current );
 			if( !next )
 			{
-				debug( 1, _( L"No history item at index %d\n" ), i );
+				/*
+				  This is not an error - it simply means the user has
+				  a short history
+				*/
 				break;
 			}
 			

env_universal.c

@@ -1,5 +1,6 @@
 #include "config.h"
 
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <wchar.h>
@@ -26,7 +27,9 @@
 
 #include <signal.h>
 
+#include "fallback.h"
 #include "util.h"
+
 #include "common.h"
 #include "wutil.h"
 #include "env_universal_common.h"

env_universal_common.c

@@ -7,6 +7,7 @@
 */
 #include "config.h"
 
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <wchar.h>
@@ -27,7 +28,9 @@
 #include <signal.h>
 #include <sys/stat.h>
 
+#include "fallback.h"
 #include "util.h"
+
 #include "common.h"
 #include "wutil.h"
 #include "env_universal_common.h"

etc/fish.in

@@ -7,8 +7,8 @@
 # Set default search paths
 #
 
-set -g fish_function_path ~/.fish.d/functions    @SYSCONFDIR@/fish.d/functions    @DATADIR@/functions 
-set -g fish_complete_path ~/.fish.d/completions  @SYSCONFDIR@/fish.d/completions  @DATADIR@/completions 
+set -g fish_function_path ~/.fish.d/functions    @SYSCONFDIR@/fish.d/functions    @DATADIR@/fish/functions 
+set -g fish_complete_path ~/.fish.d/completions  @SYSCONFDIR@/fish.d/completions  @DATADIR@/fish/completions 
 
 #
 # Set default field separators

etc/fish_interactive.fish.in

@@ -45,9 +45,12 @@ end
 # Set various color values
 #
 
-function set_default -d "Set an exported universal variable, unless it has already been set"
+function set_default -d "Set an universal variable, unless it has already been set"
 	if not set -q $argv[1]
-		set -Ux -- $argv	
+		set -U -- $argv	
+	end
+	if not set -q $argv[1]
+		set -g -- $argv	
 	end
 end
 
@@ -55,6 +58,9 @@ function set_exported_default -d "Set an exported universal variable, unless it
 	if not set -q $argv[1]
 		set -Ux -- $argv	
 	end
+	if not set -q $argv[1]
+		set -gx -- $argv	
+	end
 end
 
 

event.c

@@ -12,7 +12,10 @@
 #include <string.h>
 
 #include "config.h"
+
+#include "fallback.h"
 #include "util.h"
+
 #include "wutil.h"
 #include "function.h"
 #include "proc.h"

exec.c

@@ -22,7 +22,10 @@
 #include <dirent.h>
 
 #include "config.h"
+
+#include "fallback.h"
 #include "util.h"
+
 #include "common.h"
 #include "wutil.h"
 #include "proc.h"

expand.c

@@ -27,7 +27,10 @@ parameter expansion.
 #endif
 
 #include "config.h"
+
+#include "fallback.h"
 #include "util.h"
+
 #include "common.h"
 #include "wutil.h"
 #include "env.h"

fallback.c

@@ -0,0 +1,893 @@
+/**
+   This file only contains fallback implementations of functions which
+   have been found to be missing or broken by the configuration
+   scripts.
+*/
+
+#include "config.h"
+
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <wchar.h>
+#include <wctype.h>
+#include <string.h>
+#include <dirent.h>
+#include <stdarg.h>
+#include <limits.h>
+
+#if HAVE_NCURSES_H
+#include <ncurses.h>
+#else
+#include <curses.h>
+#endif
+
+#if HAVE_TERMIO_H
+#include <termio.h>
+#endif
+
+#if HAVE_TERM_H
+#include <term.h>
+#elif HAVE_NCURSES_TERM_H
+#include <ncurses/term.h>
+#endif
+
+#include "common.h"
+#include "util.h"
+
+
+#ifdef TPUTS_KLUDGE
+
+int tputs(const char *str, int affcnt, int (*putc)(tputs_arg_t))
+{
+	while( *str )
+	{
+		putc( *str++ );
+	}	
+}
+
+#endif
+
+
+#ifndef HAVE_FWPRINTF
+#define INTERNAL_FWPRINTF 1
+#endif
+
+#ifdef HAVE_BROKEN_FWPRINTF
+#define INTERNAL_FWPRINTF 1
+#endif
+
+#ifdef INTERNAL_FWPRINTF
+
+void pad( void (*writer)(wchar_t), int count)
+{
+	
+	int i;
+	if( count < 0 )
+		return;
+	
+	for( i=0; i<count; i++ )
+	{
+		writer( L' ' );
+	}
+}
+
+/**
+   Generic formatting function. All other string formatting functions
+   are secretly a wrapper around this function. vgprintf does not
+   implement all the filters supported by printf, only those that are
+   currently used by fish. vgprintf internally uses snprintf to
+   implement the number outputs, such as %f and %x.
+
+   Currently supported functionality:
+
+   - precision specification, both through .* and .N
+   - Padding through * and N
+   - Right padding using the - prefix
+   - long versions of all filters thorugh l and ll prefix
+   - Character output using %c
+   - String output through %s
+   - Floating point number output through %f
+   - Integer output through %d, %i, %u, %o, %x and %X
+
+   For a full description on the usage of *printf, see use 'man 3 printf'.
+*/
+static int vgwprintf( void (*writer)(wchar_t), 
+					  const wchar_t *filter, 
+					  va_list va )
+{
+	const wchar_t *filter_org=filter;
+	int count=0;
+	
+	for( ;*filter; filter++)
+	{
+		if(*filter == L'%')
+		{
+			int is_long=0;
+			int width = -1;
+			filter++;
+			int loop=1;
+			int precision=-1;
+			int pad_left = 1;
+			
+			if( iswdigit( *filter ) )
+			{
+				width=0;
+				while( (*filter >= L'0') && (*filter <= L'9'))
+				{
+					width=10*width+(*filter++ - L'0');
+				}				
+			}
+
+			while( loop )
+			{
+				
+				switch(*filter)
+				{
+					case L'l':
+						/* Long variable */
+						is_long++;
+						filter++;
+						break;
+
+					case L'*':
+						/* Set minimum field width */
+						width = va_arg( va, int );
+						filter++;
+						break;
+
+					case L'-':
+						filter++;
+						pad_left=0;
+						break;
+						
+					case L'.':
+						/* 
+						   Set precision.
+						*/
+						filter++;
+						if( *filter == L'*' )
+						{
+							precision = va_arg( va, int );
+						}
+						else
+						{
+							precision=0;
+							while( (*filter >= L'0') && (*filter <= L'9'))
+							{
+								precision=10*precision+(*filter++ - L'0');
+							}							
+						}
+						break;
+						
+					default:
+						loop=0;
+						break;
+				}
+			}
+
+			switch( *filter )
+			{
+				case L'c':
+				{
+					wchar_t c;
+
+					if( (width >= 0) && pad_left )
+					{
+						pad( writer, width-1 );					
+						count += maxi( width-1, 0 );						
+					}
+
+					c = is_long?va_arg(va, wint_t):btowc(va_arg(va, int));
+					if( precision != 0 )
+						writer( c );
+
+
+					if( (width >= 0) && !pad_left )
+					{
+						pad( writer, width-1 );
+						count += maxi( width-1, 0 );		
+					}
+					
+					count++;
+					
+					break;
+				}
+				case L's':
+				{		
+					
+					wchar_t *ss=0;
+					if( is_long )
+					{
+						ss = va_arg(va, wchar_t *);
+					}
+					else
+					{
+						char *ns = va_arg(va, char*);
+
+						if( ns )
+						{
+							ss = str2wcs( ns );
+						}						
+					}
+										
+					if( !ss )
+					{
+						return -1;
+					}
+					
+					if( (width >= 0) && pad_left )
+					{
+						pad( writer, width-wcslen(ss) );					
+						count += maxi(width-wcslen(ss), 0);						
+					}
+					
+					wchar_t *s=ss;
+					int precount = count;
+					
+					while( *s )
+					{
+						if( (precision > 0) && (precision <= (count-precount) ) )
+							break;
+						
+						writer( *(s++) );
+						count++;
+					}
+					
+					if( (width >= 0) && !pad_left )
+					{
+						pad( writer, width-wcslen(ss) );					
+						count += maxi( width-wcslen(ss), 0 );						
+					}
+					
+					if( !is_long )
+						free( ss );
+					
+					break;
+				}
+
+				case L'd':
+				case L'i':
+				case L'o':
+				case L'u':
+				case L'x':
+				case L'X':
+				{
+					char str[33];
+					char *pos;
+					char format[16];
+					int len;
+					
+					format[0]=0;
+					strcat( format, "%");
+					if( precision >= 0 )
+						strcat( format, ".*" );
+					switch( is_long )
+					{
+						case 2:
+							strcat( format, "ll" );
+							break;
+						case 1:
+							strcat( format, "l" );
+							break;
+					}
+					
+					len = strlen(format);
+					format[len++]=(char)*filter;
+					format[len]=0;
+
+					switch( *filter )
+					{
+						case L'd':
+						case L'i':
+						{
+							
+							switch( is_long )
+							{
+								case 0:
+								{
+									int d = va_arg( va, int );
+									if( precision >= 0 )
+										snprintf( str, 32, format, precision, d );
+									else
+										snprintf( str, 32, format, d );
+									
+									break;
+								}
+								
+								case 1:
+								{
+									long d = va_arg( va, long );
+									if( precision >= 0 )
+										snprintf( str, 32, format, precision, d );
+									else
+										snprintf( str, 32, format, d );
+									break;
+								}
+								
+								case 2:
+								{
+									long long d = va_arg( va, long long );
+									if( precision >= 0 )
+										snprintf( str, 32, format, precision, d );
+									else
+										snprintf( str, 32, format, d );
+									break;
+								}
+						
+								default:
+									debug( 0, L"Invalid length modifier in string %ls\n", filter_org );
+									return -1;
+							}
+							break;
+							
+						}
+						
+						case L'u':
+						case L'o':
+						case L'x':
+						case L'X':
+						{
+							
+							switch( is_long )
+							{
+								case 0:
+								{
+									unsigned d = va_arg( va, unsigned );
+									if( precision >= 0 )
+										snprintf( str, 32, format, precision, d );
+									else
+										snprintf( str, 32, format, d );
+									break;
+								}
+								
+								case 1:
+								{
+									unsigned long d = va_arg( va, unsigned long );
+									if( precision >= 0 )
+										snprintf( str, 32, format, precision, d );
+									else
+										snprintf( str, 32, format, d );
+									break;
+								}
+								
+								case 2:
+								{
+									unsigned long long d = va_arg( va, unsigned long long );
+									if( precision >= 0 )
+										snprintf( str, 32, format, precision, d );
+									else
+										snprintf( str, 32, format, d );
+									break;
+								}
+								
+								default:
+									debug( 0, L"Invalid length modifier in string %ls\n", filter_org );
+									return -1;
+							}
+							break;
+							
+						}
+						
+						default:
+							debug( 0, L"Invalid filter %ls in string %ls\n", *filter, filter_org );
+							return -1;
+							
+					}
+					
+					if( (width >= 0) && pad_left )
+					{
+						int l = maxi(width-strlen(str), 0 );
+						pad( writer, l );
+						count += l;
+					}
+					
+					pos = str;
+					
+					while( *pos )
+					{
+						writer( *(pos++) );
+						count++;
+					}
+					
+					if( (width >= 0) && !pad_left )
+					{
+						int l = maxi(width-strlen(str), 0 );
+						pad( writer, l );
+						count += l;
+					}
+					
+					break;
+				}
+
+				case L'f':
+				{
+					char str[32];
+					char *pos;
+					double val = va_arg( va, double );
+					
+					if( precision>= 0 )
+					{
+						if( width>= 0 )
+						{
+							snprintf( str, 32, "%*.*f", width, precision, val );
+						}
+						else
+						{
+							snprintf( str, 32, "%.*f", precision, val );
+						}
+					}
+					else
+					{
+						if( width>= 0 )
+						{
+							snprintf( str, 32, "%*f", width, val );
+						}
+						else
+						{
+							snprintf( str, 32, "%f", val );
+						}
+					}
+
+					pos = str;
+					
+					while( *pos )
+					{
+						writer( *(pos++) );
+						count++;
+					}
+					
+					break;
+				}
+
+				case L'n':
+				{
+					int *n = va_arg( va, int *);
+					
+					*n = count;					
+					break;
+				}
+				case L'%':
+				{
+					writer('%');
+					count++;
+					break;
+				}
+				default:
+					debug( 0, L"Unknown switch %lc in string %ls\n", *filter, filter_org );
+					return -1;
+			}
+		}
+		else
+		{
+			writer( *filter );
+			count++;
+		}
+	}
+
+	return count;
+}
+
+/**
+   Holds data for swprintf writer
+*/
+static struct
+{
+	int count;
+	int max;
+	wchar_t *pos;
+}
+sw_data;
+
+/**
+   Writers for string output
+*/
+static void sw_writer( wchar_t c )
+{
+	if( sw_data.count < sw_data.max )
+		*(sw_data.pos++)=c;	
+	sw_data.count++;
+}
+
+int vswprintf( wchar_t *out, size_t n, const wchar_t *filter, va_list va )
+{
+	int written;
+	
+	sw_data.pos=out;
+	sw_data.max=n;
+	sw_data.count=0;
+	written=vgwprintf( &sw_writer,
+					   filter,
+					   va );
+	if( written < n )
+	{
+		*sw_data.pos = 0;
+	}
+	else
+	{
+		written=-1;
+	}
+	
+	return written;
+}
+
+int swprintf( wchar_t *out, size_t n, const wchar_t *filter, ... )
+{
+	va_list va;
+	int written;
+	
+	va_start( va, filter );
+	written = vswprintf( out, n, filter, va );
+	va_end( va );
+	return written;
+}
+
+/**
+   Holds auxiliary data for fwprintf and wprintf writer
+*/
+static FILE *fw_data;
+
+static void fw_writer( wchar_t c )
+{
+	putwc( c, fw_data );
+}
+
+/*
+   Writers for file output
+*/
+int vfwprintf( FILE *f, const wchar_t *filter, va_list va )
+{
+	fw_data = f;
+	return vgwprintf( &fw_writer, filter, va );
+}
+
+int fwprintf( FILE *f, const wchar_t *filter, ... )
+{
+	va_list va;
+	int written;
+	
+	va_start( va, filter );
+	written = vfwprintf( f, filter, va );
+	va_end( va );
+	return written;
+}
+
+int vwprintf( const wchar_t *filter, va_list va )
+{
+	return vfwprintf( stdout, filter, va );
+}
+
+int wprintf( const wchar_t *filter, ... )
+{
+	va_list va;
+	int written;
+	
+	va_start( va, filter );
+	written=vwprintf( filter, va );
+	va_end( va );
+	return written;
+}
+
+#endif
+
+#ifndef HAVE_FGETWC
+
+wint_t fgetwc(FILE *stream)
+{
+	wchar_t res=0;
+	mbstate_t state;
+	memset (&state, '\0', sizeof (state));
+
+	while(1)
+	{
+		int b = fgetc( stream );
+		char bb;
+			
+		int sz;
+			
+		if( b == EOF )
+			return WEOF;
+
+		bb=b;
+			
+		sz = mbrtowc( &res, &bb, 1, &state );
+			
+		switch( sz )
+		{
+			case -1:
+				memset (&state, '\0', sizeof (state));
+				return WEOF;
+
+			case -2:
+				break;
+			case 0:
+				return 0;
+			default:
+				return res;
+		}
+	}
+
+}
+
+
+wint_t getwc(FILE *stream)
+{
+	return fgetwc( stream );
+}
+
+
+#endif
+
+#ifndef HAVE_FPUTWC
+
+wint_t fputwc(wchar_t wc, FILE *stream)
+{
+	int res;
+	char s[MB_CUR_MAX+1];
+	memset( s, 0, MB_CUR_MAX+1 );
+	wctomb( s, wc );
+	res = fputs( s, stream );
+	return res==EOF?WEOF:wc;
+}
+
+wint_t putwc(wchar_t wc, FILE *stream)
+{
+	return fputwc( wc, stream );
+}
+
+#endif
+
+#ifndef HAVE_WCSTOK
+
+/*
+  Used by fallback wcstok. Borrowed from glibc
+*/
+static size_t fish_wcsspn (const wchar_t *wcs,
+					  const wchar_t *accept )
+{
+	register const wchar_t *p;
+	register const wchar_t *a;
+	register size_t count = 0;
+
+	for (p = wcs; *p != L'\0'; ++p)
+    {
+		for (a = accept; *a != L'\0'; ++a)
+			if (*p == *a)
+				break;
+		
+		if (*a == L'\0')
+			return count;
+		else
+			++count;
+    }
+	return count;	
+}
+
+/*
+  Used by fallback wcstok. Borrowed from glibc
+*/
+static wchar_t *fish_wcspbrk (const wchar_t *wcs, const wchar_t *accept)
+{
+	while (*wcs != L'\0')
+		if (wcschr (accept, *wcs) == NULL)
+			++wcs;
+		else
+			return (wchar_t *) wcs;
+	return NULL;	
+}
+
+/*
+  Fallback wcstok implementation. Borrowed from glibc.
+*/
+wchar_t *wcstok(wchar_t *wcs, const wchar_t *delim, wchar_t **save_ptr)
+{
+	wchar_t *result;
+
+	if (wcs == NULL)
+    {
+		if (*save_ptr == NULL)
+        {
+			errno = EINVAL;
+			return NULL;
+        }
+		else
+			wcs = *save_ptr;
+    }
+
+	/* Scan leading delimiters.  */
+	wcs += fish_wcsspn (wcs, delim);
+	
+	if (*wcs == L'\0')
+    {
+		*save_ptr = NULL;		
+		return NULL;
+    }
+
+	/* Find the end of the token.  */
+	result = wcs;
+	
+	wcs = fish_wcspbrk (result, delim);
+	
+	if (wcs == NULL)
+	{
+		/* This token finishes the string.  */
+		*save_ptr = NULL;
+	}
+	else
+    {
+		/* Terminate the token and make *SAVE_PTR point past it.  */
+		*wcs = L'\0';
+		*save_ptr = wcs + 1;
+    }
+	return result;
+}
+
+#endif
+
+#ifndef HAVE_WCSDUP
+wchar_t *wcsdup( const wchar_t *in )
+{
+	size_t len=wcslen(in);
+	wchar_t *out = malloc( sizeof( wchar_t)*(len+1));
+	if( out == 0 )
+	{
+		return 0;
+	}
+
+	memcpy( out, in, sizeof( wchar_t)*(len+1));
+	return out;
+	
+}
+#endif
+
+#ifndef HAVE_WCSLEN
+size_t wcslen(const wchar_t *in)
+{
+	const wchar_t *end=in;
+	while( *end )
+		end++;
+	return end-in;
+}
+#endif
+
+
+#ifndef HAVE_WCSCASECMP
+int wcscasecmp( const wchar_t *a, const wchar_t *b )
+{
+	if( *a == 0 )
+	{
+		return (*b==0)?0:-1;
+	}
+	else if( *b == 0 )
+	{
+		return 1;
+	}
+	int diff = towlower(*a)-towlower(*b);
+	if( diff != 0 )
+		return diff;
+	else
+		return wcscasecmp( a+1,b+1);
+}
+#endif
+
+
+#ifndef HAVE_WCSNCASECMP
+int wcsncasecmp( const wchar_t *a, const wchar_t *b, int count )
+{
+	if( count == 0 )
+		return 0;
+	
+	if( *a == 0 )
+	{
+		return (*b==0)?0:-1;
+	}
+	else if( *b == 0 )
+	{
+		return 1;
+	}
+	int diff = towlower(*a)-towlower(*b);
+	if( diff != 0 )
+		return diff;
+	else
+		return wcsncasecmp( a+1,b+1, count-1);
+}
+#endif
+
+#ifndef HAVE_WCWIDTH
+int wcwidth( wchar_t c )
+{
+	if( c < 32 )
+		return 0;
+	if ( c == 127 )
+		return 0;
+	return 1;
+}
+#endif
+
+#ifndef HAVE_WCSNDUP
+wchar_t *wcsndup( const wchar_t *in, int c )
+{
+	wchar_t *res = malloc( sizeof(wchar_t)*(c+1) );
+	if( res == 0 )
+	{
+		return 0;
+	}
+	wcsncpy( res, in, c+1 );
+	res[c] = L'\0';	
+	return res;	
+}
+#endif
+
+long convert_digit( wchar_t d, int base )
+{
+	long res=-1;
+	if( (d <= L'9') && (d >= L'0') )
+	{
+		res = d - L'0';
+	}
+	else if( (d <= L'z') && (d >= L'a') )
+	{
+		res = d + 10 - L'a';		
+	}
+	else if( (d <= L'Z') && (d >= L'A') )
+	{
+		res = d + 10 - L'A';		
+	}
+	if( res >= base )
+	{
+		res = -1;
+	}
+	
+	return res;
+}
+
+#ifndef HAVE_WCSTOL
+long wcstol(const wchar_t *nptr, 
+			wchar_t **endptr,
+			int base)
+{
+	long long res=0;
+	int is_set=0;
+	if( base > 36 )
+	{
+		errno = EINVAL;
+		return 0;
+	}
+
+	while( 1 )
+	{
+		long nxt = convert_digit( *nptr, base );
+		if( endptr != 0 )
+			*endptr = (wchar_t *)nptr;
+		if( nxt < 0 )
+		{
+			if( !is_set )
+			{
+				errno = EINVAL;
+			}
+			return res;			
+		}
+		res = (res*base)+nxt;
+		is_set = 1;
+		if( res > LONG_MAX )
+		{
+			errno = ERANGE;
+			return LONG_MAX;
+		}
+		if( res < LONG_MIN )
+		{
+			errno = ERANGE;
+			return LONG_MIN;
+		}
+		nptr++;
+	}
+}
+#endif
+
+

fallback.h

@@ -0,0 +1,182 @@
+
+#ifndef FISH_FALLBACK_H
+#define FISH_FALLBACK_H
+
+#include <stdio.h>
+#include <stdarg.h>
+
+#ifdef TPUTS_KLUDGE
+
+
+/**
+   Linux on PPC seems to have a tputs implementation that sometimes
+   behaves strangely. This fallback seems to fix things.
+*/
+int tputs(const char *str, int affcnt, int (*putc)(tputs_arg_t));
+
+#endif
+
+/*
+  Here follows the prototypes for fallback implementations of various
+  standarcs libc functions relating to wide character support. Some of
+  these prototypes are always defined, since some libc versions
+  include the code, but you have to use special magical #defines for
+  the prototype to appear.
+*/
+
+/**
+   Print formated string. Some operating systems (Like NetBSD) do not
+   have wide string formating functions.  Therefore we implement our
+   own. Not at all complete. Supports wide and narrow characters,
+   strings and decimal numbers, position (%n), field width and
+   precision.
+*/
+int fwprintf( FILE *f, const wchar_t *format, ... );
+
+
+/**
+   Print formated string. Some operating systems (Like NetBSD) do not
+   have wide string formating functions.  Therefore we define our
+   own. Not at all complete. Supports wide and narrow characters,
+   strings and decimal numbers, position (%n), field width and
+   precision.
+*/
+int swprintf( wchar_t *str, size_t l, const wchar_t *format, ... );
+
+/**
+   Print formated string. Some operating systems (Like NetBSD) do not
+   have wide string formating functions.  Therefore we define our
+   own. Not at all complete. Supports wide and narrow characters,
+   strings and decimal numbers, position (%n), field width and
+   precision.
+*/
+int wprintf( const wchar_t *format, ... );
+
+/**
+   Print formated string. Some operating systems (Like NetBSD) do not
+   have wide string formating functions.  Therefore we define our
+   own. Not at all complete. Supports wide and narrow characters,
+   strings and decimal numbers, position (%n), field width and
+   precision.
+*/
+int vwprintf( const wchar_t *filter, va_list va );
+
+/**
+   Print formated string. Some operating systems (Like NetBSD) do not
+   have wide string formating functions.  Therefore we define our
+   own. Not at all complete. Supports wide and narrow characters,
+   strings and decimal numbers, position (%n), field width and
+   precision.
+*/
+int vfwprintf( FILE *f, const wchar_t *filter, va_list va );
+
+/**
+   Print formated string. Some operating systems (Like NetBSD) do not
+   have wide string formating functions.  Therefore we define our
+   own. Not at all complete. Supports wide and narrow characters,
+   strings and decimal numbers, position (%n), field width and
+   precision.
+*/
+int vswprintf( wchar_t *out, size_t n, const wchar_t *filter, va_list va );
+
+/**
+   Fallback implementation of fgetwc
+*/
+wint_t fgetwc(FILE *stream);
+
+/**
+   Fallback implementation of getwc
+*/
+wint_t getwc(FILE *stream);
+
+/**
+   Fallback implementation of fputwc
+*/
+wint_t fputwc(wchar_t wc, FILE *stream);
+/**
+   Fallback implementation of putwc
+*/
+wint_t putwc(wchar_t wc, FILE *stream);
+
+/**
+   Fallback implementation of wcstok. Uses code borrowed from glibc.
+*/
+wchar_t *wcstok(wchar_t *wcs, const wchar_t *delim, wchar_t **ptr);
+
+
+/**
+   Return the number of columns used by a character. This is a libc
+   function, but the prototype for this function is missing in some libc
+   implementations. 
+
+   Fish has a fallback implementation in case the implementation is
+   missing altogether.  In locales without a native wcwidth, Unicode
+   is probably so broken that it isn't worth trying to implement a
+   real wcwidth. Therefore, the fallback wcwidth assumes any printing
+   character takes up one column and anything else uses 0 columns.
+*/
+int wcwidth( wchar_t c );
+
+/**
+   Create a duplicate string. Wide string version of strdup. Will
+   automatically exit if out of memory.
+*/
+wchar_t *wcsdup(const wchar_t *in);
+
+size_t wcslen(const wchar_t *in);
+
+/**
+   Case insensitive string compare function. Wide string version of
+   strcasecmp.
+
+   This implementation of wcscasecmp does not take into account
+   esoteric locales where uppercase and lowercase do not cleanly
+   transform between each other. Hopefully this should be fine since
+   fish only uses this function with one of the strings supplied by
+   fish and guaranteed to be a sane, english word. Using wcscasecmp on
+   a user-supplied string should be considered a bug.
+*/
+int wcscasecmp( const wchar_t *a, const wchar_t *b );
+
+/**
+   Case insensitive string compare function. Wide string version of
+   strncasecmp.
+
+   This implementation of wcsncasecmp does not take into account
+   esoteric locales where uppercase and lowercase do not cleanly
+   transform between each other. Hopefully this should be fine since
+   fish only uses this function with one of the strings supplied by
+   fish and guaranteed to be a sane, english word. Using wcsncasecmp on
+   a user-supplied string should be considered a bug.
+*/
+int wcsncasecmp( const wchar_t *a, const wchar_t *b, int count );
+
+/**
+   Returns a newly allocated wide character string wich is a copy of
+   the string in, but of length c or shorter. The returned string is
+   always null terminated, and the null is not included in the string
+   length.
+*/
+wchar_t *wcsndup( const wchar_t *in, int c );
+
+/**
+   Converts from wide char to digit in the specified base. If d is not
+   a valid digit in the specified base, return -1.
+*/
+long convert_digit( wchar_t d, int base );
+
+/**
+   Fallback implementation. Convert a wide character string to a
+   number in the specified base. This functions is the wide character
+   string equivalent of strtol. For bases of 10 or lower, 0..9 are
+   used to represent numbers. For bases below 36, a-z and A-Z are used
+   to represent numbers higher than 9. Higher bases than 36 are not
+   supported.
+*/
+long wcstol(const wchar_t *nptr,
+			wchar_t **endptr,
+			int base);
+
+
+
+#endif

fish_pager.c

@@ -35,7 +35,10 @@
 
 #include <signal.h>
 
+
+#include "fallback.h"
 #include "util.h"
+
 #include "wutil.h"
 #include "common.h"
 #include "complete.h"

fish_tests.c

@@ -4,6 +4,7 @@
 
 #include "config.h"
 
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <wchar.h>
@@ -26,7 +27,9 @@
 #include <locale.h>
 #include <dirent.h>
 
+#include "fallback.h"
 #include "util.h"
+
 #include "common.h"
 #include "proc.h"
 #include "reader.h"

fishd.c

@@ -41,6 +41,7 @@ time the original barrier request was sent have been received.
 
 #include "config.h"
 
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <wchar.h>
@@ -61,7 +62,9 @@ time the original barrier request was sent have been received.
 #include <locale.h>
 #include <signal.h>
 
+#include "fallback.h"
 #include "util.h"
+
 #include "common.h"
 #include "wutil.h"
 #include "env_universal_common.h"

function.c

@@ -9,10 +9,14 @@
 #include <signal.h>
 
 #include "config.h"
+
 #include "wutil.h"
+#include "fallback.h"
 #include "util.h"
+
 #include "function.h"
 #include "proc.h"
+#include "translate.h"
 #include "parser.h"
 #include "common.h"
 #include "intern.h"
@@ -227,7 +231,7 @@ const wchar_t *function_get_desc( const wchar_t *argv )
 	if( data == 0 )
 		return 0;
 	
-	return data->desc;
+	return _(data->desc);
 }
 
 void function_set_desc( const wchar_t *name, const wchar_t *desc )

halloc.c

@@ -8,10 +8,13 @@
 
 #include "config.h"
 
+
 #include <stdlib.h>
 #include <unistd.h>
 
+#include "fallback.h"
 #include "util.h"
+
 #include "common.h"
 #include "halloc.h"
 

halloc_util.c

@@ -8,11 +8,14 @@
 
 #include "config.h"
 
+
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
 
+#include "fallback.h"
 #include "util.h"
+
 #include "common.h"
 #include "halloc.h"
 

highlight.c

@@ -12,7 +12,10 @@
 #include <signal.h>
 
 #include "config.h"
+
+#include "fallback.h"
 #include "util.h"
+
 #include "wutil.h"
 #include "highlight.h"
 #include "tokenizer.h"

history.c

@@ -12,7 +12,10 @@
 
 
 #include "config.h"
+
+#include "fallback.h"
 #include "util.h"
+
 #include "wutil.h"
 #include "history.h"
 #include "common.h"

input.c

@@ -43,7 +43,10 @@ implementation in fish is as of yet incomplete.
 #include <wctype.h>
 
 
+
+#include "fallback.h"
 #include "util.h"
+
 #include "wutil.h"
 #include "reader.h"
 #include "proc.h"

input_common.c

@@ -5,6 +5,7 @@ Implementation file for the low level input library
 */
 #include "config.h"
 
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
@@ -15,7 +16,9 @@ Implementation file for the low level input library
 #include <wchar.h>
 
 
+#include "fallback.h"
 #include "util.h"
+
 #include "common.h"
 #include "wutil.h"
 #include "input_common.h"

intern.c

@@ -5,12 +5,15 @@
 */
 #include "config.h"
 
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <wchar.h>
 #include <unistd.h>
 
+#include "fallback.h"
 #include "util.h"
+
 #include "wutil.h"
 #include "common.h"
 #include "intern.h"

io.c

@@ -5,6 +5,7 @@ Utilities for io redirection.
 */
 #include "config.h"
 
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <wchar.h>
@@ -31,7 +32,9 @@ Utilities for io redirection.
 #include <ncurses/term.h>
 #endif
 
+#include "fallback.h"
 #include "util.h"
+
 #include "wutil.h"
 #include "exec.h"
 #include "common.h"

kill.c

@@ -18,7 +18,10 @@
 
 
 #include "config.h"
+
+#include "fallback.h"
 #include "util.h"
+
 #include "wutil.h"
 #include "kill.h"
 #include "proc.h"

main.c

@@ -23,6 +23,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "config.h"
 
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <wchar.h>
@@ -40,7 +41,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <locale.h>
 #include <signal.h>
 
+#include "fallback.h"
 #include "util.h"
+
 #include "common.h"
 #include "reader.h"
 #include "builtin.h"

mimedb.c

@@ -21,6 +21,7 @@ license. Read the source code of the library for more information.
 
 #include "config.h"
 
+
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -43,8 +44,10 @@ license. Read the source code of the library for more information.
 #endif
 
 #include "xdgmime.h"
+#include "fallback.h"
 #include "util.h"
 
+
 /**
    Location of the applications .desktop file, relative to a base mime directory
 */

output.c

@@ -38,7 +38,10 @@
 #include <time.h>
 #include <wchar.h>
 
+
+#include "fallback.h"
 #include "util.h"
+
 #include "wutil.h"
 #include "expand.h"
 #include "common.h"
@@ -292,15 +295,7 @@ int writeb( tputs_arg_t b )
 
 int writembs( char *str )
 {
-#ifdef TPUTS_KLUDGE
-	while( *str )
-	{
-		out( *str );
-	}
-#else
-	tputs(str,1,writeb);
-#endif
-	return 0;
+	return tputs(str,1,&writeb)==ERR?1:0;
 }
 
 int writech( wint_t ch )

parse_util.c

@@ -6,6 +6,7 @@
 
 #include "config.h"
 
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <sys/types.h>
@@ -17,7 +18,9 @@
 #include <time.h>
 #include <assert.h>
 
+#include "fallback.h"
 #include "util.h"
+
 #include "wutil.h"
 #include "common.h"
 #include "tokenizer.h"

parser.c

@@ -18,7 +18,10 @@ The fish parser. Contains functions for parsing code.
 #include <signal.h>
 
 #include "config.h"
+
+#include "fallback.h"
 #include "util.h"
+
 #include "common.h"
 #include "wutil.h"
 #include "proc.h"

po/de.po

@@ -1300,11 +1300,11 @@ msgstr "fish"
 
 #: init/fish_interactive.fish.in:13 init/fish_interactive.fish:13
 msgid "Welcome to fish, the friendly interactive shell\\n"
-msgstr "Willkommen zu fish, der Freundlichen Interaktiven SHell"
+msgstr "Willkommen zu fish, der Freundlichen Interaktiven Shell\\n"
 
 #: init/fish_interactive.fish.in:14 init/fish_interactive.fish:14
 msgid "Type %shelp%s for instructions on how to use fish\\n"
-msgstr "Anweisungen zur fish-Benutzung erhalten Sie über %shelp%s "
+msgstr "Anweisungen zur fish-Benutzung erhalten Sie über %shelp%s\\n"
 
 #: init/fish_interactive.fish.in:20 init/fish_interactive.fish:20
 msgid "Commands to execute when fish exits"

proc.c

@@ -42,7 +42,10 @@ Some of the code in this file is based on code from the Glibc manual.
 #include <ncurses/term.h>
 #endif
 
+
+#include "fallback.h"
 #include "util.h"
+
 #include "wutil.h"
 #include "proc.h"
 #include "common.h"

reader.c

@@ -59,7 +59,10 @@ commence.
 
 #include <assert.h>
 
+
+#include "fallback.h"
 #include "util.h"
+
 #include "wutil.h"
 #include "highlight.h"
 #include "reader.h"

sanity.c

@@ -14,7 +14,10 @@
 
 
 #include "config.h"
+
+#include "fallback.h"
 #include "util.h"
+
 #include "common.h"
 #include "sanity.h"
 #include "proc.h"

set_color.c

@@ -1,5 +1,6 @@
 #include "config.h"
 
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>

share/completions/apm.fish

@@ -1,8 +1,8 @@
 #apm
-complete -f -c apm -s V -l version -d (_ "Display version and exit")
-complete -f -c apm -s v -l verbose -d (_ "Print APM info")
-complete -f -c apm -s m -l minutes -d (_ "Print time remaining")
-complete -f -c apm -s M -l monitor -d (_ "Monitor status info")
-complete -f -c apm -s S -l standby -d (_ "Request APM standby mode")
-complete -f -c apm -s s -l suspend -d (_ "Request APM suspend mode")
-complete -f -c apm -s d -l debug -d (_ "APM status debugging info")
+complete -f -c apm -s V -l version -d (N_ "Display version and exit")
+complete -f -c apm -s v -l verbose -d (N_ "Print APM info")
+complete -f -c apm -s m -l minutes -d (N_ "Print time remaining")
+complete -f -c apm -s M -l monitor -d (N_ "Monitor status info")
+complete -f -c apm -s S -l standby -d (N_ "Request APM standby mode")
+complete -f -c apm -s s -l suspend -d (N_ "Request APM suspend mode")
+complete -f -c apm -s d -l debug -d (N_ "APM status debugging info")

share/completions/apropos.fish

@@ -2,20 +2,20 @@
 function __fish_complete_apropos
 	if test (commandline -ct)
 		set str (commandline -ct)
-		apropos $str|sed -e "s/^\(.*$str\([^ ]*\).*\)$/$str\2\t\1/"
+		apropos $str|sed -e "s/^\(.*$str\([^ ]*\).*\)$/$str\2"\t"\1/"
 	end
 end
 
-complete -xc apropos -a '(__fish_complete_apropos)' -d (_ "whatis entry")
+complete -xc apropos -a '(__fish_complete_apropos)' -d (N_ "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 (_ "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 wildcards")
-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 configuration file")
-complete -f -c apropos -s V -l version -d (_ "Display version and exit")
+complete -c apropos -s h -l help -d (N_ "Display help and exit")
+complete -f -c apropos -s d -l debug -d (N_ "Print debugging info")
+complete -f -c apropos -s v -l verbose -d (N_ "Verbose mode")
+complete -f -c apropos -s r -l regex -d (N_ "Keyword as regex")
+complete -f -c apropos -s w -l wildcard -d (N_ "Keyword as wildcards")
+complete -f -c apropos -s e -l exact -d (N_ "Keyword as exactly match")
+complete -x -c apropos -s m -l system -d (N_ "Search for other system")
+complete -x -c apropos -s M -l manpath -a '(echo $MANPATH)' -d (N_ "Specify man path")
+complete -x -c apropos -s C -l config-file -d (N_ "Specify a configuration file")
+complete -f -c apropos -s V -l version -d (N_ "Display version and exit")
 

share/completions/apt-build.fish

@@ -1,29 +1,29 @@
 
 #apt-build
-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 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 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 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")
-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 (_ "Display version and exit")
+complete -c apt-build -l help -d (N_ "Display help and exit")
+complete -f -c apt-build -a update -d (N_ "Update list of packages")
+complete -f -c apt-build -a upgrade -d (N_ "Upgrade packages")
+complete -f -c apt-bulid -a world -d (N_ "Rebuild your system")
+complete -x -c apt-build -a install -d (N_ "Build and install a new package")
+complete -x -c apt-build -a source -d (N_ "Download and extract a source")
+complete -x -c apt-build -a info -d (N_ "Info on a package")
+complete -x -c apt-build -a remove -d (N_ "Remove packages")
+complete -x -c apt-build -a clean-build -d (N_ "Erase built packages")
+complete -x -c apt-build -a build-source -d (N_ "Build source without install")
+complete -x -c apt-build -a clean-sources -d (N_ "Clean source directories")
+complete -x -c apt-build -a update-source -d (N_ "Update source and rebuild")
+complete -x -c apt-build -a update-repository -d (N_ "Update the repository")
+complete -f -c apt-build -l nowrapper -d (N_ "Do not use gcc wrapper")
+complete -f -c apt-build -l remove-builddep -d (N_ "Remove build-dep")
+complete -f -c apt-build -l no-source -d (N_ "Do not download source")
+complete -f -c apt-build -l build-dir -d (N_ "Specify build-dir")
+complete -f -c apt-build -l rebuild -d (N_ "Rebuild a package")
+complete -f -c apt-build -l reinstall -d (N_ "Rebuild and install an installed package")
+complete -r -f -c apt-build -l build-command -d (N_ "Use <command> to build")
+complete -r -c apt-build -l patch -d (N_ "Apply <file> patch")
+complete -c apt-build -s p -l patch-strip -d (N_ "Prefix to strip on patch")
+complete -c apt-build -s y -l yes -d (N_ "Assume yes to all questions")
+complete -c apt-build -l purge -d (N_ "Use purge instead of remove")
+complete -c apt-build -l noupdate -d (N_ "Do not run update")
+complete -r -c apt-build -l source-list -d (N_ "Specify sources.list file")
+complete -f -c apt-build -s v -l version -d (N_ "Display version and exit")

share/completions/apt-cache.fish

@@ -1,31 +1,31 @@
 #apt-cache
-complete -c apt-cache -s h -l help -d (_ "Display help and exit")
-complete -f -c apt-cache -a gencaches -d (_ "Build apt cache")
-complete -x -c apt-cache -a showpkg -d (_ "Show package info")
-complete -f -c apt-cache -a stats -d (_ "Show cache statistics")
-complete -x -c apt-cache -a showsrc -d (_ "Show source package")
-complete -f -c apt-cache -a dump -d (_ "Show packages in cache")
-complete -f -c apt-cache -a dumpavail -d (_ "Print available list")
-complete -f -c apt-cache -a unmet -d (_ "List unmet dependencies in cache")
-complete -x -c apt-cache -a show -d (_ "Display package record")
-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 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 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 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")
-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 (_ "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")
+complete -c apt-cache -s h -l help -d (N_ "Display help and exit")
+complete -f -c apt-cache -a gencaches -d (N_ "Build apt cache")
+complete -x -c apt-cache -a showpkg -d (N_ "Show package info")
+complete -f -c apt-cache -a stats -d (N_ "Show cache statistics")
+complete -x -c apt-cache -a showsrc -d (N_ "Show source package")
+complete -f -c apt-cache -a dump -d (N_ "Show packages in cache")
+complete -f -c apt-cache -a dumpavail -d (N_ "Print available list")
+complete -f -c apt-cache -a unmet -d (N_ "List unmet dependencies in cache")
+complete -x -c apt-cache -a show -d (N_ "Display package record")
+complete -x -c apt-cache -a search -d (N_ "Search packagename by REGEX")
+complete -c apt-cache -l full -a search -d (N_ "Search full package name")
+complete -x -c apt-cache -l names-only -a search -d (N_ "Search packagename only")
+complete -x -c apt-cache -a depends -d (N_ "List dependencies for the package")
+complete -x -c apt-cache -a rdepends -d (N_ "List reverse dependencies for the package")
+complete -x -c apt-cache -a pkgnames -d (N_ "Print package name by prefix")
+complete -x -c apt-cache -a dotty -d (N_ "Generate dotty output for packages")
+complete -x -c apt-cache -a policy -d (N_ "Debug preferences file")
+complete -r -c apt-cache -s p -l pkg-cache -d (N_ "Select file to store package cache")
+complete -r -c apt-cache -s s -l src-cache -d (N_ "Select file to store source cache")
+complete -f -c apt-cache -s q -l quiet -d (N_ "Quiet mode")
+complete -f -c apt-cache -s i -l important -d (N_ "Print important dependencies")
+complete -f -c apt-cache -s a -l all-versions -d (N_ "Print full records")
+complete -f -c apt-cache -s g -l generate -d (N_ "Auto-gen package cache")
+complete -f -c apt-cache -l all-names -d (N_ "Print all names")
+complete -f -c apt-cache -l recurse -d (N_ "Dep and rdep recursive")
+complete -f -c apt-cache -l installed -d (N_ "Limit to installed")
+complete -f -c apt-cache -s v -l version -d (N_ "Display version and exit")
+complete -r -c apt-cache -s c -l config-file -d (N_ "Specify config file")
+complete -x -c apt-cache -s o -l option -d (N_ "Specify options")
 

share/completions/apt-cdrom.fish

@@ -1,13 +1,13 @@
 #apt-cdrom
-complete -c apt-cdrom -s h -l help -d (_ "Display help and exit")
-complete -r -c apt-cdrom -a add -d (_ "Add new disc to source list")
-complete -x -c apt-cdrom -a ident -d (_ "Report identity of disc")
-complete -r -c apt-cdrom -s d -l cdrom -d (_ "Mount point")
-complete -f -c apt-cdrom -s r -l rename -d (_ "Rename a disc")
-complete -f -c apt-cdrom -s m -l no-mount -d (_ "No mounting")
-complete -f -c apt-cdrom -s f -l fast -d (_ "Fast copy")
-complete -f -c apt-cdrom -s a -l thorough -d (_ "Thorough 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")
-complete -x -c apt-cdrom -s o -l option -d (_ "Specify options")
+complete -c apt-cdrom -s h -l help -d (N_ "Display help and exit")
+complete -r -c apt-cdrom -a add -d (N_ "Add new disc to source list")
+complete -x -c apt-cdrom -a ident -d (N_ "Report identity of disc")
+complete -r -c apt-cdrom -s d -l cdrom -d (N_ "Mount point")
+complete -f -c apt-cdrom -s r -l rename -d (N_ "Rename a disc")
+complete -f -c apt-cdrom -s m -l no-mount -d (N_ "No mounting")
+complete -f -c apt-cdrom -s f -l fast -d (N_ "Fast copy")
+complete -f -c apt-cdrom -s a -l thorough -d (N_ "Thorough package scan")
+complete -f -c apt-cdrom -s n -l no-act -d (N_ "No changes")
+complete -f -c apt-cdrom -s v -l version -d (N_ "Display version and exit")
+complete -r -c apt-cdrom -s c -l config-file -d (N_ "Specify config file")
+complete -x -c apt-cdrom -s o -l option -d (N_ "Specify options")

share/completions/apt-config.fish

@@ -1,7 +1,7 @@
 #apt-config
-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 (_ "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")
+complete -c apt-config -s h -l help -d (N_ "Display help and exit")
+complete -c apt-config -a shell -d (N_ "Access config file from shell")
+complete -f -c apt-config -a dump -d (N_ "Dump contents of config file")
+complete -f -c apt-config -s v -l version -d (N_ "Display version and exit")
+complete -r -c apt-config -s c -l config-file -d (N_ "Specify config file")
+complete -x -c apt-config -s o -l option -d (N_ "Specify options")

share/completions/apt-extracttemplates.fish

@@ -1,7 +1,7 @@
 
 #apt-extracttemplates
-complete -c apt-extracttemplates -s h -l help -d (_ "Display help and exit")
-complete -r -c apt-extracttemplates -s t -d (_ "Set temp dir")
-complete -r -c apt-extracttemplates -s c -d (_ "Specifiy config file")
-complete -r -c apt-extracttemplates -s o -d (_ "Specify options")
+complete -c apt-extracttemplates -s h -l help -d (N_ "Display help and exit")
+complete -r -c apt-extracttemplates -s t -d (N_ "Set temp dir")
+complete -r -c apt-extracttemplates -s c -d (N_ "Specifiy config file")
+complete -r -c apt-extracttemplates -s o -d (N_ "Specify options")
 

share/completions/apt-file.fish

@@ -1,17 +1,17 @@
 #apt-file
-complete -c apt-file -s h -l help -d (_ "Display help and exit")
-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")
-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 (_ "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 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")
+complete -c apt-file -s h -l help -d (N_ "Display help and exit")
+complete -x -c apt-file -a update -d (N_ "Resync package contents from source")
+complete -r -c apt-file -a search -d (N_ "Search package containing pattern")
+complete -r -c apt-file -a list -d (N_ "List contents of a package matching pattern")
+complete -x -c apt-file -a purge -d (N_ "Remove all gz files from cache")
+complete -r -c apt-file -s c -l cache -d (N_ "Set cache dir")
+complete -f -c apt-file -s v -l verbose -d (N_ "Verbose mode")
+complete -c apt-file -s d -l cdrom-mount -d (N_ "Use cdrom-mount-point")
+complete -f -c apt-file -s i -l ignore-case -d (N_ "Do not expand pattern")
+complete -f -c apt-file -s x -l regexp -d (N_ "Pattern is regexp")
+complete -f -c apt-file -s V -l version -d (N_ "Display version and exit")
+complete -f -c apt-file -s a -l architecture -d (N_ "Set arch")
+complete -r -c apt-file -s s -l sources-list -a "(ls /etc/apt)" -d (N_ "Set sources.list file")
+complete -f -c apt-file -s l -l package-only -d (N_ "Only display package name")
+complete -f -c apt-file -s F -l fixed-string -d (N_ "Do not expand pattern")
+complete -f -c apt-file -s y -l dummy -d (N_ "Run in dummy mode")

share/completions/apt-ftparchive.fish

@@ -1,17 +1,17 @@
 #apt-ftparchive
-complete -c apt-ftparchive -s h -l help -d (_ "Display help and exit")
-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")
-complete -f -c apt-ftparchive -a clean -d (_ "Remove records")
-complete -f -c apt-ftparchive -l md5 -d (_ "Generate MD5 sums")
-complete -f -c apt-ftparchive -s d -l db -d (_ "Use a binary db")
-complete -f -c apt-ftparchive -s q -l quiet -d (_ "Quiet mode")
-complete -f -c apt-ftparchive -l delink -d (_ "Perform delinking")
-complete -f -c apt-ftparchive -l contents -d (_ "Perform contents generation")
-complete -c apt-ftparchive -s s -l source-override -d (_ "Use source override")
-complete -f -c apt-ftparchive -l readonly -d (_ "Make caching db readonly")
-complete -f -c apt-ftparchive -s v -l version -d (_ "Display version and exit")
-complete -r -c apt-ftparchive -s c -l config-file -d (_ "Use config file")
-complete -r -c apt-ftparchive -s o -l option -d (_ "Set config options")
+complete -c apt-ftparchive -s h -l help -d (N_ "Display help and exit")
+complete -f -c apt-ftparchive -a packages -d (N_ "Generate package from source")
+complete -f -c apt-ftparchive -a sources -d (N_ "Generate source index file")
+complete -f -c apt-ftparchive -a contents -d (N_ "Generate contents file")
+complete -f -c apt-ftparchive -a release -d (N_ "Generate release file")
+complete -f -c apt-ftparchive -a clean -d (N_ "Remove records")
+complete -f -c apt-ftparchive -l md5 -d (N_ "Generate MD5 sums")
+complete -f -c apt-ftparchive -s d -l db -d (N_ "Use a binary db")
+complete -f -c apt-ftparchive -s q -l quiet -d (N_ "Quiet mode")
+complete -f -c apt-ftparchive -l delink -d (N_ "Perform delinking")
+complete -f -c apt-ftparchive -l contents -d (N_ "Perform contents generation")
+complete -c apt-ftparchive -s s -l source-override -d (N_ "Use source override")
+complete -f -c apt-ftparchive -l readonly -d (N_ "Make caching db readonly")
+complete -f -c apt-ftparchive -s v -l version -d (N_ "Display version and exit")
+complete -r -c apt-ftparchive -s c -l config-file -d (N_ "Use config file")
+complete -r -c apt-ftparchive -s o -l option -d (N_ "Set config options")

share/completions/apt-get.fish

@@ -1,6 +1,6 @@
 #completion for apt-get
 
-function __fish_apt_no_subcommand -d (_ 'Test if apt has yet to be given the subcommand')
+function __fish_apt_no_subcommand -d (N_ 'Test if apt has yet to be given the subcommand')
 	for i in (commandline -opc)
 		if contains -- $i update upgrade dselect-upgrade dist-upgrade install remove source build-dep check clean autoclean
 			return 1
@@ -9,7 +9,7 @@ function __fish_apt_no_subcommand -d (_ 'Test if apt has yet to be given the sub
 	return 0
 end
 
-function __fish_apt_use_package -d (_ 'Test if apt command should have packages as potential completion')
+function __fish_apt_use_package -d (N_ 'Test if apt command should have packages as potential completion')
 	for i in (commandline -opc)
 		if contains -- $i contains install remove build-dep
 			return 0
@@ -18,47 +18,47 @@ function __fish_apt_use_package -d (_ 'Test if apt command should have packages
 	return 1
 end
 
-complete -c apt-get -n '__fish_apt_use_package' -a '(__fish_print_packages)' -d (_ 'Package')
+complete -c apt-get -n '__fish_apt_use_package' -a '(__fish_print_packages)' -d (N_ 'Package')
 
-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')
-complete -f -n '__fish_apt_no_subcommand' -c apt-get -a 'dist-upgrade' -d (_ 'Distro upgrade')
-complete -f -n '__fish_apt_no_subcommand' -c apt-get -a 'install' -d (_ 'Install one or more packages')
-complete -f -n '__fish_apt_no_subcommand' -c apt-get -a 'remove' -d (_ 'Remove one or more packages')
-complete -f -n '__fish_apt_no_subcommand' -c apt-get -a 'source' -d (_ 'Fetch source packages')
-complete -f -n '__fish_apt_no_subcommand' -c apt-get -a 'build-dep' -d (_ 'Install/remove packages for dependencies')
-complete -f -n '__fish_apt_no_subcommand' -c apt-get -a 'check' -d (_ 'Update cache and check 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 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')
-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')
-complete -c apt-get -s b -l compile -d (_ 'Compile source packages')
-complete -c apt-get -s b -l build -d (_ 'Compile source packages')
-complete -c apt-get -l ignore-hold -d (_ 'Ignore package Holds')
-complete -c apt-get -l no-upgrade -d (_ "Do not upgrade packages")
-complete -c apt-get -l force-yes -d (_ 'Force yes')
-complete -c apt-get -l print-uris -d (_ 'Print the URIs')
-complete -c apt-get -l purge -d (_ 'Use purge instead of remove')
-complete -c apt-get -l reinstall -d (_ 'Reinstall packages')
-complete -c apt-get -l list-cleanup -d (_ 'Erase obsolete files')
-complete -c apt-get -s t -l target-release -d (_ 'Control default input to the policy engine')
-complete -c apt-get -l trivial-only -d (_ 'Only perform operations that are trivial')
-complete -c apt-get -l no-remove -d (_ 'Abort if any packages are to be removed')
-complete -c apt-get -l only-source -d (_ 'Only accept source packages')
-complete -c apt-get -l diff-only -d (_ 'Download only diff file')
-complete -c apt-get -l tar-only -d (_ 'Download only tar file')
-complete -c apt-get -l arch-only -d (_ 'Only process arch-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')
-complete -r -c apt-get -s o -l option -d (_ 'Set a config option')
+complete -c apt-get -s h -l help -d (N_ 'Display help and exit')
+complete -f -n '__fish_apt_no_subcommand' -c apt-get -a 'update' -d (N_ 'Update sources')
+complete -f -n '__fish_apt_no_subcommand' -c apt-get -a 'upgrade' -d (N_ 'Upgrade or install newest packages')
+complete -f -n '__fish_apt_no_subcommand' -c apt-get -a 'dselect-upgrade' -d (N_ 'Use with dselect front-end')
+complete -f -n '__fish_apt_no_subcommand' -c apt-get -a 'dist-upgrade' -d (N_ 'Distro upgrade')
+complete -f -n '__fish_apt_no_subcommand' -c apt-get -a 'install' -d (N_ 'Install one or more packages')
+complete -f -n '__fish_apt_no_subcommand' -c apt-get -a 'remove' -d (N_ 'Remove one or more packages')
+complete -f -n '__fish_apt_no_subcommand' -c apt-get -a 'source' -d (N_ 'Fetch source packages')
+complete -f -n '__fish_apt_no_subcommand' -c apt-get -a 'build-dep' -d (N_ 'Install/remove packages for dependencies')
+complete -f -n '__fish_apt_no_subcommand' -c apt-get -a 'check' -d (N_ 'Update cache and check dependencies')
+complete -f -n '__fish_apt_no_subcommand' -c apt-get -a 'clean' -d (N_ 'Clean local caches and packages')
+complete -f -n '__fish_apt_no_subcommand' -c apt-get -a 'autoclean' -d (N_ 'Clean packages no longer be downloaded')
+complete -c apt-get -s d -l download-only -d (N_ 'Download Only')
+complete -c apt-get -s f -l fix-broken -d (N_ 'Correct broken dependencies')
+complete -c apt-get -s m -l fix-missing -d (N_ 'Ignore missing packages')
+complete -c apt-get -l no-download -d (N_ 'Disable downloading packages')
+complete -c apt-get -s q -l quiet -d (N_ 'Quiet mode')
+complete -c apt-get -s s -l simulate -d (N_ 'Perform a simulation')
+complete -c apt-get -s y -l assume-yes -d (N_ 'Automatic yes to prompts')
+complete -c apt-get -s u -l show-upgraded -d (N_ 'Show upgraded packages')
+complete -c apt-get -s V -l verbose-versions -d (N_ 'Show full versions for packages')
+complete -c apt-get -s b -l compile -d (N_ 'Compile source packages')
+complete -c apt-get -s b -l build -d (N_ 'Compile source packages')
+complete -c apt-get -l ignore-hold -d (N_ 'Ignore package Holds')
+complete -c apt-get -l no-upgrade -d (N_ "Do not upgrade packages")
+complete -c apt-get -l force-yes -d (N_ 'Force yes')
+complete -c apt-get -l print-uris -d (N_ 'Print the URIs')
+complete -c apt-get -l purge -d (N_ 'Use purge instead of remove')
+complete -c apt-get -l reinstall -d (N_ 'Reinstall packages')
+complete -c apt-get -l list-cleanup -d (N_ 'Erase obsolete files')
+complete -c apt-get -s t -l target-release -d (N_ 'Control default input to the policy engine')
+complete -c apt-get -l trivial-only -d (N_ 'Only perform operations that are trivial')
+complete -c apt-get -l no-remove -d (N_ 'Abort if any packages are to be removed')
+complete -c apt-get -l only-source -d (N_ 'Only accept source packages')
+complete -c apt-get -l diff-only -d (N_ 'Download only diff file')
+complete -c apt-get -l tar-only -d (N_ 'Download only tar file')
+complete -c apt-get -l arch-only -d (N_ 'Only process arch-dependant build-dependencies')
+complete -c apt-get -l allow-unauthenticated -d (N_ 'Ignore non-authenticated packages')
+complete -c apt-get -s v -l version -d (N_ 'Display version and exit')
+complete -r -c apt-get -s c -l config-file -d (N_ 'Specify a config file')
+complete -r -c apt-get -s o -l option -d (N_ 'Set a config option')
 

share/completions/apt-key.fish

@@ -1,5 +1,5 @@
 #apt-key
-complete -r -c apt-key -a add -d (_ "Add a new key")
-complete -f -c apt-key -a del -d (_ "Remove a key")
-complete -f -c apt-key -a list -d (_ "List trusted keys")
+complete -r -c apt-key -a add -d (N_ "Add a new key")
+complete -f -c apt-key -a del -d (N_ "Remove a key")
+complete -f -c apt-key -a list -d (N_ "List trusted keys")
 

share/completions/apt-listbugs.fish

@@ -1,25 +1,25 @@
 #apt-listbugs
-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 -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 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")
-complete -f -c apt-listbugs -s I -l index -d (_ "Use the raw index.db")
-complete -f -c apt-listbugs -s X -l indexdir -d (_ "Specify index dir")
-complete -f -c apt-listbugs -s P -l pin-priority -d (_ "Specify Pin-Priority value")
-complete -f -c apt-listbugs -l title -d (_ "Specify the title of rss")
-complete -f -c apt-listbugs -s f -l force-download -d (_ "Retrieve fresh bugs")
-complete -f -c apt-listbugs -s q -l quiet -d (_ "Do not display progress bar")
-complete -f -c apt-listbugs -s c -l cache-dir -a "/var/cache/apt-listbugs/" -d (_ "Specify local cache dir")
-complete -f -c apt-listbugs -s t -l timer -d (_ "Specify the expire cache timer")
-complete -c apt-listbugs -s C -l aptconf -d (_ "Specify apt config file")
-complete -f -c apt-listbugs -s y -l force-yes -d (_ "Assume 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 packages")
-complete -c apt-listbugs -a rss -d (_ "List bugs in rss format")
+complete -c apt-listbugs -s h -l help -d (N_ "Display help and exit")
+complete -f -c apt-listbugs -s s -l severity -a "critical grave"  -d (N_ "Set severity")
+complete -f -c apt-listbugs -s T -l tag -d (N_ "Tags you want to see")
+complete -f -c apt-listbugs -s S -l stats -a "outstanding 'pending upload' resolved done open" -d (N_ "Bug-status you want to see")
+complete -f -c apt-listbugs -s l -l showless -d (N_ "Ignore bugs in your system")
+complete -f -c apt-listbugs -s g -l showgreater -d (N_ "Ignore newer bugs than upgrade packages")
+complete -f -c apt-listbugs -s D -l show-downgrade -d (N_ "Bugs for downgrade packages")
+complete -f -c apt-listbugs -s H -l hostname -a "osdn.debian.or.jp" -d (N_ "Bug Tracking system")
+complete -f -c apt-listbugs -s p -l port -d (N_ "Specify port for web interface")
+complete -f -c apt-listbugs -s R -l release-critical -d (N_ "Use daily bug report")
+complete -f -c apt-listbugs -s I -l index -d (N_ "Use the raw index.db")
+complete -f -c apt-listbugs -s X -l indexdir -d (N_ "Specify index dir")
+complete -f -c apt-listbugs -s P -l pin-priority -d (N_ "Specify Pin-Priority value")
+complete -f -c apt-listbugs -l title -d (N_ "Specify the title of rss")
+complete -f -c apt-listbugs -s f -l force-download -d (N_ "Retrieve fresh bugs")
+complete -f -c apt-listbugs -s q -l quiet -d (N_ "Do not display progress bar")
+complete -f -c apt-listbugs -s c -l cache-dir -a "/var/cache/apt-listbugs/" -d (N_ "Specify local cache dir")
+complete -f -c apt-listbugs -s t -l timer -d (N_ "Specify the expire cache timer")
+complete -c apt-listbugs -s C -l aptconf -d (N_ "Specify apt config file")
+complete -f -c apt-listbugs -s y -l force-yes -d (N_ "Assume yes to all questions")
+complete -f -c apt-listbugs -s n -l force-no -d (N_ "Assume no to all questions")
+complete -c apt-listbugs -a list -d (N_ "List bugs from packages")
+complete -c apt-listbugs -a rss -d (N_ "List bugs in rss format")
 

share/completions/apt-listchanges.fish

@@ -1,13 +1,13 @@
 #apt-listchanges
-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 mode")
-complete -f -c apt-listchanges -s f -l frontend -a "pager browser xterm-pager xterm-browser text mail none" -d (_ "Select frontend interface")
-complete -r -f -c apt-listchanges -l email-address -d (_ "Specify email address")
-complete -f -c apt-listchanges -s c -l confirm -d (_ "Ask confirmation")
-complete -f -c apt-listchanges -s a -l all -d (_ "Display all changelogs")
-complete -r -c apt-listchanges -l save_seen -d (_ "Avoid changelogs from db in named file")
-complete -r -f -c apt-listchanges -l which -a "news changelogs both" -d (_ "Select display")
-complete -f -c apt-listchanges -s h -l headers -d (_ "Insert header")
-complete -f -c apt-listchanges -l debug -d (_ "Display debug info")
-complete -r -c apt-listchanges -l profile -d (_ "Select an option profile")
+complete -c apt-listchanges -l help -d (N_ "Display help and exit")
+complete -c apt-listchanges -l apt -d (N_ "Read filenames from pipe")
+complete -f -c apt-listchanges -s v -l verbose -d (N_ "Verbose mode")
+complete -f -c apt-listchanges -s f -l frontend -a "pager browser xterm-pager xterm-browser text mail none" -d (N_ "Select frontend interface")
+complete -r -f -c apt-listchanges -l email-address -d (N_ "Specify email address")
+complete -f -c apt-listchanges -s c -l confirm -d (N_ "Ask confirmation")
+complete -f -c apt-listchanges -s a -l all -d (N_ "Display all changelogs")
+complete -r -c apt-listchanges -l save_seen -d (N_ "Avoid changelogs from db in named file")
+complete -r -f -c apt-listchanges -l which -a "news changelogs both" -d (N_ "Select display")
+complete -f -c apt-listchanges -s h -l headers -d (N_ "Insert header")
+complete -f -c apt-listchanges -l debug -d (N_ "Display debug info")
+complete -r -c apt-listchanges -l profile -d (N_ "Select an option profile")

share/completions/apt-move.fish

@@ -1,22 +1,22 @@
 #apt-move
-complete -c apt-move -a get -d (_ "Generate master file")
-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 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 -c apt-move -a get -d (N_ "Generate master file")
+complete -c apt-move -a getlocal -d (N_ "Alias for 'get'")
+complete -f -c apt-move -a move -d (N_ "Move packages to local tree")
+complete -f -c apt-move -a delete -d (N_ "Delete obsolete package files")
+complete -f -c apt-move -a packages -d (N_ "Build new local files")
+complete -f -c apt-move -a fsck -d (N_ "Rebuild index files")
+complete -f -c apt-move -a update -d (N_ "Move packages from cache to local mirror")
+complete -f -c apt-move -a local -d (N_ "Alias for 'move delete packages'")
+complete -f -c apt-move -a localupdate -d (N_ "Alias for 'update'")
+complete -f -c apt-move -a mirror -d (N_ "Download package missing from mirror")
+complete -f -c apt-move -a sync -d (N_ "Sync packages installed")
 complete -f -c apt-move -a exclude -d 'test $LOCALDIR/.exclude file'
-complete -c apt-move -a movefile -d (_ "Move file specified on commandline")
-complete -f -c apt-move -a listbin -d (_ "List packages 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 f -d (_ "Force deletion")
-complete -f -c apt-move -s q -d (_ "Suppresses normal output")
-complete -f -c apt-move -s t -d (_ "Test run")
+complete -c apt-move -a movefile -d (N_ "Move file specified on commandline")
+complete -f -c apt-move -a listbin -d (N_ "List packages that may serve as input to mirrorbin or mirrorsource" )
+complete -f -c apt-move -a mirrorbin -d (N_ "Fetch package from STDIN")
+complete -f -c apt-move -a mirrorsrc -d (N_ "Fetch source package from STDIN")
+complete -f -c apt-move -s a -d (N_ "Process all packages")
+complete -c apt-move -s c -d (N_ "Use specific conffile")
+complete -f -c apt-move -s f -d (N_ "Force deletion")
+complete -f -c apt-move -s q -d (N_ "Suppresses normal output")
+complete -f -c apt-move -s t -d (N_ "Test run")

share/completions/apt-proxy-import.fish

@@ -1,10 +1,10 @@
 #apt-proxy-import
-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')
-complete -r -c apt-proxy-import -s u -l user -a '(__fish_complete_users)' -d (_ 'Change to user')
-complete -r -c apt-proxy-import -s d -l debug -d (_ 'Debug level[default 0]')
+complete -c apt-proxy-import -s h -l help -d (N_ 'Display help and exit')
+complete -f -c apt-proxy-import -s V -l version -d (N_ 'Display version and exit')
+complete -f -c apt-proxy-import -s v -l verbose -d (N_ 'Verbose mode')
+complete -f -c apt-proxy-import -s q -l quiet -d (N_ 'No message to STDOUT')
+complete -f -c apt-proxy-import -s r -l recursive -d (N_ 'Recurse into subdir')
+complete -r -c apt-proxy-import -s i -l import-dir -a '(ls -Fp|grep /$)' -d (N_ 'Dir to import')
+complete -r -c apt-proxy-import -s u -l user -a '(__fish_complete_users)' -d (N_ 'Change to user')
+complete -r -c apt-proxy-import -s d -l debug -d (N_ 'Debug level[default 0]')
 

share/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 build 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 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")
+complete -c apt-rdepends -l help -d (N_ "Display help and exit")
+complete -f -c apt-rdepends -s b -l build-depends -d (N_ "Show build dependencies")
+complete -f -c apt-rdepends -s d -l dotty -d (N_ "Generate a dotty graph")
+complete -f -c apt-rdepends -s p -l print-state -d (N_ "Show state of dependencies")
+complete -f -c apt-rdepends -s r -l reverse -d (N_ "List packages depending on")
+complete -r -f -c apt-rdepends -s f -l follow -d (N_ "Comma-separated list of dependancy types to follow recursively")
+complete -r -f -c apt-rdepends -s s -l show -d (N_ "Comma-separated list of dependancy types to show")
+complete -r -f -c apt-rdepends -l state-follow -d (N_ "Comma-separated list of package installation states to follow recursively")
+complete -r -f -c apt-rdepends -l state-show -d (N_ "Comma-separated list of package installation states to show")
+complete -f -c apt-rdepends -l man -d (N_ "Display man page")
+complete -f -c apt-rdepends -l version -d (N_ "Display version and exit")
 

share/completions/apt-setup.fish

@@ -1,4 +1,4 @@
 #apt-setup
-complete -c apt-setup -a probe -d (_ "Probe a CD")
-complete -c apt-setup -s N -d (_ "Run in noninteractive mode")
+complete -c apt-setup -a probe -d (N_ "Probe a CD")
+complete -c apt-setup -s N -d (N_ "Run in noninteractive mode")
 

share/completions/apt-show-source.fish

@@ -1,10 +1,10 @@
 #apt-show-source
-complete -c apt-show-source -s h -l help -d (_ 'Display help and exit')
-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 source packages with version')
-complete -f -c apt-show-source -s v -l verbose -d (_ 'Verbose mode')
+complete -c apt-show-source -s h -l help -d (N_ 'Display help and exit')
+complete -r -c apt-show-source -l status-file -d (N_ 'Read package from file') -f
+complete -r -c apt-show-source -o stf -d (N_ 'Read package from file') -f
+complete -r -c apt-show-source -l list-dir -a '(ls -Fp .|grep /$) /var/lib/apt/lists' -d (N_ 'Specify APT list dir')
+complete -r -c apt-show-source -o ld -a '(ls -Fp .|grep /$) /var/lib/apt/lists' -d (N_ 'Specify APT list dir')
+complete -r -c apt-show-source -s p -l package -a '(apt-cache pkgnames)' -d (N_ 'List PKG info')
+complete -f -c apt-show-source -l version-only -d (N_ 'Display version and exit')
+complete -f -c apt-show-source -s a -l all -d (N_ 'Print all source packages with version')
+complete -f -c apt-show-source -s v -l verbose -d (N_ 'Verbose mode')

share/completions/apt-show-versions.fish

@@ -1,14 +1,14 @@
 #apt-show-versions
-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 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 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 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')
+complete -c apt-show-source -s h -l help -d (N_ 'Display help and exit')
+complete -r -c apt-show-versions -s p -l packages -a '(apt-cache pkgnames)' -d (N_ 'Print PKG versions')
+complete -f -c apt-show-versions -s r -l regex -d (N_ 'Using regex')
+complete -f -c apt-show-versions -s u -l upgradeable -d (N_ 'Print only upgradeable packages')
+complete -f -c apt-show-versions -s a -l allversions -d (N_ 'Print all versions')
+complete -f -c apt-show-versions -s b -l brief -d (N_ 'Print package name/distro')
+complete -f -c apt-show-versions -s v -l verbose -d (N_ 'Print verbose info')
+complete -f -c apt-show-versions -s i -l initialize -d (N_ 'Init or update cache only')
+complete -r -c apt-show-versions -l status-file -d (N_ 'Read package from file')
+complete -r -c apt-show-versions -o stf -d (N_ 'Read package from file')
+complete -r -c apt-show-versions -l list-dir -a '(ls -Fp .|grep /$) /var/lib/apt/lists /var/state/apt/lists' -d (N_ 'Specify APT list dir')
+complete -r -c apt-show-versions -o ld -a '(ls -Fp .|grep /$) /var/lib/apt/lists /var/state/apt/lists' -d (N_ 'Specify APT list dir')
 

share/completions/apt-sortpkgs.fish

@@ -1,7 +1,7 @@
 #apt-sortpkgs
-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 (_ "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")
+complete -c apt-sortpkgs -s h -l help -d (N_ "Display help and exit")
+complete -f -c apt-sortpkgs -s s -l source -d (N_ "Use source index field")
+complete -f -c apt-sortpkgs -s v -l version -d (N_ "Display version and exit")
+complete -r -c apt-sortpkgs -s c -l conf-file -d (N_ "Specify conffile")
+complete -r -f -c apt-sortpkgs -s o -l option -d (N_ "Set config options")
 

share/completions/apt-spy.fish

@@ -1,20 +1,20 @@
 #apt-spy
-complete -c apt-spy -s h -d (_ "Display help and exit")
-complete -f -c apt-spy -s d -a "stable testing unstable" -d (_ "Debian distribution")
-complete -f -c apt-spy -s a -a "Africa Asia Europe North-America Oceania South-America" -d (_ "Servers in the areas")
-complete -c apt-spy -s c -d (_ "Conf file")
-complete -f -c apt-spy -s e -d (_ "Finish after number of servers")
-complete -c apt-spy -s f -d (_ "File to grab servers")
-complete -c apt-spy -s i -d (_ "File as input")
-complete -c apt-spy -s m -d (_ "Mirror-list file")
-complete -c apt-spy -s o -d (_ "Output sources.list file")
-complete -f -c apt-spy -s p -d (_ "Use proxy server")
-complete -f -c apt-spy -s s -d (_ "Comma separated country list")
-complete -f -c apt-spy -s t -d (_ "How long in sec to download")
-complete -f -c apt-spy -s u -d (_ "Custom URL to get mirror list")
-complete -c apt-spy -s w -d (_ "Write top servers to file")
-complete -f -c apt-spy -s n -d (_ "Number of top servers")
-complete -f -c apt-spy -a "update" -d (_ "Update mirror list")
-complete -f -c apt-spy -s v -d (_ "Version number")
+complete -c apt-spy -s h -d (N_ "Display help and exit")
+complete -f -c apt-spy -s d -a "stable testing unstable" -d (N_ "Debian distribution")
+complete -f -c apt-spy -s a -a "Africa Asia Europe North-America Oceania South-America" -d (N_ "Servers in the areas")
+complete -c apt-spy -s c -d (N_ "Conf file")
+complete -f -c apt-spy -s e -d (N_ "Finish after number of servers")
+complete -c apt-spy -s f -d (N_ "File to grab servers")
+complete -c apt-spy -s i -d (N_ "File as input")
+complete -c apt-spy -s m -d (N_ "Mirror-list file")
+complete -c apt-spy -s o -d (N_ "Output sources.list file")
+complete -f -c apt-spy -s p -d (N_ "Use proxy server")
+complete -f -c apt-spy -s s -d (N_ "Comma separated country list")
+complete -f -c apt-spy -s t -d (N_ "How long in sec to download")
+complete -f -c apt-spy -s u -d (N_ "Custom URL to get mirror list")
+complete -c apt-spy -s w -d (N_ "Write top servers to file")
+complete -f -c apt-spy -s n -d (N_ "Number of top servers")
+complete -f -c apt-spy -a "update" -d (N_ "Update mirror list")
+complete -f -c apt-spy -s v -d (N_ "Version number")
 
 

share/completions/apt-src.fish

@@ -1,24 +1,24 @@
 #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 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")
-complete -c apt-src -s c -l here -d (_ "Run on current dir")
-complete -f -c apt-src -l upstream-version -d (_ "Omit debian version")
-complete -f -c apt-src -s k -l keep-built -d (_ "Do not del built files")
-complete -f -c apt-src -s n -l no-delete-source -d (_ "Do not del source files")
-complete -f -c apt-src -l version -d (_ "Source tree version")
-complete -f -c apt-src -s q -l quiet -d (_ "Output to /dev/null")
-complete -f -c apt-src -s t -l trace -d (_ "Output trace")
+complete -c apt-src -s h -l help -d (N_ "Display help and exit")
+complete -f -c apt-src -a "update" -d (N_ "Update list of source packages")
+complete -f -c apt-src -a "install" -d (N_ "Install source packages")
+complete -f -c apt-src -a "upgrade" -d (N_ "Upgrade source packages")
+complete -f -c apt-src -a "remove" -d (N_ "Remove source packages")
+complete -f -c apt-src -a "build" -d (N_ "Build source packages")
+complete -f -c apt-src -a "clean" -d (N_ "Clean source packages")
+complete -f -c apt-src -a "import" -d (N_ "Detect known source tree")
+complete -f -c apt-src -a "list" -d (N_ "List installed source package\(s\)")
+complete -f -c apt-src -a "location" -d (N_ "Root source tree")
+complete -f -c apt-src -a "version" -d (N_ "Version of source package")
+complete -f -c apt-src -a "name" -d (N_ "Name of the source package")
+complete -f -c apt-src -s b -l build -d (N_ "Build source packages")
+complete -f -c apt-src -s i -l installdebs -d (N_ "Install after build")
+complete -f -c apt-src -s p -l patch -d (N_ "Patch local changes")
+complete -r -c apt-src -s l -l location -d (N_ "Specify a dir")
+complete -c apt-src -s c -l here -d (N_ "Run on current dir")
+complete -f -c apt-src -l upstream-version -d (N_ "Omit debian version")
+complete -f -c apt-src -s k -l keep-built -d (N_ "Do not del built files")
+complete -f -c apt-src -s n -l no-delete-source -d (N_ "Do not del source files")
+complete -f -c apt-src -l version -d (N_ "Source tree version")
+complete -f -c apt-src -s q -l quiet -d (N_ "Output to /dev/null")
+complete -f -c apt-src -s t -l trace -d (N_ "Output trace")

share/completions/apt-zip-inst.fish

@@ -1,10 +1,10 @@
 #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 (_ "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 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")
+complete -c apt-zip-inst -s h -l help -d (N_ "Display help and exit")
+complete -f -c apt-zip-inst -s V -l version -d (N_ "Display version and exit")
+complete -c apt-zip-inst -s m -l medium -d (N_ "Removable medium")
+complete -f -c apt-zip-inst -s a -l aptgetaction -a "dselect-upgrade upgrade dist-upgrade" -d (N_ "Select an action")
+complete -c apt-zip-inst -s p -l packages -d (N_ "List of packages to install")
+complete -f -c apt-zip-inst -s f -l fix-broken -d (N_ "Fix broken option")
+complete -c apt-zip-inst -l skip-mount -d (N_ "Specify a non-mountpoint dir")
 
 

share/completions/apt-zip-list.fish

@@ -1,13 +1,13 @@
 #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 (_ "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 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")
-complete -c apt-zip-list -s o -l options -a "tar restart" -d (_ "Specify options")
-complete -c apt-zip-list -s A -l accept -a "http ftp" -d (_ "Accept protocols")
-complete -c apt-zip-list -s R -l reject -a "http ftp" -d (_ "Reject protocols")
+complete -c apt-zip-list -s h -l help -d (N_ "Display help and exit")
+complete -f -c apt-zip-list -s V -l version -d (N_ "Display version and exit")
+complete -c apt-zip-list -s m -l medium -d (N_ "Removable medium")
+complete -f -c apt-zip-list -s a -l aptgetaction -a "dselect-upgrade upgrade dist-upgrade" -d (N_ "Select an action")
+complete -c apt-zip-list -s p -l packages -d (N_ "List of packages to install")
+complete -f -c apt-zip-list -s f -l fix-broken -d (N_ "Fix broken option")
+complete -c apt-zip-list -l skip-mount -d (N_ "Specify a non-mountpoint dir")
+complete -c apt-zip-list -s M -l method -d (N_ "Select a method")
+complete -c apt-zip-list -s o -l options -a "tar restart" -d (N_ "Specify options")
+complete -c apt-zip-list -s A -l accept -a "http ftp" -d (N_ "Accept protocols")
+complete -c apt-zip-list -s R -l reject -a "http ftp" -d (N_ "Reject protocols")
 

share/completions/arp.fish

@@ -1,11 +1,11 @@
 #completion for arp
-complete -c arp -s v -l verbose -d (_ "Verbose mode")
-complete -c arp -s n -l numeric -d (_ "Numerical address")
-complete -x -c arp -s H -l tw-type -a "ether arcnet pronet ax25 netrom" -d (_ "Class of hw type")
-complete -c arp -s a -l display -x -a "(__fish_print_hostnames)" -d (_ "Show arp entries")
-complete -x -c arp -s d -l delete -a "(__fish_print_hostnames)" -d (_ "Remove an entry for hostname")
-complete -c arp -s D -l use-device -d (_ "Use hardware address")
-complete -x -c arp -s i -l device -a "(__fish_print_interfaces)" -d (_ "Select interface")
-complete -x -c arp -s s -l set -d (_ "Manually create ARP address") -a "(__fish_print_hostnames)"
-complete -f -c arp -s f -l file -d (_ "Take addr from filename, default /etc/ethers") 
+complete -c arp -s v -l verbose -d (N_ "Verbose mode")
+complete -c arp -s n -l numeric -d (N_ "Numerical address")
+complete -x -c arp -s H -l tw-type -a "ether arcnet pronet ax25 netrom" -d (N_ "Class of hw type")
+complete -c arp -s a -l display -x -a "(__fish_print_hostnames)" -d (N_ "Show arp entries")
+complete -x -c arp -s d -l delete -a "(__fish_print_hostnames)" -d (N_ "Remove an entry for hostname")
+complete -c arp -s D -l use-device -d (N_ "Use hardware address")
+complete -x -c arp -s i -l device -a "(__fish_print_interfaces)" -d (N_ "Select interface")
+complete -x -c arp -s s -l set -d (N_ "Manually create ARP address") -a "(__fish_print_hostnames)"
+complete -f -c arp -s f -l file -d (N_ "Take addr from filename, default /etc/ethers") 
 

share/completions/at.fish

@@ -1,10 +1,10 @@
 #at
-complete -f -c at -s V -d (_ "Display version and exit")
-complete -f -c at -s q -d (_ "Use specified queue")
-complete -f -c at -s m -d (_ "Send mail to user")
-complete -c at -s f -x -a "(__fish_complete_suffix (commandline -ct) '' 'At job')" -d (_ "Read job from file")
-complete -f -c at -s l -d (_ "Alias for atq")
-complete -f -c at -s d -d (_ "Alias for atrm")
-complete -f -c at -s v -d (_ "Show the time")
-complete -f -c at -s c -d (_ "Print the jobs listed")
+complete -f -c at -s V -d (N_ "Display version and exit")
+complete -f -c at -s q -d (N_ "Use specified queue")
+complete -f -c at -s m -d (N_ "Send mail to user")
+complete -c at -s f -x -a "(__fish_complete_suffix (commandline -ct) '' 'At job')" -d (N_ "Read job from file")
+complete -f -c at -s l -d (N_ "Alias for atq")
+complete -f -c at -s d -d (N_ "Alias for atrm")
+complete -f -c at -s v -d (N_ "Show the time")
+complete -f -c at -s c -d (N_ "Print the jobs listed")
 

share/completions/atd.fish

@@ -1,6 +1,6 @@
 #atd
-complete -f -c atd -s l -d (_ "Limiting load factor")
-complete -f -c atd -s b -d (_ "Minimum interval in seconds")
-complete -f -c atd -s d -d (_ "Debug mode")
-complete -f -c atd -s s -d (_ "Process at queue only once")
+complete -f -c atd -s l -d (N_ "Limiting load factor")
+complete -f -c atd -s b -d (N_ "Minimum interval in seconds")
+complete -f -c atd -s d -d (N_ "Debug mode")
+complete -f -c atd -s s -d (N_ "Process at queue only once")
 

share/completions/atq.fish

@@ -1,4 +1,4 @@
 #atq
-complete -f -c atq -s V -d (_ "Display version and exit")
-complete -f -c atq -s q -d (_ "Use specified queue")
+complete -f -c atq -s V -d (N_ "Display version and exit")
+complete -f -c atq -s q -d (N_ "Use specified queue")
 

share/completions/atrm.fish

@@ -1,2 +1,2 @@
 #atrm
-complete -f -c atrm -s V -d (_ "Display version and exit")
+complete -f -c atrm -s V -d (N_ "Display version and exit")

share/completions/bc.fish

@@ -1,9 +1,9 @@
 # Completions for the binary calculator
 
-complete -c bc -s i -l interactive -d (_ "Force interactive mode")
-complete -c bc -s l -l math-lib -d (_ "Define math library")
-complete -c bc -s w -l warn -d (_ "Give warnings for extensions to POSIX bc")
-complete -c bc -s s -l standard -d (_ "Process exactly POSIX bc")
-complete -c bc -s q -l quiet -d (_ "Do not print the GNU welcome")
-complete -c bc -s v -l version -d (_ "Display version and exit")
-complete -c bc -s h -l help -d (_ "Display help and exit")
+complete -c bc -s i -l interactive -d (N_ "Force interactive mode")
+complete -c bc -s l -l math-lib -d (N_ "Define math library")
+complete -c bc -s w -l warn -d (N_ "Give warnings for extensions to POSIX bc")
+complete -c bc -s s -l standard -d (N_ "Process exactly POSIX bc")
+complete -c bc -s q -l quiet -d (N_ "Do not print the GNU welcome")
+complete -c bc -s v -l version -d (N_ "Display version and exit")
+complete -c bc -s h -l help -d (N_ "Display help and exit")

share/completions/bunzip2.fish

@@ -6,10 +6,10 @@ complete -c bunzip2 -x -a "(
 )
 "
 
-complete -c bunzip2 -s c -l stdout -d (_ "Decompress to stdout")
-complete -c bunzip2 -s f -l force -d (_ "Overwrite")
-complete -c bunzip2 -s k -l keep -d (_ "Do not overwrite")
-complete -c bunzip2 -s s -l small -d (_ "Reduce memory usage")
-complete -c bunzip2 -s v -l verbose -d (_ "Print compression ratios")
-complete -c bunzip2 -s L -l license -d (_ "Print license")
-complete -c bunzip2 -s V -l version -d (_ "Display version and exit")
+complete -c bunzip2 -s c -l stdout -d (N_ "Decompress to stdout")
+complete -c bunzip2 -s f -l force -d (N_ "Overwrite")
+complete -c bunzip2 -s k -l keep -d (N_ "Do not overwrite")
+complete -c bunzip2 -s s -l small -d (N_ "Reduce memory usage")
+complete -c bunzip2 -s v -l verbose -d (N_ "Print compression ratios")
+complete -c bunzip2 -s L -l license -d (N_ "Print license")
+complete -c bunzip2 -s V -l version -d (N_ "Display version and exit")

share/completions/bzcat.fish

@@ -5,4 +5,4 @@ complete -c bzcat -x -a "(
 	__fish_complete_suffix (commandline -ct) .tbz2 'Compressed archive'
 )
 "
-complete -c bzcat -s s -l small -d (_ "Reduce memory usage")
+complete -c bzcat -s s -l small -d (N_ "Reduce memory usage")

share/completions/bzip2.fish

@@ -1,4 +1,4 @@
-complete -c bzip2 -s c -l stdout -d (_ "Compress to stdout")
+complete -c bzip2 -s c -l stdout -d (N_ "Compress to stdout")
 complete -c bzip2 -s d -l decompress -x -a "(
 	__fish_complete_suffix (commandline -ct) .bz 'Compressed file'
 	__fish_complete_suffix (commandline -ct) .bz2 'Compressed file'
@@ -6,14 +6,14 @@ complete -c bzip2 -s d -l decompress -x -a "(
 	__fish_complete_suffix (commandline -ct) .tbz2 'Compressed archive'
 )
 "
-complete -c bzip2 -s z -l compress -d (_ "Compress file")
-complete -c bzip2 -s t -l test -d (_ "Check integrity")
-complete -c bzip2 -s f -l force -d (_ "Overwrite")
-complete -c bzip2 -s k -l keep -d (_ "Do not overwrite")
-complete -c bzip2 -s s -l small -d (_ "Reduce memory usage")
-complete -c bzip2 -s q -l quiet -d (_ "Supress errors")
-complete -c bzip2 -s v -l verbose -d (_ "Print compression ratios")
-complete -c bzip2 -s L -l license -d (_ "Print license")
-complete -c bzip2 -s V -l version -d (_ "Display version and exit")
-complete -c bzip2 -s 1 -l fast -d (_ "Small block size")
-complete -c bzip2 -s 9 -l best -d (_ "Large block size")
+complete -c bzip2 -s z -l compress -d (N_ "Compress file")
+complete -c bzip2 -s t -l test -d (N_ "Check integrity")
+complete -c bzip2 -s f -l force -d (N_ "Overwrite")
+complete -c bzip2 -s k -l keep -d (N_ "Do not overwrite")
+complete -c bzip2 -s s -l small -d (N_ "Reduce memory usage")
+complete -c bzip2 -s q -l quiet -d (N_ "Supress errors")
+complete -c bzip2 -s v -l verbose -d (N_ "Print compression ratios")
+complete -c bzip2 -s L -l license -d (N_ "Print license")
+complete -c bzip2 -s V -l version -d (N_ "Display version and exit")
+complete -c bzip2 -s 1 -l fast -d (N_ "Small block size")
+complete -c bzip2 -s 9 -l best -d (N_ "Large block size")

share/completions/cat.fish

@@ -1,12 +1,12 @@
-complete -c cat -s A -l show-all -d (_ "Escape all non-printing characters")
-complete -c cat -s b -l number-nonblank -d (_ "Number nonblank lines")
-complete -c cat -s e -d (_ "Escape non-printing characters except tab")
-complete -c cat -s E -l show-ends -d (_ "Display \$ at end of line")
-complete -c cat -s n -l number -d (_ "Number all lines")
-complete -c cat -s s -l squeeze-blank -d (_ "Never more than single blank line")
-complete -c cat -s t -d (_ "Escape non-printing characters except newline")
-complete -c cat -s T -l show-tabs -d (_ "Escape tab")
-complete -c cat -s v -d (_ "Escape non-printing except newline and tab")
-complete -c cat -l help -d (_ "Display help and exit")
-complete -c cat -l version -d (_ "Display version and exit")
+complete -c cat -s A -l show-all -d (N_ "Escape all non-printing characters")
+complete -c cat -s b -l number-nonblank -d (N_ "Number nonblank lines")
+complete -c cat -s e -d (N_ "Escape non-printing characters except tab")
+complete -c cat -s E -l show-ends -d (N_ "Display \$ at end of line")
+complete -c cat -s n -l number -d (N_ "Number all lines")
+complete -c cat -s s -l squeeze-blank -d (N_ "Never more than single blank line")
+complete -c cat -s t -d (N_ "Escape non-printing characters except newline")
+complete -c cat -s T -l show-tabs -d (N_ "Escape tab")
+complete -c cat -s v -d (N_ "Escape non-printing except newline and tab")
+complete -c cat -l help -d (N_ "Display help and exit")
+complete -c cat -l version -d (N_ "Display version and exit")
 

share/completions/cdrecord.fish

@@ -0,0 +1,92 @@
+#
+# Completions for Cdrecord
+#
+
+complete -c cdrecord -o version -d (N_ "Display version and exit") 
+complete -c cdrecord -s v -d (N_ "Increment the level of general verbosity by one")
+complete -c cdrecord -s V -d (N_ "Increment the verbose level in respect of SCSI command transport by one")
+complete -c cdrecord -a "debug={1,2,3,4,5}" -d (N_ "Set the misc debug value to #")
+complete -c cdrecord -s d -d (N_ "Increment the misc debug level by one") -a "1 2 3 4 5"
+complete -c cdrecord -s s -o silent -d (N_ "Do not print out a status report for failed SCSI commands")
+complete -c cdrecord -o force -d (N_ "Force to continue on some errors")
+complete -c cdrecord -o immed -d (N_ "Tell cdrecord to set the SCSI IMMED flag in certain commands")
+complete -c cdrecord -a "minbuf={25,35,45,55,65,75,85,95}" -d (N_ "Defines the minimum drive buffer fill ratio for the experimental ATAPI wait mode intended to free the IDE bus to allow hard disk and CD/DVD writer on the same IDE cable")
+complete -c cdrecord -o dummy -d (N_ "Complete CD/DVD-Recorder recording process with the laser turned off")
+complete -c cdrecord -o clone -d (N_ "Tells cdrecord to handle images created by readcd -clone")
+complete -c cdrecord -o dao
+complete -c cdrecord -o sao -d (N_ "Set SAO (Session At Once) mode, usually called Disk At Once mode")
+complete -c cdrecord -o tao -d (N_ "Set TAO (Track At Once) writing mode")
+complete -c cdrecord -o raw -d (N_ "Set RAW writing mode")
+complete -c cdrecord -o raw96r -d (N_ "Select Set RAW writing, the preferred raw writing mode")
+complete -c cdrecord -o raw96p -d (N_ "Select Set RAW writing, the less preferred raw writing mode")
+complete -c cdrecord -o raw16 -d (N_ "Select Set RAW writing, the preferred raw writing mode if raw96r is not supported")
+complete -c cdrecord -o multi -d (N_ "Allow multi session CDs to be made")
+complete -c cdrecord -o msinfo -d (N_ "Retrieve multi session info in a form suitable for mkisofs-1.10 or later")
+complete -c cdrecord -o toc -d (N_ "Retrieve and print out the table of content or PMA of a CD")
+complete -c cdrecord -o atip -d (N_ "Retrieve and print out the ATIP (absolute Time in Pre-groove) info")
+complete -c cdrecord -o fix -d (N_ "The disk will only be fixated")
+complete -c cdrecord -o nofix -d (N_ "Do not fixate the disk after writing the tracks")
+complete -c cdrecord -o waiti -d (N_ "Wait for input to become available on standard input before trying to open the SCSI driver")
+complete -c cdrecord -o load -d (N_ "Load the media and exit")
+complete -c cdrecord -o lock -d (N_ "Load the media, lock the door and exit")
+complete -c cdrecord -o eject -d (N_ "Eject disk after doing the work")
+complete -c cdrecord -a "speed={0,150,172,1385}" -d (N_ "Set the speed factor of the writing process to #") 
+complete -c cdrecord -a "blank={help,all,fast,track,unreserve,trtail,unclose,session}" -d (N_ "Blank a CD-RW and exit or blank a CD-RW before writing")
+complete -c cdrecord -o format -d (N_ "Format a CD-RW/DVD-RW/DVD+RW disc")
+complete -c cdrecord -a "fs=" -d (N_ "Set the FIFO (ring buffer) size to #")
+complete -c cdrecord -a "ts=" -d (N_ "Set the maximum transfer size for a single SCSI command to #")
+complete -c cdrecord -a "dev=" -d (N_ "Sets the SCSI target for the CD/DVD-Recorder")
+complete -c cdrecord -a "gracetime=" -d (N_ "Set the grace time before starting to write to ># seconds")
+complete -c cdrecord -a "timeout=" -d (N_ "Set the default SCSI command timeout value to # seconds")
+complete -c cdrecord -a "driver={help,mmc_cd,mmc_cd_dvd,mmc_cdr,mmc_cdr_sony,mmc_dvd,mmc_dvdplus,mmc_dvdplusr,mmc_dvdplusrw,cw_7501,kodak_pcd_600,philips_cdd521,philips_cdd521_old,philips_cdd522,philips_dumb,pioneer_dws114x,plasmon_rf4100,ricoh_ro1060c,ricoh_ro1420c,scsi2_cd,sony_cdu924,teac_cdr50,tyuden_ew50,yamaha_cdr100,cdr_simul,dvd_simul}" -d (N_ "Allows the user to manually select a driver for the device")
+
+# TODO: This argument accepts a comma separated list of arguments
+
+complete -c cdrecord -a "driveropts=" -d (N_ "Set driver specific options")
+complete -c cdrecord -o setdropts -d (N_ "Set the driveropts specified by driveropts=option list, the speed of the drive and the dummy flag and exit")
+complete -c cdrecord -o checkdrive -d (N_ "Checks if a driver for the current drive is present and exit")
+complete -c cdrecord -o prcap -d (N_ "Print the drive capabilities for SCSI-3/mmc compliant drives as obtained from mode page 0x2A")
+complete -c cdrecord -o inq -d (N_ "Do an inquiry for the drive, print the inquiry info and exit")
+complete -c cdrecord -o scanbus -d (N_ "Scan all SCSI devices on all SCSI busses and print the inquiry strings")
+complete -c cdrecord -o reset -d (N_ "Try to reset the SCSI bus where the CD recorder is located")
+complete -c cdrecord -o abort -d (N_ "Try to send an abort sequence to the drive")
+complete -c cdrecord -o overburn -d (N_ "Allow cdrecord to write more than the official size of a medium")
+complete -c cdrecord -o ignsize -d (N_ "Ignore the known size of the medium, use for debugging only")
+complete -c cdrecord -o useinfo -d (N_ "Use *.inf files to overwrite audio options")
+complete -c cdrecord -a "defpregap=" -d (N_ "Set the default pre-gap size for all tracks except track nr 1")
+complete -c cdrecord -o packet -d (N_ "Set Packet writing mode (experimental interface)")
+complete -c cdrecord -a "pktsize=" -d (N_ "Set the packet size to #, forces fixed packet mode (experimental)")
+complete -c cdrecord -o noclose -d (N_ "Do not close the current track, only when in packet writing mode (experimental)")
+complete -c cdrecord -a "mcn=" -d (N_ "Set the Media Catalog Number of the CD")
+complete -c cdrecord -o text -d (N_ "Write CD-Text info based on info taken from a file that contains ascii info for the text strings")
+complete -c cdrecord -a "textfile=" -d (N_ "Write CD-Text based on info found in the binary file filename")
+complete -c cdrecord -a "cuefile=" -d (N_ "Take all recording related info from a CDRWIN compliant CUE sheet file")
+
+# These completions are TRACK OPTIONS
+
+complete -c cdrecord -a "isrc=" -d (N_ "Set the International Standard Recording Number for the next track")
+complete -c cdrecord -a "index=" -d (N_ "Sets an index list for the next track")
+complete -c cdrecord -o audio -d (N_ "All subsequent tracks are written in CD-DA audio format")
+complete -c cdrecord -o swab -d (N_ "Audio data is assumed to be in byte-swapped (little-endian) order")
+complete -c cdrecord -o data -d (N_ "All subsequent tracks are written in CD-ROM mode 1 (Yellow Book) format")
+complete -c cdrecord -o mode2 -d (N_ "All subsequent tracks are written in CD-ROM mode 2 format")
+complete -c cdrecord -o xa -d (N_ "All subsequent tracks are written in CD-ROM XA mode 2 form 1 format")
+complete -c cdrecord -o xa1 -d (N_ "All subsequent tracks are written in CD-ROM XA mode 2 form 1 format")
+complete -c cdrecord -o xa2 -d (N_ "All subsequent tracks are written in CD-ROM XA mode 2 form 2 format")
+complete -c cdrecord -o xamix -d (N_ "All subsequent tracks are written in a way that allows a mix of CD-ROM XA mode 2 form 1/2 format")
+complete -c cdrecord -o cdi -d (N_ "The TOC type for the disk is set to CDI, with XA only")
+complete -c cdrecord -o isosize -d (N_ "Use the ISO-9660 file system size as the size of the next track")
+complete -c cdrecord -o pad -d (N_ "15 sectors of zeroed data will be added to the end of this and each subsequent data track")
+complete -c cdrecord -a "padsize=" -d (N_ "Set the amount of data to be appended as padding to the next track")
+complete -c cdrecord -o nopad -d (N_ "Do not pad the following tracks - the default")
+complete -c cdrecord -o shorttrack -d (N_ "Allow all subsequent tracks to violate the Red Book track length standard (min 4 s)")
+complete -c cdrecord -o noshorttrack -d (N_ "Re-enforce the Red Book track length standard (min 4 s)")
+complete -c cdrecord -a "pregap=" -d (N_ "Set the pre-gap size for the next track")
+complete -c cdrecord -o preemp -d (N_ "All TOC entries for subsequent audio tracks will indicate that the audio data has been sampled with 50/15 microsec pre-emphasis")
+complete -c cdrecord -o nopreemp -d (N_ "All TOC entries for subsequent audio tracks will indicate that the audio data has been mastered with linear data")
+complete -c cdrecord -o copy -d (N_ "All TOC entries for subsequent audio tracks of the resulting CD will indicate that the audio data has permission to be copied without limit")
+complete -c cdrecord -o nocopy -d (N_ "All TOC entries for subsequent audio tracks of the resulting CD will indicate that the audio data has permission to be copied only once for personal use")
+complete -c cdrecord -o scms -d (N_ "All TOC entries for subsequent audio tracks of the resulting CD will indicate that the audio data has no permission to be copied")
+complete -c cdrecord -a "tsize=" -d (N_ "If the master image for the next track has been stored on a raw disk, use this option to specify the valid amount of data on this disk")
+
+

share/completions/chgrp.fish

@@ -1,12 +1,12 @@
 
-complete -c chgrp -s c -l changes -d (_ "Output diagnostic for changed files")
-complete -c chgrp -l dereference -d (_ "Dereferense symbolic links")
-complete -c chgrp -s h -l no-dereference -d (_ "Do not dereference symbolic links")
-complete -c chgrp -l from -d (_ "Change from owner/group")
-complete -c chgrp -s f -l silent -d (_ "Supress errors")
-complete -c chgrp -l reference -d (_ "Use same owner/group as file") -r
-complete -c chgrp -s R -l recursive -d (_ "Operate recursively")
-complete -c chgrp -s v -l verbose -d (_ "Output diagnostic for every file")
-complete -c chgrp -s h -l help -d (_ "Display help and exit")
-complete -c chgrp -l version -d (_ "Display version and exit")
+complete -c chgrp -s c -l changes -d (N_ "Output diagnostic for changed files")
+complete -c chgrp -l dereference -d (N_ "Dereferense symbolic links")
+complete -c chgrp -s h -l no-dereference -d (N_ "Do not dereference symbolic links")
+complete -c chgrp -l from -d (N_ "Change from owner/group")
+complete -c chgrp -s f -l silent -d (N_ "Supress errors")
+complete -c chgrp -l reference -d (N_ "Use same owner/group as file") -r
+complete -c chgrp -s R -l recursive -d (N_ "Operate recursively")
+complete -c chgrp -s v -l verbose -d (N_ "Output diagnostic for every file")
+complete -c chgrp -s h -l help -d (N_ "Display help and exit")
+complete -c chgrp -l version -d (N_ "Display version and exit")
 complete -c chgrp -d Group -a "(__fish_complete_groups)"

share/completions/chown.fish

@@ -1,12 +1,12 @@
-complete -c chown -s c -l changes -d (_ "Output diagnostic for changed files")
-complete -c chown -l dereference -d (_ "Dereferense symbolic links")
-complete -c chown -s h -l no-dereference -d (_ "Do not dereference symbolic links")
-complete -c chown -l from -d (_ "Change from owner/group")
-complete -c chown -s f -l silent -d (_ "Supress errors")
-complete -c chown -l reference -d (_ "Use same owner/group as file") -r
-complete -c chown -s R -l recursive -d (_ "Operate recursively")
-complete -c chown -s v -l verbose -d (_ "Output diagnostic for every file")
-complete -c chown -s h -l help -d (_ "Display help and exit")
-complete -c chown -l version -d (_ "Display version and exit")
-complete -c chown -d (_ "Username") -a "(__fish_print_users):"
-complete -c chown -d (_ "Username") -a "(echo (commandline -ct)|grep -o '.*:')(cat /etc/group |cut -d : -f 1)"
+complete -c chown -s c -l changes -d (N_ "Output diagnostic for changed files")
+complete -c chown -l dereference -d (N_ "Dereferense symbolic links")
+complete -c chown -s h -l no-dereference -d (N_ "Do not dereference symbolic links")
+complete -c chown -l from -d (N_ "Change from owner/group")
+complete -c chown -s f -l silent -d (N_ "Supress errors")
+complete -c chown -l reference -d (N_ "Use same owner/group as file") -r
+complete -c chown -s R -l recursive -d (N_ "Operate recursively")
+complete -c chown -s v -l verbose -d (N_ "Output diagnostic for every file")
+complete -c chown -s h -l help -d (N_ "Display help and exit")
+complete -c chown -l version -d (N_ "Display version and exit")
+complete -c chown -d (N_ "Username") -a "(__fish_print_users):"
+complete -c chown -d (N_ "Username") -a "(echo (commandline -ct)|grep -o '.*:')(cat /etc/group |cut -d : -f 1)"

share/completions/commandline.fish

@@ -1,12 +1,12 @@
-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")
+complete -c commandline -s a -l append -d (N_ "Add text to the end of the selected area")
+complete -c commandline -s i -l insert -d (N_ "Add text at cursor")
+complete -c commandline -s r -l replace -d (N_ "Replace selected part")
 
-complete -c commandline -s 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 j -l current-job  -d (N_ "Select job under cursor")
+complete -c commandline -s p -l current-process  -d (N_ "Select process under cursor")
+complete -c commandline -s t -l current-token -d (N_ "Select token under cursor")
+complete -c commandline -s b -l current-buffer -d (N_ "Select entire command line (default)")
 
-complete -c commandline -s 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")
+complete -c commandline -s c -l cut-at-cursor -d (N_ "Only return that part of the command line before the cursor")
+complete -c commandline -s f -l function -d (N_ "Inject readline functions to reader")
 

share/completions/complete.fish

@@ -1,14 +1,14 @@
-complete -c complete -s c -l command -d (_ "Command to add completion to") -r
-complete -c complete -s p -l path -d (_ "Path to add completion to")
-complete -c complete -s s -l short-option -d (_ "Posix-style option to complete")
-complete -c complete -s l -l long-option -d (_ "GNU-style option to complete")
-complete -c complete -s o -l old-option -d (_ "Old style long option to complete")
-complete -c complete -s f -l no-files -d (_ "Do not use file completion")
-complete -c complete -s r -l require-parameter -d (_ "Require parameter")
-complete -c complete -s x -l exclusive -d (_ "Require parameter and do not use file completion")
-complete -c complete -s a -l arguments -d (_ "A list of possible arguments")
-complete -c complete -s d -l description -d (_ "Description of this completions")
-complete -c complete -s u -l unauthorative -d (_ "Option list is not complete")
-complete -c complete -s e -l erase -d (_ "Remove completion")
-complete -c complete -s h -l help -d (_ "Display help and exit")
-complete -c complete -s C -l do-complete -d (_ "Print all completions for the specified commandline")
+complete -c complete -s c -l command -d (N_ "Command to add completion to") -r
+complete -c complete -s p -l path -d (N_ "Path to add completion to")
+complete -c complete -s s -l short-option -d (N_ "Posix-style option to complete")
+complete -c complete -s l -l long-option -d (N_ "GNU-style option to complete")
+complete -c complete -s o -l old-option -d (N_ "Old style long option to complete")
+complete -c complete -s f -l no-files -d (N_ "Do not use file completion")
+complete -c complete -s r -l require-parameter -d (N_ "Require parameter")
+complete -c complete -s x -l exclusive -d (N_ "Require parameter and do not use file completion")
+complete -c complete -s a -l arguments -d (N_ "A list of possible arguments")
+complete -c complete -s d -l description -d (N_ "Description of this completions")
+complete -c complete -s u -l unauthorative -d (N_ "Option list is not complete")
+complete -c complete -s e -l erase -d (N_ "Remove completion")
+complete -c complete -s h -l help -d (N_ "Display help and exit")
+complete -c complete -s C -l do-complete -d (N_ "Print all completions for the specified commandline")

share/completions/configure.fish

@@ -1,12 +1,12 @@
-complete -c configure -s h -l help -x -a "short recursive" -d (_ "Display help and exit")
-complete -c configure -s V -l version -d (_ "Display version and exit")
-complete -c configure -s q -l quiet -d (_ "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")
-complete -c configure -l srcdir -d (_ "Set source directory") -a "__fish_complete_directory (commandline -ct)" -x
-complete -c configure -l prefix -d (_ "Architecture-independent install directory") -a "__fish_complete_directory (commandline -ct)" -x
-complete -c configure -l exec-prefix -d (_ "Architecture-dependent install directory") -a "__fish_complete_directory (commandline -ct)" -x
-complete -c configure -l build -d (_ "Configure for building on BUILD") -x
-complete -c configure -l host -d (_ "Cross-compile to build programs to run on HOST") -x
-complete -c configure -l target -d (_ "Configure for building compilers for TARGET") -x -u
+complete -c configure -s h -l help -x -a "short recursive" -d (N_ "Display help and exit")
+complete -c configure -s V -l version -d (N_ "Display version and exit")
+complete -c configure -s q -l quiet -d (N_ "Quiet mode")
+complete -c configure -l cache-file -f -d (N_ "Cache test results in specified file")
+complete -c configure -s C -l config-cache -d (N_ "Cache test results in file config.cache")
+complete -c configure -s n -l no-create -d (N_ "Do not create output files")
+complete -c configure -l srcdir -d (N_ "Set source directory") -a "__fish_complete_directory (commandline -ct)" -x
+complete -c configure -l prefix -d (N_ "Architecture-independent install directory") -a "__fish_complete_directory (commandline -ct)" -x
+complete -c configure -l exec-prefix -d (N_ "Architecture-dependent install directory") -a "__fish_complete_directory (commandline -ct)" -x
+complete -c configure -l build -d (N_ "Configure for building on BUILD") -x
+complete -c configure -l host -d (N_ "Cross-compile to build programs to run on HOST") -x
+complete -c configure -l target -d (N_ "Configure for building compilers for TARGET") -x -u

share/completions/cut.fish

@@ -1,10 +1,10 @@
-complete -c cut -s b -l bytes -x -d (_ "Output byte range")
-complete -c cut -s c -l characters -x -d (_ "Output character range")
-complete -c cut -s d -l delimiter -x -d (_ "Select field delimiter")
-complete -c cut -s d -l fields -x -d (_ "Select fields")
-complete -c cut -s n -d (_ "Dont split mutibyte characters")
-complete -c cut -s s -l only-delimited -d (_ "Do not print lines without delimiter")
-complete -c cut -l output-delimiter -d (_ "Select output delimiter")
-complete -c cut -l help -d (_ "Display help and exit")
-complete -c cut -l version -d (_ "Display version and exit")
+complete -c cut -s b -l bytes -x -d (N_ "Output byte range")
+complete -c cut -s c -l characters -x -d (N_ "Output character range")
+complete -c cut -s d -l delimiter -x -d (N_ "Select field delimiter")
+complete -c cut -s d -l fields -x -d (N_ "Select fields")
+complete -c cut -s n -d (N_ "Dont split mutibyte characters")
+complete -c cut -s s -l only-delimited -d (N_ "Do not print lines without delimiter")
+complete -c cut -l output-delimiter -d (N_ "Select output delimiter")
+complete -c cut -l help -d (N_ "Display help and exit")
+complete -c cut -l version -d (N_ "Display version and exit")
 

share/completions/cvs.fish

@@ -56,40 +56,40 @@ complete -c cvs -n '__fish_no_cvs_subcommand' -xa 'watchers\t"'(_ "See who is wa
 # cvs_options switches, which must be specified before a command.
 # 
 
-complete -c cvs -n '__fish_no_cvs_subcommand' -x -l allow-root -d (_ "Specify legal cvsroot directory." )
-complete -c cvs -n '__fish_no_cvs_subcommand' -s a -d (_ "Authenticate all net traffic")
-complete -c cvs -n '__fish_no_cvs_subcommand' -r -s T -d (_ "Use "tmpdir" for temporary files")
-complete -c cvs -n '__fish_no_cvs_subcommand' -x -s d -d (_ "Overrides $CVSROOT as the root of the CVS tree")
-complete -c cvs -n '__fish_no_cvs_subcommand' -x -s e -d (_ "Use "editor" for editing log information")
-complete -c cvs -n '__fish_no_cvs_subcommand' -s f -d (_ "Do not use the ~/.cvsrc file")
-complete -c cvs -n '__fish_no_cvs_subcommand' -s H -d (_ "Displays usage information for command")
-complete -c cvs -n '__fish_no_cvs_subcommand' -s n -d (_ "Do not change any files")
-complete -c cvs -n '__fish_no_cvs_subcommand' -s Q -d (_ "Cause CVS to be really quiet")
-complete -c cvs -n '__fish_no_cvs_subcommand' -s R -d (_ "Read-only repository mode")
-complete -c cvs -n '__fish_no_cvs_subcommand' -s q -d (_ "Cause CVS to be somewhat quiet")
-complete -c cvs -n '__fish_no_cvs_subcommand' -s r -d (_ "Make checked-out files read-only")
-complete -c cvs -n '__fish_no_cvs_subcommand' -x -s s -d (_ "Set CVS user variable")
-complete -c cvs -n '__fish_no_cvs_subcommand' -s t -d (_ "Show trace of program execution -- try with -n")
-complete -c cvs -n '__fish_no_cvs_subcommand' -x -s v -d (_ "Display version and exit")
-complete -c cvs -n '__fish_no_cvs_subcommand' -s w -d (_ "Make checked-out files read-write (default)")
-complete -c cvs -n '__fish_no_cvs_subcommand' -s x -d (_ "Encrypt all net traffic")
-complete -c cvs -n '__fish_no_cvs_subcommand' -x -s z -d (_ "Compression level for net traffic") -a '1 2 3 4 5 6 7 8 9'
+complete -c cvs -n '__fish_no_cvs_subcommand' -x -l allow-root -d (N_ "Specify legal cvsroot directory." )
+complete -c cvs -n '__fish_no_cvs_subcommand' -s a -d (N_ "Authenticate all net traffic")
+complete -c cvs -n '__fish_no_cvs_subcommand' -r -s T -d (N_ "Use "tmpdir" for temporary files")
+complete -c cvs -n '__fish_no_cvs_subcommand' -x -s d -d (N_ "Overrides $CVSROOT as the root of the CVS tree")
+complete -c cvs -n '__fish_no_cvs_subcommand' -x -s e -d (N_ "Use "editor" for editing log information")
+complete -c cvs -n '__fish_no_cvs_subcommand' -s f -d (N_ "Do not use the ~/.cvsrc file")
+complete -c cvs -n '__fish_no_cvs_subcommand' -s H -d (N_ "Displays usage information for command")
+complete -c cvs -n '__fish_no_cvs_subcommand' -s n -d (N_ "Do not change any files")
+complete -c cvs -n '__fish_no_cvs_subcommand' -s Q -d (N_ "Cause CVS to be really quiet")
+complete -c cvs -n '__fish_no_cvs_subcommand' -s R -d (N_ "Read-only repository mode")
+complete -c cvs -n '__fish_no_cvs_subcommand' -s q -d (N_ "Cause CVS to be somewhat quiet")
+complete -c cvs -n '__fish_no_cvs_subcommand' -s r -d (N_ "Make checked-out files read-only")
+complete -c cvs -n '__fish_no_cvs_subcommand' -x -s s -d (N_ "Set CVS user variable")
+complete -c cvs -n '__fish_no_cvs_subcommand' -s t -d (N_ "Show trace of program execution -- try with -n")
+complete -c cvs -n '__fish_no_cvs_subcommand' -x -s v -d (N_ "Display version and exit")
+complete -c cvs -n '__fish_no_cvs_subcommand' -s w -d (N_ "Make checked-out files read-write (default)")
+complete -c cvs -n '__fish_no_cvs_subcommand' -s x -d (N_ "Encrypt all net traffic")
+complete -c cvs -n '__fish_no_cvs_subcommand' -x -s z -d (N_ "Compression level for net traffic") -a '1 2 3 4 5 6 7 8 9'
 
 #
 # Universal cvs options, which can be applied to any cvs command.
 #
 
-complete -c cvs -n '__fish_seen_subcommand_from checkout diff export history rdiff rtag update' -x -s D -d (_ "Use the most recent revision no later than date")
-complete -c cvs -n '__fish_seen_subcommand_from annotate export rdiff rtag update' -s f -d (_ "Retrieve files even when no match for tag/date")
-complete -c cvs -n '__fish_seen_subcommand_from add checkout diff import update' -x -s k -d (_ "Alter default keyword processing")
-complete -c cvs -n '__fish_seen_subcommand_from annotate checkout commit diff edit editors export log rdiff remove rtag status tag unedit update watch watchers' -s l -d (_ "Don't recurse")
-complete -c cvs -n '__fish_seen_subcommand_from add commit import' -x -s m -d (_ "Specify log message instead of invoking editor")
-complete -c cvs -n '__fish_seen_subcommand_from checkout commit export rtag' -s n -d (_ "Don't run any tag programs")
-complete -c cvs -n 'not __fish_no_cvs_subcommand' -s P -d (_ "Prune empty directories")
-complete -c cvs -n '__fish_seen_subcommand_from checkout update' -s p -d (_ "Pipe files to stdout")
-complete -c cvs -n '__fish_seen_subcommand_from annotate checkout commit diff edit editors export rdiff remove rtag status tag unedit update watch watchers' -s R -d (_ "Process directories recursively")
-complete -c cvs -n '__fish_seen_subcommand_from annotate checkout commit diff history export rdiff rtag update' -x -s r -d (_ "Use a specified tag")
-complete -c cvs -n '__fish_seen_subcommand_from import update' -r -s W -d (_ "Specify filenames to be filtered")
+complete -c cvs -n '__fish_seen_subcommand_from checkout diff export history rdiff rtag update' -x -s D -d (N_ "Use the most recent revision no later than date")
+complete -c cvs -n '__fish_seen_subcommand_from annotate export rdiff rtag update' -s f -d (N_ "Retrieve files even when no match for tag/date")
+complete -c cvs -n '__fish_seen_subcommand_from add checkout diff import update' -x -s k -d (N_ "Alter default keyword processing")
+complete -c cvs -n '__fish_seen_subcommand_from annotate checkout commit diff edit editors export log rdiff remove rtag status tag unedit update watch watchers' -s l -d (N_ "Don't recurse")
+complete -c cvs -n '__fish_seen_subcommand_from add commit import' -x -s m -d (N_ "Specify log message instead of invoking editor")
+complete -c cvs -n '__fish_seen_subcommand_from checkout commit export rtag' -s n -d (N_ "Don't run any tag programs")
+complete -c cvs -n 'not __fish_no_cvs_subcommand' -s P -d (N_ "Prune empty directories")
+complete -c cvs -n '__fish_seen_subcommand_from checkout update' -s p -d (N_ "Pipe files to stdout")
+complete -c cvs -n '__fish_seen_subcommand_from annotate checkout commit diff edit editors export rdiff remove rtag status tag unedit update watch watchers' -s R -d (N_ "Process directories recursively")
+complete -c cvs -n '__fish_seen_subcommand_from annotate checkout commit diff history export rdiff rtag update' -x -s r -d (N_ "Use a specified tag")
+complete -c cvs -n '__fish_seen_subcommand_from import update' -r -s W -d (N_ "Specify filenames to be filtered")
 
 #
 # cvs options for admin. Note that all options marked as "useless", "might not
@@ -97,90 +97,90 @@ complete -c cvs -n '__fish_seen_subcommand_from import update' -r -s W -d (_ "Sp
 #
 
 set -l admin_opt -c cvs -n 'contains admin (commandline -poc)'
-complete $admin_opt -x -s k -d (_ "Set the default keyword substitution")
-complete $admin_opt    -s l -d (_ "Lock a revision")
-complete $admin_opt -x -s m -d (_ "Replace a log message")
-complete $admin_opt -x -s n -d (_ "Force name/rev association")
-complete $admin_opt -x -s N -d (_ "Make a name/rev association")
-complete $admin_opt    -s q -d (_ "Run quietly")
-complete $admin_opt -x -s s -d (_ "Set a state attribute for a revision")
-complete $admin_opt    -s t -d (_ "Write descriptive text from a file into RCS")
-complete $admin_opt -x -o t- -d (_ "Write descriptive text into RCS")
-complete $admin_opt -x -s l -d (_ "Unlock a revision")
+complete $admin_opt -x -s k -d (N_ "Set the default keyword substitution")
+complete $admin_opt    -s l -d (N_ "Lock a revision")
+complete $admin_opt -x -s m -d (N_ "Replace a log message")
+complete $admin_opt -x -s n -d (N_ "Force name/rev association")
+complete $admin_opt -x -s N -d (N_ "Make a name/rev association")
+complete $admin_opt    -s q -d (N_ "Run quietly")
+complete $admin_opt -x -s s -d (N_ "Set a state attribute for a revision")
+complete $admin_opt    -s t -d (N_ "Write descriptive text from a file into RCS")
+complete $admin_opt -x -o t- -d (N_ "Write descriptive text into RCS")
+complete $admin_opt -x -s l -d (N_ "Unlock a revision")
 
 #
 # cvs options for annotate.
 #
 
 set -l annotate_opt -c cvs -n 'contains annotate (commandline -poc)'
-complete $annotate_opt -s f -d (_ "Annotate binary files")
+complete $annotate_opt -s f -d (N_ "Annotate binary files")
 
 #
 # cvs options for checkout.
 #
 
 set -l checkout_opt -c cvs -n 'contains checkout (commandline -poc)'
-complete $checkout_opt    -s A -d (_ "Reset sticky tags/dates/k-opts")
-complete $checkout_opt    -s c -d (_ "Copy module file to stdout")
-complete $checkout_opt -x -s d -d (_ "Name directory for working files")
-complete $checkout_opt -x -s j -d (_ "Merge revisions")
-complete $checkout_opt    -s N -d (_ "For -d. Don't shorten paths")
+complete $checkout_opt    -s A -d (N_ "Reset sticky tags/dates/k-opts")
+complete $checkout_opt    -s c -d (N_ "Copy module file to stdout")
+complete $checkout_opt -x -s d -d (N_ "Name directory for working files")
+complete $checkout_opt -x -s j -d (N_ "Merge revisions")
+complete $checkout_opt    -s N -d (N_ "For -d. Don't shorten paths")
 
 #
 # cvs options for commit.
 #
 
 set -l commit_opt -c cvs -n 'contains commit (commandline -poc)'
-complete $commit_opt -r -s F -d (_ "Read log message from file")
-complete $commit_opt    -s f -d (_ "Force new revision")
+complete $commit_opt -r -s F -d (N_ "Read log message from file")
+complete $commit_opt    -s f -d (N_ "Force new revision")
 
 #
 # cvs options for diff.
 #
 
 set -l diff_opt -c cvs -n 'contains diff (commandline -poc)'
-complete $diff_opt    -s a -l text -d (_ "Treat all files as text")
-complete $diff_opt    -s b -l ignore-space-change -d (_ "Treat all whitespace as one space")
-complete $diff_opt    -s B -l ignore-blank-lines -d (_ "Ignore blank line only changes")
-complete $diff_opt    -l binary -d (_ "Binary mode")
-complete $diff_opt    -l brief -d (_ "Report only whether files differ")
-complete $diff_opt    -s c -d (_ "Use context format")
-complete $diff_opt -r -s C -d (_ "Set context size")
-complete $diff_opt    -l context -d (_ "Set context format and, optionally, size")
-complete $diff_opt    -l changed-group-format -d (_ "Set line group format")
-complete $diff_opt    -s d -l minimal -d (_ "Try to find a smaller set of changes")
-complete $diff_opt    -s e -l ed -d (_ "Make output a valid ed script")
-complete $diff_opt    -s t -l expand-tabs -d (_ "Expand tabs to spaces")
-complete $diff_opt    -s f -l forward-ed -d (_ "Output that looks like an ed script")
-complete $diff_opt -x -s F -d (_ "Set regexp for context, unified formats")
-complete $diff_opt    -s H -l speed-large-files -d (_ "Speed handling of large files with small changes")
-complete $diff_opt -x -l horizon-lines -d (_ "Set horizon lines")
-complete $diff_opt    -s i -l ignore-case -d (_ "Ignore changes in case")
-complete $diff_opt -x -s I -l ignore-matching-lines -d (_ "Ignore changes matching regexp")
-complete $diff_opt -x -l ifdef -d (_ "Make ifdef from diff")
-complete $diff_opt    -s w -l ignore-all-space -d (_ "Ignore whitespace")
-complete $diff_opt    -s T -l initial-tab -d (_ "Start lines with a tab")
-complete $diff_opt -x -s L -l label -d (_ "Use label instead of filename in output")
-complete $diff_opt    -l left-column -d (_ "Print only left column")
-complete $diff_opt -x -l line-format -d (_ "Use format to produce if-then-else output")
-complete $diff_opt    -s n -l rcs -d (_ "Produce RCS-style diffs")
-complete $diff_opt    -s N -l new-file -d (_ "Treat files absent from one dir as empty")
-complete $diff_opt -l new-group-format -l new-line-format -l old-group-format -l old-line-format -d (_ "Specifies line formatting")
-complete $diff_opt    -s p -l show-c-function -d (_ "Identify the C function each change is in")
-complete $diff_opt    -s s -l report-identical-files -d (_ "Report identical files")
-complete $diff_opt    -s y -l side-by-side -d (_ "Use side-by-side format")
-complete $diff_opt    -l suppress-common-lines -d (_ "Suppress common lines in side-by-side")
-complete $diff_opt    -s u -l unified -d (_ "Use unified format")
-complete $diff_opt -x -s U -d (_ "Set context size in unified")
-complete $diff_opt -x -s W -l width -d (_ "Set column width for side-by-side format")
+complete $diff_opt    -s a -l text -d (N_ "Treat all files as text")
+complete $diff_opt    -s b -l ignore-space-change -d (N_ "Treat all whitespace as one space")
+complete $diff_opt    -s B -l ignore-blank-lines -d (N_ "Ignore blank line only changes")
+complete $diff_opt    -l binary -d (N_ "Binary mode")
+complete $diff_opt    -l brief -d (N_ "Report only whether files differ")
+complete $diff_opt    -s c -d (N_ "Use context format")
+complete $diff_opt -r -s C -d (N_ "Set context size")
+complete $diff_opt    -l context -d (N_ "Set context format and, optionally, size")
+complete $diff_opt    -l changed-group-format -d (N_ "Set line group format")
+complete $diff_opt    -s d -l minimal -d (N_ "Try to find a smaller set of changes")
+complete $diff_opt    -s e -l ed -d (N_ "Make output a valid ed script")
+complete $diff_opt    -s t -l expand-tabs -d (N_ "Expand tabs to spaces")
+complete $diff_opt    -s f -l forward-ed -d (N_ "Output that looks like an ed script")
+complete $diff_opt -x -s F -d (N_ "Set regexp for context, unified formats")
+complete $diff_opt    -s H -l speed-large-files -d (N_ "Speed handling of large files with small changes")
+complete $diff_opt -x -l horizon-lines -d (N_ "Set horizon lines")
+complete $diff_opt    -s i -l ignore-case -d (N_ "Ignore changes in case")
+complete $diff_opt -x -s I -l ignore-matching-lines -d (N_ "Ignore changes matching regexp")
+complete $diff_opt -x -l ifdef -d (N_ "Make ifdef from diff")
+complete $diff_opt    -s w -l ignore-all-space -d (N_ "Ignore whitespace")
+complete $diff_opt    -s T -l initial-tab -d (N_ "Start lines with a tab")
+complete $diff_opt -x -s L -l label -d (N_ "Use label instead of filename in output")
+complete $diff_opt    -l left-column -d (N_ "Print only left column")
+complete $diff_opt -x -l line-format -d (N_ "Use format to produce if-then-else output")
+complete $diff_opt    -s n -l rcs -d (N_ "Produce RCS-style diffs")
+complete $diff_opt    -s N -l new-file -d (N_ "Treat files absent from one dir as empty")
+complete $diff_opt -l new-group-format -l new-line-format -l old-group-format -l old-line-format -d (N_ "Specifies line formatting")
+complete $diff_opt    -s p -l show-c-function -d (N_ "Identify the C function each change is in")
+complete $diff_opt    -s s -l report-identical-files -d (N_ "Report identical files")
+complete $diff_opt    -s y -l side-by-side -d (N_ "Use side-by-side format")
+complete $diff_opt    -l suppress-common-lines -d (N_ "Suppress common lines in side-by-side")
+complete $diff_opt    -s u -l unified -d (N_ "Use unified format")
+complete $diff_opt -x -s U -d (N_ "Set context size in unified")
+complete $diff_opt -x -s W -l width -d (N_ "Set column width for side-by-side format")
 
 #
 # cvs export options.
 #
 
 set -l export_opt -c cvs -n 'contains export (commandline -poc)'
-complete $export_opt -x -s d -d (_ "Name directory for working files")
-complete $export_opt    -s N -d (_ "For -d. Don't shorten paths")
+complete $export_opt -x -s d -d (N_ "Name directory for working files")
+complete $export_opt    -s N -d (N_ "For -d. Don't shorten paths")
 
 #
 # cvs history options.
@@ -188,64 +188,64 @@ complete $export_opt    -s N -d (_ "For -d. Don't shorten paths")
 #
 
 set -l history_opt -c cvs -n 'contains history (commandline -poc)'
-complete $history_opt -s c -d (_ "Report on each commit")
-complete $history_opt -s e -d (_ "Report on everything")
-complete $history_opt -x -s m -d (_ "Report on a module")
-complete $history_opt -s o -d (_ "Report on checked-out modules")
-complete $history_opt -s T -d (_ "Report on all tags")
-complete $history_opt -x -s x -d (_ "Specify record type") -a "F\trelease O\tcheckout E\texport T\trtag C\tcollisions G\tmerge U\t'Working file copied from repository' P\t'Working file patched to repository' W\t'Working copy deleted during update' A\t'New file added' M\t'File modified' R\t'File removed.'"
-complete $history_opt -s a -d (_ "Show history for all users")
-complete $history_opt -s l -d (_ "Show last modification only")
-complete $history_opt -s w -d (_ "Show only records for this directory")
+complete $history_opt -s c -d (N_ "Report on each commit")
+complete $history_opt -s e -d (N_ "Report on everything")
+complete $history_opt -x -s m -d (N_ "Report on a module")
+complete $history_opt -s o -d (N_ "Report on checked-out modules")
+complete $history_opt -s T -d (N_ "Report on all tags")
+complete $history_opt -x -s x -d (N_ "Specify record type") -a "F\trelease O\tcheckout E\texport T\trtag C\tcollisions G\tmerge U\t'Working file copied from repository' P\t'Working file patched to repository' W\t'Working copy deleted during update' A\t'New file added' M\t'File modified' R\t'File removed.'"
+complete $history_opt -s a -d (N_ "Show history for all users")
+complete $history_opt -s l -d (N_ "Show last modification only")
+complete $history_opt -s w -d (N_ "Show only records for this directory")
 
 #
 # cvs import options.
 #
 
 set -l import_opt -c cvs -n 'contains import (commandline -poc)'
-complete $import_opt -x -s b -d (_ "Multiple vendor branch")
-complete $import_opt -r -s I -d (_ "Files to ignore during import")
+complete $import_opt -x -s b -d (N_ "Multiple vendor branch")
+complete $import_opt -r -s I -d (N_ "Files to ignore during import")
 
 #
 # cvs log options.
 #
 
 set -l log_opt -c cvs -n 'contains log (commandline -poc)'
-complete $log_opt -s b -d (_ "Print info about revision on default branch")
-complete $log_opt -x -s d -d (_ "Specify date range for query")
-complete $log_opt -s h -d (_ "Print only file info")
-complete $log_opt -s N -d (_ "Do not print tags")
-complete $log_opt -s R -d (_ "Print only rcs filename")
-complete $log_opt -x -s r -d (_ "Print only given revisions")
-complete $log_opt -s S -d (_ "Suppress header if no revisions found")
-complete $log_opt -x -s s -d (_ "Specify revision states")
-complete $log_opt -s t -d (_ "Same as -h, plus descriptive text")
-complete $log_opt -x -s w -d (_ "Specify users for query")
+complete $log_opt -s b -d (N_ "Print info about revision on default branch")
+complete $log_opt -x -s d -d (N_ "Specify date range for query")
+complete $log_opt -s h -d (N_ "Print only file info")
+complete $log_opt -s N -d (N_ "Do not print tags")
+complete $log_opt -s R -d (N_ "Print only rcs filename")
+complete $log_opt -x -s r -d (N_ "Print only given revisions")
+complete $log_opt -s S -d (N_ "Suppress header if no revisions found")
+complete $log_opt -x -s s -d (N_ "Specify revision states")
+complete $log_opt -s t -d (N_ "Same as -h, plus descriptive text")
+complete $log_opt -x -s w -d (N_ "Specify users for query")
 
 #
 # cvs rdiff options.
 #
 
 set -l rdiff_opt -c cvs -n 'contains rdiff (commandline -poc)'
-complete $rdiff_opt -s c -d (_ "Use context diff format")
-complete $rdiff_opt -s s -d (_ "Create summary change report")
-complete $rdiff_opt -s t -d (_ "diff top two revisions")
-complete $rdiff_opt -s u -d (_ "Use unidiff format")
+complete $rdiff_opt -s c -d (N_ "Use context diff format")
+complete $rdiff_opt -s s -d (N_ "Create summary change report")
+complete $rdiff_opt -s t -d (N_ "diff top two revisions")
+complete $rdiff_opt -s u -d (N_ "Use unidiff format")
 
 #
 # cvs release options.
 #
 
-complete -c cvs -n 'contains release (commandline -poc)' -s d -d (_ "Delete working copy if release succeeds")
+complete -c cvs -n 'contains release (commandline -poc)' -s d -d (N_ "Delete working copy if release succeeds")
 
 #
 # cvs update options.
 #
 
 set -l update_opt -c cvs -n 'contains update (commandline -poc)'
-complete $update_opt -s A -d (_ "Reset sticky tags, dates, and k-opts")
-complete $update_opt -s C -d (_ "Overwrite modified files with clean copies")
-complete $update_opt -s d -d (_ "Create any missing directories")
-complete $update_opt -x -s I -d (_ "Specify files to ignore")
-complete $update_opt -x -s j -d (_ "Merge revisions")
+complete $update_opt -s A -d (N_ "Reset sticky tags, dates, and k-opts")
+complete $update_opt -s C -d (N_ "Overwrite modified files with clean copies")
+complete $update_opt -s d -d (N_ "Create any missing directories")
+complete $update_opt -x -s I -d (N_ "Specify files to ignore")
+complete $update_opt -x -s j -d (N_ "Merge revisions")
 

share/completions/darcs.fish

@@ -58,179 +58,179 @@ complete -c darcs -n '__fish_use_subcommand' -xa 'repair\t"'(_ "Repair the corru
 #
 # These switches are universal
 #
-complete -c darcs -s h -l help -d (_ "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 (_ "Verbose mode")
-complete -c darcs -l standard-verbosity -d (_ "Neither verbose nor quiet output")
+complete -c darcs -s h -l help -d (N_ "Shows brief description of command and its arguments")
+complete -c darcs -l disable -d (N_ "Disable this command")
+complete -c darcs -l repodir -d (N_ "Specify the repository directory in which to run") -x -a '(__fish_complete_directory (commandline -ct))'
+complete -c darcs -s v -l verbose -d (N_ "Verbose mode")
+complete -c darcs -l standard-verbosity -d (N_ "Neither verbose nor quiet output")
 
 #
 # Here follows a huge list of subcommand-specific completions. These are incomplete.
 #
 
 set -l record_opt -c darcs -n 'contains record (commandline -poc)'
-complete $record_opt -s m -l patch-name -d (_ "Name of patch") -x
-complete $record_opt -s A -l author -d (_ "Specify author id") -x
-complete $record_opt -l logfile -d (_ "Give patch name and comment in file") -r
-complete $record_opt -s a -l all -d (_ "Answer yes to all patches")
-complete $record_opt -s l -l look-for-adds -d (_ "In addition to modifications, look for files that are not boring, and thus are potentially pending addition")
-complete $record_opt -l delete-logfile -d (_ "Delete the logfile when done")
-complete $record_opt -l no-test -d (_ "Don't run the test script")
-complete $record_opt -l test -d (_ "Run the test script")
-complete $record_opt -l leave-test-directory -d (_ "Don't remove the test directory")
-complete $record_opt -l remove-test-directory -d (_ "Remove the test directory")
-complete $record_opt -l compress -d (_ "Create compressed patches")
-complete $record_opt -l dont-compress -d (_ "Don't create compressed patches")
-complete $record_opt -l pipe -d (_ "Expect to receive input from a pipe")
-complete $record_opt -l interactive -d (_ "Prompt user interactively")
-complete $record_opt -l ask-deps -d (_ "Ask for extra dependencies")
-complete $record_opt -l no-ask-deps -d (_ "Don't ask for extra dependencies")
-complete $record_opt -l edit-long-comment -d (_ "Edit the long comment by default")
-complete $record_opt -l skip-long-comment -d (_ "Don't give a long comment")
-complete $record_opt -l prompt-long-comment -d (_ "Prompt for whether to edit the long comment")
-complete $record_opt -l ignore-times -d (_ "Don't trust the file modification times")
-complete $record_opt -l dont-look-for-adds -d (_ "Don't look for any files or directories that could be added, and don't add them automatically")
+complete $record_opt -s m -l patch-name -d (N_ "Name of patch") -x
+complete $record_opt -s A -l author -d (N_ "Specify author id") -x
+complete $record_opt -l logfile -d (N_ "Give patch name and comment in file") -r
+complete $record_opt -s a -l all -d (N_ "Answer yes to all patches")
+complete $record_opt -s l -l look-for-adds -d (N_ "In addition to modifications, look for files that are not boring, and thus are potentially pending addition")
+complete $record_opt -l delete-logfile -d (N_ "Delete the logfile when done")
+complete $record_opt -l no-test -d (N_ "Don't run the test script")
+complete $record_opt -l test -d (N_ "Run the test script")
+complete $record_opt -l leave-test-directory -d (N_ "Don't remove the test directory")
+complete $record_opt -l remove-test-directory -d (N_ "Remove the test directory")
+complete $record_opt -l compress -d (N_ "Create compressed patches")
+complete $record_opt -l dont-compress -d (N_ "Don't create compressed patches")
+complete $record_opt -l pipe -d (N_ "Expect to receive input from a pipe")
+complete $record_opt -l interactive -d (N_ "Prompt user interactively")
+complete $record_opt -l ask-deps -d (N_ "Ask for extra dependencies")
+complete $record_opt -l no-ask-deps -d (N_ "Don't ask for extra dependencies")
+complete $record_opt -l edit-long-comment -d (N_ "Edit the long comment by default")
+complete $record_opt -l skip-long-comment -d (N_ "Don't give a long comment")
+complete $record_opt -l prompt-long-comment -d (N_ "Prompt for whether to edit the long comment")
+complete $record_opt -l ignore-times -d (N_ "Don't trust the file modification times")
+complete $record_opt -l dont-look-for-adds -d (N_ "Don't look for any files or directories that could be added, and don't add them automatically")
 
 
 set -l pull_opt -c darcs -n 'contains pull (commandline -poc)'
-complete $pull_opt -s p -l patches -d (_ "Select patches matching REGEXP") -x
-complete $pull_opt -s t -l tags -d (_ "Select tags matching REGEXP") -x
-complete $pull_opt -s a -l all -d (_ "Answer yes to all patches")
-complete $pull_opt -s s -l summary -d (_ "Summarize changes")
-complete $pull_opt -s q -l quiet -d (_ "Suppress informational output")
-complete $pull_opt -l matches -d (_ "Select patches matching PATTERN") -x
-complete $pull_opt -l external-merge -d (_ "Use external tool to merge conflicts") -x
-complete $pull_opt -l interactive -d (_ "Prompt user interactively")
-complete $pull_opt -l compress -d (_ "Create compressed patches")
-complete $pull_opt -l dont-compress -d (_ "Don't create compressed patches")
-complete $pull_opt -l test -d (_ "Run the test script")
-complete $pull_opt -l no-test -d (_ "Don't run the test script")
-complete $pull_opt -l dry-run -d (_ "Don't actually take the action")
-complete $pull_opt -l no-summary -d (_ "Don't summarize changes")
-complete $pull_opt -l ignore-times -d (_ "Don't trust the file modification times")
-complete $pull_opt -l no-deps -d (_ "Don't automatically fulfill dependencies")
-complete $pull_opt -l set-default -d (_ "Set default repository [DEFAULT]")
-complete $pull_opt -l no-set-default -d (_ "Don't set default repository")
-complete $pull_opt -l set-scripts-executable -d (_ "Make scripts executable")
-complete $pull_opt -l dont-set-scripts-executable -d (_ "Don't make scripts executable")
+complete $pull_opt -s p -l patches -d (N_ "Select patches matching REGEXP") -x
+complete $pull_opt -s t -l tags -d (N_ "Select tags matching REGEXP") -x
+complete $pull_opt -s a -l all -d (N_ "Answer yes to all patches")
+complete $pull_opt -s s -l summary -d (N_ "Summarize changes")
+complete $pull_opt -s q -l quiet -d (N_ "Suppress informational output")
+complete $pull_opt -l matches -d (N_ "Select patches matching PATTERN") -x
+complete $pull_opt -l external-merge -d (N_ "Use external tool to merge conflicts") -x
+complete $pull_opt -l interactive -d (N_ "Prompt user interactively")
+complete $pull_opt -l compress -d (N_ "Create compressed patches")
+complete $pull_opt -l dont-compress -d (N_ "Don't create compressed patches")
+complete $pull_opt -l test -d (N_ "Run the test script")
+complete $pull_opt -l no-test -d (N_ "Don't run the test script")
+complete $pull_opt -l dry-run -d (N_ "Don't actually take the action")
+complete $pull_opt -l no-summary -d (N_ "Don't summarize changes")
+complete $pull_opt -l ignore-times -d (N_ "Don't trust the file modification times")
+complete $pull_opt -l no-deps -d (N_ "Don't automatically fulfill dependencies")
+complete $pull_opt -l set-default -d (N_ "Set default repository [DEFAULT]")
+complete $pull_opt -l no-set-default -d (N_ "Don't set default repository")
+complete $pull_opt -l set-scripts-executable -d (N_ "Make scripts executable")
+complete $pull_opt -l dont-set-scripts-executable -d (N_ "Don't make scripts executable")
 
 
 set -l apply_opt  -c darcs -n 'contains apply (commandline -poc)'
-complete $apply_opt -s a -l all -d (_ "Answer yes to all patches")
-complete $apply_opt -l verify -d (_ "Verify that the patch was signed by a key in PUBRING") -r
-complete $apply_opt -l verify-ssl -d (_ "Verify using openSSL with authorized keys from specified file") -r
-complete $apply_opt -l sendmail-command -d (_ "Specify sendmail command") -r
-complete $apply_opt -l reply -d (_ "Reply to email-based patch using FROM address") -x
-complete $apply_opt -l cc -d (_ "Mail results to additional EMAIL(s). Requires --reply") -x
-complete $apply_opt -l external-merge -d (_ "Use external tool to merge conflicts") -r
-complete $apply_opt -l no-verify -d (_ "Don't verify patch signature")
-complete $apply_opt -l ignore-times -d (_ "Don't trust the file modification times")
-complete $apply_opt -l compress -d (_ "Create compressed patches")
-complete $apply_opt -l dont-compress -d (_ "Don't create compressed patches")
-complete $apply_opt -l interactive -d (_ "Prompt user interactively")
-complete $apply_opt -l mark-conflicts -d (_ "Mark conflicts")
-complete $apply_opt -l allow-conflicts -d (_ "Allow conflicts, but don't mark them")
-complete $apply_opt -l dont-allow-conflicts -d (_ "Fail on patches that create conflicts [DEFAULT]")
-complete $apply_opt -l no-test -d (_ "Don't run the test script")
-complete $apply_opt -l test -d (_ "Run the test script")
-complete $apply_opt -l happy-forwarding -d (_ "Forward unsigned messages without extra header")
-complete $apply_opt -l leave-test-directory -d (_ "Don't remove the test directory")
-complete $apply_opt -l remove-test-directory -d (_ "Remove the test directory")
-complete $apply_opt -l set-scripts-executable -d (_ "Make scripts executable")
-complete $apply_opt -l dont-set-scripts-executable -d (_ "Don't make scripts executable")
+complete $apply_opt -s a -l all -d (N_ "Answer yes to all patches")
+complete $apply_opt -l verify -d (N_ "Verify that the patch was signed by a key in PUBRING") -r
+complete $apply_opt -l verify-ssl -d (N_ "Verify using openSSL with authorized keys from specified file") -r
+complete $apply_opt -l sendmail-command -d (N_ "Specify sendmail command") -r
+complete $apply_opt -l reply -d (N_ "Reply to email-based patch using FROM address") -x
+complete $apply_opt -l cc -d (N_ "Mail results to additional EMAIL(s). Requires --reply") -x
+complete $apply_opt -l external-merge -d (N_ "Use external tool to merge conflicts") -r
+complete $apply_opt -l no-verify -d (N_ "Don't verify patch signature")
+complete $apply_opt -l ignore-times -d (N_ "Don't trust the file modification times")
+complete $apply_opt -l compress -d (N_ "Create compressed patches")
+complete $apply_opt -l dont-compress -d (N_ "Don't create compressed patches")
+complete $apply_opt -l interactive -d (N_ "Prompt user interactively")
+complete $apply_opt -l mark-conflicts -d (N_ "Mark conflicts")
+complete $apply_opt -l allow-conflicts -d (N_ "Allow conflicts, but don't mark them")
+complete $apply_opt -l dont-allow-conflicts -d (N_ "Fail on patches that create conflicts [DEFAULT]")
+complete $apply_opt -l no-test -d (N_ "Don't run the test script")
+complete $apply_opt -l test -d (N_ "Run the test script")
+complete $apply_opt -l happy-forwarding -d (N_ "Forward unsigned messages without extra header")
+complete $apply_opt -l leave-test-directory -d (N_ "Don't remove the test directory")
+complete $apply_opt -l remove-test-directory -d (N_ "Remove the test directory")
+complete $apply_opt -l set-scripts-executable -d (N_ "Make scripts executable")
+complete $apply_opt -l dont-set-scripts-executable -d (N_ "Don't make scripts executable")
 
 
 set -l check_opt  -c darcs -n 'contains check (commandline -poc)'
-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")
-complete $check_opt -l no-test -d (_ "Don't run the test script")
-complete $check_opt -l test -d (_ "Run the test script")
-complete $check_opt -l leave-test-directory -d (_ "Don't remove the test directory")
-complete $check_opt -l remove-test-directory -d (_ "Remove the test directory")
+complete $check_opt -s v -l verbose -d (N_ "Verbose mode")
+complete $check_opt -s q -l quiet -d (N_ "Suppress informational output")
+complete $check_opt -l complete -d (N_ "Check the entire repository")
+complete $check_opt -l partial -d (N_ "Check patches since latest checkpoint")
+complete $check_opt -l no-test -d (N_ "Don't run the test script")
+complete $check_opt -l test -d (N_ "Run the test script")
+complete $check_opt -l leave-test-directory -d (N_ "Don't remove the test directory")
+complete $check_opt -l remove-test-directory -d (N_ "Remove the test directory")
 
 
 set -l mv_opt  -c darcs -n 'contains mv (commandline -poc)'
-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 -s v -l verbose -d (N_ "Verbose mode")
+complete $mv_opt -l case-ok -d (N_ "Don't refuse to add files differing only in case")
 
 
 set -l send_opt -c darcs -n 'contains send (commandline -poc)'
-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")
-complete $send_opt -s a -l all -d (_ "Answer yes to all patches")
-complete $send_opt -xs A  -l author -d (_ "Specify author id")
-complete $send_opt -rs o -l output -d (_ "Specify output filename")
-complete $send_opt -s u -l unified -d (_ "Output patch in a darcs-specific format similar to diff -u")
-complete $send_opt -s s -l summary -d (_ "Summarize changes")
-complete $send_opt -xl matches -d (_ "Select patches matching PATTERN")
-complete $send_opt -l interactive -d (_ "Prompt user interactively")
-complete $send_opt -xl from -d (_ "Specify email address")
-complete $send_opt -xl to -d (_ "Specify destination email")
-complete $send_opt -xl cc -d (_ "Mail results to additional EMAIL(s). Requires --reply")
-complete $send_opt -l sign -d (_ "Sign the patch with your gpg key")
-complete $send_opt -xl sign-as -d (_ "Sign the patch with a given keyid")
-complete $send_opt -rl sign-ssl -d (_ "Sign the patch using openssl with a given private key")
-complete $send_opt -l dont-sign -d (_ "Do not sign the patch")
-complete $send_opt -l dry-run -d (_ "Don't actually take the action")
-complete $send_opt -l no-summary -d (_ "Don't summarize changes")
-complete $send_opt -rl context -d (_ "Send to context stored in FILENAME")
-complete $send_opt -l edit-description -d (_ "Edit the patch bundle description")
-complete $send_opt -l set-default -d (_ "Set default repository [DEFAULT]")
-complete $send_opt -l no-set-default -d (_ "Don't set default repository")
-complete $send_opt -rl sendmail-command -d (_ "Specify sendmail command")
+complete $send_opt -s v -l verbose -d (N_ "Verbose mode")
+complete $send_opt -s q -l quiet -d (N_ "Suppress informational output")
+complete $send_opt -xs p -l patches -d (N_ "Select patches matching REGEXP")
+complete $send_opt -xs t -l tags -d (N_ "Select tags matching REGEXP")
+complete $send_opt -s a -l all -d (N_ "Answer yes to all patches")
+complete $send_opt -xs A  -l author -d (N_ "Specify author id")
+complete $send_opt -rs o -l output -d (N_ "Specify output filename")
+complete $send_opt -s u -l unified -d (N_ "Output patch in a darcs-specific format similar to diff -u")
+complete $send_opt -s s -l summary -d (N_ "Summarize changes")
+complete $send_opt -xl matches -d (N_ "Select patches matching PATTERN")
+complete $send_opt -l interactive -d (N_ "Prompt user interactively")
+complete $send_opt -xl from -d (N_ "Specify email address")
+complete $send_opt -xl to -d (N_ "Specify destination email")
+complete $send_opt -xl cc -d (N_ "Mail results to additional EMAIL(s). Requires --reply")
+complete $send_opt -l sign -d (N_ "Sign the patch with your gpg key")
+complete $send_opt -xl sign-as -d (N_ "Sign the patch with a given keyid")
+complete $send_opt -rl sign-ssl -d (N_ "Sign the patch using openssl with a given private key")
+complete $send_opt -l dont-sign -d (N_ "Do not sign the patch")
+complete $send_opt -l dry-run -d (N_ "Don't actually take the action")
+complete $send_opt -l no-summary -d (N_ "Don't summarize changes")
+complete $send_opt -rl context -d (N_ "Send to context stored in FILENAME")
+complete $send_opt -l edit-description -d (N_ "Edit the patch bundle description")
+complete $send_opt -l set-default -d (N_ "Set default repository [DEFAULT]")
+complete $send_opt -l no-set-default -d (N_ "Don't set default repository")
+complete $send_opt -rl sendmail-command -d (N_ "Specify sendmail command")
 
 
 set -l init_opt  -c darcs -n 'contains initialize (commandline -poc)'
-complete $init_opt -l plain-pristine-tree -d (_ "Use a plain pristine tree [DEFAULT]")
-complete $init_opt -l no-pristine-tree -d (_ "Use no pristine tree")
+complete $init_opt -l plain-pristine-tree -d (N_ "Use a plain pristine tree [DEFAULT]")
+complete $init_opt -l no-pristine-tree -d (N_ "Use no pristine tree")
 
 
 set -l annotate_opt -c darcs -n 'contains annotate (commandline -poc)'
-complete $annotate_opt -s s -l summary -d (_ "Summarize changes")
-complete $annotate_opt -l no-summary -d (_ "Don't summarize changes")
-complete $annotate_opt -s u -l unified -d (_ "Output patch in a darcs-specific format similar to diff -u")
-complete $annotate_opt -l human-readable -d (_ "Give human readable output")
-complete $annotate_opt -l xml-output -d (_ "Generate XML formatted output")
-complete $annotate_opt -l match -x -d (_ "Select patch matching PATTERN")
-complete $annotate_opt -s p -l patch -x -d (_ "Select patch matching REGEXP")
-complete $annotate_opt -s t -l tag -x -d (_ "Select tag matching REGEXP")
-complete $annotate_opt -l creator-hash -x -d (_ "Specify hash of creator patch (see docs)")
+complete $annotate_opt -s s -l summary -d (N_ "Summarize changes")
+complete $annotate_opt -l no-summary -d (N_ "Don't summarize changes")
+complete $annotate_opt -s u -l unified -d (N_ "Output patch in a darcs-specific format similar to diff -u")
+complete $annotate_opt -l human-readable -d (N_ "Give human readable output")
+complete $annotate_opt -l xml-output -d (N_ "Generate XML formatted output")
+complete $annotate_opt -l match -x -d (N_ "Select patch matching PATTERN")
+complete $annotate_opt -s p -l patch -x -d (N_ "Select patch matching REGEXP")
+complete $annotate_opt -s t -l tag -x -d (N_ "Select tag matching REGEXP")
+complete $annotate_opt -l creator-hash -x -d (N_ "Specify hash of creator patch (see docs)")
 
 
 set -l changes_opt -c darcs -n 'contains changes (commandline -poc)'
-complete $changes_opt -l to-match -x -d (_ "Select changes up to a patch matching PATTERN")
-complete $changes_opt -l to-patch -x -d (_ "Select changes up to a patch matching REGEXP")
-complete $changes_opt -l to-tag -x -d (_ "Select changes up to a tag matching REGEXP")
-complete $changes_opt -l from-match -x -d (_ "Select changes starting with a patch matching PATTERN")
-complete $changes_opt -l from-patch -x -d (_ "Select changes starting with a patch matching REGEXP")
-complete $changes_opt -l from-tag -x -d (_ "Select changes starting with a tag matching REGEXP")
-complete $changes_opt -l last -x -d (_ "Select the last NUMBER patches")
-complete $changes_opt -l matches -x -d (_ "Select patches matching PATTERN")
-complete $changes_opt -s p -l patches -x -d (_ "Select patches matching REGEXP")
-complete $changes_opt -s t -l tags -x -d (_ "Select tags matching REGEXP")
-complete $changes_opt -l context -d (_ "Give output suitable for get --context")
-complete $changes_opt -l xml-output -d (_ "Generate XML formatted output")
-complete $changes_opt -l human-readable -d (_ "Give human-readable output")
-complete $changes_opt -s s -l summary -d (_ "Summarize changes")
-complete $changes_opt -l no-summary -d (_ "Don't summarize changes")
-complete $changes_opt -s q -l quiet -d (_ "Suppress informational output")
-complete $changes_opt -l reverse -d (_ "Show changes in reverse order")
-complete $changes_opt -l repo -x -d (_ "Specify the repository URL")
+complete $changes_opt -l to-match -x -d (N_ "Select changes up to a patch matching PATTERN")
+complete $changes_opt -l to-patch -x -d (N_ "Select changes up to a patch matching REGEXP")
+complete $changes_opt -l to-tag -x -d (N_ "Select changes up to a tag matching REGEXP")
+complete $changes_opt -l from-match -x -d (N_ "Select changes starting with a patch matching PATTERN")
+complete $changes_opt -l from-patch -x -d (N_ "Select changes starting with a patch matching REGEXP")
+complete $changes_opt -l from-tag -x -d (N_ "Select changes starting with a tag matching REGEXP")
+complete $changes_opt -l last -x -d (N_ "Select the last NUMBER patches")
+complete $changes_opt -l matches -x -d (N_ "Select patches matching PATTERN")
+complete $changes_opt -s p -l patches -x -d (N_ "Select patches matching REGEXP")
+complete $changes_opt -s t -l tags -x -d (N_ "Select tags matching REGEXP")
+complete $changes_opt -l context -d (N_ "Give output suitable for get --context")
+complete $changes_opt -l xml-output -d (N_ "Generate XML formatted output")
+complete $changes_opt -l human-readable -d (N_ "Give human-readable output")
+complete $changes_opt -s s -l summary -d (N_ "Summarize changes")
+complete $changes_opt -l no-summary -d (N_ "Don't summarize changes")
+complete $changes_opt -s q -l quiet -d (N_ "Suppress informational output")
+complete $changes_opt -l reverse -d (N_ "Show changes in reverse order")
+complete $changes_opt -l repo -x -d (N_ "Specify the repository URL")
 
 
 set -l add_opt -c darcs -n 'contains add (commandline -poc)'
-complete $add_opt -l boring -d (_ "Don't skip boring files")
-complete $add_opt -l case-ok -d (_ "Don't refuse to add files differing only in case")
-complete $add_opt -s r -l recursive -d (_ "Add contents of subdirectories")
-complete $add_opt -l not-recursive -d (_ "Don't add contents of subdirectories")
-complete $add_opt -l date-trick -d (_ "Add files with date appended to avoid conflict. [EXPERIMENTAL]")
-complete $add_opt -l no-date-trick -d (_ "Don't use experimental date appending trick. [DEFAULT]")
-complete $add_opt -s q -l quiet -d (_ "Suppress informational output")
-complete $add_opt -l dry-run -d (_ "Don't actually take the action")
-complete $add_opt -s q -l quiet -d (_ "Suppress informational output")
+complete $add_opt -l boring -d (N_ "Don't skip boring files")
+complete $add_opt -l case-ok -d (N_ "Don't refuse to add files differing only in case")
+complete $add_opt -s r -l recursive -d (N_ "Add contents of subdirectories")
+complete $add_opt -l not-recursive -d (N_ "Don't add contents of subdirectories")
+complete $add_opt -l date-trick -d (N_ "Add files with date appended to avoid conflict. [EXPERIMENTAL]")
+complete $add_opt -l no-date-trick -d (N_ "Don't use experimental date appending trick. [DEFAULT]")
+complete $add_opt -s q -l quiet -d (N_ "Suppress informational output")
+complete $add_opt -l dry-run -d (N_ "Don't actually take the action")
+complete $add_opt -s q -l quiet -d (N_ "Suppress informational output")
 
 

share/completions/date.fish

@@ -1,11 +1,11 @@
-complete -c date -s d -l date -d (_ "Display date described by string") -x
-complete -c date -s f -l file -d (_ "Display date for each line in file") -r
-complete -c date -s I -l iso-8601 -d (_ "Output in ISO 8601 format") -x -a "date hours minutes seconds"
-complete -c date -s s -l set -d (_ "Set time") -x
-complete -c date -s R -l rfc-2822 -d (_ "Output RFC-2822 compliant date string")
-complete -c date -s r -l reference -d (_ "Display the last modification time of file") -r
-complete -c date -s u -l utc -d (_ "Print or set Coordinated Universal Time")
-complete -c date -l universal -d (_ "Print or set Coordinated Universal Time")
-complete -c date -s h -l help -d (_ "Display help and exit")
-complete -c date -s v -l version -d (_ "Display version and exit")
+complete -c date -s d -l date -d (N_ "Display date described by string") -x
+complete -c date -s f -l file -d (N_ "Display date for each line in file") -r
+complete -c date -s I -l iso-8601 -d (N_ "Output in ISO 8601 format") -x -a "date hours minutes seconds"
+complete -c date -s s -l set -d (N_ "Set time") -x
+complete -c date -s R -l rfc-2822 -d (N_ "Output RFC-2822 compliant date string")
+complete -c date -s r -l reference -d (N_ "Display the last modification time of file") -r
+complete -c date -s u -l utc -d (N_ "Print or set Coordinated Universal Time")
+complete -c date -l universal -d (N_ "Print or set Coordinated Universal Time")
+complete -c date -s h -l help -d (N_ "Display help and exit")
+complete -c date -s v -l version -d (N_ "Display version and exit")
 

share/completions/df.fish

@@ -9,30 +9,30 @@
 set -l is_gnu 
 df --version >/dev/null ^/dev/null; and set is_gnu --is-gnu
 
-__fish_gnu_complete -c df -s h -l human-readable -d (_ "Human readable sizes") $is_gnu
-__fish_gnu_complete -c df -s i -l inodes -d (_ "List inode information") $is_gnu
-__fish_gnu_complete -c df -s k -d (_ "Use 1kB block size") $is_gnu
-__fish_gnu_complete -c df -s l -l local -d (_ "List only local filesystems") $is_gnu
-__fish_gnu_complete -c df -s P -l portability -d (_ "Use Posix format") $is_gnu
-__fish_gnu_complete -c df -s t -l type -r -d (_ "Show filesystems of specified type") $is_gnu -x -a "(__fish_print_filesystems)"
+__fish_gnu_complete -c df -s h -l human-readable -d (N_ "Human readable sizes") $is_gnu
+__fish_gnu_complete -c df -s i -l inodes -d (N_ "List inode information") $is_gnu
+__fish_gnu_complete -c df -s k -d (N_ "Use 1kB block size") $is_gnu
+__fish_gnu_complete -c df -s l -l local -d (N_ "List only local filesystems") $is_gnu
+__fish_gnu_complete -c df -s P -l portability -d (N_ "Use Posix format") $is_gnu
+__fish_gnu_complete -c df -s t -l type -r -d (N_ "Show filesystems of specified type") $is_gnu -x -a "(__fish_print_filesystems)"
 
 if test -n "$is_gnu"
 
-	complete -c df -s a -l all -d (_ "Include empty filesystems")
-	complete -c df -s B -l block-size -r -d (_ "Block size")
-	complete -c df -s H -l si -d (_ "Human readable sizes, powers of 1000")
-	complete -c df -l no-sync -d (_ "Do not sync before getting usage info")
-	complete -c df -l sync -d (_ "Sync before getting usage info")
-	complete -c df -s T -l print-type -d (_ "Print filesystem type")
-	complete -c df -s x -l exclude-type -d (_ "Excluded filesystem type") -r -x -a "(__fish_print_filesystems)"
-	complete -c df -l help -d (_ "Display help and exit")
-	complete -c df -l version -d (_ "Display version and exit")
+	complete -c df -s a -l all -d (N_ "Include empty filesystems")
+	complete -c df -s B -l block-size -r -d (N_ "Block size")
+	complete -c df -s H -l si -d (N_ "Human readable sizes, powers of 1000")
+	complete -c df -l no-sync -d (N_ "Do not sync before getting usage info")
+	complete -c df -l sync -d (N_ "Sync before getting usage info")
+	complete -c df -s T -l print-type -d (N_ "Print filesystem type")
+	complete -c df -s x -l exclude-type -d (N_ "Excluded filesystem type") -r -x -a "(__fish_print_filesystems)"
+	complete -c df -l help -d (N_ "Display help and exit")
+	complete -c df -l version -d (N_ "Display version and exit")
 
 else
 
-	complete -c df -s a -d (_ "Show all filesystems")
-	complete -c df -s g -d (_ "Show sizes in gigabytes")
-	complete -c df -s m -d (_ "Show sizes in megabytes")
-	complete -c df -s n -d (_ "Print out the previously obtained statistics from the file systems")
+	complete -c df -s a -d (N_ "Show all filesystems")
+	complete -c df -s g -d (N_ "Show sizes in gigabytes")
+	complete -c df -s m -d (N_ "Show sizes in megabytes")
+	complete -c df -s n -d (N_ "Print out the previously obtained statistics from the file systems")
 
 end

share/completions/diff.fish

@@ -1,26 +1,26 @@
 # Completions for diff
-complete -c diff -s i -l ignore-case -d (_ "Ignore case differences")
-complete -c diff -l ignore-file-name-case -d (_ "Ignore case when comparing file names")
-complete -c diff -l no-ignore-file-name-case -d (_ "Consider case when comparing file names")
-complete -c diff -s E -l ignore-tab-expansion -d (_ "Ignore changes due to tab expansion")
-complete -c diff -s b -l ignore-space-change -d (_ "Ignore changes in the amount of white space")
-complete -c diff -s w -l ignore-all-space -d (_ "Ignore all white space")
-complete -c diff -s B -l ignore-blank-lines -d (_ "Ignore changes whose lines are all blank")
-complete -c diff -s I -l ignore-matching-lines -x -d (_ "Ignore changes whose lines match the REGEX")
-complete -c diff -s a -l text -d (_ "Treat all files as text")
-complete -c diff -s r -l recursive -d (_ "Recursively compare subdirectories")
-complete -c diff -s N -l new-file -d (_ "Treat absent files as empty")
-complete -c diff -s C -l context -x -d (_ "Output NUM lines of copied context")
-complete -c diff -s c -d (_ "Output 3 lines of copied context")
-complete -c diff -s U -l unified -x -d (_ "Output NUM lines of unified context")
-complete -c diff -s u -d (_ "Output 3 lines of unified context")
-complete -c diff -s q -l brief -d (_ "Output only whether the files differ")
-complete -c diff -l normal -d (_ "Output a normal diff")
-complete -c diff -s y -l side-by-side -d (_ "Output in two columns")
-complete -c diff -s W -l width -x -d (_ "Output at most NUM print columns")
-complete -c diff -s d -l minimal -d (_ "Try to find a smaller set of changes")
-complete -c diff -l from-file -r -d (_ "Compare FILE1 to all operands")
-complete -c diff -l to-file -r -d (_ "Compare FILE2 to all operands")
-complete -c diff -s l -l paginate -d (_ "Pass the output through 'pr'")
-complete -c diff -s v -l version -d (_ "Display version and exit")
-complete -c diff -l help -d (_ "Display help and exit")
+complete -c diff -s i -l ignore-case -d (N_ "Ignore case differences")
+complete -c diff -l ignore-file-name-case -d (N_ "Ignore case when comparing file names")
+complete -c diff -l no-ignore-file-name-case -d (N_ "Consider case when comparing file names")
+complete -c diff -s E -l ignore-tab-expansion -d (N_ "Ignore changes due to tab expansion")
+complete -c diff -s b -l ignore-space-change -d (N_ "Ignore changes in the amount of white space")
+complete -c diff -s w -l ignore-all-space -d (N_ "Ignore all white space")
+complete -c diff -s B -l ignore-blank-lines -d (N_ "Ignore changes whose lines are all blank")
+complete -c diff -s I -l ignore-matching-lines -x -d (N_ "Ignore changes whose lines match the REGEX")
+complete -c diff -s a -l text -d (N_ "Treat all files as text")
+complete -c diff -s r -l recursive -d (N_ "Recursively compare subdirectories")
+complete -c diff -s N -l new-file -d (N_ "Treat absent files as empty")
+complete -c diff -s C -l context -x -d (N_ "Output NUM lines of copied context")
+complete -c diff -s c -d (N_ "Output 3 lines of copied context")
+complete -c diff -s U -l unified -x -d (N_ "Output NUM lines of unified context")
+complete -c diff -s u -d (N_ "Output 3 lines of unified context")
+complete -c diff -s q -l brief -d (N_ "Output only whether the files differ")
+complete -c diff -l normal -d (N_ "Output a normal diff")
+complete -c diff -s y -l side-by-side -d (N_ "Output in two columns")
+complete -c diff -s W -l width -x -d (N_ "Output at most NUM print columns")
+complete -c diff -s d -l minimal -d (N_ "Try to find a smaller set of changes")
+complete -c diff -l from-file -r -d (N_ "Compare FILE1 to all operands")
+complete -c diff -l to-file -r -d (N_ "Compare FILE2 to all operands")
+complete -c diff -s l -l paginate -d (N_ "Pass the output through 'pr'")
+complete -c diff -s v -l version -d (N_ "Display version and exit")
+complete -c diff -l help -d (N_ "Display help and exit")

share/completions/du.fish

@@ -1,20 +1,20 @@
-complete -c du -s a -l all -d (_ "Write size for all files")
-complete -c du -l apparent-size -d (_ "Print file size, not disk usage")
-complete -c du -s B -l block-size -d (_ "Block size")
-complete -c du -s b -l bytes -d (_ "Use 1B block size")
-complete -c du -s c -l total -d (_ "Produce grand total")
-complete -c du -s D -l dereference-args -d (_ "Dereference file symlinks")
-complete -c du -s h -l human-readable -d (_ "Human readable sizes")
-complete -c du -s H -l si -d (_ "Human readable sizes, powers of 1000")
-complete -c du -s k -d (_ "Use 1kB block size")
-complete -c du -s l -l count-links -d (_ "Count hard links multiple times")
-complete -c du -s L -l dereference -d (_ "Dereference all symlinks")
-complete -c du -s S -l separate-dirs -d (_ "Do not include subdirectory size")
-complete -c du -s s -l summarize -d (_ "Display only a total for each argument")
-complete -c du -s x -l one-file-system -d (_ "Skip other filesystems")
-complete -c du -s X -l exclude-from -r -d (_ "Exclude files thet match pattern in file")
-complete -c du -l exclude -r -d (_ "Exclude files that match pattern")
-complete -c du -l max-depth -r -d (_ "Recursion limit")
-complete -c du -l help -d (_ "Display help and exit")
-complete -c du -l version -d (_ "Display version and exit")
+complete -c du -s a -l all -d (N_ "Write size for all files")
+complete -c du -l apparent-size -d (N_ "Print file size, not disk usage")
+complete -c du -s B -l block-size -d (N_ "Block size")
+complete -c du -s b -l bytes -d (N_ "Use 1B block size")
+complete -c du -s c -l total -d (N_ "Produce grand total")
+complete -c du -s D -l dereference-args -d (N_ "Dereference file symlinks")
+complete -c du -s h -l human-readable -d (N_ "Human readable sizes")
+complete -c du -s H -l si -d (N_ "Human readable sizes, powers of 1000")
+complete -c du -s k -d (N_ "Use 1kB block size")
+complete -c du -s l -l count-links -d (N_ "Count hard links multiple times")
+complete -c du -s L -l dereference -d (N_ "Dereference all symlinks")
+complete -c du -s S -l separate-dirs -d (N_ "Do not include subdirectory size")
+complete -c du -s s -l summarize -d (N_ "Display only a total for each argument")
+complete -c du -s x -l one-file-system -d (N_ "Skip other filesystems")
+complete -c du -s X -l exclude-from -r -d (N_ "Exclude files thet match pattern in file")
+complete -c du -l exclude -r -d (N_ "Exclude files that match pattern")
+complete -c du -l max-depth -r -d (N_ "Recursion limit")
+complete -c du -l help -d (N_ "Display help and exit")
+complete -c du -l version -d (N_ "Display version and exit")
 

share/completions/echo.fish

@@ -1,5 +1,5 @@
-complete -c echo -s n -d (_ "No newline")
-complete -c echo -s e -d (_ "Use backslash escaped characters")
-complete -c echo -s E -d (_ "Do not use backslash escaped characters")
-complete -c echo -l help -d (_ "Display help and exit")
-complete -c echo -l version -d (_ "Display version and exit")
+complete -c echo -s n -d (N_ "No newline")
+complete -c echo -s e -d (N_ "Use backslash escaped characters")
+complete -c echo -s E -d (N_ "Do not use backslash escaped characters")
+complete -c echo -l help -d (N_ "Display help and exit")
+complete -c echo -l version -d (N_ "Display version and exit")

share/completions/emacs.fish

@@ -1,10 +1,10 @@
 #
 # These completions are uncomplete
 #
-complete -c emacs -s q -d (_ "Do not load init files")
-complete -c emacs -s u -d (_ "Load users init file") -xa "(__fish_complete_users)"
-complete -c emacs -s t -d (_ "Use file as terminal") -r
-complete -c emacs -s f -d (_ "Execute Lisp function") -x
-complete -c emacs -s l -d (_ "Load Lisp code from file") -r
-complete -c emacs -o nw -d (_ "Do not use X interface")
-complete -uc emacs -s d -o display -d (_ "Create window on the specified display") -x
+complete -c emacs -s q -d (N_ "Do not load init files")
+complete -c emacs -s u -d (N_ "Load users init file") -xa "(__fish_complete_users)"
+complete -c emacs -s t -d (N_ "Use file as terminal") -r
+complete -c emacs -s f -d (N_ "Execute Lisp function") -x
+complete -c emacs -s l -d (N_ "Load Lisp code from file") -r
+complete -c emacs -o nw -d (N_ "Do not use X interface")
+complete -uc emacs -s d -o display -d (N_ "Create window on the specified display") -x

share/completions/emerge.fish

@@ -1,6 +1,6 @@
 #Completions for emerge
 
-function __fish_emerge_use_package -d (_ 'Test if emerge command should have packages as potential completion')
+function __fish_emerge_use_package -d (N_ 'Test if emerge command should have packages as potential completion')
 	for i in (commandline -opc)
 		if contains -- $i -a --ask -p --pretend --oneshot -O --nodeps -f --fetchonly
 			return 0
@@ -9,7 +9,7 @@ function __fish_emerge_use_package -d (_ 'Test if emerge command should have pac
 	return 1
 end
 
-function __fish_emerge_manipulate_package -d (_ 'Tests if emerge command should have package as potential completion for removal')
+function __fish_emerge_manipulate_package -d (N_ 'Tests if emerge command should have package as potential completion for removal')
 	for i in (commandline -opc)
 		if contains -- $i -u --update -C --unmerge -P --prune
 			return 0
@@ -18,51 +18,51 @@ function __fish_emerge_manipulate_package -d (_ 'Tests if emerge command should
 	return 1
 end
 
-function __fish_emerge_print_installed_pkgs -d (_ 'Prints completions for installed packages on the system from /var/db/pkg')
+function __fish_emerge_print_installed_pkgs -d (N_ 'Prints completions for installed packages on the system from /var/db/pkg')
 	if test -d /var/db/pkg 
 		find /var/db/pkg/ -type d | cut -d'/' -f6 | sort | uniq | sed 's/-[0-9]\{1,\}\..*$//'
 		return
 	end
 end
 
-complete -f -c emerge -n '__fish_emerge_use_package' -a '(__fish_print_packages)' -d (_ 'Package')
-complete -f -c emerge -n '__fish_emerge_manipulate_package' -a '(__fish_emerge_print_installed_pkgs)' -d (_ 'Package')
-complete -c emerge -s h -l help -d (_ "Display help and exit")
-complete -c emerge -s c -l clean -d (_ "Cleans the system by removing outdated packages")
-complete -c emerge -l depclean -d (_ "Cleans the system by removing packages that are not associated with explicitly merged packages")
-complete -c emerge -l info -d (_ "Displays important portage variables that will be exported to ebuild.sh when performing merges")
-complete -c emerge -l metadata -d (_ "Causes portage to process all the metacache files as is normally done on the tail end of an rsync update using emerge --sync")
-complete -c emerge -s P -l prune -d (_ "Removes all but the most recently installed version of a package from your system")
-complete -c emerge -l regen -d (_ "Causes portage to check and update the dependency cache of all ebuilds in the portage tree")
-complete -c emerge -s s -l search -d (_ "Searches for matches of the supplied string in the current local portage tree")
-complete -c emerge -s C -l unmerge -d (_ "Removes all matching packages completely from your system")
-complete -c emerge -s a -l ask -d (_ "Before performing the merge, display what ebuilds and tbz2s will be installed, in the same format as when using --pretend")
-complete -c emerge -s b -l buildpkg -d (_ "Tell emerge to build binary packages for all ebuilds processed in addition to actually merging the packages")
-complete -c emerge -s B -l buildpkgonly -d (_ "Creates a binary package, but does not merge it to the system")
-complete -c emerge -s l -l changelog -d (_ "When pretending, also display the ChangeLog entries for packages that will be upgraded")
-complete -c emerge -l columns -d (_ "Display the pretend output in a tabular form")
-complete -c emerge -s d -l debug -d (_ "Tell emerge to run the ebuild command in --debug mode")
-complete -c emerge -s D -l deep -d (_ "When used in conjunction with --update, this flag forces emerge to consider the entire dependency tree of packages, instead of checking only the immediate dependencies of the packages")
-complete -c emerge -s e -l emptytree -d (_ "Virtually tweaks the tree of installed packages to contain nothing")
-complete -c emerge -s f -l fetchonly -d (_ "Instead of doing any package building, just perform fetches for all packages (main package as well as all dependencies)")
-complete -c emerge -l fetch-all-uri -d (_ "Same as --fetchonly except that all package files, including those not required to build the package, will be processed")
-complete -c emerge -s g -l getbinpkg -d (_ "Using the server and location defined in PORTAGE_BINHOST, portage will download the information from each binary file there and it will use that information to help build the dependency list")
-complete -c emerge -s G -l getbinpkgonly -d (_ "This option is identical to -g, except it will not use ANY information from the local machine")
-complete -c emerge -s N -l newuse -d (_ "Tells emerge to include installed packages where USE flags have changed since installation")
-complete -c emerge -l noconfmem -d (_ "Merge files in CONFIG_PROTECT to the live fs instead of silently dropping them")
-complete -c emerge -s O -l nodeps -d (_ "Merge specified packages, but don't merge any dependencies")
-complete -c emerge -s n -l noreplace -d (_ "Skip the packages specified on the command-line that have already been installed")
-complete -c emerge -l nospinner -d (_ "Disables the spinner regardless of terminal type")
-complete -c emerge -l oneshot -d (_ "Emerge as normal, but don't add packages to the world profile")
-complete -c emerge -s o -l onlydeps -d (_ "Only merge (or pretend to merge) the dependencies of the specified packages, not the packages themselves")
-complete -c emerge -s p -l pretend -d (_ "Do not merge, display what ebuilds and tbz2s would have been installed")
-complete -c emerge -s q -l quiet -d (_ "Reduced output from portage's displays")
-complete -c emerge -l resume -d (_ "Resumes the last merge operation")
-complete -c emerge -s S -l searchdesc -d (_ "Matches the search string against the description field as well the package's name")
-complete -c emerge -l skipfirst -d (_ "Remove the first package in the resume list so that a merge may continue in the presence of an uncorrectable or inconsequential error")
-complete -c emerge -s t -l tree -d (_ "Shows the dependency tree using indentation for dependencies")
-complete -c emerge -s u -l update -d (_ "Updates packages to the best version available")
-complete -c emerge -s k -l usepkg -d (_ "Tell emerge to use binary packages (from $PKGDIR) if they are available, thus possibly avoiding some time-consuming compiles")
-complete -c emerge -s K -l usepkgonly -d (_ "Like --usepkg, except this only allows the use of binary packages, and it will abort the emerge if the package is not available at the time of dependency calculation")
-complete -c emerge -s v -l verbose -d (_ "Increased or expanded display of content in portage's displays")
-complete -c emerge -s V -l version -d (_ "Displays the currently installed version of portage along with other information useful for quick reference on a system")
+complete -f -c emerge -n '__fish_emerge_use_package' -a '(__fish_print_packages)' -d (N_ 'Package')
+complete -f -c emerge -n '__fish_emerge_manipulate_package' -a '(__fish_emerge_print_installed_pkgs)' -d (N_ 'Package')
+complete -c emerge -s h -l help -d (N_ "Display help and exit")
+complete -c emerge -s c -l clean -d (N_ "Cleans the system by removing outdated packages")
+complete -c emerge -l depclean -d (N_ "Cleans the system by removing packages that are not associated with explicitly merged packages")
+complete -c emerge -l info -d (N_ "Displays important portage variables that will be exported to ebuild.sh when performing merges")
+complete -c emerge -l metadata -d (N_ "Causes portage to process all the metacache files as is normally done on the tail end of an rsync update using emerge --sync")
+complete -c emerge -s P -l prune -d (N_ "Removes all but the most recently installed version of a package from your system")
+complete -c emerge -l regen -d (N_ "Causes portage to check and update the dependency cache of all ebuilds in the portage tree")
+complete -c emerge -s s -l search -d (N_ "Searches for matches of the supplied string in the current local portage tree")
+complete -c emerge -s C -l unmerge -d (N_ "Removes all matching packages completely from your system")
+complete -c emerge -s a -l ask -d (N_ "Before performing the merge, display what ebuilds and tbz2s will be installed, in the same format as when using --pretend")
+complete -c emerge -s b -l buildpkg -d (N_ "Tell emerge to build binary packages for all ebuilds processed in addition to actually merging the packages")
+complete -c emerge -s B -l buildpkgonly -d (N_ "Creates a binary package, but does not merge it to the system")
+complete -c emerge -s l -l changelog -d (N_ "When pretending, also display the ChangeLog entries for packages that will be upgraded")
+complete -c emerge -l columns -d (N_ "Display the pretend output in a tabular form")
+complete -c emerge -s d -l debug -d (N_ "Tell emerge to run the ebuild command in --debug mode")
+complete -c emerge -s D -l deep -d (N_ "When used in conjunction with --update, this flag forces emerge to consider the entire dependency tree of packages, instead of checking only the immediate dependencies of the packages")
+complete -c emerge -s e -l emptytree -d (N_ "Virtually tweaks the tree of installed packages to contain nothing")
+complete -c emerge -s f -l fetchonly -d (N_ "Instead of doing any package building, just perform fetches for all packages (main package as well as all dependencies)")
+complete -c emerge -l fetch-all-uri -d (N_ "Same as --fetchonly except that all package files, including those not required to build the package, will be processed")
+complete -c emerge -s g -l getbinpkg -d (N_ "Using the server and location defined in PORTAGE_BINHOST, portage will download the information from each binary file there and it will use that information to help build the dependency list")
+complete -c emerge -s G -l getbinpkgonly -d (N_ "This option is identical to -g, except it will not use ANY information from the local machine")
+complete -c emerge -s N -l newuse -d (N_ "Tells emerge to include installed packages where USE flags have changed since installation")
+complete -c emerge -l noconfmem -d (N_ "Merge files in CONFIG_PROTECT to the live fs instead of silently dropping them")
+complete -c emerge -s O -l nodeps -d (N_ "Merge specified packages, but don't merge any dependencies")
+complete -c emerge -s n -l noreplace -d (N_ "Skip the packages specified on the command-line that have already been installed")
+complete -c emerge -l nospinner -d (N_ "Disables the spinner regardless of terminal type")
+complete -c emerge -l oneshot -d (N_ "Emerge as normal, but don't add packages to the world profile")
+complete -c emerge -s o -l onlydeps -d (N_ "Only merge (or pretend to merge) the dependencies of the specified packages, not the packages themselves")
+complete -c emerge -s p -l pretend -d (N_ "Do not merge, display what ebuilds and tbz2s would have been installed")
+complete -c emerge -s q -l quiet -d (N_ "Reduced output from portage's displays")
+complete -c emerge -l resume -d (N_ "Resumes the last merge operation")
+complete -c emerge -s S -l searchdesc -d (N_ "Matches the search string against the description field as well the package's name")
+complete -c emerge -l skipfirst -d (N_ "Remove the first package in the resume list so that a merge may continue in the presence of an uncorrectable or inconsequential error")
+complete -c emerge -s t -l tree -d (N_ "Shows the dependency tree using indentation for dependencies")
+complete -c emerge -s u -l update -d (N_ "Updates packages to the best version available")
+complete -c emerge -s k -l usepkg -d (N_ "Tell emerge to use binary packages (from $PKGDIR) if they are available, thus possibly avoiding some time-consuming compiles")
+complete -c emerge -s K -l usepkgonly -d (N_ "Like --usepkg, except this only allows the use of binary packages, and it will abort the emerge if the package is not available at the time of dependency calculation")
+complete -c emerge -s v -l verbose -d (N_ "Increased or expanded display of content in portage's displays")
+complete -c emerge -s V -l version -d (N_ "Displays the currently installed version of portage along with other information useful for quick reference on a system")

share/completions/fish.fish

@@ -1,6 +1,6 @@
-complete -c fish -s c -l "command" -d (_ "Run fish with this command")
-complete -c fish -s h -l help -d (_ "Display help and exit")
-complete -c fish -s v -l version -d (_ "Display version and exit")
-complete -c fish -s i -l interactive -d (_ "Run in interactive mode")
-complete -c fish -s l -l login -d (_ "Run in login mode")
-complete -c fish -s p -l profile -d (_ "Output profiling information to specified file") -f
+complete -c fish -s c -l "command" -d (N_ "Run fish with this command")
+complete -c fish -s h -l help -d (N_ "Display help and exit")
+complete -c fish -s v -l version -d (N_ "Display version and exit")
+complete -c fish -s i -l interactive -d (N_ "Run in interactive mode")
+complete -c fish -s l -l login -d (N_ "Run in login mode")
+complete -c fish -s p -l profile -d (N_ "Output profiling information to specified file") -f

share/completions/function.fish

@@ -1,8 +1,8 @@
-complete -c function -s d -l description -d (_ "Set function description") -x
-complete -c function -xa "(functions -n)" -d (_ "Function")
-complete -c function -xa "(builtin -n)" -d (_ "Builtin")
-complete -c function -s j -l on-job-exit -d (_ "Make the function a job exit event handler") -x
-complete -c function -s p -l on-process-exit -d (_ "Make the function a process exit event handler") -x
-complete -c function -s s -l on-signal -d (_ "Make the function a signal event handler") -x
-complete -c function -s v -l on-variable -d (_ "Make the function a variable update event handler") -x
-complete -c function -s b -l key-binding -d (_ "Allow dash (-) in function name")
+complete -c function -s d -l description -d (N_ "Set function description") -x
+complete -c function -xa "(functions -n)" -d (N_ "Function")
+complete -c function -xa "(builtin -n)" -d (N_ "Builtin")
+complete -c function -s j -l on-job-exit -d (N_ "Make the function a job exit event handler") -x
+complete -c function -s p -l on-process-exit -d (N_ "Make the function a process exit event handler") -x
+complete -c function -s s -l on-signal -d (N_ "Make the function a signal event handler") -x
+complete -c function -s v -l on-variable -d (N_ "Make the function a variable update event handler") -x
+complete -c function -s b -l key-binding -d (N_ "Allow dash (-) in function name")

share/completions/functions.fish

@@ -1,6 +1,6 @@
-complete -c functions -s e -l erase -d (_ "Erase function") -x -a "(functions -n)"
-complete -c functions -xa "(functions -na)" -d (_ "Function")
-complete -c functions -s a -l all -d (_ "Show hidden functions")
-complete -c functions -s h -l help -d (_ "Display help and exit")
-complete -c functions -s d -l description -d (_ "Set function description") -x
+complete -c functions -s e -l erase -d (N_ "Erase function") -x -a "(functions -n)"
+complete -c functions -xa "(functions -na)" -d (N_ "Function")
+complete -c functions -s a -l all -d (N_ "Show hidden functions")
+complete -c functions -s h -l help -d (N_ "Display help and exit")
+complete -c functions -s d -l description -d (N_ "Set function description") -x