Events should not be marked as non-interactive

darcs-hash:20060116165421-ac50b-503a15877d19055be9fc640baf9430fe0c606083.gz

INSTALL

@@ -33,10 +33,13 @@ broken.
 Simple install procedure
 ========================
 
+If you have downloaded the darcs repository of fish, you need to run
+autoconf.
+
  % ./configure
- % make                                  #Compile fish
- % make install                          #Install fish
- % echo /usr/local/bin/fish >>/etc/shells #Add fish to list of shells
+ % make                                   # Compile fish
+ % make install                           # Install fish
+ % echo /usr/local/bin/fish >>/etc/shells # Add fish to list of shells
 
 If you wish to use fish as your default shell, use the following
 command:
@@ -49,6 +52,9 @@ chsh will prompt you for your password, and change your default shell.
 Local install procedure
 =======================
 
+If you have downloaded the darcs repository of fish, you need to run
+autoconf first.
+
 To install fish in your own home directory (typically as non-root),
 type:
 
@@ -57,6 +63,6 @@ type:
  % make install			# Install fish
 
 You will not be able to use fish as the default shell unless you also
-add the corresponding line to /etc/shells, which kind of defeats the
-point of a local install. But you can at least build and run fish.
-
+add the corresponding line to /etc/shells, which mostly defeats the
+point of a local install. As a workaround, you can add fish as the
+last command of the init files for your regular shell.

Makefile.in

@@ -38,6 +38,7 @@ INSTALL:=@INSTALL@
 
 prefix = @prefix@
 exec_prefix = @exec_prefix@
+datadir = @datadir@
 bindir = @bindir@
 mandir = @mandir@
 sysconfdir = @sysconfdir@
@@ -46,13 +47,15 @@ fishfile = @fishfile@
 fishinputfile = @fishinputfile@
 docdir = @docdir@
 
+HAVE_GETTEXT=@HAVE_GETTEXT@
+
 # All objects used by fish, that are compiled from an ordinary .c file
 # using an ordinary .h file.
 COMMON_OBJS := function.o builtin.o common.o complete.o env.o exec.o	\
 	expand.o highlight.o history.o kill.o parser.o proc.o reader.o		\
 	sanity.o tokenizer.o util.o wildcard.o wgetopt.o wutil.o input.o	\
 	output.o intern.o env_universal.o env_universal_common.o			\
-	input_common.o event.o signal.o io.o
+	input_common.o event.o signal.o io.o translate.o
 
 # builtin_help.h exists, but builtin_help.c is autogenerated
 COMMON_OBJS_WITH_HEADER := builtin_help.o
@@ -62,7 +65,7 @@ COMMON_OBJS_WITH_CODE := builtin_set.o builtin_commandline.o builtin_ulimit.c
 
 # All objects that the system needs to build fish
 FISH_OBJS := $(COMMON_OBJS) $(COMMON_OBJS_WITH_CODE) $(COMMON_OBJS_WITH_HEADER) main.o
-FISH_PAGER_OBJS := fish_pager.o common.o output.o util.o wutil.o tokenizer.o input_common.o env_universal.o env_universal_common.o
+FISH_PAGER_OBJS := fish_pager.o common.o output.o util.o wutil.o tokenizer.o input_common.o env_universal.o env_universal_common.o translate.o
 FISH_TESTS_OBJS := $(COMMON_OBJS) $(COMMON_OBJS_WITH_CODE) $(COMMON_OBJS_WITH_HEADER) fish_tests.o 
 FISHD_OBJS := fishd.o env_universal_common.o common.o util.o wutil.o	\
 
@@ -105,8 +108,8 @@ CMD_DOC_SRC := doc_src/count.txt doc_src/dirh.txt doc_src/dirs.txt	\
 	doc_src/fishd.txt doc_src/help.txt doc_src/mimedb.txt			\
 	doc_src/nextd.txt doc_src/open.txt doc_src/popd.txt				\
 	doc_src/prevd.txt doc_src/psub.txt doc_src/pushd.txt			\
-	doc_src/set_color.txt doc_src/tokenize.txt doc_src/trap.txt		\
-	doc_src/type.txt doc_src/umask.txt doc_src/vared.txt
+	doc_src/set_color.txt doc_src/trap.txt doc_src/type.txt			\
+	doc_src/umask.txt doc_src/vared.txt
 
 #
 # Files generated by running doxygen on the files in $(CMD_DOC_SRC)
@@ -126,7 +129,7 @@ DOC_SRC_DIR_FILES := doc_src/Doxyfile.in doc_src/doc.hdr	\
 # Files in ./
 MAIN_DIR_FILES := Doxyfile Doxyfile.user Makefile.in configure			\
     configure.ac config.h.in install-sh set_color.c count.c				\
-    key_reader.c tokenize.c gen_hdr.sh gen_hdr2.c $(MIME_OBJS:.o=.h)	\
+    key_reader.c gen_hdr.sh gen_hdr2.c $(MIME_OBJS:.o=.h)				\
     $(MIME_OBJS:.o=.c) $(COMMON_OBJS_WITH_HEADER:.o=.h)					\
     $(COMMON_OBJS:.o=.h) $(COMMON_OBJS_WITH_CODE:.o=.c)					\
     $(COMMON_OBJS:.o=.c) builtin_help.hdr fish.spec.in INSTALL README	\
@@ -145,17 +148,23 @@ TESTS_DIR_FILES := $(TEST_IN) $(TEST_IN:.in=.out) $(TEST_IN:.in=.err)	\
 COMPLETIONS_DIR_FILES := $(wildcard init/completions/*.fish)
 
 # Programs to build
-PROGRAMS:=fish set_color tokenize @XSEL@ mimedb count fish_pager fishd
+PROGRAMS:=fish set_color @XSEL@ mimedb count fish_pager fishd
 
 # Manuals to install
 MANUALS:=doc_src/fish.1 @XSEL_MAN_PATH@			\
 	doc_src/builtin_doc/man/man1/mimedb.1		\
 	doc_src/builtin_doc/man/man1/set_color.1	\
-	doc_src/builtin_doc/man/man1/tokenize.1		\
 	doc_src/builtin_doc/man/man1/count.1
 
+#All translation message catalogs
+TRANSLATIONS_SRC := $(wildcard po/*.po)
+TRANSLATIONS := $(TRANSLATIONS_SRC:.po=.gmo)
+
 #Make everything needed for installing fish
-all: $(PROGRAMS) user_doc 
+all: $(PROGRAMS) user_doc
+
+debug:
+	make fish CFLAGS="-O0 -Wno-unused -Werror -g @INCLUDEDIR@ -Wall -std=gnu99 -fno-strict-aliasing"
 
 # User documentation, describing the features of the fish shell.
 user_doc: doc.h Doxyfile.user user_doc.head.html
@@ -205,6 +214,29 @@ doc.h:$(BUILTIN_DOC_SRC) $(CMD_DOC_SRC) doc_src/doc.hdr
 	cat $*.txt >>$@; 
 	echo "*/" >>$@
 
+# Compile translation file
+%.gmo:%.po
+	if test $(HAVE_GETTEXT) = 1; then \
+		msgfmt $*.po -o $*.gmo; \
+	fi
+
+# Update existing po file or copy messages.pot
+%.po: messages.pot
+	if test $(HAVE_GETTEXT) = 1;then \
+		if test -f $*.po; then \
+			msgmerge -U --backup=existing --no-wrap $*.po messages.pot;\
+		else \
+			cp messages.pot $*.po;\
+		fi; \
+	fi
+
+# Create a template translation object
+messages.pot: *.c *.h init/*.in init/*.fish init/completions/*.fish
+	if test $(HAVE_GETTEXT) = 1;then \
+		xgettext -k_ -kN_ -kcomplete_desc --no-wrap *.c *.h -o messages.pot; \
+		xgettext -j -k_ -LShell --no-wrap init/*.in init/*.fish init/completions/*.fish -o messages.pot; \
+	fi
+
 # Generate the internal help functions by making doxygen create
 # man-pages which are then converted into C code. The convertion path
 # looks like this: 
@@ -266,7 +298,7 @@ builtin_help.c: $(BUILTIN_DOC_HDR) doc_src/count.doxygen gen_hdr2 gen_hdr.sh bui
 	echo "}" >>$@
 #man -- doc_src/builtin_doc/man/man1/`basename $@ .c`.1 | cat -s | ./gen_hdr2 >>$@
 
-install: all 
+install: all install-translations
 	$(INSTALL) -m 755 -d $(DESTDIR)$(bindir) 
 	for i in $(PROGRAMS); do\
 		$(INSTALL) -m 755 $$i $(DESTDIR)$(bindir) ; \
@@ -294,7 +326,7 @@ install: all
 	@echo If you want to use fish as the default shell, remember to first
 	@echo add the line \'$(DESTDIR)$(bindir)/fish\' to the file \'/etc/shells\'.
 
-uninstall:
+uninstall: uninstall-translations
 	for i in $(PROGRAMS); do \
 		rm -f $(DESTDIR)$(bindir)/$$i; \
 	done;
@@ -303,10 +335,26 @@ uninstall:
 	rm -f $(DESTDIR)$(sysconfdir)$(fishinputfile)
 	rm -r $(DESTDIR)$(sysconfdir)$(fishdir)
 	rm -r $(DESTDIR)$(docdir)
-	for i in fish.1* @XSEL_MAN@ mimedb.1* set_color.1* tokenize.1* count.1*; do \
+	for i in fish.1* @XSEL_MAN@ mimedb.1* set_color.1* count.1*; do \
 		rm $(DESTDIR)$(mandir)/man1/$$i; \
 	done;
 
+install-translations: $(TRANSLATIONS)
+	if test $(HAVE_GETTEXT) = 1; then \
+		for i in $(TRANSLATIONS); do \
+			$(INSTALL) -m 755 -d $(DESTDIR)$(datadir)/locale/$$(basename $$i .gmo)/LC_MESSAGES; \
+			$(INSTALL) -m 644 $$i $(DESTDIR)$(datadir)/locale/$$(basename $$i .gmo)/LC_MESSAGES/fish.mo; \
+			echo $(DESTDIR)$(datadir)/locale/$$(basename $$i .gmo)/LC_MESSAGES/fish.mo;\
+		done; \
+	fi
+
+uninstall-translations: 
+	if test $(HAVE_GETTEXT) = 1; then \
+		for i in $(TRANSLATIONS_SRC); do \
+			rm -f $(DESTDIR)$(datadir)/locale/$$(basename $$i .po)/LC_MESSAGES/fish.mo; \
+		done; \
+	fi
+
 # The fish shell
 fish: $(FISH_OBJS) 
 	$(CC) $(FISH_OBJS) $(LDFLAGS) -o $@
@@ -327,9 +375,6 @@ mimedb: $(MIME_OBJS) util.o common.o doc_src/mimedb.c
 set_color: set_color.o doc_src/set_color.c 
 	$(CC) set_color.o doc_src/set_color.c $(LDFLAGS) -o $@
 
-tokenize: tokenize.o doc_src/tokenize.c 
-	$(CC) tokenize.o doc_src/tokenize.c $(LDFLAGS) -o $@
-
 # Test program for the tokenizer library
 tokenizer_test: tokenizer.c tokenizer.h util.o wutil.o common.o
 	$(CC) ${CFLAGS} tokenizer.c util.o wutil.o common.o -D TOKENIZER_TEST $(LDFLAGS) -o $@
@@ -346,18 +391,20 @@ depend:
 #
 # Uses install instead of mkdir so build won't fail if the directory 
 # exists
-fish-@PACKAGE_VERSION@.tar: $(DOC_SRC_DIR_FILES) $(MAIN_DIR_FILES) $(INIT_DIR_FILES) $(TEST_DIR_FILES) $(COMPLETIONS_DIR_FILES) ChangeLog
+fish-@PACKAGE_VERSION@.tar: $(DOC_SRC_DIR_FILES) $(MAIN_DIR_FILES) $(INIT_DIR_FILES) $(TEST_DIR_FILES) $(COMPLETIONS_DIR_FILES) ChangeLog $(TRANSLATIONS_SRC)
 	rm -rf fish-@PACKAGE_VERSION@
 	$(INSTALL) -d fish-@PACKAGE_VERSION@
 	$(INSTALL) -d fish-@PACKAGE_VERSION@/doc_src
 	$(INSTALL) -d fish-@PACKAGE_VERSION@/init
 	$(INSTALL) -d fish-@PACKAGE_VERSION@/init/completions
 	$(INSTALL) -d fish-@PACKAGE_VERSION@/tests
+	$(INSTALL) -d fish-@PACKAGE_VERSION@/po
 	cp -f $(DOC_SRC_DIR_FILES) fish-@PACKAGE_VERSION@/doc_src
 	cp -f $(MAIN_DIR_FILES) fish-@PACKAGE_VERSION@/
 	cp -f $(INIT_DIR_FILES) fish-@PACKAGE_VERSION@/init/
 	cp -f $(COMPLETIONS_DIR_FILES) fish-@PACKAGE_VERSION@/init/completions/
 	cp -f $(TESTS_DIR_FILES) fish-@PACKAGE_VERSION@/tests/
+	cp -f $(TRANSLATIONS_SRC) fish-@PACKAGE_VERSION@/po/
 	tar -c fish-@PACKAGE_VERSION@ >fish-@PACKAGE_VERSION@.tar
 	rm -rf fish-@PACKAGE_VERSION@
 
@@ -384,7 +431,7 @@ distclean: clean
 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 tokenize gen_hdr2 mimedb
+	rm -f tokenizer_test fish key_reader set_color gen_hdr2 mimedb
 	rm -f fishd fish_pager count 
 	rm -f fish-@PACKAGE_VERSION@.tar 
 	rm -f fish-@PACKAGE_VERSION@.tar.gz 
@@ -394,70 +441,90 @@ clean:
 	rm -rf doc_src/builtin_doc
 	rm -rf fish-@PACKAGE_VERSION@
 	rm -rf xsel-0.9.6/
+	rm -f $(TRANSLATIONS)
 
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 
 builtin.o: config.h util.h wutil.h builtin.h function.h complete.h proc.h
-builtin.o: parser.h reader.h env.h expand.h common.h wgetopt.h sanity.h
+builtin.o: io.h parser.h reader.h env.h expand.h common.h wgetopt.h sanity.h
 builtin.o: tokenizer.h builtin_help.h wildcard.h input_common.h input.h
-builtin.o: intern.h
-builtin_commandline.o: config.h util.h builtin.h common.h wgetopt.h reader.h
-builtin_commandline.o: proc.h parser.h tokenizer.h input_common.h input.h
+builtin.o: intern.h event.h signal.h translate.h
+builtin_commandline.o: signal.h config.h util.h builtin.h common.h wgetopt.h
+builtin_commandline.o: reader.h proc.h io.h parser.h tokenizer.h
+builtin_commandline.o: input_common.h input.h translate.h
 builtin_help.o: config.h util.h common.h builtin_help.h
-builtin_set.o: config.h util.h builtin.h env.h expand.h common.h wgetopt.h
-builtin_set.o: proc.h parser.h
-common.o: config.h util.h wutil.h common.h expand.h proc.h wildcard.h
-common.o: parser.h
-complete.o: config.h util.h tokenizer.h wildcard.h proc.h parser.h function.h
-complete.o: complete.h builtin.h env.h exec.h expand.h common.h reader.h
-complete.o: history.h intern.h wutil.h
-env.o: config.h util.h wutil.h proc.h common.h env.h sanity.h expand.h
-env.o: history.h reader.h parser.h env_universal.h env_universal_common.h
-env_universal.o: util.h common.h wutil.h env_universal_common.h
-env_universal.o: env_universal.h
-env_universal_common.o: util.h common.h wutil.h env_universal_common.h
-exec.o: config.h util.h common.h wutil.h proc.h exec.h parser.h builtin.h
-exec.o: function.h env.h wildcard.h sanity.h expand.h env_universal.h
-exec.o: env_universal_common.h
-expand.o: config.h util.h common.h wutil.h env.h proc.h parser.h expand.h
-expand.o: wildcard.h exec.h tokenizer.h complete.h
-fishd.o: util.h common.h wutil.h env_universal_common.h
-fish_pager.o: config.h util.h wutil.h common.h complete.h output.h
+builtin_set.o: signal.h config.h util.h builtin.h env.h expand.h common.h
+builtin_set.o: wgetopt.h proc.h io.h parser.h translate.h
+builtin_ulimit.o: config.h util.h builtin.h common.h wgetopt.h translate.h
+common.o: config.h signal.h util.h wutil.h common.h expand.h proc.h io.h
+common.o: wildcard.h parser.h
+complete.o: signal.h config.h util.h tokenizer.h wildcard.h proc.h io.h
+complete.o: parser.h function.h complete.h builtin.h env.h exec.h expand.h
+complete.o: common.h reader.h history.h intern.h translate.h wutil.h
+env.o: config.h signal.h util.h wutil.h proc.h io.h common.h env.h sanity.h
+env.o: expand.h history.h reader.h parser.h env_universal.h
+env.o: env_universal_common.h input_common.h event.h translate.h
+env_universal.o: config.h signal.h util.h common.h wutil.h
+env_universal.o: env_universal_common.h env_universal.h
+env_universal_common.o: signal.h util.h common.h wutil.h
+env_universal_common.o: env_universal_common.h
+event.o: signal.h config.h util.h function.h proc.h io.h parser.h common.h
+event.o: event.h translate.h
+exec.o: signal.h config.h util.h common.h wutil.h proc.h io.h exec.h parser.h
+exec.o: builtin.h function.h env.h wildcard.h sanity.h expand.h
+exec.o: env_universal.h env_universal_common.h translate.h
+expand.o: signal.h config.h util.h common.h wutil.h env.h proc.h io.h
+expand.o: parser.h expand.h wildcard.h exec.h tokenizer.h complete.h
+fishd.o: signal.h util.h common.h wutil.h env_universal_common.h
+fish_pager.o: config.h signal.h util.h wutil.h common.h complete.h output.h
 fish_pager.o: input_common.h env_universal.h env_universal_common.h
-fish_tests.o: config.h util.h common.h proc.h reader.h builtin.h function.h
-fish_tests.o: complete.h wutil.h env.h expand.h parser.h tokenizer.h
-function.o: config.h util.h function.h proc.h parser.h common.h intern.h
-highlight.o: config.h util.h wutil.h highlight.h tokenizer.h proc.h parser.h
-highlight.o: builtin.h function.h env.h expand.h sanity.h common.h complete.h
-highlight.o: output.h
+fish_tests.o: config.h signal.h util.h common.h proc.h io.h reader.h
+fish_tests.o: builtin.h function.h complete.h wutil.h env.h expand.h parser.h
+fish_tests.o: tokenizer.h output.h exec.h event.h
+function.o: signal.h config.h util.h function.h proc.h io.h parser.h common.h
+function.o: intern.h event.h
+highlight.o: signal.h config.h util.h wutil.h highlight.h tokenizer.h proc.h
+highlight.o: io.h parser.h builtin.h function.h env.h expand.h sanity.h
+highlight.o: common.h complete.h output.h
 history.o: config.h util.h wutil.h history.h common.h reader.h env.h sanity.h
-input.o: config.h util.h wutil.h reader.h proc.h common.h sanity.h
-input.o: input_common.h input.h parser.h env.h expand.h
+input.o: config.h signal.h util.h wutil.h reader.h proc.h io.h common.h
+input.o: sanity.h input_common.h input.h parser.h env.h expand.h event.h
+input.o: translate.h
 input_common.o: config.h util.h common.h wutil.h input_common.h
 input_common.o: env_universal.h env_universal_common.h
 intern.o: config.h util.h common.h intern.h
-kill.o: config.h util.h wutil.h kill.h proc.h sanity.h common.h env.h
-kill.o: expand.h exec.h parser.h
-main.o: config.h util.h common.h reader.h builtin.h function.h complete.h
-main.o: wutil.h env.h sanity.h proc.h parser.h expand.h intern.h
+io.o: config.h util.h wutil.h exec.h proc.h io.h common.h translate.h
+key_reader.o: input_common.h
+kill.o: signal.h config.h util.h wutil.h kill.h proc.h io.h sanity.h common.h
+kill.o: env.h expand.h exec.h parser.h
+main.o: config.h signal.h util.h common.h reader.h builtin.h function.h
+main.o: complete.h wutil.h env.h sanity.h proc.h io.h parser.h expand.h
+main.o: intern.h exec.h event.h output.h translate.h
 mimedb.o: config.h xdgmime.h util.h
-output.o: config.h util.h wutil.h expand.h common.h output.h highlight.h
-parser.o: config.h util.h common.h wutil.h proc.h parser.h tokenizer.h exec.h
-parser.o: wildcard.h function.h builtin.h builtin_help.h env.h expand.h
-parser.o: reader.h sanity.h env_universal.h env_universal_common.h
-proc.o: config.h util.h wutil.h proc.h common.h reader.h sanity.h env.h
-reader.o: config.h util.h wutil.h highlight.h reader.h proc.h parser.h
-reader.o: complete.h history.h common.h sanity.h env.h exec.h expand.h
-reader.o: tokenizer.h kill.h input_common.h input.h function.h output.h
-sanity.o: config.h util.h common.h sanity.h proc.h history.h reader.h kill.h
-sanity.o: wutil.h
+output.o: config.h signal.h util.h wutil.h expand.h common.h output.h
+output.o: highlight.h
+parser.o: signal.h config.h util.h common.h wutil.h proc.h io.h parser.h
+parser.o: tokenizer.h exec.h wildcard.h function.h builtin.h builtin_help.h
+parser.o: env.h expand.h reader.h sanity.h env_universal.h
+parser.o: env_universal_common.h event.h translate.h
+proc.o: config.h signal.h util.h wutil.h proc.h io.h common.h reader.h
+proc.o: sanity.h env.h parser.h event.h translate.h
+reader.o: config.h signal.h util.h wutil.h highlight.h reader.h proc.h io.h
+reader.o: parser.h complete.h history.h common.h sanity.h env.h exec.h
+reader.o: expand.h tokenizer.h kill.h input_common.h input.h function.h
+reader.o: output.h translate.h
+sanity.o: signal.h config.h util.h common.h sanity.h proc.h io.h history.h
+sanity.o: reader.h kill.h wutil.h
 set_color.o: config.h
-tokenize.o: config.h
+signal.o: config.h signal.h common.h util.h wutil.h event.h reader.h proc.h
+signal.o: io.h translate.h
 tokenizer.o: config.h util.h wutil.h tokenizer.h common.h wildcard.h
+tokenizer.o: translate.h
+translate.o: config.h common.h util.h
 util.o: config.h util.h common.h wutil.h
 wgetopt.o: config.h wgetopt.h wutil.h
 wildcard.o: config.h util.h wutil.h complete.h common.h wildcard.h reader.h
-wildcard.o: expand.h
+wildcard.o: expand.h translate.h
 wutil.o: config.h util.h common.h wutil.h
 xdgmimealias.o: xdgmimealias.h xdgmime.h xdgmimeint.h
 xdgmime.o: xdgmime.h xdgmimeint.h xdgmimeglob.h xdgmimemagic.h xdgmimealias.h

builtin.c

@@ -11,7 +11,7 @@
 
 	2). Add a line like hash_put( &builtin, L"NAME", &builtin_NAME ); to builtin_init. This will enable the parser to find the builtin function.
 
-	3). Add a line like hash_put( desc, L"NAME", L"Bla bla bla" ); to the proper part of builtin_get_desc, containing a short description of what the builtin does. This description is used by the completion system.
+	3). Add a line like hash_put( desc, L"NAME", _(L"Bla bla bla") ); to the proper part of builtin_get_desc, containing a short description of what the builtin does. This description is used by the completion system.
 
 	4). Create a file doc_src/NAME.txt, containing the manual for the builtin in Doxygen-format. Check the other builtin manuals for proper syntax.
 	
@@ -61,6 +61,7 @@
 #include "intern.h"
 #include "event.h"
 #include "signal.h"
+#include "translate.h"
 
 /**
    The default prompt for the read command
@@ -76,7 +77,7 @@
 /**
    The send stuff to foreground message
 */
-#define FG_MSG L"Send job %d, '%ls' to foreground\n"
+#define FG_MSG _( L"Send job %d, '%ls' to foreground\n" )
 
 /**
    Print modes for the jobs builtin
@@ -234,9 +235,8 @@ static int builtin_bind( wchar_t **argv )
 				if(long_options[opt_index].flag != 0)
 					break;
 				sb_printf( sb_err,
-						   L"%ls%ls %ls\n",
-						   argv[0],
 						   BUILTIN_ERR_UNKNOWN,
+						   argv[0],
 						   long_options[opt_index].name );				
 				builtin_print_help( argv[0], sb_err );
 				
@@ -331,13 +331,10 @@ static int builtin_block( wchar_t **argv )
 			case 0:
 				if(long_options[opt_index].flag != 0)
 					break;
-				sb_append2( sb_err,
-							argv[0],
-							BUILTIN_ERR_UNKNOWN,
-							L" ",
-							long_options[opt_index].name,
-							L"\n",
-							(void *)0);				
+				sb_printf( sb_err,
+						   BUILTIN_ERR_UNKNOWN,
+						   argv[0],
+						   long_options[opt_index].name );				
 				builtin_print_help( argv[0], sb_err );
 					
 				return 1;
@@ -370,13 +367,13 @@ static int builtin_block( wchar_t **argv )
 	{
 		if( scope != UNSET )
 		{
-			sb_printf( sb_err, L"%ls: Can not specify scope when removing block\n", argv[0] );
+			sb_printf( sb_err, _( L"%ls: Can not specify scope when removing block\n" ), argv[0] );
 			return 1;
 		}
 
 		if( !global_event_block )
 		{
-			sb_printf( sb_err, L"%ls: No blocks defined\n", argv[0] );
+			sb_printf( sb_err, _( L"%ls: No blocks defined\n" ), argv[0] );
 			return 1;
 		}
 
@@ -473,13 +470,10 @@ static int builtin_builtin(  wchar_t **argv )
 			case 0:
 				if(long_options[opt_index].flag != 0)
 					break;
-				sb_append2( sb_err,
-							argv[0],
-							BUILTIN_ERR_UNKNOWN,
-							L" ",
-							long_options[opt_index].name,
-							L"\n",
-							(void *)0);				
+                sb_printf( sb_err,
+                           BUILTIN_ERR_UNKNOWN,
+                           argv[0],
+                           long_options[opt_index].name );
 				builtin_print_help( argv[0], sb_err );
 	
 				
@@ -570,13 +564,10 @@ static int builtin_generic( wchar_t **argv )
 			case 0:
 				if(long_options[opt_index].flag != 0)
 					break;
-				sb_append2( sb_err,
-							argv[0],
-							BUILTIN_ERR_UNKNOWN,
-							L" ",
-							long_options[opt_index].name,
-							L"\n",
-							(void *)0);				
+                sb_printf( sb_err,
+                           BUILTIN_ERR_UNKNOWN,
+                           argv[0],
+                           long_options[opt_index].name );
 				builtin_print_help( argv[0], sb_err );
 				return 1;
 				
@@ -633,13 +624,10 @@ static int builtin_exec( wchar_t **argv )
 			case 0:
 				if(long_options[opt_index].flag != 0)
 					break;
-				sb_append2( sb_err,
-							argv[0],
-							BUILTIN_ERR_UNKNOWN,
-							L" ",
-							long_options[opt_index].name,
-							L"\n",
-							(void *)0);				
+                sb_printf( sb_err,
+                           BUILTIN_ERR_UNKNOWN,
+                           argv[0],
+                           long_options[opt_index].name );
 				builtin_print_help( argv[0], sb_err );
 				return 1;
 				
@@ -732,6 +720,7 @@ static void functions_def( wchar_t *name )
 				def,
 				L"\nend\n\n",
 				(void *)0);
+	
 }
 
 
@@ -796,13 +785,10 @@ static int builtin_functions( wchar_t **argv )
 			case 0:
 				if(long_options[opt_index].flag != 0)
 					break;
-				sb_append2( sb_err,
-							argv[0],
-							BUILTIN_ERR_UNKNOWN,
-							L" ",
-							long_options[opt_index].name,
-							L"\n",
-							(void *)0);				
+                sb_printf( sb_err,
+                           BUILTIN_ERR_UNKNOWN,
+                           argv[0],
+                           long_options[opt_index].name );
 				builtin_print_help( argv[0], sb_err );
 	
 				
@@ -840,10 +826,11 @@ static int builtin_functions( wchar_t **argv )
 	*/
 	if( (erase + (desc!=0) + list) > 1 )
 	{
-		sb_append2( sb_err,
-					argv[0],
-					L": Invalid combination of options\n",
-					(void *)0);				
+		sb_printf( sb_err,
+				   _( L"%ls: Invalid combination of options\n" ),
+				   argv[0] );
+		
+
 		builtin_print_help( argv[0], sb_err );
 		
 		return 1;
@@ -864,7 +851,7 @@ static int builtin_functions( wchar_t **argv )
 		if( argc-woptind != 1 )
 		{
 			sb_printf( sb_err,
-					   L"%ls: Expected exactly one function name\n",
+					   _( L"%ls: Expected exactly one function name\n" ),
 					   argv[0] );				
 			builtin_print_help( argv[0], sb_err );
 			
@@ -874,7 +861,7 @@ static int builtin_functions( wchar_t **argv )
 		if( !function_exists( func ) )
 		{
 			sb_printf( sb_err,
-					   L"%ls: Function '%ls' does not exist\n",
+					   _( L"%ls: Function '%ls' does not exist\n" ),
 					   argv[0],
 					   func );
 			
@@ -889,6 +876,8 @@ static int builtin_functions( wchar_t **argv )
 	}
 	else if( list )
 	{
+		int is_screen = !builtin_out_redirect && isatty(1);
+		
 		al_init( &names );
 		function_get_names( &names, show_hidden );
 		names_arr = list_to_char_arr( &names );
@@ -896,13 +885,33 @@ static int builtin_functions( wchar_t **argv )
 			   al_get_count( &names ), 
 			   sizeof(wchar_t *), 
 			   (int (*)(const void *, const void *))&wcsfilecmp );
-		for( i=0; i<al_get_count( &names ); i++ )
+		if( is_screen )
 		{
-			sb_append2( sb_out,
-						names_arr[i],
-						L"\n",
-						(void *)0 );			
+			string_buffer_t buff;
+			sb_init( &buff );
+			
+			for( i=0; i<al_get_count( &names ); i++ )
+			{
+				sb_append2( &buff,
+							names_arr[i],
+							L", ",
+							(void *)0 );			
+			}
+			
+			write_screen( (wchar_t *)buff.buff );
+			sb_destroy( &buff );
 		}
+		else
+		{
+			for( i=0; i<al_get_count( &names ); i++ )
+			{
+				sb_append2( sb_out,
+							names_arr[i],
+							L"\n",
+							(void *)0 );			
+			}
+		}
+		
 		free( names_arr );
 		al_destroy( &names );			
 		return 0;
@@ -913,7 +922,7 @@ static int builtin_functions( wchar_t **argv )
 	{
 		case 0:
 		{
-			sb_append( sb_out, L"Current function definitions are:\n\n" );		
+			sb_append( sb_out, _( L"Current function definitions are:\n\n" ) );		
 			al_init( &names );
 			function_get_names( &names, show_hidden );
 			names_arr = list_to_char_arr( &names );
@@ -1049,13 +1058,10 @@ static int builtin_function( wchar_t **argv )
 			case 0:
 				if(long_options[opt_index].flag != 0)
 					break;
-				sb_append2( sb_err,
-							argv[0],
-							BUILTIN_ERR_UNKNOWN,
-							L" ",
-							long_options[opt_index].name,
-							L"\n",
-							(void *)0);				
+                sb_printf( sb_err,
+                           BUILTIN_ERR_UNKNOWN,
+                           argv[0],
+                           long_options[opt_index].name );
 				builtin_print_help( argv[0], sb_err );
 				
 				res = 1;
@@ -1078,7 +1084,7 @@ static int builtin_function( wchar_t **argv )
 				if( sig < 0 )
 				{
 					sb_printf( sb_err, 
-							   L"%ls: Unknown signal %ls\n",
+							   _( L"%ls: Unknown signal '%ls'\n" ),
 							   argv[0],
 							   woptarg );
 					res=1;
@@ -1102,7 +1108,7 @@ static int builtin_function( wchar_t **argv )
 				if( !wcsvarname( woptarg ) )
 				{
 					sb_printf( sb_err, 
-							   L"%ls: Invalid variable name %ls\n",
+							   _( L"%ls: Invalid variable name '%ls'\n" ),
 							   argv[0],
 							   woptarg );
 					res=1;
@@ -1164,7 +1170,7 @@ static int builtin_function( wchar_t **argv )
 					if( job_id == -1 )
 					{
 						sb_printf( sb_err,
-								   L"%ls: Cannot find calling job for event handler\n",
+								   _( L"%ls: Cannot find calling job for event handler\n" ),
 								   argv[0] );
 						res=1;
 					}
@@ -1182,7 +1188,7 @@ static int builtin_function( wchar_t **argv )
 					if( errno || !end || *end )
 					{
 						sb_printf( sb_err,
-								   L"%ls: Invalid process id %ls\n",
+								   _( L"%ls: Invalid process id %ls\n" ),
 								   argv[0],
 								   woptarg );
 						res=1;
@@ -1219,7 +1225,7 @@ static int builtin_function( wchar_t **argv )
 		if( argc-woptind != 1 )
 		{
 			sb_printf( sb_err, 
-					   L"%ls: Expected one argument, got %d\n",
+					   _( L"%ls: Expected one argument, got %d\n" ),
 					   argv[0],
 					   argc-woptind );
 			res=1;
@@ -1227,7 +1233,7 @@ static int builtin_function( wchar_t **argv )
 		else if( !(is_binding?wcsbindingname( argv[woptind] ) : wcsvarname( argv[woptind] ) ))
 		{ 
 			sb_printf( sb_err, 
-					   L"%ls: illegal function name '%ls'\n", 
+					   _( L"%ls: Illegal function name '%ls'\n" ), 
 					   argv[0],
 					   argv[woptind] );
 			
@@ -1237,7 +1243,7 @@ static int builtin_function( wchar_t **argv )
 		{
 			
 			sb_printf( sb_err,
-					   L"%ls: the name '%ls' is reserved,\nand can not be used as a function name\n",
+					   _( L"%ls: The name '%ls' is reserved,\nand can not be used as a function name\n" ),
 					   argv[0],
 					   argv[woptind] );
 			
@@ -1253,9 +1259,10 @@ static int builtin_function( wchar_t **argv )
 		int chars=0;
 		
 //		builtin_print_help( argv[0], sb_err );
-		
-		sb_append( sb_err, L"Current functions are: " );		
-		chars += wcslen( L"Current functions are: " );		
+		const wchar_t *cfa =  _( L"Current functions are: " );
+		sb_append( sb_err, cfa );
+		chars += wcslen( cfa );
+
 		al_init( &names );
 		function_get_names( &names, 0 );
 		names_arr = list_to_char_arr( &names );
@@ -1350,13 +1357,10 @@ static int builtin_random( wchar_t **argv )
 			case 0:
 				if(long_options[opt_index].flag != 0)
 					break;
-				sb_append2( sb_err,
-							argv[0],
-							BUILTIN_ERR_UNKNOWN,
-							L" ",
-							long_options[opt_index].name,
-							L"\n",
-							(void *)0);				
+                sb_printf( sb_err,
+                           BUILTIN_ERR_UNKNOWN,
+                           argv[0],
+                           long_options[opt_index].name );
 				builtin_print_help( argv[0], sb_err );
 				
 				return 1;
@@ -1398,7 +1402,7 @@ static int builtin_random( wchar_t **argv )
 			if( errno || *end )
 			{
 				sb_printf( sb_err,
-						   L"%ls: Seed value '%ls' is not a valid number\n", 
+						   _( L"%ls: Seed value '%ls' is not a valid number\n" ), 
 						   argv[0],
 						   argv[woptind] );
 				
@@ -1412,7 +1416,7 @@ static int builtin_random( wchar_t **argv )
 		default:
 		{
 			sb_printf( sb_err,
-					   L"%ls: Expected zero or one argument, got %d\n",
+					   _( L"%ls: Expected zero or one argument, got %d\n" ),
 					   argv[0],
 					   argc-woptind );
 			builtin_print_help( argv[0], sb_err );
@@ -1455,6 +1459,10 @@ static int builtin_read( wchar_t **argv )
 					L"local", no_argument, 0, 'l'
 				}
 				,
+				{
+					L"universal", no_argument, 0, 'U'
+				}
+				,
 				{
 					L"unexport", no_argument, 0, 'u'
 				}
@@ -1477,7 +1485,7 @@ static int builtin_read( wchar_t **argv )
 		
 		int opt = wgetopt_long( argc,
 								argv, 
-								L"xglup:c:", 
+								L"xglUup:c:", 
 								long_options, 
 								&opt_index );
 		if( opt == -1 )
@@ -1488,13 +1496,10 @@ static int builtin_read( wchar_t **argv )
 			case 0:
 				if(long_options[opt_index].flag != 0)
 					break;
-				sb_append2( sb_err, 
-							argv[0],
-							BUILTIN_ERR_UNKNOWN,
-							L" ",
-							long_options[opt_index].name,
-							L"\n",
-							(void *)0 );
+                sb_printf( sb_err,
+                           BUILTIN_ERR_UNKNOWN,
+                           argv[0],
+                           long_options[opt_index].name );
 				builtin_print_help( argv[0], sb_err );
 
 				return 1;
@@ -1508,6 +1513,9 @@ static int builtin_read( wchar_t **argv )
 			case L'l':		
 				place |= ENV_LOCAL;
 				break;
+			case L'U':		
+				place |= ENV_UNIVERSAL;
+				break;
 			case L'u':		
 				place |= ENV_UNEXPORT;
 				break;
@@ -1529,26 +1537,22 @@ static int builtin_read( wchar_t **argv )
 
 	if( ( place & ENV_UNEXPORT ) && ( place & ENV_EXPORT ) )
 	{
-		sb_append2( sb_err,
-					argv[0],
-					BUILTIN_ERR_EXPUNEXP,
-					L"\n",
-					parser_current_line(),
-					L"\n",
-					(void *)0 );
+		sb_printf( sb_err,
+				   BUILTIN_ERR_EXPUNEXP,
+				   argv[0],
+				   parser_current_line() );
+		
+					
 		builtin_print_help( argv[0], sb_err );		
 		return 1;		
 	}
 	
-	if( (place&ENV_LOCAL) && (place & ENV_GLOBAL) )
+	if( (place&ENV_LOCAL?1:0) + (place & ENV_GLOBAL?1:0) + (place & ENV_UNIVERSAL?1:0) > 1)
 	{
-		sb_append2( sb_err,
-					argv[0],
-					BUILTIN_ERR_GLOCAL,
-					L"\n",
-					parser_current_line(),
-					L"\n",
-					(void *)0 );
+		sb_printf( sb_err,
+				   BUILTIN_ERR_GLOCAL,
+				   argv[0],
+				   parser_current_line() );
 		builtin_print_help( argv[0], sb_err );		
 		
 		return 1;		
@@ -1556,10 +1560,11 @@ static int builtin_read( wchar_t **argv )
 	
 	if( woptind == argc )
 	{
+		sb_printf( sb_err,
+				   BUILTIN_ERR_MISSING,
+				   argv[0] );		
+		
 		sb_append2( sb_err,
-					argv[0],
-					BUILTIN_ERR_MISSING,
-					L"\n",
 					parser_current_line(),
 					L"\n",
 					(void *)0 );
@@ -1752,13 +1757,10 @@ static int builtin_status( wchar_t **argv )
 			case 0:
 				if(long_options[opt_index].flag != 0)
 					break;
-				sb_append2( sb_err,
-							argv[0],
-							BUILTIN_ERR_UNKNOWN,
-							L" ",
-							long_options[opt_index].name,
-							L"\n",
-							(void *)0);				
+                sb_printf( sb_err,
+                           BUILTIN_ERR_UNKNOWN,
+                           argv[0],
+                           long_options[opt_index].name );
 				builtin_print_help( argv[0], sb_err );
 				
 				return 1;
@@ -1855,7 +1857,7 @@ static int builtin_exit( wchar_t **argv )
 			if( errno || *end != 0)
 			{
 				sb_printf( sb_err, 
-						   L"%ls: Argument must be an integer '%ls'\n", 
+						   _( L"%ls: Argument '%ls' must be an integer\n" ), 
 						   argv[0],
 						   argv[1] );
 				builtin_print_help( argv[0], sb_err );				
@@ -1866,7 +1868,7 @@ static int builtin_exit( wchar_t **argv )
 		
 		default:
 			sb_printf( sb_err, 
-					   L"%ls: Too many arguments\n", 
+					   _( L"%ls: Too many arguments\n" ), 
 					   argv[0] );
 			
 			builtin_print_help( argv[0], sb_err );				
@@ -1910,11 +1912,9 @@ static int builtin_cd( wchar_t **argv )
 		dir_in = env_get( L"HOME" );
 		if( !dir_in )
 		{
-			sb_append2( sb_err,
-						argv[0], 
-						L": Could not find home directory\n",
-						(void *)0 );			
-			
+			sb_printf( sb_err,
+					   _( L"%ls: Could not find home directory\n" ),
+					   argv[0] );
 		}		
 	}	
 	else 
@@ -1925,7 +1925,7 @@ static int builtin_cd( wchar_t **argv )
 	if( !dir )
 	{
 		sb_printf( sb_err,
-				   L"%ls: is not a directory or you do not have permission to enter it\n",
+				   _( L"%ls: '%ls' is not a directory or you do not have permission to enter it\n" ),
 				   argv[0],
 				   dir_in );
 		sb_append2( sb_err, 
@@ -1937,7 +1937,7 @@ static int builtin_cd( wchar_t **argv )
 	if( wchdir( dir ) != 0 )
 	{
 		sb_printf( sb_err,
-				   L"%ls: '%ls' is not a directory\n",
+				   _( L"%ls: '%ls' is not a directory\n" ),
 				   argv[0],
 				   dir );
 		sb_append2( sb_err, 
@@ -1952,7 +1952,7 @@ static int builtin_cd( wchar_t **argv )
 	if (!set_pwd(L"PWD"))
 	{
 		res=1;
-		sb_printf( sb_err, L"%ls: Could not set PWD variable\n", argv[0] );		
+		sb_printf( sb_err, _( L"%ls: Could not set PWD variable\n" ), argv[0] );		
 	}
 	
 	free( dir );
@@ -2061,12 +2061,10 @@ static int builtin_complete( wchar_t **argv )
 			case 0:
 				if(long_options[opt_index].flag != 0)
 					break;
-				sb_append2( sb_err,
-							argv[0],
-							L": Unknown option ",
-							long_options[opt_index].name,
-							L"\n",
-							(void *)0 );
+                sb_printf( sb_err,
+                           BUILTIN_ERR_UNKNOWN,
+                           argv[0],
+                           long_options[opt_index].name );
 				sb_append( sb_err, 
 						   parser_current_line() );
 //				builtin_print_help( argv[0], sb_err );
@@ -2108,12 +2106,11 @@ static int builtin_complete( wchar_t **argv )
 			case 's':
 				if( wcslen( woptarg ) > 1 )
 				{
-					sb_append2( sb_err,
-								argv[0],
-								L": Parameter too long ",
-								woptarg,
-								L"\n",
-								(void *)0);
+					sb_printf( sb_err,
+							   _( L"%ls: Parameter '%ls' is too long\n" ),
+							   argv[0],
+							   woptarg );
+					
 					sb_append( sb_err, 
 							   parser_current_line() );
 //				builtin_print_help( argv[0], sb_err );
@@ -2164,7 +2161,7 @@ static int builtin_complete( wchar_t **argv )
 	if( woptind != argc )
 	{
 		sb_printf( sb_err, 
-				   L"%ls: Too many arguments\n",
+				   _( L"%ls: Too many arguments\n" ),
 				   argv[0] );
 		sb_append( sb_err, 
 				   parser_current_line() );
@@ -2231,7 +2228,7 @@ static int builtin_source( wchar_t ** argv )
 	
 	if( argc != 2 )
 	{
-		sb_printf( sb_err, L"%ls: Expected exactly one argument, gor %d\n", argv[0], argc );
+		sb_printf( sb_err, _( L"%ls: Expected exactly one argument, got %d\n" ), argv[0], argc );
 		builtin_print_help( argv[0], sb_err );
 		return 1;
 	}
@@ -2244,7 +2241,7 @@ static int builtin_source( wchar_t ** argv )
 		
 	if( !S_ISREG(buf.st_mode) )
 	{
-		sb_printf( sb_err, L"%ls: '%ls' is not a file\n", argv[0], argv[1] );
+		sb_printf( sb_err, _( L"%ls: '%ls' is not a file\n" ), argv[0], argv[1] );
 		builtin_print_help( argv[0], sb_err );
 		
 		return 1;
@@ -2269,7 +2266,7 @@ static int builtin_source( wchar_t ** argv )
 		if( res )
 		{
 			sb_printf( sb_err,
-					   L"%ls : Error while reading file '%ls'\n",
+					   _( L"%ls: Error while reading file '%ls'\n" ),
 					   argv[0],
 					   argv[1]
 				);
@@ -2328,6 +2325,10 @@ static int builtin_fg( wchar_t **argv )
 		*/
 		for( j=first_job; ((j!=0) && (!j->constructed)); j=j->next )
 			;
+		sb_printf( sb_err,
+				   _( L"%ls: There are no jobs\n" ),
+				   argv[0] );
+		builtin_print_help( argv[0], sb_err );
 	}
 	else if( argv[2] != 0 )
 	{
@@ -2341,18 +2342,16 @@ static int builtin_fg( wchar_t **argv )
 		j = job_get_from_pid( pid );
 		if( j != 0 )
 		{
-			sb_append2( sb_err, 
-						argv[0],
-						L": Ambiguous job\n",
-						(void *)0);	
+			sb_printf( sb_err, 
+						_( L"%ls: Ambiguous job\n" ),
+					   argv[0] );			
 		}
 		else
 		{
-			sb_append2( sb_err,
-						argv[0], 
-						L": Not a job (", 
-						argv[1], 
-						L")\n", (void *)0 );
+			sb_printf( sb_err,
+					   _( L"%ls: '%ls' is not a job\n" ), 
+					   argv[0], 
+					   argv[1] );
 		}
 		builtin_print_help( argv[0], sb_err );
 		
@@ -2362,18 +2361,14 @@ static int builtin_fg( wchar_t **argv )
 	{
 		int pid = abs(wcstol( argv[1], 0, 10 ));
 		j = job_get_from_pid( pid );
+		sb_printf( sb_err,
+				   _( L"%ls: No suitable job: %d\n" ),
+				   argv[0],
+				   pid );
+		builtin_print_help( argv[0], sb_err );
 	}
 
-	if( j == 0 )
-	{
-		sb_append2( sb_err,
-					argv[0], 
-					L": No suitable job\n",
-					(void *)0);
-		builtin_print_help( argv[0], sb_err );
-		return 1;
-	}
-	else
+	if( j != 0 )
 	{
 		if( builtin_err_redirect )
 		{
@@ -2413,18 +2408,21 @@ static int builtin_fg( wchar_t **argv )
 /**
    Helper function for builtin_bg()
 */
-static void send_to_bg( job_t *j, wchar_t *name )
+static void send_to_bg( job_t *j, const wchar_t *name )
 {
 	if( j == 0 )
 	{
-		sb_append2( sb_err, L"bg", L": Unknown job ", name, L"\n", (void *)0 );
+		sb_printf( sb_err, 
+				   _( L"%ls: Unknown job '%ls'\n" ),
+				   L"bg",
+				   name );
 		builtin_print_help( L"bg", sb_err );
 		return;
 	}	
 	else
 	{
 		sb_printf( sb_err, 
-				   L"Send job %d '%ls' to background\n",
+				   _(L"Send job %d '%ls' to background\n"),
 				   j->job_id,
 				   j->command );
 	}
@@ -2444,7 +2442,7 @@ static int builtin_bg( wchar_t **argv )
   		job_t *j;
 		for( j=first_job; ((j!=0) && (!j->constructed) && (!job_is_stopped(j))); j=j->next )
 			;
-		send_to_bg( j, L"(default)");
+		send_to_bg( j, _(L"(default)" ) );
 		return 0;
 	}
 	for( argv++; *argv != 0; argv++ )
@@ -2498,11 +2496,11 @@ static void builtin_jobs_print( job_t *j, int mode, int header )
 				/*
 				  Print table header before first job
 				*/
-				sb_append( sb_out, L"Job\tGroup\t");
+				sb_append( sb_out, _( L"Job\tGroup\t" ));
 #ifdef HAVE__PROC_SELF_STAT
-				sb_append( sb_out, L"CPU\t" );
+				sb_append( sb_out, _( L"CPU\t" ) );
 #endif
-				sb_append( sb_out, L"State\tCommand\n" );
+				sb_append( sb_out, _( L"State\tCommand\n" ) );
 			}
 			
 			sb_printf( sb_out, L"%d\t%d\t", j->job_id, j->pgid );
@@ -2510,8 +2508,12 @@ static void builtin_jobs_print( job_t *j, int mode, int header )
 #ifdef HAVE__PROC_SELF_STAT
 			sb_printf( sb_out, L"%d%%\t", cpu_use(j) );
 #endif
-			sb_append2( sb_out, job_is_stopped(j)?L"stopped\t":L"running\t", 
-						j->command, L"\n", (void *)0 );
+			sb_append2( sb_out, 
+						job_is_stopped(j)?_(L"stopped"):_(L"running"), 
+						L"\t", 
+						j->command, 
+						L"\n", 
+						(void *)0 );
 			break;
 		}
 
@@ -2522,7 +2524,7 @@ static void builtin_jobs_print( job_t *j, int mode, int header )
 				/*
 				  Print table header before first job
 				*/
-				sb_append( sb_out, L"Group\n");
+				sb_append( sb_out, _( L"Group\n" ));
 			}
 			sb_printf( sb_out, L"%d\n", j->pgid );
 			break;
@@ -2535,7 +2537,7 @@ static void builtin_jobs_print( job_t *j, int mode, int header )
 				/*
 				  Print table header before first job
 				*/
-				sb_append( sb_out, L"Procces\n");
+				sb_append( sb_out, _( L"Procces\n" ));
 			}
 
 			for( p=j->first_process; p; p=p->next )
@@ -2552,7 +2554,7 @@ static void builtin_jobs_print( job_t *j, int mode, int header )
 				/*
 				  Print table header before first job
 				*/
-				sb_append( sb_out, L"Command\n");
+				sb_append( sb_out, _( L"Command\n" ));
 			}
 
 			for( p=j->first_process; p; p=p->next )
@@ -2623,10 +2625,10 @@ static int builtin_jobs( wchar_t **argv )
 			case 0:
 				if(long_options[opt_index].flag != 0)
 					break;
-				sb_printf( sb_err,
-						   L"%ls: Unknown option '%ls'\n",
-						   argv[0],
-						   long_options[opt_index].name );
+                sb_printf( sb_err,
+                           BUILTIN_ERR_UNKNOWN,
+                           argv[0],
+                           long_options[opt_index].name );
 											
 				sb_append( sb_err, 
 						   parser_current_line() );
@@ -2704,7 +2706,7 @@ static int builtin_jobs( wchar_t **argv )
 				if( errno || *end )
 				{
 					sb_printf( sb_err, 
-							   L"%ls: Not a process id: '%ls'\n",
+							   _( L"%ls: '%ls' is not a job\n" ),
 							   argv[0], 
 							   argv[i] );
 					return 1;
@@ -2719,7 +2721,7 @@ static int builtin_jobs( wchar_t **argv )
 				else
 				{
 					sb_printf( sb_err,
-							   L"%ls: No suitable job: %d\n", 
+							   _( L"%ls: No suitable job: %d\n" ), 
 							   argv[0], 
 							   pid );
 					return 1;
@@ -2745,7 +2747,7 @@ static int builtin_jobs( wchar_t **argv )
 	if( !found )
 	{
 		sb_printf( sb_out, 
-				   L"%ls: There are no running jobs\n", 
+				   _( L"%ls: There are no jobs\n" ), 
 				   argv[0] );
 	}
 	
@@ -2764,14 +2766,14 @@ static int builtin_for( wchar_t **argv )
 	if( argc < 3) 
 	{
 		sb_printf( sb_err, 
-				   L"%ls: Expected at least two arguments\n",
+				   _( L"%ls: Expected at least two arguments\n" ),
 				   argv[0] );
 		builtin_print_help( argv[0], sb_err );
 	}
 	else if ( !wcsvarname(argv[1]) )
 	{
 		sb_printf( sb_err, 
-				   L"%ls: '%ls' invalid variable name\n",
+				   _( L"%ls: '%ls' is not a valid variable name\n" ),
 				   argv[0],
 				   argv[1] );
 		builtin_print_help( argv[0], sb_err );
@@ -2779,7 +2781,7 @@ static int builtin_for( wchar_t **argv )
 	else if (wcscmp( argv[2], L"in") != 0 )
 	{
 		sb_printf( sb_err,
-				   L"%ls: Second argument must be 'in'\n",
+				   _( L"%ls: Second argument must be 'in'\n" ),
 				   argv[0] );
 		builtin_print_help( argv[0], sb_err );
 	}
@@ -2836,12 +2838,10 @@ static int builtin_begin( wchar_t **argv )
 */
 static int builtin_end( wchar_t **argv )
 {
-	if( !current_block->outer ||
-		current_block->type == OR ||
-		current_block->type == AND )
+	if( !current_block->outer )
 	{
 		sb_printf( sb_err,
-				   L"%ls: Not inside of block\n",
+				   _( L"%ls: Not inside of block\n" ),
 				   argv[0] );
 		
 		builtin_print_help( argv[0], sb_err );
@@ -2965,7 +2965,7 @@ static int builtin_else( wchar_t **argv )
 		current_block->param1.if_state != 1)
 	{
 		sb_printf( sb_err,
-				   L"%ls: not inside of if block\n",
+				   _( L"%ls: Not inside of 'if' block\n" ),
 				   argv[0] );
 		builtin_print_help( argv[0], sb_err );
 		return 1;
@@ -2997,10 +2997,11 @@ static int builtin_break_continue( wchar_t **argv )
 	
 	if( argc != 1 )
 	{
-		sb_printf( sb_err, 
-				   L"%ls: Unknown option '%ls'\n", 
-				   argv[0], 
+		sb_printf( sb_err,
+				   BUILTIN_ERR_UNKNOWN,
+				   argv[0],
 				   argv[1] );
+
 		builtin_print_help( argv[0], sb_err );
 		return 1;		
 	}
@@ -3016,7 +3017,7 @@ static int builtin_break_continue( wchar_t **argv )
 	if( b == 0 )
 	{
 		sb_printf( sb_err, 
-				   L"%ls: Not inside of loop\n", 
+				   _( L"%ls: Not inside of loop\n" ), 
 				   argv[0] );
 		builtin_print_help( argv[0], sb_err );
 		return 1;
@@ -3056,7 +3057,7 @@ static int builtin_return( wchar_t **argv )
 			if( errno || *end != 0)
 			{
 				sb_printf( sb_err,
-						   L"%ls: Argument must be an integer '%ls'\n", 
+						   _( L"%ls: Argument '%ls' must be an integer\n" ), 
 						   argv[0], 
 						   argv[1] );
 				builtin_print_help( argv[0], sb_err );				
@@ -3067,7 +3068,7 @@ static int builtin_return( wchar_t **argv )
 		}
 		default:
 			sb_printf( sb_err, 
-					   L"%ls: Too many arguments\n", 
+					   _( L"%ls: Too many arguments\n" ), 
 					   argv[0] );
 			builtin_print_help( argv[0], sb_err );
 			return 1;		
@@ -3083,7 +3084,7 @@ static int builtin_return( wchar_t **argv )
 	if( b == 0 )
 	{
 		sb_printf( sb_err,
-				   L"%ls: Not inside of function\n", 
+				   _( L"%ls: Not inside of function\n" ), 
 				   argv[0] );
 		builtin_print_help( argv[0], sb_err );
 		return 1;
@@ -3112,7 +3113,7 @@ static int builtin_switch( wchar_t **argv )
 	if( argc != 2 )
 	{
 		sb_printf( sb_err, 
-				   L"%ls : syntax error, expected exactly one argument, got %d\n",
+				   _( L"%ls: Expected exactly one argument, got %d\n" ),
 				   argv[0],
 				   argc-1 );
 		
@@ -3143,9 +3144,9 @@ static int builtin_case( wchar_t **argv )
 	if( current_block->type != SWITCH )
 	{
 		sb_printf( sb_err,
-				   L"%ls: syntax error, case command while not in switch block\n",
+				   _( L"%ls: 'case' command while not in switch block\n" ),
 				   argv[0] );
-		builtin_print_help( L"case", sb_err );
+		builtin_print_help( argv[0], sb_err );
 		return 1;
 	}
 		
@@ -3341,7 +3342,7 @@ int builtin_run( wchar_t **argv )
 	}
 	else
 	{
-		debug( 0, L"Unknown builtin: ", argv[0], 0 );
+		debug( 0, _( L"Unknown builtin '%ls'" ), argv[0] );
 	}
 	return 1;	
 }
@@ -3363,47 +3364,46 @@ const wchar_t *builtin_get_desc( const wchar_t *b )
 		
 		hash_init( desc, &hash_wcs_func, &hash_wcs_cmp );
 
-		hash_put( desc, L"block", L"Temporarily block delivery of events" );	
-		hash_put( desc, L"builtin", L"Run a builtin command" );	
-		hash_put( desc, L"complete", L"Edit command specific completions" );	
-		hash_put( desc, L"cd", L"Change working directory" );	
-		hash_put( desc, L"exit", L"Exit the shell" );	
-		hash_put( desc, L"function", L"Define a new function" );	
-		hash_put( desc, L"functions", L"List or remove functions" );	
-		hash_put( desc, L"end", L"End a block of commands" );
-		hash_put( desc, L"else", L"Evaluate block if condition is false" );
-		hash_put( desc, L"eval", L"Evaluate parameters as a command" );	
-		hash_put( desc, L"for", L"Perform a set of commands multiple times" );
-		hash_put( desc, L".", L"Evaluate contents of file" );
-		hash_put( desc, L"set", L"Handle environment variables" );
-		hash_put( desc, L"fg", L"Send job to foreground" );
-		hash_put( desc, L"bg", L"Send job to background" );
-		hash_put( desc, L"jobs", L"Print currently running jobs" );
-		hash_put( desc, L"read", L"Read a line of input into variables" );
-		hash_put( desc, L"break", L"Stop the innermost loop" );	
-		hash_put( desc, L"continue", L"Skip the rest of the current lap of the innermost loop" );
-		hash_put( desc, L"return", L"Stop the innermost currently evaluated function" );
-		hash_put( desc, L"commandline", L"Set the commandline" );
-		hash_put( desc, L"switch", L"Conditionally execute a block of commands" );	
-		hash_put( desc, L"case", L"Conditionally execute a block of commands" );	
-		hash_put( desc, L"command", L"Run a program" );		
-		hash_put( desc, L"if", L"Conditionally execute a command" );	
-		hash_put( desc, L"while", L"Perform a command multiple times" );	
-		hash_put( desc, L"bind", L"Handle key bindings");
-		hash_put( desc, L"random", L"Generate random number");
-		hash_put( desc, L"exec", L"Run command in current process");
-		hash_put( desc, L"not", L"Negate exit status of job");
-		hash_put( desc, L"or", L"Execute second command if first fails");
-		hash_put( desc, L"and", L"Execute second command if first suceeds");
-		hash_put( desc, L"begin", L"Create a block of code" );
-		hash_put( desc, L"status", L"Return status information about fish" );
-		hash_put( desc, L"ulimit", L"Set or get the shells resurce usage limits" );
+		hash_put( desc, L"block", N_( L"Temporarily block delivery of events" ) );	
+		hash_put( desc, L"builtin", N_( L"Run a builtin command instead of a function" ) );	
+		hash_put( desc, L"complete", N_( L"Edit command specific completions" ) );	
+		hash_put( desc, L"cd", N_( L"Change working directory" ) );	
+		hash_put( desc, L"exit", N_( L"Exit the shell" ) );	
+		hash_put( desc, L"function", N_( L"Define a new function" ) );	
+		hash_put( desc, L"functions", N_( L"List or remove functions" ) );	
+		hash_put( desc, L"end", N_( L"End a block of commands" ) );
+		hash_put( desc, L"else", N_( L"Evaluate block if condition is false" ) );
+		hash_put( desc, L"eval", N_( L"Evaluate parameters as a command" ) );	
+		hash_put( desc, L"for", N_( L"Perform a set of commands multiple times" ) );
+		hash_put( desc, L".", N_( L"Evaluate contents of file" ) );
+		hash_put( desc, L"set", N_( L"Handle environment variables" ) );
+		hash_put( desc, L"fg", N_( L"Send job to foreground" ) );
+		hash_put( desc, L"bg", N_( L"Send job to background" ) );
+		hash_put( desc, L"jobs", N_( L"Print currently running jobs" ) );
+		hash_put( desc, L"read", N_( L"Read a line of input into variables" ) );
+		hash_put( desc, L"break", N_( L"Stop the innermost loop" ) );	
+		hash_put( desc, L"continue", N_( L"Skip the rest of the current lap of the innermost loop" ) );
+		hash_put( desc, L"return", N_( L"Stop the currently evaluated function" ) );
+		hash_put( desc, L"commandline", N_( L"Set or get the commandline" ) );
+		hash_put( desc, L"switch", N_( L"Conditionally execute a block of commands" ) );	
+		hash_put( desc, L"case", N_( L"Conditionally execute a block of commands" ) );	
+		hash_put( desc, L"command", N_( L"Run a program instead of a function or builtin" ) );		
+		hash_put( desc, L"if", N_( L"Evaluate block if condition is true" ) );
+		hash_put( desc, L"while", N_( L"Perform a command multiple times" ) );	
+		hash_put( desc, L"bind", N_( L"Handle fish key bindings" ));
+		hash_put( desc, L"random", N_( L"Generate random number" ));
+		hash_put( desc, L"exec", N_( L"Run command in current process" ));
+		hash_put( desc, L"not", N_( L"Negate exit status of job" ));
+		hash_put( desc, L"or", N_( L"Execute command if previous command failed" ));
+		hash_put( desc, L"and", N_( L"Execute command if previous command suceeded" ));
+		hash_put( desc, L"begin", N_( L"Create a block of code" ) );
+		hash_put( desc, L"status", N_( L"Return status information about fish" ) );
+		hash_put( desc, L"ulimit", N_( L"Set or get the shells resource usage limits" ) );
 	}
 
-	return hash_get( desc, b );	
+	return _( hash_get( desc, b ));	
 }
 
-
 void builtin_push_io( int in)
 {
 	if( builtin_stdin != -1 )

builtin.h

@@ -20,31 +20,36 @@ enum
 /**
    Error message on missing argument
 */
-#define BUILTIN_ERR_MISSING L": Expected argument"
+#define BUILTIN_ERR_MISSING _( L"%ls: Expected argument\n" )
 
 /**
    Error message on invalid combination of options
 */
-#define BUILTIN_ERR_COMBO L": Invalid combination of options"
+#define BUILTIN_ERR_COMBO _( L"%ls: Invalid combination of options\n" )
+
+/**
+   Error message on invalid combination of options
+*/
+#define BUILTIN_ERR_COMBO2 _( L"%ls: Invalid combination of options,\n%ls\n" )
 
 /**
    Error message on multiple scope levels for variables
 */
-#define BUILTIN_ERR_GLOCAL L": Variable can only be one of universal, global and local"
+#define BUILTIN_ERR_GLOCAL _( L"%ls: Variable scope can only be one of universal, global and local\n%ls\n" )
 
 /**
    Error message for specifying both export and unexport to set/read
 */
-#define BUILTIN_ERR_EXPUNEXP L": Variable can't be both exported and unexported"
+#define BUILTIN_ERR_EXPUNEXP _( L"%ls: Variable can't be both exported and unexported\n%ls\n" )
 
 /**
    Error message for unknown switch
 */
-#define BUILTIN_ERR_UNKNOWN	L": Unknown option"
+#define BUILTIN_ERR_UNKNOWN	_( L"%ls: Unknown option '%ls'\n" )
 
-#define BUILTIN_ERR_VARCHAR L"%ls: Invalid character in variable name: '%lc'. Only alphanumerical characters and underscores are valid in a variable name.\n"
+#define BUILTIN_ERR_VARCHAR _( L"%ls: Invalid character '%lc' in variable name. Only alphanumerical characters and underscores are valid in a variable name.\n" )
 
-#define BUILTIN_ERR_VARNAME_ZERO L"%ls: Variable name can not be the empty string\n"
+#define BUILTIN_ERR_VARNAME_ZERO _( L"%ls: Variable name can not be the empty string\n" )
 
 /**
    Stringbuffer used to represent standard output

builtin_commandline.c

@@ -22,6 +22,7 @@ Functions used for implementing the commandline builtin.
 #include "tokenizer.h"
 #include "input_common.h"
 #include "input.h"
+#include "translate.h"
 
 /**
    Which part of the comandbuffer are we operating on
@@ -260,13 +261,10 @@ int builtin_commandline( wchar_t **argv )
 			case 0:
 				if(long_options[opt_index].flag != 0)
 					break;
-				sb_append2( sb_err, 
-							argv[0],
-							BUILTIN_ERR_UNKNOWN,
-							L" ",
-							long_options[opt_index].name,
-							L"\n",
-							(void *)0 );
+                sb_printf( sb_err,
+                           BUILTIN_ERR_UNKNOWN,
+                           argv[0],
+                           long_options[opt_index].name );
 				builtin_print_help( argv[0], sb_err );
 
 				return 1;
@@ -322,10 +320,11 @@ int builtin_commandline( wchar_t **argv )
 		*/
 		if( buffer_part || cut_at_cursor || append_mode || tokenize )
 		{
+			sb_printf(sb_err,
+					  BUILTIN_ERR_COMBO,
+					  argv[0] );
+			
 			sb_append2(sb_err,
-					   argv[0],
-					   BUILTIN_ERR_COMBO,
-					   L"\n",
 					   parser_current_line(),
 					   L"\n",
 					   (void *)0);
@@ -335,10 +334,11 @@ int builtin_commandline( wchar_t **argv )
 
 		if( argc == woptind )
 		{
+			sb_printf( sb_err,
+					   BUILTIN_ERR_MISSING,
+					   argv[0] );
+			
 			sb_append2( sb_err,
-						argv[0],
-						BUILTIN_ERR_MISSING,
-						L"\n",
 						parser_current_line(),
 						L"\n",
 						(void *)0 );
@@ -394,22 +394,23 @@ int builtin_commandline( wchar_t **argv )
 	if( (tokenize || cut_at_cursor) && (argc-woptind) )
 	{
 		
-		sb_append2( sb_err,
-					argv[0],
-					BUILTIN_ERR_COMBO,
-					L",\n --cut-at-cursor and --tokenize can not be used when setting the commandline",
-					(void *)0 );
+		sb_printf( sb_err,
+				   BUILTIN_ERR_COMBO2,
+				   argv[0],
+				   L"--cut-at-cursor and --tokenize can not be used when setting the commandline" );
+		
+
 		builtin_print_help( argv[0], sb_err );
 		return 1;
 	}
 
 	if( append_mode && !(argc-woptind) )
 	{
-		sb_append2( sb_err,
+		sb_printf( sb_err,
+                    BUILTIN_ERR_COMBO2,
                     argv[0],
-                    BUILTIN_ERR_COMBO,
-                    L",\n insertion mode switches can not be used when not in insertion mode",
-                    (void *)0 );
+				   L"insertion mode switches can not be used when not in insertion mode" );
+
         builtin_print_help( argv[0], sb_err );		
         return 1;
 	}

builtin_set.c

@@ -20,6 +20,7 @@ Functions used for implementing the set builtin.
 #include "wgetopt.h"
 #include "proc.h"
 #include "parser.h"
+#include "translate.h"
 
 /** 
 	Extract the name from a destination argument of the form name[index1 index2...]
@@ -92,9 +93,7 @@ static int parse_fill_indexes( array_list_t *indexes,
 		long l_ind = wcstol(src, &end, 10);
 		if (end == src) 
 		{
-			wchar_t sbuf[256];
-			swprintf(sbuf, 255, L"Invalid index starting at %ls\n", src);
-			sb_append(sb_err, sbuf);
+			sb_printf(sb_err, _(L"%ls: Invalid index starting at '%ls'\n"), L"set", src);
 			return -1;
 		}
 
@@ -362,13 +361,11 @@ int builtin_set( wchar_t **argv )
 
 	if( query && (erase || list || global || local || universal || export || unexport ) )
 	{
-		sb_append2(sb_err,
+		sb_printf(sb_err,
+				  BUILTIN_ERR_COMBO2,
 				  argv[0],
-				  BUILTIN_ERR_COMBO,
-				  L"\n",
-				  parser_current_line(),
-				  L"\n",
-				  (void *)0);
+				  parser_current_line() );
+		
 		builtin_print_help( argv[0], sb_err );
 		return 1;
 	}
@@ -377,13 +374,11 @@ int builtin_set( wchar_t **argv )
 	/* Check operation and modifiers sanity */
 	if( erase && list ) 
 	{
-		sb_append2(sb_err,
+		sb_printf(sb_err,
+				  BUILTIN_ERR_COMBO2,
 				  argv[0],
-				  BUILTIN_ERR_COMBO,
-				  L"\n",
-				  parser_current_line(),
-				  L"\n",
-				  (void *)0);
+				  parser_current_line() );		
+
 		builtin_print_help( argv[0], sb_err );
 		return 1;
 	}
@@ -391,9 +386,8 @@ int builtin_set( wchar_t **argv )
 	if( local + global + universal > 1 ) 
 	{
 		sb_printf( sb_err,
-				   L"%ls%ls\n%ls\n",
-				   argv[0],
 				   BUILTIN_ERR_GLOCAL,
+				   argv[0],
 				   parser_current_line() );
 		builtin_print_help( argv[0], sb_err );
 		return 1;
@@ -401,13 +395,10 @@ int builtin_set( wchar_t **argv )
 
 	if( export && unexport ) 
 	{
-		sb_append2(sb_err,
-				   argv[0],
+		sb_printf( sb_err,
 				   BUILTIN_ERR_EXPUNEXP,
-				   L"\n",
-				   parser_current_line(),
-				   L"\n", 
-				   (void *)0);
+				   argv[0],
+				   parser_current_line() );
 		builtin_print_help( argv[0], sb_err );
 		return 1;
 	}
@@ -493,12 +484,11 @@ int builtin_set( wchar_t **argv )
 			/* No arguments -- display name & value for all variables in scope */
 			if( erase ) 
 			{
-				sb_append2( sb_err,
-							argv[0],
-							L": Erase needs a variable name\n", 
-							parser_current_line(), 
-							L"\n",
-							(void *)0 );
+				sb_printf( sb_err,
+						   _(L"%ls: Erase needs a variable name\n%ls\n"), 
+						   argv[0],
+						   parser_current_line() );
+				
 				builtin_print_help( argv[0], sb_err );
 				retcode = 1;
 			}
@@ -531,12 +521,11 @@ int builtin_set( wchar_t **argv )
 			/* There are some arguments, we have at least a variable name */
 			if( erase && al_get_count(&values) != 0 ) 
 			{
-				sb_append2( sb_err, 
-							argv[0],
-							L": Values cannot be specfied with erase\n",
-							parser_current_line(),
-							L"\n",
-							(void *)0 );
+				sb_printf( sb_err, 
+						   _(L"%ls: Values cannot be specfied with erase\n%ls\n"),
+						   argv[0],
+						   parser_current_line() );
+				
 				builtin_print_help( argv[0], sb_err );
 				retcode = 1;
 			} 

builtin_ulimit.c

@@ -17,6 +17,7 @@ Functions used for implementing the ulimit builtin.
 #include "builtin.h"
 #include "common.h"
 #include "wgetopt.h"
+#include "translate.h"
 
 /**
    Struct describing a resource limit
@@ -344,13 +345,10 @@ int builtin_ulimit( wchar_t ** argv )
 			case 0:
 				if(long_options[opt_index].flag != 0)
 					break;
-				sb_append2( sb_err, 
-							argv[0],
-							BUILTIN_ERR_UNKNOWN,
-							L" ",
-							long_options[opt_index].name,
-							L"\n",
-							(void *)0 );
+                sb_printf( sb_err,
+                           BUILTIN_ERR_UNKNOWN,
+                           argv[0],
+                           long_options[opt_index].name );
 				builtin_print_help( argv[0], sb_err );
 
 				return 1;

common.c

@@ -104,8 +104,17 @@ static struct winsize termsize;
 */
 static int block_count=0;
 
+static string_buffer_t *setlocale_buff=0;
+
+
 void common_destroy()
 {
+	if( setlocale_buff )
+	{
+		sb_destroy( setlocale_buff );
+		free( setlocale_buff );
+	}
+	
 	debug( 3, L"Calls: wcsdupcat %d, wcsdupcat2 %d, wcsndup %d, str2wcs %d, wcs2str %d", c1, c2, c3, c4, c5 );
 }
 
@@ -253,7 +262,6 @@ wchar_t *str2wcs( const char *in )
 	if( !res )
 	{
 		die_mem();
-		
 	}
 	
 	if( (size_t)-1 == mbstowcs( res, in, sizeof(wchar_t)*(strlen(in)) +1) )
@@ -720,26 +728,33 @@ wchar_t *quote_end( const wchar_t *in )
 }
 
 
-void fish_setlocale(int category, const wchar_t *locale)
+const wchar_t *wsetlocale(int category, const wchar_t *locale)
 {
-	char *lang = wcs2str( locale );
-	setlocale(category,lang);
+
+	char *lang = locale?wcs2str( locale ):0;
+	char * res = setlocale(category,lang);
+	
 	free( lang );
+
 	/*
 	  Use ellipsis if on known unicode system, otherwise use $
 	*/
-	if( wcslen( locale ) )
+	char *ctype = setlocale( LC_CTYPE, (void *)0 );
+	ellipsis_char = (strstr( ctype, ".UTF")||strstr( ctype, ".utf") )?L'\u2026':L'$';	
+		
+	if( !res )
+		return 0;
+	
+	if( !setlocale_buff )
 	{
-		ellipsis_char = wcsstr( locale, L".UTF")?L'\u2026':L'$';	
-	}
-	else
-	{
-		char *lang = getenv( "LANG" );
-		if( lang )
-			ellipsis_char = strstr( lang, ".UTF")?L'\u2026':L'$';	
-		else
-			ellipsis_char = L'$';
+		setlocale_buff = malloc( sizeof(string_buffer_t) );
+		sb_init( setlocale_buff);
 	}
+	
+	sb_clear( setlocale_buff );
+	sb_printf( setlocale_buff, L"%s", res );
+	
+	return (wchar_t *)setlocale_buff->buff;	
 }
 
 int contains_str( const wchar_t *a, ... )
@@ -784,18 +799,19 @@ int writeb( tputs_arg_t b )
 
 void die_mem()
 {
-	debug( 0, L"Out of memory, shutting down fish." );
+	/*
+	  Do not translate this message, and do not send it through the
+	  usual channels. This increases the odds that the message gets
+	  through correctly, even if we are out of memory.
+	*/
+	fwprintf( stderr, L"Out of memory, shutting down fish.\n" );
 	exit(1);
 }
 
-void debug( int level, wchar_t *msg, ... )
+void debug( int level, const wchar_t *msg, ... )
 {
 	va_list va;
 	string_buffer_t sb;
-	wchar_t *start, *pos;
-	int line_width = 0;
-	int tok_width = 0;
-	int screen_width = common_get_width();
 	
 	if( level > debug_level )
 		return;
@@ -806,10 +822,22 @@ void debug( int level, wchar_t *msg, ... )
 	sb_printf( &sb, L"%ls: ", program_name );
 	sb_vprintf( &sb, msg, va );
 	va_end( va );	
+
+	write_screen( (wchar_t *)sb.buff );
+
+	sb_destroy( &sb );	
+}
+
+void write_screen( const wchar_t *msg )
+{
+	const wchar_t *start, *pos;
+	int line_width = 0;
+	int tok_width = 0;
+	int screen_width = common_get_width();
 	
 	if( screen_width )
 	{
-		start = pos = (wchar_t *)sb.buff;
+		start = pos = msg;
 		while( 1 )
 		{
 			int overflow = 0;
@@ -881,11 +909,9 @@ void debug( int level, wchar_t *msg, ... )
 	}
 	else
 	{
-		fwprintf( stderr, L"%ls", sb.buff );
-		
+		fwprintf( stderr, L"%ls", msg );
 	}
 	putwc( L'\n', stderr );
-	sb_destroy( &sb );
 }
 
 wchar_t *escape( const wchar_t *in, 

common.h

@@ -134,7 +134,6 @@ wchar_t *wcsdupcat( const wchar_t *a, const wchar_t *b );
 */
 wchar_t *wcsdupcat2( const wchar_t *a, ... );
 
-#ifndef HAVE_WCSNDUP
 /**
    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
@@ -142,7 +141,6 @@ wchar_t *wcsdupcat2( const wchar_t *a, ... );
    length.
 */
 wchar_t *wcsndup( const wchar_t *in, int c );
-#endif
 
 /**
    Converts from wide char to digit in the specified base. If d is not
@@ -185,19 +183,14 @@ size_t wcslcat( wchar_t *dst, const wchar_t *src, size_t siz );
 */
 size_t wcslcpy( wchar_t *dst, const wchar_t *src, size_t siz );
 
-#ifndef HAVE_WCSDUP
 /**
    Create a duplicate string. Wide string version of strdup. Will
    automatically exit if out of memory.
 */
 wchar_t *wcsdup(const wchar_t *in);
-#endif
 
-#ifndef HAVE_WCSLEN
 size_t wcslen(const wchar_t *in);
-#endif
 
-#ifndef HAVE_WCSCASECMP
 /**
    Case insensitive string compare function. Wide string version of
    strcasecmp.
@@ -210,9 +203,7 @@ size_t wcslen(const wchar_t *in);
    a user-supplied string should be considered a bug.
 */
 int wcscasecmp( const wchar_t *a, const wchar_t *b );
-#endif
 
-#ifndef HAVE_WCSNCASECMP
 /**
    Case insensitive string compare function. Wide string version of
    strncasecmp.
@@ -225,7 +216,6 @@ int wcscasecmp( const wchar_t *a, const wchar_t *b );
    a user-supplied string should be considered a bug.
 */
 int wcsncasecmp( const wchar_t *a, const wchar_t *b, int count );
-#endif
 
 /**
    Test if the given string is a valid variable name
@@ -266,9 +256,12 @@ wchar_t *quote_end( const wchar_t *in );
 void error_reset();
 
 /**
-   Set the locale, also change the ellipsis character
+   This function behaves exactly like a wide character equivalent of
+   the C function setlocale, except that it will also try to detect if
+   the user is using a Unicode character set, and if so, use the
+   unicode ellipsis character as ellipsis, instead of '$'.      
 */
-void fish_setlocale( int category, const wchar_t *locale );
+const wchar_t *wsetlocale( int category, const wchar_t *locale );
 
 /**
    Checks if \c needle is included in the list of strings specified
@@ -314,7 +307,7 @@ void common_destroy();
 
    will print the string 'fish: Pi = 3.141', given that debug_level is 1 or higher, and that program_name is 'fish'.
 */
-void debug( int level, wchar_t *msg, ... );
+void debug( int level, const wchar_t *msg, ... );
 
 /**
    Replace special characters with backslash escape sequences. Newline is
@@ -387,5 +380,12 @@ int common_get_height();
 */
 void common_handle_winch( int signal );
 
+/**
+   Write paragraph of output to screen. Ignore newlines in message and
+   perform internal line-breaking.
+*/
+void write_screen( const wchar_t *msg );
+
+
 #endif
 

complete.c

@@ -35,6 +35,7 @@
 #include "reader.h"
 #include "history.h"
 #include "intern.h"
+#include "translate.h"
 
 #include "wutil.h"
 
@@ -48,63 +49,67 @@
 /**
    Description for ~USER completion
 */
-#define COMPLETE_USER_DESC COMPLETE_SEP_STR L"User home"
+#define COMPLETE_USER_DESC _( L"User home" )
 
 /**
    Description for short variables. The value is concatenated to this description
 */
-#define COMPLETE_VAR_DESC_VAL COMPLETE_SEP_STR L"Variable: "
+#define COMPLETE_VAR_DESC_VAL _( L"Variable: " )
 
 /**
    Description for generic executable
 */
-#define COMPLETE_EXEC_DESC COMPLETE_SEP_STR L"Executable"
+#define COMPLETE_EXEC_DESC _( L"Executable" )
 /**
    Description for link to executable
 */
-#define COMPLETE_EXEC_LINK_DESC COMPLETE_SEP_STR L"Executable link"
+#define COMPLETE_EXEC_LINK_DESC _( L"Executable link" )
 
 /**
    Description for regular file
 */
-#define COMPLETE_FILE_DESC COMPLETE_SEP_STR L"File"
+#define COMPLETE_FILE_DESC _( L"File" )
 /**
    Description for character device
 */
-#define COMPLETE_CHAR_DESC COMPLETE_SEP_STR L"Character device"
+#define COMPLETE_CHAR_DESC _( L"Character device" )
 /**
    Description for block device
 */
-#define COMPLETE_BLOCK_DESC COMPLETE_SEP_STR L"Block device"
+#define COMPLETE_BLOCK_DESC _( L"Block device" )
 /**
    Description for fifo buffer
 */
-#define COMPLETE_FIFO_DESC COMPLETE_SEP_STR L"Fifo"
+#define COMPLETE_FIFO_DESC _( L"Fifo" )
 /**
    Description for symlink
 */
-#define COMPLETE_SYMLINK_DESC COMPLETE_SEP_STR L"Symbolic link"
+#define COMPLETE_SYMLINK_DESC _( L"Symbolic link" )
 /**
    Description for Rotten symlink
 */
-#define COMPLETE_ROTTEN_SYMLINK_DESC COMPLETE_SEP_STR L"Rotten symbolic link"
+#define COMPLETE_ROTTEN_SYMLINK_DESC _( L"Rotten symbolic link" )
+/**
+   Description for symlink loop
+*/
+#define COMPLETE_LOOP_SYMLINK_DESC _( L"Symbolic link loop" )
 /**
    Description for socket
 */
-#define COMPLETE_SOCKET_DESC COMPLETE_SEP_STR L"Socket"
+#define COMPLETE_SOCKET_DESC _( L"Socket" )
 /**
    Description for directory
 */
-#define COMPLETE_DIRECTORY_DESC COMPLETE_SEP_STR L"Directory"
+#define COMPLETE_DIRECTORY_DESC _( L"Directory" )
 
 /**
    Description for function
 */
-#define COMPLETE_FUNCTION_DESC COMPLETE_SEP_STR L"Function"
+#define COMPLETE_FUNCTION_DESC _( L"Function" )
 /**
    Description for builtin command
 */
-#define COMPLETE_BUILTIN_DESC COMPLETE_SEP_STR L"Builtin"
+#define COMPLETE_BUILTIN_DESC _( L"Builtin" )
 
 /**
    The command to run to get a description from a file suffix
@@ -204,6 +209,9 @@ static hash_table_t *condition_cache=0;
 */
 static hash_table_t *loaded_completions=0;
 
+static string_buffer_t *get_desc_buff=0;
+
+
 void complete_init()
 {
 }
@@ -321,18 +329,21 @@ static void clear_hash_value( const void *key, const void *data )
 void complete_destroy()
 {
 	complete_entry *i=first_entry, *prev;
+
 	while( i )
 	{
 		prev = i;
 		i=i->next;
 		complete_free_entry( prev );
 	}
-
+	first_entry = 0;
+	
 	if( suffix_hash )
 	{
 		hash_foreach( suffix_hash, &clear_hash_entry );
 		hash_destroy( suffix_hash );
 		free( suffix_hash );		
+		suffix_hash=0;
 	}
 	
 	if( loaded_completions )
@@ -341,8 +352,16 @@ void complete_destroy()
 					  &clear_hash_value );
 		hash_destroy( loaded_completions );
 		free( loaded_completions );
+		loaded_completions = 0;
 	}
-	
+
+	if( get_desc_buff )
+	{
+		sb_destroy( get_desc_buff );
+		free( get_desc_buff );
+		get_desc_buff = 0;
+	}
+
 }
 
 /**
@@ -376,8 +395,6 @@ void complete_add( const wchar_t *cmd,
 	complete_entry *c =
 		complete_find_exact_entry( cmd, cmd_type );
 	complete_entry_opt *opt;
-	wchar_t *tmp;
-
 
 	if( c == 0 )
 	{
@@ -424,9 +441,7 @@ void complete_add( const wchar_t *cmd,
 
 	if( desc && wcslen( desc ) )
 	{
-		tmp = wcsdupcat( COMPLETE_SEP_STR, desc );
-		opt->desc = intern( tmp );
-		free( tmp );
+		opt->desc = intern( desc );
 	}
 	else
 		opt->desc = L"";
@@ -746,7 +761,7 @@ int complete_is_valid_option( const wchar_t *str,
 						str[0] = opt[j];
 						str[1]=0;
 						al_push( errors,
-								 wcsdupcat2(L"Unknown option \'", str, L"\'", 0) );
+								 wcsdupcat2(_( L"Unknown option: " ), L"'", str, L"'", 0) );
 					}
 
 					opt_found = 0;
@@ -765,12 +780,12 @@ int complete_is_valid_option( const wchar_t *str,
 				if( hash_get_count( &gnu_match_hash )==0)
 				{
 					al_push( errors,
-							 wcsdupcat2(L"Unknown option \'", opt, L"\'", 0) );
+							 wcsdupcat2( _(L"Unknown option: "), L"'", opt, L"\'", 0) );
 				}
 				else
 				{
 					al_push( errors,
-							 wcsdupcat2(L"Multiple matches for option \'", opt, L"\'", 0) );
+							 wcsdupcat2( _(L"Multiple matches for option: "), L"'", opt, L"\'", 0) );
 				}
 			}
 		}
@@ -847,13 +862,13 @@ static const wchar_t *complete_get_desc_suffix( const wchar_t *suff_orig )
 				wchar_t *ln = (wchar_t *)al_get(&l, 0 );
 				if( wcscmp( ln, L"unknown" ) != 0 )
 				{
-					desc = wcsdupcat( COMPLETE_SEP_STR, ln);
+					desc = wcsdup( ln);
 					/*
 					  I have decided I prefer to have the description
 					  begin in uppercase and the whole universe will just
 					  have to accept it. Hah!
 					*/
-					desc[1]=towupper(desc[1]);
+					desc[0]=towupper(desc[0]);
 				}
 			}
 
@@ -880,87 +895,100 @@ static const wchar_t *complete_get_desc_suffix( const wchar_t *suff_orig )
 const wchar_t *complete_get_desc( const wchar_t *filename )
 {
 	struct stat buf;
-	const wchar_t *desc = COMPLETE_FILE_DESC;
-
+	if( !get_desc_buff )
+	{
+		get_desc_buff = malloc(sizeof(string_buffer_t) );
+		sb_init( get_desc_buff );
+	}
+	else
+	{
+		sb_clear( get_desc_buff );
+	}
 	
 	if( lwstat( filename, &buf )==0)
-	{
-		if( waccess( filename, X_OK ) == 0 )
-		{
-			desc = COMPLETE_EXEC_DESC;
-		}
-		
+	{		
 		if( S_ISCHR(buf.st_mode) )
-			desc= COMPLETE_CHAR_DESC;
+		{
+			sb_printf( get_desc_buff, L"%lc%ls", COMPLETE_SEP, COMPLETE_CHAR_DESC );				
+		}
 		else if( S_ISBLK(buf.st_mode) )
-			desc = COMPLETE_BLOCK_DESC;
+			sb_printf( get_desc_buff, L"%lc%ls", COMPLETE_SEP, COMPLETE_BLOCK_DESC );				
 		else if( S_ISFIFO(buf.st_mode) )
-			desc = COMPLETE_FIFO_DESC;
+			sb_printf( get_desc_buff, L"%lc%ls", COMPLETE_SEP, COMPLETE_FIFO_DESC );				
 		else if( S_ISLNK(buf.st_mode))
 		{
 			struct stat buf2;
-			desc = COMPLETE_SYMLINK_DESC;
-
-			if( waccess( filename, X_OK ) == 0 )
-				desc = COMPLETE_EXEC_LINK_DESC;
 
 			if( wstat( filename, &buf2 ) == 0 )
 			{
 				if( S_ISDIR(buf2.st_mode) )
 				{
-					desc = L"/" COMPLETE_SYMLINK_DESC;
+					sb_printf( get_desc_buff, L"/%lc%ls", COMPLETE_SEP, COMPLETE_SYMLINK_DESC );
 				}
+				else if( waccess( filename, X_OK ) == 0 )
+					sb_printf( get_desc_buff, L"%lc%ls", COMPLETE_SEP, COMPLETE_EXEC_LINK_DESC );				
+				else
+					sb_printf( get_desc_buff, L"%lc%ls", COMPLETE_SEP, COMPLETE_SYMLINK_DESC );
 			}
 			else
 			{
 				switch( errno )
 				{
 					case ENOENT:
-						desc = COMPLETE_ROTTEN_SYMLINK_DESC;
+						sb_printf( get_desc_buff, L"%lc%ls", COMPLETE_SEP, COMPLETE_ROTTEN_SYMLINK_DESC );
 						break;
 
 					case EACCES:
 						break;
 
 					default:
-						wperror( L"stat" );
+						if( errno == ELOOP )
+						{
+							sb_printf( get_desc_buff, L"%lc%ls", COMPLETE_SEP, COMPLETE_LOOP_SYMLINK_DESC );
+						}
+						
+						/*
+						  Some kind of broken symlink. We ignore it
+						  here, and it will get a 'file' description,
+						  or one based on suffix.
+						*/
 						break;
 				}
 			}
+
 		}
 		else if( S_ISSOCK(buf.st_mode))
-			desc= COMPLETE_SOCKET_DESC;
+			sb_printf( get_desc_buff, L"%lc%ls", COMPLETE_SEP, COMPLETE_SOCKET_DESC );
 		else if( S_ISDIR(buf.st_mode) )
-			desc= L"/" COMPLETE_DIRECTORY_DESC;
+			sb_printf( get_desc_buff, L"/%lc%ls", COMPLETE_SEP, COMPLETE_DIRECTORY_DESC );
+		else if( waccess( filename, X_OK ) == 0 )
+		{
+			sb_printf( get_desc_buff, L"%lc%ls", COMPLETE_SEP, COMPLETE_EXEC_DESC );
+		}
+
 	}
-/*	else
-  {
 
-  switch( errno )
-  {
-  case EACCES:
-  break;
-
-  default:
-  fprintf( stderr, L"The following error happened on file %ls\n", filename );
-  wperror( L"lstat" );
-  break;
-  }
-  }
-*/
-	if( desc == COMPLETE_FILE_DESC )
+	if( wcslen((wchar_t *)get_desc_buff->buff) == 0 )
 	{
 		wchar_t *suffix = wcsrchr( filename, L'.' );
 		if( suffix != 0 )
 		{
 			if( !wcsrchr( suffix, L'/' ) )
 			{
-				desc = complete_get_desc_suffix( suffix );
+				sb_printf( get_desc_buff,
+						   L"%lc%ls",
+						   COMPLETE_SEP,
+						   complete_get_desc_suffix( suffix ) );			
 			}
 		}
+		else
+			sb_printf( get_desc_buff,
+					   L"%lc%ls", 
+					   COMPLETE_SEP, 
+					   COMPLETE_FILE_DESC );			
 	}
 
-	return desc;
+	return (wchar_t *)get_desc_buff->buff;
 }
 
 /**
@@ -976,7 +1004,7 @@ const wchar_t *complete_get_desc( const wchar_t *filename )
 
    \param comp_out the destination list
    \param wc_escaped the prefix, possibly containing wildcards. The wildcard should not have been unescaped, i.e. '*' should be used for any string, not the ANY_STRING character.
-   \param desc the default description, used for completions with no embedded description
+   \param desc the default description, used for completions with no embedded description. The description _may_ contain a COMPLETE_SEP character, if not, one will be prefixed to it
    \param desc_func the function that generates a description for those completions witout an embedded description
    \param possible_comp the list of possible completions to iterate over
 */
@@ -1006,6 +1034,7 @@ static void copy_strings_with_prefix( array_list_t *comp_out,
 
 		wildcard_complete( next_str, wc, desc, desc_func, comp_out );
 	}
+
 	free( wc );
 
 }
@@ -1028,8 +1057,11 @@ static void complete_cmd_desc( const wchar_t *cmd, array_list_t *comp )
 	if( !cmd )
 		return;
 
-	cmd_start=wcschr(cmd, L'/');
-	if( !cmd_start )
+	cmd_start=wcsrchr(cmd, L'/');
+
+	if( cmd_start )
+		cmd_start++;
+	else
 		cmd_start = cmd;
 	
 	cmd_len = wcslen(cmd_start);
@@ -1049,131 +1081,127 @@ static void complete_cmd_desc( const wchar_t *cmd, array_list_t *comp )
 	
 	esc = expand_escape( cmd_start, 1 );		
 	
-	if( esc )
+	if( whatis_path )
 	{
+		apropos_cmd =wcsdupcat2( L"grep ^/dev/null -F <", whatis_path, L" ", esc, 0 );
+	}
+	else
+	{
+		apropos_cmd = wcsdupcat( L"apropos ^/dev/null ", esc );
+	}
+	free(esc);		
 	
-		if( whatis_path )
+	al_init( &list );
+	hash_init( &lookup, &hash_wcs_func, &hash_wcs_cmp );
+
+	/*
+	  First locate a list of possible descriptions using a single
+	  call to apropos or a direct search if we know the location
+	  of the whatis database. This can take some time on slower
+	  systems with a large set of manuals, but it should be ok
+	  since apropos is only called once.
+	*/
+	exec_subshell( apropos_cmd, &list );
+	/*
+	  Then discard anything that is not a possible completion and put
+	  the result into a hashtable with the completion as key and the
+	  description as value.
+	  
+	  Should be reasonably fast, since no memory allocations are needed.
+	*/
+	for( i=0; i<al_get_count( &list); i++ )
+	{
+		wchar_t *el = (wchar_t *)al_get( &list, i );
+		wchar_t *key, *key_end, *val_begin;
+		
+		if( !el )
+			continue;
+		
+		//fwprintf( stderr, L"%ls\n", el );
+		if( wcsncmp( el, cmd_start, cmd_len ) != 0 )
+			continue;
+		//fwprintf( stderr, L"%ls\n", el );
+		key = el + cmd_len;
+		
+		key_end = wcschr( el, L' ' );
+		if( !key_end )
 		{
-			apropos_cmd =wcsdupcat2( L"grep ^/dev/null -F <", whatis_path, L" ", esc, 0 );
+			key_end = wcschr( el, L'\t' );
+			if( !key_end )
+			{
+				continue;
+			}
+		}
+		
+		*key_end = 0;
+		val_begin=key_end+1;
+		
+		//fwprintf( stderr, L"Key %ls\n", el );
+		
+		while( *val_begin != L'-' && *val_begin)
+		{
+			val_begin++;
+		}
+		
+		if( !val_begin )
+		{
+			continue;
+		}
+		
+		val_begin++;
+		
+		while( *val_begin == L' ' || *val_begin == L'\t' )
+		{
+			val_begin++;
+		}
+		
+		if( !*val_begin )
+		{
+			continue;
+		}
+		
+		/*
+		  And once again I make sure the first character is uppercased
+		  because I like it that way, and I get to decide these
+		  things.
+		*/
+		val_begin[0]=towupper(val_begin[0]);
+		hash_put( &lookup, key, val_begin );				
+	}
+
+	/*
+	  Then do a lookup on every completion and if a match is found,
+	  change to the new description. 
+	  
+	  This needs to do a reallocation for every description added, but
+	  there shouldn't be that many completions, so it should be ok.
+	*/
+	for( i=0; i<al_get_count(comp); i++ )
+	{
+		wchar_t *el = (wchar_t *)al_get( comp, i );
+		wchar_t *cmd_end = wcschr( el, 
+								   COMPLETE_SEP );
+		wchar_t *new_desc;
+		
+		if( cmd_end )
+			*cmd_end = 0;
+
+		new_desc = (wchar_t *)hash_get( &lookup,
+										el );
+		
+		if( new_desc )
+		{
+			wchar_t *new_el = wcsdupcat2( el,
+										  COMPLETE_SEP_STR,
+										  new_desc, 
+										  0 );
+			al_set( comp, i, new_el );
+			free( el );			
 		}
 		else
 		{
-			apropos_cmd = wcsdupcat( L"apropos ^/dev/null ", esc );
-		}
-		free(esc);		
-
-		al_init( &list );
-		hash_init( &lookup, &hash_wcs_func, &hash_wcs_cmp );
-
-		/*
-		  First locate a list of possible descriptions using a single
-		  call to apropos or a direct search if we know the location
-		  of the whatis database. This can take some time on slower
-		  systems with a large set of manuals, but it should be ok
-		  since apropos is only called once.
-		*/
-		exec_subshell( apropos_cmd, &list );
-		/*
-		  Then discard anything that is not a possible completion and put
-		  the result into a hashtable with the completion as key and the
-		  description as value.
-
-		  Should be reasonably fast, since no memory allocations are needed.
-		*/
-		for( i=0; i<al_get_count( &list); i++ )
-		{
-			wchar_t *el = (wchar_t *)al_get( &list, i );
-			wchar_t *key, *key_end, *val_begin;
-			
-			if( !el )
-				continue;
-			
-			//fwprintf( stderr, L"%ls\n", el );
-			if( wcsncmp( el, cmd_start, cmd_len ) != 0 )
-				continue;
-			//fwprintf( stderr, L"%ls\n", el );
-			key = el + cmd_len;
-
-			key_end = wcschr( el, L' ' );
-			if( !key_end )
-			{
-				key_end = wcschr( el, L'\t' );
-				if( !key_end )
-				{
-					continue;
-				}
-			}
-			
-			*key_end = 0;
-			val_begin=key_end+1;
-
-			//fwprintf( stderr, L"Key %ls\n", el );
-
-			while( *val_begin != L'-' && *val_begin)
-			{
-				val_begin++;
-			}
-			
-			if( !val_begin )
-			{
-				continue;
-			}
-			
-			val_begin++;
-				
-			while( *val_begin == L' ' || *val_begin == L'\t' )
-			{
-				val_begin++;
-			}
-			
-			if( !*val_begin )
-			{
-				continue;
-			}
-			
-			/*
-			  And once again I make sure the first character is uppercased
-			  because I like it that way, and I get to decide these
-			  things.
-			*/
-			val_begin[0]=towupper(val_begin[0]);
-			hash_put( &lookup, key, val_begin );				
-		}
-
-		/*
-		  Then do a lookup on every completion and if a match is found,
-		  change to the new description. 
-
-		  This needs to do a reallocation for every description added, but
-		  there shouldn't be that many completions, so it should be ok.
-		*/
-		for( i=0; i<al_get_count(comp); i++ )
-		{
-			wchar_t *el = (wchar_t *)al_get( comp, i );
-			wchar_t *cmd_end = wcschr( el, 
-									   COMPLETE_SEP );
-			wchar_t *new_desc;
-		
 			if( cmd_end )
-				*cmd_end = 0;
-
-			new_desc = (wchar_t *)hash_get( &lookup,
-											el );
-		
-			if( new_desc )
-			{
-				wchar_t *new_el = wcsdupcat2( el,
-											  COMPLETE_SEP_STR,
-											  new_desc, 
-											  0 );
-				al_set( comp, i, new_el );
-				free( el );			
-			}
-			else
-			{
-				if( cmd_end )
-					*cmd_end = COMPLETE_SEP;
-			}
+				*cmd_end = COMPLETE_SEP;
 		}
 	}
 	
@@ -1303,15 +1331,18 @@ static void complete_cmd( const wchar_t *cmd,
 				wchar_t *nxt = (wchar_t *)al_get( &tmp, i );
 				
 				wchar_t *desc = wcsrchr( nxt, COMPLETE_SEP );
-				int is_valid = (desc && (wcscmp(desc, 
-												COMPLETE_DIRECTORY_DESC)==0));
-				if( is_valid )
+				if( desc )
 				{
-					al_push( comp, nxt );
-				}
-				else
-				{
-					free(nxt);
+					int is_valid = desc && (wcscmp(desc+1, 
+												   COMPLETE_DIRECTORY_DESC)==0);
+					if( is_valid )
+					{
+						al_push( comp, nxt );
+					}
+					else
+					{
+						free(nxt);
+					}
 				}
 			}
 		}
@@ -1325,10 +1356,10 @@ static void complete_cmd( const wchar_t *cmd,
 
 /**
    Evaluate the argument list (as supplied by complete -a) and insert
-   any return matching completions. Matching is done using\c
+   any return matching completions. Matching is done using \c
    copy_strings_with_prefix, meaning the completion may contain
    wildcards. Logically, this is not always the right thing to do, but
-   I have yet to come up with a case where one would not want this.
+   I have yet to come up with a case where this matters.
    
    \param str The string to complete.
    \param args The list of option arguments to be evaluated.
@@ -1340,12 +1371,24 @@ static void complete_from_args( const wchar_t *str,
 								const wchar_t *desc,
 								array_list_t *comp_out )
 {
+	int was_interactive = is_interactive;
+	
 	array_list_t possible_comp;
+	int i;
+	
 	al_init( &possible_comp );
 
+	is_interactive=0;
 	eval_args( args, &possible_comp );
-
-	debug( 3, L"desc is '%ls', %d long\n", desc, wcslen(desc) );
+	is_interactive=was_interactive;
+	
+	/* We need to unescape these strings before matching them */
+	for( i=0; i< al_get_count( &possible_comp ); i++ )
+	{
+		wchar_t *next = (wchar_t *)al_get( &possible_comp, i );
+		al_set( &possible_comp , i, unescape( next, 0 ) );
+		free( next );
+	}
 
 	copy_strings_with_prefix( comp_out, str, desc, 0, &possible_comp );
 
@@ -1489,7 +1532,6 @@ void complete_load( wchar_t *cmd,
 	
 	expand_variable_array( path_var, &path_list );
 
-
 	/*
 	  Iterate over path searching for suitable completion files
 	*/
@@ -1700,12 +1742,13 @@ static int complete_param( wchar_t *cmd_orig,
 						short_ok( str, o->short_opt, i->short_opt_str ) )
 					{
 						wchar_t *next_opt =
-							malloc( sizeof(wchar_t)*(2 + wcslen(o->desc)));
+							malloc( sizeof(wchar_t)*(3 + wcslen(o->desc)));
 						if( !next_opt )
 							die_mem();
 						
 						next_opt[0]=o->short_opt;
-						next_opt[1]=L'\0';
+						next_opt[1]=COMPLETE_SEP;						
+						next_opt[2]=L'\0';			
 						wcscat( next_opt, o->desc );
 						al_push( comp_out, next_opt );
 					}
@@ -1732,14 +1775,14 @@ static int complete_param( wchar_t *cmd_orig,
 							if( o->old_mode || !(o->result_mode & NO_COMMON ) )
 							{
 								al_push( comp_out,
-										 wcsdupcat(&((wchar_t *)whole_opt.buff)[wcslen(str)], o->desc) );
+										 wcsdupcat2(&((wchar_t *)whole_opt.buff)[wcslen(str)], COMPLETE_SEP_STR, o->desc, (void *)0) );
 //								fwprintf( stderr, L"Add without param %ls\n", o->long_opt );
 							}
 							
 							if( !o->old_mode && ( wcslen(o->comp) || (o->result_mode & NO_COMMON ) ) )
 							{
 								al_push( comp_out,
-										 wcsdupcat2(&((wchar_t *)whole_opt.buff)[wcslen(str)], L"=", o->desc, 0) );
+										 wcsdupcat2(&((wchar_t *)whole_opt.buff)[wcslen(str)], L"=", COMPLETE_SEP_STR, o->desc, (void *)0) );
 //								fwprintf( stderr, L"Add with param %ls\n", o->long_opt );
 							}
 							
@@ -1809,7 +1852,7 @@ static int complete_variable( const wchar_t *var,
 			/*
 			  Variable description is 'Variable: VALUE
 			*/
-			blarg = wcsdupcat2( &name[varlen], COMPLETE_VAR_DESC_VAL, value, 0 );
+			blarg = wcsdupcat2( &name[varlen], COMPLETE_SEP_STR, COMPLETE_VAR_DESC_VAL, value, 0 );
 
 			if( blarg )
 			{
@@ -1936,6 +1979,7 @@ static int try_complete_user( const wchar_t *cmd,
 						{
 							wchar_t *blarg = wcsdupcat2( &pw_name[name_len], 
 														 L"/", 
+														 COMPLETE_SEP_STR,
 														 COMPLETE_USER_DESC,
 														 0 );
 							if( blarg != 0 )

configure.ac

@@ -1,23 +1,18 @@
 # Process this file with autoconf to produce a configure script.
 AC_INIT(fish,1.19.0,fish-users@lists.sf.net)
 
-AC_CANONICAL_TARGET
-
-if test $target_cpu = powerpc; then
-   AC_DEFINE([TPUTS_KLUDGE],[1],[Evil kludge to get Power based machines to work])
-fi
-
-AC_DEFINE_UNQUOTED([CPU],[L"$target_cpu"],[CPU type])
+# Run autoheader automatically, it's quick, and saves people the hassle of remembering to run it manually
+autoheader
 
+# Tell autoconf to create config.h header 
 AC_CONFIG_HEADERS(config.h)
 
-# Checks for programs.
+# Set up various programs needed for install
 AC_PROG_CC
 AC_PROG_CPP
 AC_PROG_INSTALL
-#AC_ISC_POSIX
-#AC_PROG_MAKE_SET
 
+# Check for doxygen, needed to build
 AC_CHECK_PROG( has_doxygen, [doxygen], "true")
 
 if ! test $has_doxygen = "true"; then
@@ -44,6 +39,17 @@ else
     AC_SUBST( XSEL_MAN_PATH,[ ])
 fi
 
+# Test cpu for special handling of ppc
+AC_CANONICAL_TARGET
+
+if test $target_cpu = powerpc; then
+   AC_DEFINE([TPUTS_KLUDGE],[1],[Evil kludge to get Power based machines to work])
+fi
+
+AC_DEFINE_UNQUOTED([CPU],[L"$target_cpu"],[CPU type])
+
+
+# Set up install locations
 if [[ "$prefix" = NONE ]]; then
 	AC_DEFINE_UNQUOTED( [PREFIX], L"/usr/local", [Installation directory])
 	AC_SUBST( PREFIX, /usr/local)
@@ -67,6 +73,10 @@ AC_DEFINE_UNQUOTED( DOCDIR, [L"$(eval echo $docdir)"], [Documentation directory]
 AC_DEFINE_UNQUOTED( SYSCONFDIR, [L"$(eval echo $sysconfdir)"], [System configuration directory] )
 AC_SUBST( SYSCONFDIR, ["$(eval echo $sysconfdir)"] )
 
+# Set up locale directory
+AC_DEFINE_UNQUOTED( [LOCALEDIR], "$(eval echo $datadir)/locale", [Locale directory])
+AC_SUBST( [LOCALEDIR], [$datadir/locale])
+
 # See if Linux procfs is present
 AC_CHECK_FILES([/proc/self/stat])
 
@@ -74,9 +84,6 @@ AC_CHECK_FILES([/proc/self/stat])
 AC_CHECK_FILE([/usr/pkg/lib],[AC_SUBST(LIBDIR,[-L/usr/pkg/lib\ -R/usr/pkg/lib])])
 AC_CHECK_FILE([/usr/pkg/include],[AC_SUBST(INCLUDEDIR,[-I/usr/pkg/include])])
 
-AC_CHECK_FUNCS( [wprintf futimes wcwidth wcswidth getopt_long] ) 
-AC_CHECK_HEADERS([getopt.h termio.h sys/resource.h])
-
 # 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>],
@@ -113,6 +120,7 @@ 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>],
@@ -125,19 +133,28 @@ else
     AC_MSG_RESULT(no)
 fi
 
-
+# Check for libraries
 AC_CHECK_LIB(socket, connect)
 AC_CHECK_LIB(rt, nanosleep)
 
-AC_CHECK_FUNCS(wcsdup wcsndup wcslen wcscasecmp wcsncasecmp)
+# Check for various header files
+AC_CHECK_HEADERS([getopt.h termio.h sys/resource.h])
+
+# Check for various function
+AC_CHECK_FUNCS(wcsdup wcsndup wcslen wcscasecmp wcsncasecmp gettext wprintf futimes wcwidth wcswidth getopt_long ) 
+
+# Check again for gettext library, so we can insert information 
+AC_CHECK_FUNC(gettext, AC_SUBST(HAVE_GETTEXT,1), AC_SUBST(HAVE_GETTEXT,0) )
 
 # Check if we have ncurses, and use it rather than curses if possible.
 AC_CHECK_HEADERS([ncurses.h],[AC_SUBST(CURSESLIB,[ncurses]) AC_DEFINE(HAVE_NCURSES_H)],[AC_SUBST(CURSESLIB,[curses])])
 
-#Force use of ncurses if it is avialable via NetBSD pkgsrc. This is an
-#ugly kludge to force NetBSD to use ncurses, since NetBSDs own version
-#does not properly support terminfo.
+# Force use of ncurses if it is avialable via NetBSD pkgsrc. This is an
+# ugly kludge to force NetBSD to use ncurses, since NetBSDs own version
+# does not properly support terminfo.
 AC_CHECK_FILE([/usr/pkg/include/ncurses.h],[AC_SUBST(CURSESLIB,[ncurses]) AC_DEFINE(HAVE_NCURSES_H)])
 
 AC_CONFIG_FILES([Makefile fish.spec doc_src/fish.1 doc_src/Doxyfile init/fish init/fish_interactive.fish init/fish_complete.fish])
 AC_OUTPUT
+
+echo "Now run 'make' and 'make install'"

doc_src/and.txt

@@ -2,22 +2,16 @@
 \section and and - Conditionally execute a command
 
 \subsection and-synopsis Synopsis
- <tt>and COMMAND1; COMMAND2</tt>
+ <tt>COMMAND1; and COMMAND2</tt>
 
 \subsection and-description Description
 
-The \c and builtin is used to execute one command, and if it returns
-zero status, also execute a second command. 
+The \c and builtin is used to execute a command if the current exit status (as set by the last previous command) is zero
 
 \subsection and-example Example
 
 The following code runs the \c make command to build a program, and if it suceeds, it runs <tt>make install</tt>, which installs the program.
 <pre>
-and make; make install
+make; and make install
 </pre>
 
-\c or and \c and can be nested, as in this example, that attempts to build and install a program, and removed the files created by the build process on failiure
-
-<pre>
-or and make; make install; make clean
-</pre>

doc_src/doc.hdr

@@ -23,7 +23,7 @@ Example:
 calls the \c echo command. \c echo is a command which will write its
 arguments to the screen. In the example above, the output will be
 'hello world'. Everything in fish is done with commands. There are
-commands for performing a set of command multiple times, commands for
+commands for performing a set of commands multiple times, commands for
 assigning variables, commands for treating a group of commands as a
 single command, etc.. And every single command follows the same simple
 syntax.
@@ -38,7 +38,7 @@ topic. There are manual pages for almost every command on most
 computers. There are also manual pages for many other things, such as
 system libraries and important files.
 
-Every program on a computer can be used as a command in \c fish. If
+Every program on your computer can be used as a command in \c fish. If
 the program file is located in one of the directories in the <a
 href="#variables-special">PATH</a>, it is sufficient to type the name
 of the program to use it. Otherwise the whole filename, including the
@@ -78,7 +78,11 @@ Example:
 
 <tt>rm "cumbersome filename.txt"</tt>
 
-Will remove the file 'cumbersome filename.txt'.
+Will remove the file 'cumbersome filename.txt', while
+
+<tt>rm cumbersome filename.txt</tt>
+
+would remove the two files 'cumbersome' and 'filenmae.txt'.
 
 \subsection escapes Escaping characters
 
@@ -138,8 +142,8 @@ which directs the output of the echo command to the file error.txt.
 <tt>DESTINATION</tt> can be one of the following: 
 
 - A filename. The output will be written to the specified file.
-- An ampersand (\&) followed by the number of a file descriptor. The file descriptor will be a duplicate of the specified file descriptor.
-- A minus sign (-). The FD will be closed.
+- An ampersand (\&) followed by the number of another file descriptor. The file descriptor will be a duplicate of the specified file descriptor.
+- A minus sign (-). The file descriptor will be closed.
 
 Example:
 
@@ -239,15 +243,16 @@ type <tt>fg -h</tt> or <tt>help fg</tt>.
 
 Tab completion is one of the most time saving features of any modern
 shell. By tapping the tab key, the user asks \c fish to guess the rest
-of the command or parameter that the user is currently typing. If
-there is only one possible completion, \c fish will write it out. If
-there is more than one completion, \c fish will write out the longest
-common prefix that all completions have in common. If all completions
-differ on the first character, a list of all possible completions is
-printed. The list features descriptions of the completions and if the
-list doesn't fit the screen, it is scrollable by using the arrow keys,
-the page up/page down keys or the space bar. Press any other key will
-exit the list and insert the pressed key into the command line.
+of the command or parameter that the user is currently typing. If \c
+fish can only find one possible completion, \c fish will write it
+out. If there is more than one completion, \c fish will write out the
+longest common prefix that all completions have in common. If all
+completions differ on the first character, a list of all possible
+completions is printed. The list features descriptions of the
+completions and if the list doesn't fit the screen, it is scrollable
+by using the arrow keys, the page up/page down keys or the space
+bar. Press any other key will exit the list and insert the pressed key
+into the command line.
 
 These are the general purpose tab completions that \c fish provides:
 
@@ -261,20 +266,20 @@ These are the general purpose tab completions that \c fish provides:
 of these completions are simple options like the \c -l option for \c
 ls, but some are more advanced. The latter include:
 
-- The programs 'man' and 'whatis' complete using all installed 
-manual pages.
-- The 'make' program complete using all targets in the Makefile in 
-the current directory.
-- The 'mount' command complete using all mount points specified in fstab.
-- The 'ssh' command complete using all hosts in that are stored 
-in the known_hosts file. (see the ssh documentation for more information) 
-- The 'su' command complete using all users on the system
-- The \c apt-get, \c rpm and \c tym commands complete using all installed packages.
+- The programs 'man' and 'whatis' show all installed 
+manual pages as completions.
+- The 'make' program uses all targets in the Makefile in 
+the current directory as completions.
+- The 'mount' command uses all mount points specified in fstab as completions.
+- The 'ssh' command uses all hosts in that are stored 
+in the known_hosts file as completions. (see the ssh documentation for more information) 
+- The 'su' command uses all users on the system as completions.
+- The \c apt-get, \c rpm and \c yum commands use all installed packages as completions.
 
 \subsection completion-own Writing your own completions
 
 Specifying your own completions is not complicated. To specify a
-completion, one simply uses the \c complete command. \c complete takes
+completion, use the \c complete command. \c complete takes
 as a parameter the name of the command to specify a completion
 for. For example, to add a completion for the program \c myprog, one
 would start the completion command with <tt>complete -c myprog
@@ -361,7 +366,7 @@ PNG format.
 
 \subsection expand-brace Brace expansion
 
-A comma separated list of characters enclosed en curly braces will be
+A comma separated list of characters enclosed in curly braces will be
 expanded so each element of the list becomes a new parameter.
 
 Example:
@@ -403,8 +408,9 @@ 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' works. A case of one syntax just lending itself so nicely
-to solving an unrelated problem in it's spare time.
+'{$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.
 
 Variable expansion is the only type of expansion performed on double
 quoted strings. There is, however, an important difference in how
@@ -637,7 +643,7 @@ echo $smurf
 \subsection variables-special Special variables
 
 The user can change the settings of \c fish by changing the values of
-certain environment variables. 
+certain environment variables.
 
 - \c BROWSER, which is the users preferred web browser. If this variable is set, fish will use the specified browser instead of the system default browser to display the fish documentation.
 - \c CDPATH, which is an array of directories in which to search for the new directory for the \c cd builtin.
@@ -655,6 +661,7 @@ values of these variables. They are:
 - \c PWD, which is the current working directory. 
 - \c status, which is the exit status of the last foreground job to exit. If a job contains pipelines, the status of the last command in the pipeline is the status for the job.
 - \c USER, which is the username. This variable can only be changed by the root user.
+- \c LANG, \c LC_ALL, \c LC_COLLATE, \c LC_CTYPE, \c LC_MESSAGES, \c LC_MONETARY, \c LC_NUMERIC and \c LC_TIME set the language option for the shell and subprograms. See the section <a href='#variables-locale'>Locale variables</a> for more information.
 
 Variables whose name are in uppercase are exported to the commands
 started by fish. This rule is not enforced by fish, but it is good
@@ -663,6 +670,22 @@ unexported variables. \c fish also uses several variables
 internally. Such variables are prefixed with the string __FISH or
 __fish. These should be ignored by the user.
 
+\subsection variables-locale Locale variables
+
+The most common way to set the locale to use a command like 'set -x
+LANG en_GB.utf8', which sets the current locale to be the english
+language, as used in Great Britain, using the UTF-8 character set. For
+a list of available locales, use 'locale -a'.
+
+\c LANG, \c LC_ALL, \c LC_COLLATE, \c LC_CTYPE, \c LC_MESSAGES, \c
+LC_MONETARY, \c LC_NUMERIC and LC_TIME set the language option for the
+shell and subprograms. These variables work as follows: \c LC_ALL
+forces all the aspects of the locale to the specified value. If LC_ALL
+is set, all other locale variables will be ignored. The other LC_
+variables set the specified aspect of the locale information. LANG
+is a fallback value, it will be used if none of the LC_ variables are
+specified.
+
 \section builtin-overview Builtins 
 
 Many other shells have a large library of builtin commands. Most of
@@ -678,6 +701,7 @@ The following commands are distributed with fish. Many of them are
 builtins or shellscript functions, and can only be used inside fish.
 
 - <a href="builtins.html#source">.</a>, read and execute the commands in a file 
+- <a href="builtins.html#and">and</a>, execute command if previous command suceeded
 - <a href="builtins.html#bg">bg</a>, set a command to the background
 - <a href="builtins.html#begin">begin</a>, execute a block of commands
 - <a href="builtins.html#bind">bind</a>, change keyboard bindings
@@ -709,6 +733,7 @@ builtins or shellscript functions, and can only be used inside fish.
 - <a href="commands.html#mimedb">mimedb</a>, view mimedata about a file
 - <a href="commands.html#nextd">nextd</a>, move forward in the directory history
 - <a href="builtins.html#not">not</a>, negates the exit status of any command
+- <a href="builtins.html#or">or</a>, execute a command if previous command failed
 - <a href="commands.html#popd">popd</a>, move to the topmost directory on the directory stack
 - <a href="commands.html#prevd">prevd</a>, move backwards in the direcotry stack
 - <a href="commands.html#pushd">pushd</a>, push the surrent directory onto the directory stack
@@ -720,7 +745,7 @@ builtins or shellscript functions, and can only be used inside fish.
 - <a href="builtins.html#switch">switch</a>, conditionally execute a block of commands
 - <a href="commands.html#tokenize">tokenize</a>, split a string up into multiple tokens
 - <a href="builtins.html#ulimit">ulimit</a>, set or get the shells resurce usage limits
-- <a href="commandss.html#umask">umask</a>, set or get the file creation mask
+- <a href="commands.html#umask">umask</a>, set or get the file creation mask
 - <a href="builtins.html#while">while</a>, perform a block of commands while a condition is met
 
 For more information about these commands, use the <tt>--help</tt>
@@ -750,7 +775,7 @@ Here are some of the commands available in the editor:
 - Alt-d move next word to the <a href="#killring">killring</a>
 - Alt-w prints a short description of the command under the cursor 
 - Alt-l lists the contents of the current directory, unless the cursor is over a directory argument, in which case the contents of that directory will be listed 
-- Alt-p adds the string '| less;' to the end of the job under the cursor. The result is that the output of the command will be paged.aadddddssss
+- Alt-p adds the string '| less;' to the end of the job under the cursor. The result is that the output of the command will be paged.
 
 You can change these key bindings by making an inputrc file. To do
 this, copy the file /etc/fish_inputrc to your home directory and
@@ -922,6 +947,9 @@ function fish_prompt -d "Write out the prompt"
 	printf '\%s\@\%s\%s\%s\%s> ' (whoami) (hostname|cut -d . -f 1) (set_color \$fish_color_cwd) (prompt_pwd) (set_color normal)
 end
 </pre>
+
+where \c prompt_pwd is a shellscript function that displays a condensed version of the current working direcotry.
+
 </p>
 
 
@@ -975,7 +1003,68 @@ it's initalization files to function properly. To solve this
 problem, either copy the initialization files to each fish users home
 directory, or install them in /etc.
 
+\section i18n Translating fish to other languages
 
+Fish uses the GNU gettext library to implement translation to multiple
+languages. If fish is not available in your language, please consider
+making a translation. Currently, only the shell itself can be
+translated, a future version of fish should also include translated
+manuals.
+
+To make a translation of fish, you will first need the sourcecode,
+available from the <a href='http://roo.no-ip.org/fish'>fish
+homepage</a>. Download the latest version, and then extract it using a
+command like <code>tar -zxf fish-VERSION.tar.gz</code>.
+
+Next, cd into the newly created fish directory using <code>cd
+fish-VERSION</code>.
+
+You will now need to configure the sourcecode using the command
+<code>./configure</code>. This step might take a while.
+
+Before you continue, you will need to know the ISO 639 language code
+of the language you are translating to. These codes can be found <a
+href='http://www.w3.org/WAI/ER/IG/ert/iso639.htm'>here</a>. For
+example, the language code for Uighur is ug.
+
+Now you have the sourcecode and it is properly configured. Lets start
+translating. To do this, first create an empty translation table for
+the language you wish to translate to by writing <code>make
+po/[LANGUAGE CODE].po</code> in the fish terminal. For example, if you
+are translating to Uighur, you should write <code>make
+po/ug.po</code>. This should create the file po/ug.po, a template
+translation table containing all the strings that need to be
+translated.
+
+Now you are all set up to translate fish to a new language. Open the
+newly created .po file in your editor of choice, and start
+translating. The .po file format is rather simple. It contains pairs
+of string in a format like:
+
+<pre>
+msgid "%ls: No suitable job\n"
+msgstr ""
+</pre>
+
+The first line is the english string to translate, the second line
+should contain your translation. For example, in swedish the above
+might become:
+
+<pre>
+msgid "%ls: No suitable job\n"
+msgstr "%ls: Inget jobb matchar\n"
+</pre>
+
+%s, %ls, %d and other tokens beginning with a '%' are
+placeholders. These will be replaced by a value by fish at
+runtime. You must always take care to use exactly the same
+placeholders in the same order in your translation. (Actually, there
+are ways to avoid this, but they are to complicated for this short
+introduction. See the full manual for the printf C function for more
+information.)
+
+Once you have provided a translation for fish, please send it to <a
+href='fish-users@lists.sf.net'>fish-users@lists.sf.net</a>.
 
 \section todo Missing features and bugs
 
@@ -1022,10 +1111,10 @@ g++, javac, java, gcj, lpr, doxygen, whois, find)
 \subsection bugs Known bugs
 
 - Completion for gcc -\#\#\# option doesn't work.
-- Many completions are made specifically for the GNU 
-version of a POSIX command
+- Many completions are made specifically for the GNU version of a POSIX command
 - Yanking weird characters from clipboard prints Unicode escapes
 - Suspending and then resuming pipelines containing a builtin seems to be broken.
+- Interactive input seems broken inside blocks. Is local echo and other terminal values not restored when in an interactive block?
 
 If you think you have found a bug not described here, please send a
 report to <a href="mailto:axel@liljencrantz.se"> axel@liljencrantz.se

doc_src/or.txt

@@ -2,22 +2,16 @@
 \section or or - Conditionally execute a command
 
 \subsection or-synopsis Synopsis
- <tt>or COMMAND1; COMMAND2</tt>
+ <tt>COMMAND1; or COMMAND2</tt>
 
 \subsection or-description Description
 
-The \c or builtin is used to execute one command, and if it returns
-non-zero status, also execute a second command. 
+The \c or builtin is used to execute a command if the current exit status (as set by the last previous command) is non-zero
 
 \subsection or-example Example
 
 The following code runs the \c make command to build a program, or if it fails, it runs <tt>make clean</tt>, which removes the files created by the build process
 <pre>
-or make; make clean
+make; or make clean
 </pre>
 
-\c or and \c and can be nested, as in this example, that attempts to build and install a program, and removed the files created by the build process on failiure
-
-<pre>
-or and make; make install; make clean
-</pre>

doc_src/set.txt

@@ -1,22 +1,24 @@
 \section set set - Handle environment variables.
 
 \subsection set-synopsis Synopsis
-<tt>set [OPTIONS] VARIABLE_NAME [VALUES...]</tt>
+<code>set [OPTIONS] [VARIABLE_NAME [VALUES...]]</code>
 
-The <tt>set</tt> builtin causes fish to assign the variable <tt>VARIABLE_NAME</tt> the values <tt>VALUES...</tt>. 
+The <code>set</code> builtin causes fish to assign the variable <code>VARIABLE_NAME</code> the values <code>VALUES...</code>. 
 
 \subsection set-description Description
-- <tt>-e</tt> or <tt>--erase</tt> causes the specified environment variable to be erased
-- <tt>-g</tt> or <tt>--global</tt> causes the specified environment variable to be made global. If this option is not supplied, the specified variable will dissapear when the current block ends
-- <tt>-l</tt> or <tt>--local</tt> forces the specified environment variable to be made local to the current block, even if the variable already exists and is non-local
-- <tt>-n</tt> or <tt>--names</tt> List only the names of all defined variables
-- <tt>-q</tt> or <tt>--query</tt> test if the specified variable names are defined. Does not output anything, but the builtins exit status is the number of variables specified that were not defined.
-- <tt>-u</tt> or <tt>--unexport</tt> causes the specified environment not to be exported to child processes
-- <tt>-U</tt> or <tt>--universal</tt> causes the specified environment variable to be made universal. If this option is supplied, the variable will be shared between all the current users fish instances on the current computer, and will be preserved across restarts of the shell.
-- <tt>-x</tt> or <tt>--export</tt> causes the specified environment variable to be exported to child processes
+- <code>-e</code> or <code>--erase</code> causes the specified environment variable to be erased
+- <code>-g</code> or <code>--global</code> causes the specified environment variable to be made global. If this option is not supplied, the specified variable will dissapear when the current block ends
+- <code>-l</code> or <code>--local</code> forces the specified environment variable to be made local to the current block, even if the variable already exists and is non-local
+- <code>-n</code> or <code>--names</code> List only the names of all defined variables
+- <code>-q</code> or <code>--query</code> test if the specified variable names are defined. Does not output anything, but the builtins exit status is the number of variables specified that were not defined.
+- <code>-u</code> or <code>--unexport</code> causes the specified environment not to be exported to child processes
+- <code>-U</code> or <code>--universal</code> causes the specified environment variable to be made universal. If this option is supplied, the variable will be shared between all the current users fish instances on the current computer, and will be preserved across restarts of the shell.
+- <code>-x</code> or <code>--export</code> causes the specified environment variable to be exported to child processes
 
 If set is called with no arguments, the names and values of all
-environment variables are printed.
+environment variables are printed. If some of the scope or export
+flags have been given, only the variables matching the specified scope
+are printed. 
 
 If the \c -e or \c --erase option is specified, the variable
 specified by the following arguments will be erased
@@ -25,13 +27,15 @@ If a variable is set to more than one value, the variable will be an
 array with the specified elements. If a variable is set to zero
 elements, it will become an array with zero elements.
 
-If the variable name is one or more array elements, such as <tt>PATH[1
-3 7]</tt>, only those array elements specified will be changed.
+If the variable name is one or more array elements, such as <code>PATH[1
+3 7]</code>, only those array elements specified will be changed.
 
 \subsection set-example Example
 
-<tt>set foo hi</tt> sets the value of the variable foo to be hi.
+<code>set -xg</code> will print all global, exported variables.
 
-<tt>set -e smurf</tt> removes the variable \c smurf.
+<code>set foo hi</code> sets the value of the variable foo to be hi.
 
-<tt>set PATH[4] ~/bin</tt> changes the fourth element of the \c PATH array to \c ~/bin
+<code>set -e smurf</code> removes the variable \c smurf.
+
+<code>set PATH[4] ~/bin</code> changes the fourth element of the \c PATH array to \c ~/bin

doc_src/tokenize.txt

@@ -1,14 +0,0 @@
-
-\section tokenize tokenize - tokenize a string
-
-\subsection tokenize-synopsis Synopsis
- <tt>tokenize [STRING...]</tt>
-
-\subsection tokenize-description Description
-- STRING is the string or list of strings to tokenize. Each token will be printed on a line by itself
-- \c -e, \c --with-empty allow empty tokens
-- \c -n, \c --no-empty ignore empty tokens (Default)
-- <tt>-d DELIMITER</tt>,  <tt>--delimiter=DELIMITER</tt> is the list of characters that will be used as delimiters. If unspecified, the IFS environment variable will be used as the delimiter string,
-- \c -h, \c --help Display help message and exit
-- \c -v, \c --version Display version and exit
-

env.c

@@ -41,6 +41,8 @@
 #include "env_universal.h"
 #include "input_common.h"
 #include "event.h"
+#include "translate.h"
+#include "complete.h"
 
 /**
    Command used to start fishd
@@ -190,7 +192,7 @@ static void start_fishd()
 	
 	if( !pw )
 	{
-		debug( 0, L"Could not get user information" );
+		debug( 0, _( L"Could not get user information" ) );
 		return;
 	}
 	
@@ -213,6 +215,87 @@ static mode_t get_umask()
 	return res;
 }
 
+/**
+   List of all locale variable names
+*/
+static const wchar_t *locale_variable[] =
+{
+	L"LANG", L"LC_ALL", L"LC_COLLATE", L"LC_CTYPE", L"LC_MESSAGES", L"LC_MONETARY", L"LC_NUMERIC", L"LC_TIME", (void *)0
+}
+	;
+
+/**
+   Checks if the specified variable is a locale variable
+*/
+static int is_locale( const wchar_t *key )
+{
+	int i;
+	for( i=0; locale_variable[i]; i++ )
+		if( wcscmp(locale_variable[i], key ) == 0 )
+			return 1;
+	return 0;
+}
+
+/**
+  Properly sets all locale information
+*/
+static void handle_locale()
+{
+	const wchar_t *lc_all = env_get( L"LC_ALL" );
+	const wchar_t *lang;
+	int i;
+	wchar_t *old = wcsdup(wsetlocale( LC_MESSAGES, (void *)0 ));
+
+	/*
+	  Array of locale constants corresponding to the local variable names defined in locale_variable
+	*/
+	static const int cat[] = 
+		{
+			0, LC_ALL, LC_COLLATE, LC_CTYPE, LC_MESSAGES, LC_MONETARY, LC_NUMERIC, LC_TIME
+		}
+	;
+	
+	if( lc_all )
+	{
+		wsetlocale( LC_ALL, lc_all );
+	}
+	else
+	{
+		lang = env_get( L"LANG" );
+		if( lang )
+		{
+			wsetlocale( LC_ALL, lang );
+		}
+		
+		for( i=2; locale_variable[i]; i++ )
+		{
+			const wchar_t *val = env_get( locale_variable[i] );
+			if( val )
+				wsetlocale(  cat[i], val );
+		}
+	}
+	
+	if( wcscmp( wsetlocale( LC_MESSAGES, (void *)0 ), old ) != 0 )
+	{
+		/* Make change known to gettext.  */
+		{
+			extern int  _nl_msg_cat_cntr;
+			++_nl_msg_cat_cntr;
+		}			
+		
+		if( is_interactive )
+		{
+			complete_destroy();
+			complete_init();
+			
+			debug( 0, _(L"Changing language to english") );
+		}
+	}
+	free( old );
+		
+}
+
+
 /**
    Universal variable callback function. This function makes sure the
    proper events are triggered when an event occurs.
@@ -223,6 +306,9 @@ static void universal_callback( int type,
 {
 	wchar_t *str=0;
 	
+	if( is_locale( name ) )
+		handle_locale();
+	
 	switch( type )
 	{
 		case SET:
@@ -417,7 +503,7 @@ void env_init()
 		free( uname );
 	}
 	
-	env_universal_init( env_get( L"FISHD_SOKET_DIR"), 
+	env_universal_init( env_get( L"FISHD_SOCKET_DIR"), 
 						env_get( L"USER" ),
 						&start_fishd,
 						&universal_callback );
@@ -474,7 +560,7 @@ static env_node_t *env_get_node( const wchar_t *key )
 	
 	return 0;
 }
-	
+
 void env_set( const wchar_t *key, 
 			  const wchar_t *val, 
 			  int var_mode )
@@ -489,18 +575,13 @@ void env_set( const wchar_t *key,
 
 	event_t ev;
 	int is_universal = 0;	
-	
+
 	if( (var_mode & ENV_USER ) && 
 		hash_get( &env_read_only, key ) )
 	{
 		return;
 	}
 	
-	if( wcscmp(key, L"LANG" )==0 )
-	{
-		fish_setlocale(LC_ALL,val);
-	}
-
 	if( wcscmp( key, L"umask" ) == 0)
 	{
 		wchar_t *end;
@@ -524,7 +605,6 @@ void env_set( const wchar_t *key,
 		*/
 		return;
 	}
-	
 
 	/*
 	  Zero element arrays are internaly not coded as null but as this placeholder string
@@ -676,9 +756,17 @@ void env_set( const wchar_t *key,
 //	debug( 1, L"env_set: return from event firing" );	
 		al_destroy( &ev.arguments );	
 	}
-	
+
+	if( is_locale( key ) )
+	{
+		handle_locale();
+	}
+		
 }
 
+
+
+
 /**
    Attempt to remove/free the specified key/value pair from the
    specified hash table.
@@ -726,6 +814,10 @@ void env_remove( const wchar_t *key, int var_mode )
 	{
 		env_universal_remove( key );
 	}
+
+	if( is_locale( key ) )
+		handle_locale();
+			
 }
 
 
@@ -754,7 +846,7 @@ wchar_t *env_get( const wchar_t *key )
 			wchar_t *next = history_get( i-add_current );
 			if( !next )
 			{
-				debug( 1, L"No history at idx %d\n", i );
+				debug( 1, _( L"No history item at index %d\n" ), i );
 				break;
 			}
 			
@@ -898,8 +990,20 @@ void env_pop()
 {
 	if( &top->env != global )
 	{
+		int i;
+		int locale_changed = 0;
+		
 		env_node_t *killme = top;
 
+		for( i=0; locale_variable[i]; i++ )
+		{
+			if( hash_get( &killme->env, locale_variable[i] ) )
+			{
+				locale_changed = 1;
+				break;
+			}
+		}
+
 		if( killme->new_scope )
 		{
 			has_changed |= killme->export || local_scope_exports( killme->next );
@@ -909,12 +1013,15 @@ void env_pop()
 		hash_foreach( &killme->env, &clear_hash_entry );
 		hash_destroy( &killme->env );
 		free( killme );
+
+		if( locale_changed )
+			handle_locale();
 		
 	}
 	else
 	{
 		debug( 0,
-			   L"Tried to pop empty environment stack." );
+			   _( L"Tried to pop empty environment stack." ) );
 		sanity_lose();
 	}	
 }

env_universal.c

@@ -112,7 +112,7 @@ static int get_socket( int fork_ok )
 	local.sun_family = AF_UNIX;
 	strcpy(local.sun_path, name );
 	free( name );
-	len = strlen(local.sun_path) + sizeof(local.sun_family);
+	len = sizeof(local);
 	
 	if( connect( s, (struct sockaddr *)&local, len) == -1 ) 
 	{

event.c

@@ -19,6 +19,7 @@
 #include "common.h"
 #include "event.h"
 #include "signal.h"
+#include "translate.h"
 
 /**
    Number of signals that can be queued before an overflow occurs
@@ -324,7 +325,7 @@ static void event_fire_internal( event_t *event )
 	array_list_t *fire=0;
 
 	int was_subshell = is_subshell;
-	int was_interactive = is_interactive;
+//	int was_interactive = is_interactive;
 	
 	/*
 	  First we free all events that have been removed
@@ -401,7 +402,7 @@ static void event_fire_internal( event_t *event )
 		  they are marked as non-interactive and as a subshell
 		*/
 		is_subshell=1;
-		is_interactive=0;		
+//		is_interactive=0;		
 		eval( (wchar_t *)b->buff, 0, TOP );
 		
 	}
@@ -410,7 +411,7 @@ static void event_fire_internal( event_t *event )
 	  Restore interactivity flags
 	*/
 	is_subshell = was_subshell;
-	is_interactive = was_interactive;
+//	is_interactive = was_interactive;
 
 	if( b )
 	{
@@ -486,7 +487,7 @@ static void event_fire_delayed()
 		
 		if( lst->overflow )
 		{
-			debug( 0, L"Signal list overflow. Signals have been ignored" );
+			debug( 0, _( L"Signal list overflow. Signals have been ignored." ) );
 		}
 		
 		/*

exec.c

@@ -36,6 +36,7 @@
 #include "expand.h"
 #include "signal.h"
 #include "env_universal.h"
+#include "translate.h"
 
 /**
    Prototype for the getpgid library function. The prototype for this
@@ -48,15 +49,15 @@ pid_t getpgid( pid_t pid );
 /**
    file descriptor redirection error message
 */
-#define FD_ERROR   L"An error occurred while redirecting file descriptor %d"
+#define FD_ERROR   _( L"An error occurred while redirecting file descriptor %d" )
 /**
    file redirection error message
 */
-#define FILE_ERROR L"An error occurred while redirecting file '%ls'"
+#define FILE_ERROR _( L"An error occurred while redirecting file '%ls'" )
 /**
    fork error message
 */
-#define FORK_ERROR L"Could not create child process - exiting"
+#define FORK_ERROR _( L"Could not create child process - exiting" )
 
 
 /**
@@ -235,14 +236,14 @@ void free_fd( io_data_t *io, int fd )
    redirections described by \c io.
 
    \param io the list of IO redirections for the child
+   \param exit_on_error whether to call exit() on errors
+
+   \return 1 on sucess, 0 on failiure
 */
-static void handle_child_io( io_data_t *io )
+static int handle_child_io( io_data_t *io, int exit_on_error )
 {
 
 	close_unused_internal_pipes( io );
-	
-	if( env_universal_server.fd >= 0 )
-		exec_close( env_universal_server.fd );
 
 	for( ; io; io=io->next )
 	{
@@ -276,7 +277,14 @@ static void handle_child_io( io_data_t *io )
 						   io->param1.filename );
 					
 					wperror( L"open" );
-					exit(1);
+					if( exit_on_error )
+					{
+						exit(1);
+					}
+					else
+					{
+						return 0;
+					}					
 				}				
 				else if( tmp != io->fd)
 				{
@@ -288,7 +296,14 @@ static void handle_child_io( io_data_t *io )
 							   FD_ERROR,
 							   io->fd );
 						wperror( L"dup2" );
-						exit(1);
+						if( exit_on_error )
+						{
+							exit(1);
+						}
+						else
+						{
+							return 0;
+						}
 					}
 					exec_close( tmp );
 				}				
@@ -298,19 +313,21 @@ static void handle_child_io( io_data_t *io )
 			case IO_FD:
 			{
 				close(io->fd);
-/*				debug( 3, L"Redirect fd %d in process %ls (%d) from fd %d",
-  io->fd,
-  p->actual_cmd,
-  p->pid,
-  io->old_fd );
-*/			
+
 				if( dup2( io->param1.old_fd, io->fd ) == -1 )
 				{
 					debug( 1, 
 						   FD_ERROR,
 						   io->fd );
 					wperror( L"dup2" );
-					exit(1);					
+					if( exit_on_error )
+					{
+						exit(1);
+					}
+					else
+					{
+						return 0;
+					}
 				}
 				break;
 			}
@@ -318,21 +335,23 @@ static void handle_child_io( io_data_t *io )
 			case IO_BUFFER:
 			case IO_PIPE:
 			{
-				close(io->fd);
-				
-/*				debug( 3, L"Pipe fd %d in process %ls (%d) (Through fd %d)", 
-  io->fd, 
-  p->actual_cmd,
-  p->pid,
-  io->pipe_fd[io->fd] );
-*/
 				int fd_to_dup = io->fd;
+
+				close(io->fd);
 				
 				if( dup2( io->param1.pipe_fd[fd_to_dup?1:0], io->fd ) == -1 )
 				{
 					debug( 1, PIPE_ERROR );
 					wperror( L"dup2" );
-					exit(1);
+					if( exit_on_error )
+					{
+						exit(1);
+					}
+					else
+					{
+						return 0;
+					}					
+
 				}
 
 				if( fd_to_dup != 0 )
@@ -341,28 +360,21 @@ static void handle_child_io( io_data_t *io )
 					exec_close( io->param1.pipe_fd[1]);
 				}
 				else
+				{
 					exec_close( io->param1.pipe_fd[0] );
+				}
 				
-/*				
-  if( close( io[i].pipe_fd[ io->fd ] ) == -1 )
-  {
-  wperror( L"close" );
-  exit(1);
-  }
-*/			
-/*				if( close( io[i].pipe_fd[1] ) == -1 )
-  {
-  wperror( L"close" );
-  exit(1);
-  }
-*/
-		
-/*		    fprintf( stderr, "fd %d points to fd %d\n", i, io[i].fd[i>0?1:0] );*/
 				break;
 			}
 			
 		}
 	}
+
+	if( env_universal_server.fd >= 0 )
+		exec_close( env_universal_server.fd );
+
+	return 1;
+	
 }
 
 /**
@@ -371,10 +383,17 @@ static void handle_child_io( io_data_t *io )
    process is put in the jobs group, all signal handlers are reset,
    SIGCHLD is unblocked (the exec call blocks blocks SIGCHLD), and all
    IO redirections and other file descriptor actions are performed.
+
+   \param j the job to set up the IO for
+   \param exit_on_error whether to call exit() on errors
+
+   \return 1 on sucess, 0 on failiure
 */
-static void setup_child_process( job_t *j )
+static int setup_child_process( job_t *j, process_t *p )
 {
-	if( is_interactive && !is_subshell && !is_block)
+	int res;
+	
+	if( is_interactive  && p->type==EXTERNAL )
     {
 		pid_t pid;
 		/* 
@@ -399,14 +418,19 @@ static void setup_child_process( job_t *j )
 		}
 	}
 	
+	res = handle_child_io( j->io, (p==0) );
+
 	/* Set the handling for job control signals back to the default.  */
-	signal_reset_handlers();
-
-	handle_child_io( j->io );
-
+	if( res )
+	{
+		signal_reset_handlers();
+	}
+	
 	/* Remove all signal blocks */
 	signal_unblock();	
 	
+	return res;
+	
 }
 								 
 								 
@@ -421,7 +445,7 @@ static void launch_process( process_t *p )
 		
 	execve (wcs2str(p->actual_cmd), wcsv2strv( (const wchar_t **) p->argv), env_export_arr( 0 ) );
 	debug( 0, 
-		   L"Failed to execute process %ls",
+		   _( L"Failed to execute process '%ls'" ),
 		   p->actual_cmd );
 	wperror( L"execve" );
 	exit(1);
@@ -438,11 +462,33 @@ static int has_fd( io_data_t *d, int fd )
 }
 
 
+/**
+   Free a transmogrified io chain. Only the chain itself and resources
+   used by a transmogrified IO_FILE redirection are freed, since the
+   original chain may still be needed.
+*/
+static void io_untransmogrify( io_data_t * in, io_data_t *out )
+{
+	if( !out )
+		return;
+	io_untransmogrify( in->next, out->next );
+	switch( in->io_mode )
+	{
+		case IO_FILE:
+			exec_close( out->param1.old_fd );
+			break;
+	}	
+	free(out);
+}
+
+
 /**
    Make a copy of the specified io redirection chain, but change file
    redirection into fd redirection. This makes the redirection chain
    suitable for use as block-level io, since the file won't be
    repeatedly reopened for every command in the block.
+
+   \return the transmogrified chain on sucess, or 0 on failiure
 */
 static io_data_t *io_transmogrify( io_data_t * in )
 {
@@ -458,7 +504,8 @@ static io_data_t *io_transmogrify( io_data_t * in )
 	out->fd = in->fd;
 	out->io_mode = IO_FD;
 	out->param2.close_old = 1;
-	
+	out->next=0;
+		
 	switch( in->io_mode )
 	{
 		/*
@@ -487,7 +534,8 @@ static io_data_t *io_transmogrify( io_data_t * in )
 					   in->param1.filename );
 								
 				wperror( L"open" );
-				exit(1);
+				free( out );
+				return 0;
 			}	
 
 			out->param1.old_fd = fd;
@@ -495,31 +543,19 @@ static io_data_t *io_transmogrify( io_data_t * in )
 		}
 	}
 	
-	out->next = io_transmogrify( in->next );
+	if( in->next)
+	{
+		out->next = io_transmogrify( in->next );
+		if( !out->next )
+		{
+			io_untransmogrify( in, out );
+			return 0;
+		}
+	}
 	
 	return out;
 }
 
-/**
-   Free a transmogrified io chain. Only the chain itself and resources
-   used by a transmogrified IO_FILE redirection are freed, since the
-   original chain may still be needed.
-*/
-static void io_untransmogrify( io_data_t * in, io_data_t *out )
-{
-	if( !in )
-		return;
-	io_untransmogrify( in->next, out->next );
-	switch( in->io_mode )
-	{
-		case IO_FILE:
-			exec_close( out->param1.old_fd );
-			break;
-	}	
-	free(out);
-}
-
-
 /**
    Morph an io redirection chain into redirections suitable for
    passing to eval, call eval, and clean up morphed redirections.
@@ -529,32 +565,32 @@ static void io_untransmogrify( io_data_t * in, io_data_t *out )
    \param io the io redirections to be performed on this block
 */
 
-static int internal_exec_helper( const wchar_t *def, 
+static void internal_exec_helper( const wchar_t *def, 
 								 int block_type,
 								 io_data_t *io )
 {
-	int res=0;
 	io_data_t *io_internal = io_transmogrify( io );
 	int is_block_old=is_block;
 	is_block=1;
 
-	signal_unblock();
+	/*
+	  Did the transmogrification fail - if so, set error status and return
+	*/
+	if( io && !io_internal )
+	{
+		proc_set_last_status( 1 );
+		return;
+	}
 	
+	signal_unblock();
+		
 	eval( def, io_internal, block_type );		
-
+	
 	signal_block();
-
-/*
-	io_data_t *buff = io_get( io, 1 );
-	if( buff && buff->io_mode == IO_BUFFER )
-	fwprintf( stderr, L"block %ls produced %d bytes of output\n", 
-	def,
-	buff->out_buffer->used );
-*/
+	
 	io_untransmogrify( io, io_internal );
 	job_reap( 0 );
 	is_block=is_block_old;
-	return res;
 }
 
 /**
@@ -565,7 +601,7 @@ static int internal_exec_helper( const wchar_t *def,
 static int handle_new_child( job_t *j, process_t *p )
 {
 	
-	if(is_interactive  && !is_subshell && !is_block)
+	if( is_interactive  && p->type==EXTERNAL )
 	{
 		int new_pgid=0;
 		
@@ -580,7 +616,7 @@ static int handle_new_child( job_t *j, process_t *p )
 			if( getpgid( p->pid) != j->pgid )
 			{
 				debug( 1, 
-					   L"Could not send process %d from group %d to group %d",
+					   _( L"Could not send process %d from group %d to group %d" ),
 					   p->pid, 
 					   getpgid( p->pid),
 					   j->pgid );
@@ -592,7 +628,7 @@ static int handle_new_child( job_t *j, process_t *p )
 		{
 			if( tcsetpgrp (0, j->pgid) )
 			{
-				debug( 1, L"Could not send job %d ('%ls')to foreground", 
+				debug( 1, _( L"Could not send job %d ('%ls') to foreground" ), 
 					   j->job_id, 
 					   j->command );
 				wperror( L"tcsetpgrp" );
@@ -604,7 +640,7 @@ static int handle_new_child( job_t *j, process_t *p )
 		{
 			if( tcsetpgrp (0, j->pgid) )
 			{
-				debug( 1, L"Could not send job %d ('%ls')to foreground", 
+				debug( 1, _( L"Could not send job %d ('%ls') to foreground" ), 
 					   j->job_id, 
 					   j->command );
 				wperror( L"tcsetpgrp" );
@@ -654,11 +690,20 @@ void exec( job_t *j )
 		/*
 		  setup_child_process make sure signals are propelry set up
 		*/
-		setup_child_process( j );
-		launch_process( j->first_process );
-		/*
-		  launch_process _never_ returns...
-		*/
+		if( setup_child_process( j, 0 ) )
+		{
+			/*
+			  launch_process never returns
+			*/
+			launch_process( j->first_process );
+		}
+		else
+		{
+			j->constructed=1;
+			j->first_process->completed=1;
+			return;
+		}
+		
 	}
 	
 
@@ -766,7 +811,7 @@ void exec( job_t *j )
 //			fwprintf( stderr, L"run function %ls\n", argv[0] );
 				if( def == 0 )
 				{
-					debug( 0, L"Unknown function %ls", p->argv[0] );
+					debug( 0, _( L"Unknown function '%ls'" ), p->argv[0] );
 					break;
 				}
 				parser_push_block( FUNCTION_CALL );
@@ -874,7 +919,7 @@ void exec( job_t *j )
 							{
 								builtin_stdin=-1;
 								debug( 1, 
-									   L"Unknown input redirection type %d",
+									   _( L"Unknown input redirection type %d" ),
 									   in->io_mode);
 								break;
 							}
@@ -975,7 +1020,7 @@ void exec( job_t *j )
 						  This is the child process. Write out the contents of the pipeline.
 						*/
 						p->pid = getpid();
-						setup_child_process( j );
+						setup_child_process( j, p );
 						write( io_buffer->fd, 
 							   io_buffer->param2.out_buffer->buff, 
 							   io_buffer->param2.out_buffer->used );
@@ -1063,7 +1108,7 @@ void exec( job_t *j )
 					  This is the child process. 
 					*/
 					p->pid = getpid();
-					setup_child_process( j );
+					setup_child_process( j, p );
 					if( sb_out->used )
 						fwprintf( stdout, L"%ls", sb_out->buff );
 					if( sb_err->used )
@@ -1105,7 +1150,7 @@ void exec( job_t *j )
 					  This is the child process. 
 					*/
 					p->pid = getpid();
-					setup_child_process( j );
+					setup_child_process( j, p );
 					launch_process( p );
 
 					/*
@@ -1201,7 +1246,7 @@ int exec_subshell( const wchar_t *cmd,
 	if( !cmd )
 	{
 		debug( 1, 
-			   L"Sent null command to subshell. This is a fish bug. If it can be reproduced, please send a bug report to %s", 
+			   _( L"Sent null command to subshell. This is a fish bug. If it can be reproduced, please send a bug report to %s." ), 
 			   PACKAGE_BUGREPORT );		
 		return 0;		
 	}
@@ -1247,7 +1292,14 @@ int exec_subshell( const wchar_t *cmd,
 					wchar_t *el;
 					*end=0;
 					el = str2wcs( begin );				
-					al_push( l, el );
+					if( !el )
+					{
+						debug( 0, _( L"Subshell '%ls' returned illegal string, discarded one entry" ), cmd );
+					}
+					else
+					{
+						al_push( l, el );
+					}
 					begin = end+1;
 					break;
 				}

exec.h

@@ -16,7 +16,7 @@
 /**
    pipe redirection error message
 */
-#define PIPE_ERROR L"An error occurred while setting up pipe"
+#define PIPE_ERROR _(L"An error occurred while setting up pipe")
 
 /**
    Initialize the exec library

fish.spec.in

@@ -51,14 +51,12 @@ fi
 %_mandir/man1/xsel.1x*
 %_mandir/man1/mimedb.1*
 %_mandir/man1/set_color.1*
-%_mandir/man1/tokenize.1*
 %_mandir/man1/count.1*
 %attr(0755,root,root) %_bindir/fish
 %attr(0755,root,root) %_bindir/fishd
 %attr(0755,root,root) %_bindir/fish_pager
 %attr(0755,root,root) %_bindir/xsel
 %attr(0755,root,root) %_bindir/set_color
-%attr(0755,root,root) %_bindir/tokenize
 %attr(0755,root,root) %_bindir/mimedb
 %attr(0755,root,root) %_bindir/count
 %config %_sysconfdir/fish
@@ -67,6 +65,7 @@ fi
 %config %_sysconfdir/fish.d/fish_*.fish
 %dir %_sysconfdir/fish.d/completions
 %config %_sysconfdir/fish.d/completions/*.fish
+%_datadir/locale/*/LC_MESSAGES/fish.mo
 
 %changelog
 * Tue Nov 29 2005 Axel Liljencrantz <axel@liljencrantz.se> 1.17.0-0

fish_pager.c

@@ -422,9 +422,10 @@ static void printed_length( wchar_t *str,
 				case L'^':
 				case L'<':
 				case L'>':
-				case L'@':
 				case L'(':
 				case L')':
+				case L'[':
+				case L']':
 				case L'{':
 				case L'}':
 				case L'?':
@@ -432,6 +433,11 @@ static void printed_length( wchar_t *str,
 				case L'|':
 				case L';':
 				case L':':
+				case L'\'':
+				case L'"':
+				case L'%':
+				case L'~':
+					
 					if( has_description )
 						desc_len++;
 					else
@@ -839,8 +845,7 @@ static void init()
 {
 	struct sigaction act;
 	program_name = L"fish_pager";
-	fish_setlocale( LC_ALL, L"" );
-	
+	wsetlocale( LC_ALL, L"" );
 	
 	int out = dup( 1 );
 	close(1);

fishd.c

@@ -174,8 +174,8 @@ static int get_socket()
 	
 	local.sun_family = AF_UNIX;
 	strcpy( local.sun_path, sock_name );
-	len = strlen( local.sun_path ) + sizeof( local.sun_family );
-
+	len = sizeof(local);
+	
 	debug(1, L"Connect to socket at %s", sock_name);
 	
 	if( ( s = socket( AF_UNIX, SOCK_STREAM, 0 ) ) == -1 )
@@ -400,7 +400,7 @@ static void init()
 
 	sock = get_socket();
 	daemonize();	
-	fish_setlocale( LC_ALL, L"" );	
+	wsetlocale( LC_ALL, L"" );	
 	env_universal_common_init( &broadcast );
 	
 	load();	

function.c

@@ -68,12 +68,20 @@ void function_add( const wchar_t *name,
 				   int is_binding )
 {
 	int i;
+	wchar_t *cmd_end;
 	
+
 	if( function_exists( name ) )
 		function_remove( name );
 	
 	function_data_t *d = malloc( sizeof( function_data_t ) );
 	d->cmd = wcsdup( val );
+	cmd_end = d->cmd + wcslen(d->cmd)-1;
+	while( (cmd_end>d->cmd) && wcschr( L"\n\r\t ", *cmd_end ) )
+	{
+		*cmd_end--=0;
+	}
+	
 	d->desc = desc?wcsdup( desc ):0;
 	d->is_binding = is_binding;
 	hash_put( &function, intern(name), d );

init/completions/apm.fish

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

init/completions/apropos.fish

@@ -6,16 +6,16 @@ function __fish_complete_apropos
 	end
 end
 
-complete -xc apropos -a '(__fish_complete_apropos)' -d "Whatis entry"
+complete -xc apropos -a '(__fish_complete_apropos)' -d (_ "whatis entry")
 
-complete -c apropos -s h -l help -d "apropos command help"
-complete -f -c apropos -s d -l debug -d "print debugging info"
-complete -f -c apropos -s v -l verbose -d "print verbose warning"
-complete -f -c apropos -s r -l regex -d "keyword as regex"
-complete -f -c apropos -s w -l wildcard -d "keyword as wildwards"
-complete -f -c apropos -s e -l exact -d "keyword as exactly match"
-complete -x -c apropos -s m -l system -d "search for other system"
-complete -x -c apropos -s M -l manpath -a '(echo $MANPATH)' -d "specify man path"
-complete -x -c apropos -s C -l config-file -d "specify a conf file"
-complete -f -c apropos -s V -l version -d "Display version"
+complete -c apropos -s h -l help -d (_ "Display help and exit")
+complete -f -c apropos -s d -l debug -d (_ "Print debugging info")
+complete -f -c apropos -s v -l verbose -d (_ "Verbose mode")
+complete -f -c apropos -s r -l regex -d (_ "Keyword as regex")
+complete -f -c apropos -s w -l wildcard -d (_ "Keyword as wildwards")
+complete -f -c apropos -s e -l exact -d (_ "Keyword as exactly match")
+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")
 

init/completions/apt-build.fish

@@ -1,29 +1,29 @@
 
 #apt-build
-complete -c apt-build -l help -d "apt-build command help"
-complete -f -c apt-build -a update -d "update list of packages"
-complete -f -c apt-build -a upgrade -d "upgrade packages"
-complete -f -c apt-bulid -a world -d "rebuild your system"
-complete -x -c apt-build -a install -d "build and install a new pkg"
-complete -x -c apt-build -a source -d "download and extract a src"
-complete -x -c apt-build -a info -d "info on a pkg"
-complete -x -c apt-build -a remove -d "remove packages"
-complete -x -c apt-build -a clean-build -d "erase built pkgs"
-complete -x -c apt-build -a build-source -d "build src without install"
-complete -x -c apt-build -a clean-sources -d "clean src dirs"
-complete -x -c apt-build -a update-source -d "update src and rebuild them"
-complete -x -c apt-build -a update-repository -d "update the repository"
-complete -f -c apt-build -l nowrapper -d "do not use gcc wrapper"
-complete -f -c apt-build -l remove-builddep -d "remove build-dep"
-complete -f -c apt-build -l no-source -d "do not download source"
-complete -f -c apt-build -l build-dir -d "specify build-dir"
-complete -f -c apt-build -l rebuild -d "rebuild a package"
-complete -f -c apt-build -l reinstall -d "rebuild and install an installed pkg"
-complete -r -f -c apt-build -l build-command -d "use <command> to build"
-complete -r -c apt-build -l patch -d "apply <file> patch"
-complete -c apt-build -s p -l patch-strip -d "prefix to strip on patch"
-complete -c apt-build -s y -l yes -d "assume yes"
-complete -c apt-build -l purge -d "use purge instead of remove"
-complete -c apt-build -l noupdate -d "do not run update"
-complete -r -c apt-build -l source-list -d "specify sources.list file"
-complete -f -c apt-build -s v -l version -d "show version"
+complete -c apt-build -l help -d (_ "Display help and exit")
+complete -f -c apt-build -a update -d (_ "Update list of packages")
+complete -f -c apt-build -a upgrade -d (_ "Upgrade packages")
+complete -f -c apt-bulid -a world -d (_ "Rebuild your system")
+complete -x -c apt-build -a install -d (_ "Build and install a new 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")

init/completions/apt-cache.fish

@@ -1,33 +1,31 @@
 #apt-cache
-complete -c apt-cache -s h -l help -d "apt-cache command help"
-complete -c apt-cache -a add -d "add index files Debug only"
-complete -f -c apt-cache -a gencaches -d "build apt cache"
-complete -x -c apt-cache -a showpkg -d "show package info"
-complete -f -c apt-cache -a stats -d "show cache statistics"
-complete -x -c apt-cache -a showsrc -d "show source package"
-complete -f -c apt-cache -a dump -d "show packages in cache"
-complete -f -c apt-cache -a dumpavail -d "print available list"
-complete -f -c apt-cache -a unmet -d "list unmet dep in cache"
-complete -x -c apt-cache -a show -d "display package record"
-complete -x -c apt-cache -a search -d "search pkgname by REGEX"
-complete -c apt-cache -l full -a search -d "search full package name"
-complete -x -c apt-cache -l names-only -a search -d "search pkgname only"
-complete -x -c apt-cache -a depends -d "list dep for the package"
-complete -x -c apt-cache -a rdepends -d "list reverse dep for the package"
-complete -x -c apt-cache -a pkgnames -d "print package name by prefix"
-complete -x -c apt-cache -a dotty -d "generate dotty output for packages"
-complete -x -c apt-cache -a policy -d "debug preferences file"
-complete -x -c apt-cache -a madison -d "mimic madison"
-complete -r -c apt-cache -s p -l pkg-cache -d "select file to store pkg cache"
-complete -r -c apt-cache -s s -l src-cache -d "select file to store src cache"
-complete -f -c apt-cache -s q -l quiet -d "quiet output"
-complete -f -c apt-cache -s i -l important -d "print important deps"
-complete -f -c apt-cache -s a -l all-versions -d "print full records"
-complete -f -c apt-cache -s g -l generate -d "auto-gen package cache"
-complete -f -c apt-cache -l all-names -d "print all names"
-complete -f -c apt-cache -l recurse -d "dep and rdep recursive"
-complete -f -c apt-cache -l installed -d "limit to installed"
-complete -f -c apt-cache -s v -l version -d "show version"
-complete -r -c apt-cache -s c -l config-file -d "specify config file"
-complete -x -c apt-cache -s o -l option -d "specify options"
+complete -c apt-cache -s h -l help -d (_ "Display help and exit")
+complete -f -c apt-cache -a gencaches -d (_ "Build apt cache")
+complete -x -c apt-cache -a showpkg -d (_ "Show package info")
+complete -f -c apt-cache -a stats -d (_ "Show cache statistics")
+complete -x -c apt-cache -a showsrc -d (_ "Show source package")
+complete -f -c apt-cache -a dump -d (_ "Show packages in cache")
+complete -f -c apt-cache -a dumpavail -d (_ "Print available list")
+complete -f -c apt-cache -a unmet -d (_ "List unmet 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")
 

init/completions/apt-cdrom.fish

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

init/completions/apt-config.fish

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

init/completions/apt-extracttemplates.fish

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

init/completions/apt-file.fish

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

init/completions/apt-ftparchive.fish

@@ -1,17 +1,17 @@
 #apt-ftparchive
-complete -c apt-ftparchive -s h -l help -d "apt-ftparchive command help"
-complete -f -c apt-ftparchive -a packages -d "generate pkg from source"
-complete -f -c apt-ftparchive -a sources -d "generate source index file"
-complete -f -c apt-ftparchive -a contents -d "generate contents file"
-complete -f -c apt-ftparchive -a release -d "generate release file"
-complete -f -c apt-ftparchive -a clean -d "remove records"
-complete -f -c apt-ftparchive -l md5 -d "generate MD5 sums"
-complete -f -c apt-ftparchive -s d -l db -d "use a binary db"
-complete -f -c apt-ftparchive -s q -l quiet -d "quiet mode"
-complete -f -c apt-ftparchive -l delink -d "perform delinking"
-complete -f -c apt-ftparchive -l contents -d "perform contents generation"
-complete -c apt-ftparchive -s s -l source-override -d "use source override"
-complete -f -c apt-ftparchive -l readonly -d "make caching db readonly"
-complete -f -c apt-ftparchive -s v -l version -d "show version"
-complete -r -c apt-ftparchive -s c -l config-file -d "use config file"
-complete -r -c apt-ftparchive -s o -l option -d "set config options"
+complete -c apt-ftparchive -s h -l help -d (_ "Display help and exit")
+complete -f -c apt-ftparchive -a packages -d (_ "Generate 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")

init/completions/apt-get.fish

@@ -1,6 +1,6 @@
 #completion for apt-get
 
-function __fish_apt_no_subcommand -d 'test if apt has yet to be given the subcommand'
+function __fish_apt_no_subcommand -d (_ 'Test if apt has yet to be given the subcommand')
 	for i in (commandline -opc)
 		if contains -- $i update upgrade dselect-upgrade dist-upgrade install remove source build-dep check clean autoclean
 			return 1
@@ -9,7 +9,7 @@ function __fish_apt_no_subcommand -d 'test if apt has yet to be given the subcom
 	return 0
 end
 
-function __fish_apt_use_package -d 'Test if apt command should have packages as potential completion'
+function __fish_apt_use_package -d (_ 'Test if apt command should have packages as potential completion')
 	for i in (commandline -opc)
 		if contains -- $i contains install remove build-dep
 			return 0
@@ -18,47 +18,47 @@ function __fish_apt_use_package -d 'Test if apt command should have packages as
 	return 1
 end
 
-complete -c apt-get -n '__fish_apt_use_package' -a '(__fish_print_packages)' -d 'Package'
+complete -c apt-get -n '__fish_apt_use_package' -a '(__fish_print_packages)' -d (_ 'Package')
 
-complete -c apt-get -s h -l help -d 'apt-get command help'
-complete -f -n '__fish_apt_no_subcommand' -c apt-get -a 'update' -d 'update sources'
-complete -f -n '__fish_apt_no_subcommand' -c apt-get -a 'upgrade' -d 'upgrade or install newest packages'
-complete -f -n '__fish_apt_no_subcommand' -c apt-get -a 'dselect-upgrade' -d 'use with dselect front-end'
-complete -f -n '__fish_apt_no_subcommand' -c apt-get -a 'dist-upgrade' -d 'distro upgrade'
-complete -f -n '__fish_apt_no_subcommand' -c apt-get -a 'install' -d 'install one or more packages'
-complete -f -n '__fish_apt_no_subcommand' -c apt-get -a 'remove' -d 'remove one or more packages'
-complete -f -n '__fish_apt_no_subcommand' -c apt-get -a 'source' -d 'fetch source packages'
-complete -f -n '__fish_apt_no_subcommand' -c apt-get -a 'build-dep' -d 'install/remove packages for dependencies'
-complete -f -n '__fish_apt_no_subcommand' -c apt-get -a 'check' -d 'update cache and check dep'
-complete -f -n '__fish_apt_no_subcommand' -c apt-get -a 'clean' -d 'clean local caches and packages'
-complete -f -n '__fish_apt_no_subcommand' -c apt-get -a 'autoclean' -d 'clean packages no longer be downloaded'
-complete -c apt-get -s d -l download-only -d 'Download Only'
-complete -c apt-get -s f -l fix-broken -d 'correct broken deps'
-complete -c apt-get -s m -l fix-missing -d 'ignore missing packages'
-complete -c apt-get -l no-download -d 'Disable downloading packages'
-complete -c apt-get -s q -l quiet -d 'quiet output'
-complete -c apt-get -s s -l simulate -d 'perform a siulation'
-complete -c apt-get -s y -l assume-yes -d 'automatic yes to prompts'
-complete -c apt-get -s u -l show-upgraded -d 'show upgraded packages'
-complete -c apt-get -s V -l verbose-versions -d 'show full versions for packages'
-complete -c apt-get -s b -l compile -d 'compile source packages'
-complete -c apt-get -s b -l build -d 'compile source packages'
-complete -c apt-get -l ignore-hold -d 'ignore package Holds'
-complete -c apt-get -l no-upgrade -d 'Do not upgrade packages'
-complete -c apt-get -l force-yes -d 'Force yes'
-complete -c apt-get -l print-uris -d 'print the URIs'
-complete -c apt-get -l purge -d 'use purge instead of remove'
-complete -c apt-get -l reinstall -d 'reinstall packages'
-complete -c apt-get -l list-cleanup -d 'erase obsolete files'
-complete -c apt-get -s t -l target-release -d 'control default input to the policy engine'
-complete -c apt-get -l trivial-only -d 'only perform operations that are trivial'
-complete -c apt-get -l no-remove -d 'abort if any packages are to be removed'
-complete -c apt-get -l only-source -d 'only accept source packages'
-complete -c apt-get -l diff-only -d 'download only diff file'
-complete -c apt-get -l tar-only -d 'download only tar file'
-complete -c apt-get -l arch-only -d 'only process arch-dep build-deps'
-complete -c apt-get -l allow-unauthenticated -d 'ignore non-authenticated packages'
-complete -c apt-get -s v -l version -d 'show program version'
-complete -r -c apt-get -s c -l config-file -d 'specify a config file'
-complete -r -c apt-get -s o -l option -d 'set a config option'
+complete -c apt-get -s h -l help -d (_ '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')
 

init/completions/apt-key.fish

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

init/completions/apt-listbugs.fish

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

init/completions/apt-listchanges.fish

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

init/completions/apt-move.fish

@@ -1,23 +1,22 @@
 #apt-move
-complete -c apt-move -a get -d "generate master file"
-complete -c apt-move -a getlocal -d "alias of get"
-complete -f -c apt-move -a move -d "move pkgs to local tree"
-complete -f -c apt-move -a delete -d "delete obsolete pkg files"
-complete -f -c apt-move -a packages -d "build new local files"
-complete -f -c apt-move -a fsck -d "rebuild index files"
-complete -f -c apt-move -a update -d "move pkgs from cache to local mirror"
-complete -f -c apt-move -a local -d "alias to move delete packages"
-complete -f -c apt-move -a localupdate -d "alias for update"
-complete -f -c apt-move -a mirror -d "download pkg missing from mirror"
-complete -f -c apt-move -a sync -d "sync pkgs installed"
+complete -c apt-move -a get -d (_ "Generate master file")
+complete -c apt-move -a getlocal -d (_ "Alias 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 -f -c apt-move -a exclude -d 'test $LOCALDIR/.exclude file'
-complete -c apt-move -a movefile -d "move file from CLI"
-complete -f -c apt-move -a listbin -d "mirror|sync|repo"
-complete -f -c apt-move -a mirrorbin -d "fetch pkg from STDIN"
-complete -f -c apt-move -a mirrorsrc -d "fetch src pkg from STDIN"
-complete -f -c apt-move -s a -d "process all pkgs"
-complete -c apt-move -s c -d "use specific conffile"
-complete -f -c apt-move -s d -d "use specific dist"
-complete -f -c apt-move -s f -d "force deletion"
-complete -f -c apt-move -s q -d "suppresses normal output"
-complete -f -c apt-move -s t -d "test run"
+complete -c apt-move -a movefile -d (_ "Move file specified on commandline")
+complete -f -c apt-move -a listbin -d (_ "List packags that may serve as input to mirrorbin or mirrorsource" )
+complete -f -c apt-move -a mirrorbin -d (_ "Fetch package from STDIN")
+complete -f -c apt-move -a mirrorsrc -d (_ "Fetch source package from STDIN")
+complete -f -c apt-move -s a -d (_ "Process all packages")
+complete -c apt-move -s c -d (_ "Use specific conffile")
+complete -f -c apt-move -s 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")

init/completions/apt-proxy-import.fish

@@ -1,10 +1,10 @@
 #apt-proxy-import
-complete -c apt-proxy-import -s h -l help -d 'apt-proxy-import command help'
-complete -f -c apt-proxy-import -s V -l version -d 'print version'
-complete -f -c apt-proxy-import -s v -l verbose -d 'verbose info'
-complete -f -c apt-proxy-import -s q -l quiet -d 'no message to STDOUT'
-complete -f -c apt-proxy-import -s r -l recursive -d 'recurse into subdir'
-complete -r -c apt-proxy-import -s i -l import-dir -a '(ls -Fp|grep /$)' -d 'dir to import'
-complete -r -c apt-proxy-import -s u -l user -a '(__fish_complete_users)' -d 'change to user'
-complete -r -c apt-proxy-import -s d -l debug -d 'debug level[default 0]'
+complete -c apt-proxy-import -s h -l help -d (_ '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]')
 

init/completions/apt-rdepends.fish

@@ -1,13 +1,13 @@
 #apt-rdepends
-complete -c apt-rdepends -l help -d "apt-rdepends command help"
-complete -f -c apt-rdepends -s b -l build-depends -d "show bulid deps"
-complete -f -c apt-rdepends -s d -l dotty -d "generate a dotty graph"
-complete -f -c apt-rdepends -s p -l print-state -d "show state of deps"
-complete -f -c apt-rdepends -s r -l reverse -d "list pkgs depending on"
-complete -r -f -c apt-rdepends -s f -l follow -d "only follow DEPENDS recursively"
-complete -r -f -c apt-rdepends -s s -l show -d "only show DEPENDS"
-complete -r -f -c apt-rdepends -l state-follow -d "only follow STATES recursively"
-complete -r -f -c apt-rdepends -l state-show -d "only show STATES"
-complete -f -c apt-rdepends -l man -d "display man page"
-complete -f -c apt-rdepends -l version -d "print version"
+complete -c apt-rdepends -l help -d (_ "Display help and exit")
+complete -f -c apt-rdepends -s b -l build-depends -d (_ "Show bulid dependencies")
+complete -f -c apt-rdepends -s d -l dotty -d (_ "Generate a dotty graph")
+complete -f -c apt-rdepends -s p -l print-state -d (_ "Show state of 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")
 

init/completions/apt-setup.fish

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

init/completions/apt-show-source.fish

@@ -1,10 +1,10 @@
 #apt-show-source
-complete -c apt-show-source -s h -l help -d 'apt-show-source command help'
-complete -r -c apt-show-source -l status-file -d 'read pkg from FILE' -f
-complete -r -c apt-show-source -o stf -d 'read pkg from FILE' -f
-complete -r -c apt-show-source -l list-dir -a '(ls -Fp .|grep /$) /var/lib/apt/lists' -d 'specify APT list dir'
-complete -r -c apt-show-source -o ld -a '(ls -Fp .|grep /$) /var/lib/apt/lists' -d 'specify APT list dir'
-complete -r -c apt-show-source -s p -l package -a '(apt-cache pkgnames)' -d 'list PKG info'
-complete -f -c apt-show-source -l version-only -d 'print version only'
-complete -f -c apt-show-source -s a -l all -d 'print all src pkgs with version'
-complete -f -c apt-show-source -s v -l verbose -d 'verbose message'
+complete -c apt-show-source -s h -l help -d (_ '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')

init/completions/apt-show-versions.fish

@@ -1,14 +1,14 @@
 #apt-show-versions
-complete -c apt-show-source -s h -l help -d 'apt-show-versions command help'
-complete -r -c apt-show-versions -s p -l packages -a '(apt-cache pkgnames)' -d 'print PKG versions'
-complete -f -c apt-show-versions -s r -l regex -d 'using regex'
-complete -f -c apt-show-versions -s u -l upgradeable -d 'print only upgradeable pkgs'
-complete -f -c apt-show-versions -s a -l allversions -d 'print all versions'
-complete -f -c apt-show-versions -s b -l brief -d 'print pkg name/distro'
-complete -f -c apt-show-versions -s v -l verbose -d 'print verbose info'
-complete -f -c apt-show-versions -s i -l initialize -d 'init or update cache only'
-complete -r -c apt-show-versions -l status-file -d 'read pkg from FILE'
-complete -r -c apt-show-versions -o stf -d 'read pkg from FILE'
-complete -r -c apt-show-versions -l list-dir -a '(ls -Fp .|grep /$) /var/lib/apt/lists /var/state/apt/lists' -d 'specify APT list dir'
-complete -r -c apt-show-versions -o ld -a '(ls -Fp .|grep /$) /var/lib/apt/lists /var/state/apt/lists' -d 'specify APT list dir'
+complete -c apt-show-source -s h -l help -d (_ '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')
 

init/completions/apt-sortpkgs.fish

@@ -1,7 +1,7 @@
 #apt-sortpkgs
-complete -c apt-sortpkgs -s h -l help -d "apt-sortpkgs command help"
-complete -f -c apt-sortpkgs -s s -l source -d "use source index field"
-complete -f -c apt-sortpkgs -s v -l version -d "show version"
-complete -r -c apt-sortpkgs -s c -l conf-file -d "specify conffile"
-complete -r -f -c apt-sortpkgs -s o -l option -d "set config options"
+complete -c apt-sortpkgs -s h -l help -d (_ "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")
 

init/completions/apt-spy.fish

@@ -1,20 +1,20 @@
 #apt-spy
-complete -c apt-spy -s h -d "apt-spy command help"
-complete -f -c apt-spy -s d -a "stable testing unstable" -d "Debian distribtion"
-complete -f -c apt-spy -s a -a "Africa Asia Europe North-America Oceania South-America" -d "servers in the areas"
-complete -c apt-spy -s c -d "conf file"
-complete -f -c apt-spy -s e -d "finish after number of servers"
-complete -c apt-spy -s f -d "file to grab servers"
-complete -c apt-spy -s i -d "file as input"
-complete -c apt-spy -s m -d "mirror-list file"
-complete -c apt-spy -s o -d "output sources.list file"
-complete -f -c apt-spy -s p -d "use proxy server"
-complete -f -c apt-spy -s s -d "comma separated country list"
-complete -f -c apt-spy -s t -d "how long in sec to download"
-complete -f -c apt-spy -s u -d "custom URL to get mirror list"
-complete -c apt-spy -s w -d "write top servers to file"
-complete -f -c apt-spy -s n -d "number of top servers"
-complete -f -c apt-spy -a "update" -d "update mirror list"
-complete -f -c apt-spy -s v -d "version number"
+complete -c apt-spy -s h -d (_ "Display help and exit")
+complete -f -c apt-spy -s d -a "stable testing unstable" -d (_ "Debian distribtion")
+complete -f -c apt-spy -s a -a "Africa Asia Europe North-America Oceania South-America" -d (_ "Servers in the areas")
+complete -c apt-spy -s c -d (_ "Conf file")
+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")
 
 

init/completions/apt-src.fish

@@ -1,24 +1,24 @@
 #apt-src
-complete -c apt-src -s h -l help -d "apt-src command help"
-complete -f -c apt-src -a "update" -d "update list of src pkgs"
-complete -f -c apt-src -a "install" -d "install src pkgs"
-complete -f -c apt-src -a "upgrade" -d "upgrade src pkgs"
-complete -f -c apt-src -a "remove" -d "remove src pkgs"
-complete -f -c apt-src -a "build" -d "build src pkgs"
-complete -f -c apt-src -a "clean" -d "clean src pkgs"
-complete -f -c apt-src -a "import" -d "detect known src tree"
-complete -f -c apt-src -a "list" -d "list installed src pkg\(s\)"
-complete -f -c apt-src -a "location" -d "root src tree"
-complete -f -c apt-src -a "version" -d "version of src pkg"
-complete -f -c apt-src -a "name" -d "name of the src pkg"
-complete -f -c apt-src -s b -l build -d "build src pkgs"
-complete -f -c apt-src -s i -l installdebs -d "install after build"
-complete -f -c apt-src -s p -l patch -d "patch local changes"
-complete -r -c apt-src -s l -l location -d "specify a dir"
-complete -c apt-src -s c -l here -d "run on current dir"
-complete -f -c apt-src -l upstream-version -d "omit debian version"
-complete -f -c apt-src -s k -l keep-built -d "do not del built files"
-complete -f -c apt-src -s n -l no-delete-source -d "do not del source files"
-complete -f -c apt-src -l version -d "source tree version"
-complete -f -c apt-src -s q -l quiet -d "output to /dev/null"
-complete -f -c apt-src -s t -l trace -d "output trace"
+complete -c apt-src -s h -l help -d (_ "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")

init/completions/apt-zip-inst.fish

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

init/completions/apt-zip-list.fish

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

init/completions/arp.fish

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

init/completions/at.fish

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

init/completions/atd.fish

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

init/completions/atq.fish

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

init/completions/atrm.fish

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

init/completions/bc.fish

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

init/completions/btdownloadheadless.py.fish

@@ -1,34 +1,33 @@
 # Bittorrent commands
 
 for i in btdownloadcurses.py btdownloadheadless.py;
-	complete -c $i -l max_uploads -x -d "Maximum uploads at once"
-	complete -c $i -l keepalive_interval -x -d "Number of seconds between keepalives"
-	complete -c $i -l download_slice_size -x -d "Bytes per request"
-	complete -c $i -l request_backlog -x -d "Requests per pipe"
-	complete -c $i -l max_message_length -x -d "Maximum length prefix encoding"
-	complete -c $i -l ip -d "IP to report to the tracker" -x -a "(__fish_print_addresses)"
-	complete -c $i -l minport -d "Minimum port to listen to"
-	complete -c $i -l maxport -d "Maximum port to listen to"
-	complete -c $i -l responsefile -r -d "File for server response"
-	complete -c $i -l url -x -d "URL to get file from"
-	complete -c $i -l saveas -r -d "Local file target"
-	complete -c $i -l timeout -x -d "Time to close inactive socket"
-	complete -c $i -l timeout_check_interval -x -d "Time between checking timeouts"
-	complete -c $i -l max_slice_length -x -d "Maximum outgoing slice length"
-	complete -c $i -l max_rate_period -x -d "Maximum time to guess rate"
-	complete -c $i -l bind -x -d "IP to bind to locally" -a "(__fish_print_addresses)"
-	complete -c $i -l upload_rate_fudge -x -d "time equivalent of writing to kernel-level TCP buffer"
-	complete -c $i -l display_interval -x -d "Time between screen updates"
-	complete -c $i -l rerequest_interval -x -d "Time to wait between requesting more peers"
-	complete -c $i -l min_peers -x -d "Minimum number of peers to not do requesting"
-	complete -c $i -l http_timeout -x -d "Number of seconds before assuming http timeout"
-	complete -c $i -l max_initiate -x -d "Number of peers at which to stop initiating new connections"
-	complete -c $i -l max_allow_in -x -d "Maximum number of connections to allow"
-	complete -c $i -l check_hashes -x -d "Whether to check hashes on disk"
-	complete -c $i -l max_upload_rate -x -d "Maximum kB/s to upload at"
-	complete -c $i -l snub_time -x -d "Seconds to wait for data to come in before assuming choking"
-	complete -c $i -l spew -x -d "Whether to display diagnostic info"
-	complete -c $i -l rarest_first_cutoff -x -d "Number of downloads at which to switch from random to rarest first"
-	complete -c $i -l min_uploads -x -d "Number of uploads to fill out to with optimistic unchokes"
-	complete -c $i -l report_hash_failiures -x -d "Whether to inform the user that hash failures occur"
+	complete -c $i -l max_uploads -x -d (_ "Maximum uploads at once")
+	complete -c $i -l keepalive_interval -x -d (_ "Number of seconds between keepalives")
+	complete -c $i -l download_slice_size -x -d (_ "Bytes per request")
+	complete -c $i -l request_backlog -x -d (_ "Requests per pipe")
+	complete -c $i -l max_message_length -x -d (_ "Maximum length prefix encoding")
+	complete -c $i -l ip -d (_ "IP to report to the tracker") -x -a "(__fish_print_addresses)"
+	complete -c $i -l minport -d (_ "Minimum port to listen to")
+	complete -c $i -l maxport -d (_ "Maximum port to listen to")
+	complete -c $i -l responsefile -r -d (_ "File for server response")
+	complete -c $i -l url -x -d (_ "URL to get file from")
+	complete -c $i -l saveas -r -d (_ "Local file target")
+	complete -c $i -l timeout -x -d (_ "Time to close inactive socket")
+	complete -c $i -l timeout_check_interval -x -d (_ "Time between checking timeouts")
+	complete -c $i -l max_slice_length -x -d (_ "Maximum outgoing slice length")
+	complete -c $i -l max_rate_period -x -d (_ "Maximum time to guess rate")
+	complete -c $i -l bind -x -d (_ "IP to bind to locally") -a "(__fish_print_addresses)"
+	complete -c $i -l display_interval -x -d (_ "Time between screen updates")
+	complete -c $i -l rerequest_interval -x -d (_ "Time to wait between requesting more peers")
+	complete -c $i -l min_peers -x -d (_ "Minimum number of peers to not do requesting")
+	complete -c $i -l http_timeout -x -d (_ "Number of seconds before assuming http timeout")
+	complete -c $i -l max_initiate -x -d (_ "Number of peers at which to stop initiating new connections")
+	complete -c $i -l max_allow_in -x -d (_ "Maximum number of connections to allow")
+	complete -c $i -l check_hashes -x -d (_ "Whether to check hashes on disk")
+	complete -c $i -l max_upload_rate -x -d (_ "Maximum kB/s to upload at")
+	complete -c $i -l snub_time -x -d (_ "Seconds to wait for data to come in before assuming choking")
+	complete -c $i -l spew -x -d (_ "Whether to display diagnostic info")
+	complete -c $i -l rarest_first_cutoff -x -d (_ "Number of downloads at which to switch from random to rarest first")
+	complete -c $i -l min_uploads -x -d (_ "Number of uploads to fill out to with optimistic unchokes")
+	complete -c $i -l report_hash_failiures -x -d (_ "Whether to inform the user that hash failures occur")
 end;

init/completions/bunzip2.fish

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

init/completions/bzcat.fish

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

init/completions/bzip2.fish

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

init/completions/cat.fish

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

init/completions/chgrp.fish

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

init/completions/chown.fish

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

init/completions/chsh.fish

@@ -0,0 +1,10 @@
+#
+# Completions for the chsh command
+#
+
+complete -c chsh -s s -l shell -x -a "(chsh -l)" -d "Specify your login shell"
+complete -c chsh -s l -l list-shells -d "Display the list of shells listed in /etc/shells and exit"
+complete -c chsh -s u -l help -d "Display help and exit"
+complete -c chsh -s v -l version -d "Display version and exit"
+complete -x -c chsh -a "(__fish_complete_users)"
+

init/completions/commandline.fish

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

init/completions/complete.fish

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

init/completions/configure.fish

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

init/completions/cut.fish

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

init/completions/cvs.fish

@@ -2,52 +2,52 @@
 # I don't use CVS, so these completions are probably not all that good.
 #
 
-complete -c cvs -x -a 'add' -d 'Add a new file/directory to the repository'
-complete -c cvs -x -a 'admin' -d 'Administration front end for rcs'
-complete -c cvs -x -a 'annotate' -d 'Show last revision where each line was modified'
-complete -c cvs -x -a 'checkout' -d 'Checkout sources for editing'
-complete -c cvs -x -a 'commit' -d 'Check files into the repository'
-complete -c cvs -x -a 'diff' -d 'Show differences between revisions'
-complete -c cvs -x -a 'edit' -d 'Get ready to edit a watched file'
-complete -c cvs -x -a 'editors' -d 'See who is editing a watched file'
-complete -c cvs -x -a 'export' -d 'Export sources from CVS, similar to checkout'
-complete -c cvs -x -a 'history' -d 'Show repository access history'
-complete -c cvs -x -a 'import' -d 'Import sources into CVS, using vendor branches'
-complete -c cvs -x -a 'init' -d 'Create a CVS repository if it doesnt exist'
-complete -c cvs -x -a 'kserver' -d 'Kerberos server mode'
-complete -c cvs -x -a 'log' -d 'Print out history information for files'
-complete -c cvs -x -a 'login' -d 'Prompt for password for authenticating server'
-complete -c cvs -x -a 'logout' -d 'Removes entry in .cvspass for remote repository'
-complete -c cvs -x -a 'pserver' -d 'Password server mode'
-complete -c cvs -x -a 'rannotate' -d 'Show last revision where each line of module was modified'
-complete -c cvs -x -a 'rdiff' -d 'Create "patch" format diffs between releases'
-complete -c cvs -x -a 'release' -d 'Indicate that a Module is no longer in use'
-complete -c cvs -x -a 'remove' -d 'Remove an entry from the repository'
-complete -c cvs -x -a 'rlog' -d 'Print out history information for a module'
-complete -c cvs -x -a 'rtag' -d 'Add a symbolic tag to a module'
-complete -c cvs -x -a 'server' -d 'Server mode'
-complete -c cvs -x -a 'status' -d 'Display status information on checked out files'
-complete -c cvs -x -a 'tag' -d 'Add a symbolic tag to checked out version of files'
-complete -c cvs -x -a 'unedit' -d 'Undo an edit command'
-complete -c cvs -x -a 'update' -d 'Bring work tree in sync with repository'
-complete -c cvs -x -a 'version' -d 'Show current CVS version(s)'
-complete -c cvs -x -a 'watch' -d 'Set watches'
-complete -c cvs -x -a 'watchers' -d 'See who is watching a file'
+complete -c cvs -x -a 'add' -d (_ "Add a new file/directory to the repository")
+complete -c cvs -x -a 'admin' -d (_ "Administration front end for rcs")
+complete -c cvs -x -a 'annotate' -d (_ "Show last revision where each line was modified")
+complete -c cvs -x -a 'checkout' -d (_ "Checkout sources for editing")
+complete -c cvs -x -a 'commit' -d (_ "Check files into the repository")
+complete -c cvs -x -a 'diff' -d (_ "Show differences between revisions")
+complete -c cvs -x -a 'edit' -d (_ "Get ready to edit a watched file")
+complete -c cvs -x -a 'editors' -d (_ "See who is editing a watched file")
+complete -c cvs -x -a 'export' -d (_ "Export sources from CVS, similar to checkout")
+complete -c cvs -x -a 'history' -d (_ "Show repository access history")
+complete -c cvs -x -a 'import' -d (_ "Import sources into CVS, using vendor branches")
+complete -c cvs -x -a 'init' -d (_ "Create a CVS repository if it doesnt exist")
+complete -c cvs -x -a 'kserver' -d (_ "Kerberos server mode")
+complete -c cvs -x -a 'log' -d (_ "Print out history information for files")
+complete -c cvs -x -a 'login' -d (_ "Prompt for password for authenticating server")
+complete -c cvs -x -a 'logout' -d (_ "Removes entry in .cvspass for remote repository")
+complete -c cvs -x -a 'pserver' -d (_ "Password server mode")
+complete -c cvs -x -a 'rannotate' -d (_ "Show last revision where each line of module was modified")
+complete -c cvs -x -a 'rdiff' -d (_ "Create "patch" format diffs between releases")
+complete -c cvs -x -a 'release' -d (_ "Indicate that a Module is no longer in use")
+complete -c cvs -x -a 'remove' -d (_ "Remove an entry from the repository")
+complete -c cvs -x -a 'rlog' -d (_ "Print out history information for a module")
+complete -c cvs -x -a 'rtag' -d (_ "Add a symbolic tag to a module")
+complete -c cvs -x -a 'server' -d (_ "Server mode")
+complete -c cvs -x -a 'status' -d (_ "Display status information on checked out files")
+complete -c cvs -x -a 'tag' -d (_ "Add a symbolic tag to checked out version of files")
+complete -c cvs -x -a 'unedit' -d (_ "Undo an edit command")
+complete -c cvs -x -a 'update' -d (_ "Bring work tree in sync with repository")
+complete -c cvs -x -a 'version' -d (_ "Display version and exit")
+complete -c cvs -x -a 'watch' -d (_ "Set watches")
+complete -c cvs -x -a 'watchers' -d (_ "See who is watching a file")
 
-complete -c cvs -x -s H -d 'Displays usage information for command'
-complete -c cvs -x -s Q -d 'Cause CVS to be really quiet'
-complete -c cvs -x -s q -d 'Cause CVS to be somewhat quiet'
-complete -c cvs -x -s r -d 'Make checked-out files read-only'
-complete -c cvs -x -s w -d 'Make checked-out files read-write (default)'
-complete -c cvs -x -s n -d 'Do not execute anything that will change the disk'
-complete -c cvs -x -s t -d 'Show trace of program execution -- try with -n'
-complete -c cvs -x -s v -d 'CVS version and copyright'
-complete -c cvs -x -s T -r -d 'Use "tmpdir" for temporary files'
-complete -c cvs -x -s e -r -d 'Use "editor" for editing log information'
-complete -c cvs -x -s d -r -d 'Overrides $CVSROOT as the root of the CVS tree'
-complete -c cvs -x -s f -d 'Do not use the ~/.cvsrc file'
-complete -c cvs -x -s z -d 'Compression level for net traffic' -x -a '1 2 3 4 5 6 7 8 9'
-complete -c cvs -x -s x -d 'Encrypt all net traffic'
-complete -c cvs -x -s a -d 'Authenticate all net traffic'
-complete -c cvs -x -s s -d 'Set CVS user variable' -x
+complete -c cvs -x -s H -d (_ "Displays usage information for command")
+complete -c cvs -x -s Q -d (_ "Cause CVS to be really quiet")
+complete -c cvs -x -s q -d (_ "Cause CVS to be somewhat quiet")
+complete -c cvs -x -s r -d (_ "Make checked-out files read-only")
+complete -c cvs -x -s w -d (_ "Make checked-out files read-write (default)")
+complete -c cvs -x -s n -d (_ "Do not execute anything that will change the disk")
+complete -c cvs -x -s t -d (_ "Show trace of program execution -- try with -n")
+complete -c cvs -x -s v -d (_ "Display version and exit")
+complete -c cvs -x -s T -r -d (_ "Use "tmpdir" for temporary files")
+complete -c cvs -x -s e -r -d (_ "Use "editor" for editing log information")
+complete -c cvs -x -s d -r -d (_ "Overrides $CVSROOT as the root of the CVS tree")
+complete -c cvs -x -s f -d (_ "Do not use the ~/.cvsrc file")
+complete -c cvs -x -s z -d (_ "Compression level for net traffic") -x -a '1 2 3 4 5 6 7 8 9'
+complete -c cvs -x -s x -d (_ "Encrypt all net traffic")
+complete -c cvs -x -s a -d (_ "Authenticate all net traffic")
+complete -c cvs -x -s s -d (_ "Set CVS user variable") -x
 

init/completions/darcs.fish

@@ -25,177 +25,174 @@ end
 # If no subcommand has been specified, complete using all available subcommands
 #
 
-complete -c darcs -n '__fish_use_subcommand' -xa "
-	initialize\t'Create new project'
-	get\t'Create a local copy of another repository'
-	add\t'Add one or more new files or directories'
-	remove\t'Remove one or more files or directories from the repository'
-	mv\t'Move/rename one or more files or directories'
-	replace\t'Replace a token with a new value for that token'
-	record\t'Save changes in the working copy to the repository as a patch'
-	pull\t'Copy and apply patches from another repository to this one'
-	send\t'Send by email a bundle of one or more patches'
-	apply\t'Apply patches (from an email bundle) to the repository'
-	push\t'Copy and apply patches from this repository to another one'
-	whatsnew\t'Display unrecorded changes in the working copy'
-	changes\t'Gives a changelog style summary of the repo history'
-	unrecord\t'Remove recorded patches without changing the working copy'
-	amend-record\t'Replace a recorded patch with a better version'
-	revert\t'Revert to the recorded version (safe the first time only)'
-	unrevert\t'Undo the last revert (may fail if changes after the revert)'
-	unpull\t'Opposite of pull; unsafe if the patch is not in remote repo'
-	rollback\t'Record an inverse patch without changing the working directory'
-	tag\t'Tag the contents of the repository with a version name'
-	setpref\t'Set a value for a preference (test, predist, ...)'
-	diff\t'Create a diff between two versions of the repository'
-	annotate\t'Display which patch last modified something'
-	optimize\t'Optimize the repository'
-	check\t'Check the repository for consistency'
-	resolve\t'Mark any conflicts to the working copy for manual resolution'
-	dist\t'Create a distribution tarball'
-	trackdown\t'Locate the most recent version lacking an error'
-	repair\t'Repair the corrupted repository'
-"
-
+complete -c darcs -n '__fish_use_subcommand' -xa 'initialize\t"'(_ "Create new project")'"'
+complete -c darcs -n '__fish_use_subcommand' -xa 'get\t"'(_ "Create a local copy of another repository")'"'
+complete -c darcs -n '__fish_use_subcommand' -xa 'add\t"'(_ "Add one or more new files or directories")'"'
+complete -c darcs -n '__fish_use_subcommand' -xa 'remove\t"'(_ "Remove one or more files or directories from the repository")'"'
+complete -c darcs -n '__fish_use_subcommand' -xa 'mv\t"'(_ "Move/rename one or more files or directories")'"'
+complete -c darcs -n '__fish_use_subcommand' -xa 'replace\t"'(_ "Replace a token with a new value for that token")'"'
+complete -c darcs -n '__fish_use_subcommand' -xa 'record\t"'(_ "Save changes in the working copy to the repository as a patch")'"'
+complete -c darcs -n '__fish_use_subcommand' -xa 'pull\t"'(_ "Copy and apply patches from another repository to this one")'"'
+complete -c darcs -n '__fish_use_subcommand' -xa 'send\t"'(_ "Send by email a bundle of one or more patches")'"'
+complete -c darcs -n '__fish_use_subcommand' -xa 'apply\t"'(_ "Apply patches (from an email bundle) to the repository")'"'
+complete -c darcs -n '__fish_use_subcommand' -xa 'push\t"'(_ "Copy and apply patches from this repository to another one")'"'
+complete -c darcs -n '__fish_use_subcommand' -xa 'whatsnew\t"'(_ "Display unrecorded changes in the working copy")'"'
+complete -c darcs -n '__fish_use_subcommand' -xa 'changes\t"'(_ "Gives a changelog style summary of the repo history")'"'
+complete -c darcs -n '__fish_use_subcommand' -xa 'unrecord\t"'(_ "Remove recorded patches without changing the working copy")'"'
+complete -c darcs -n '__fish_use_subcommand' -xa 'amend-record\t"'(_ "Replace a recorded patch with a better version")'"'
+complete -c darcs -n '__fish_use_subcommand' -xa 'revert\t"'(_ "Revert to the recorded version (safe the first time only)" )'"'
+complete -c darcs -n '__fish_use_subcommand' -xa 'unrevert\t"'(_ "Undo the last revert (may fail if changes after the revert)")'"'
+complete -c darcs -n '__fish_use_subcommand' -xa 'unpull\t"'(_ "Opposite of pull; unsafe if the patch is not in remote repo")'"'
+complete -c darcs -n '__fish_use_subcommand' -xa 'rollback\t"'(_ "Record an inverse patch without changing the working copy" )'"'
+complete -c darcs -n '__fish_use_subcommand' -xa 'tag\t"'(_ "Tag the contents of the repository with a version name")'"'
+complete -c darcs -n '__fish_use_subcommand' -xa 'setpref\t"'(_ "Set a value for a preference (test, predist, ...)")'"'
+complete -c darcs -n '__fish_use_subcommand' -xa 'diff\t"'(_ "Create a diff between two versions of the repository")'"'
+complete -c darcs -n '__fish_use_subcommand' -xa 'annotate\t"'(_ "Display which patch last modified something")'"'
+complete -c darcs -n '__fish_use_subcommand' -xa 'optimize\t"'(_ "Optimize the repository")'"'
+complete -c darcs -n '__fish_use_subcommand' -xa 'check\t"'(_ "Check the repository for consistency")'"'
+complete -c darcs -n '__fish_use_subcommand' -xa 'resolve\t"'(_ "Mark any conflicts to the working copy for manual resolution")'"'
+complete -c darcs -n '__fish_use_subcommand' -xa 'dist\t"'(_ "Create a distribution tarball")'"'
+complete -c darcs -n '__fish_use_subcommand' -xa 'trackdown\t"'(_ "Locate the most recent version lacking an error")'"'
+complete -c darcs -n '__fish_use_subcommand' -xa 'repair\t"'(_ "Repair the corrupted repository")'"'
+ 
 #
 # These switches are universal
 #
-complete -c darcs -s h -l help -d "shows brief description of command and its arguments"
-complete -c darcs -l disable -d "Disable this command"
-complete -c darcs -l repodir -d "Specify the repository directory in which to run" -x -a '(__fish_complete_directory (commandline -ct))'
-complete -c darcs -s v -l verbose -d "give verbose output"
+complete -c darcs -s h -l help -d (_ "Shows brief description of command and its arguments")
+complete -c darcs -l disable -d (_ "Disable this command")
+complete -c darcs -l repodir -d (_ "Specify the repository directory in which to run") -x -a '(__fish_complete_directory (commandline -ct))'
+complete -c darcs -s v -l verbose -d (_ "Verbose mode")
 
 #
 # Here follows a huge list of subcommand-specific completions
 #
 
 set -- record_opt -c darcs -n 'contains record (commandline -poc)'
-complete $record_opt -s m -l patch-name -d "Name of patch" -x
-complete $record_opt -s A -l author -d "Specify author id" -x
-complete $record_opt -l logfile -d "Give patch name and comment in file" -r
-complete $record_opt -s a -l all -d "answer yes to all patches"
-complete $record_opt -s l -l look-for-adds -d "In addition to modifications, look for files that are not boring, and thus are potentially pending addition"
-complete $record_opt -l delete-logfile -d "Delete the logfile when done"
-complete $record_opt -l standard-verbosity -d "Don"\'"t give verbose output"
-complete $record_opt -l no-test -d "Don"\'"t run the test script"
-complete $record_opt -l test -d "Run the test script"
-complete $record_opt -l leave-test-directory -d "Don"\'"t remove the test directory"
-complete $record_opt -l remove-test-directory -d "Remove the test directory"
-complete $record_opt -l compress -d "Create compressed patches"
-complete $record_opt -l dont-compress -d "Don"\'"t create compressed patches"
-complete $record_opt -l pipe -d "Expect to receive input from a pipe"
-complete $record_opt -l interactive -d "Prompt user interactively"
-complete $record_opt -l ask-deps -d "Ask for extra dependencies"
-complete $record_opt -l no-ask-deps -d "Don"\'"t ask for extra dependencies"
-complete $record_opt -l edit-long-comment -d "Edit the long comment by default"
-complete $record_opt -l skip-long-comment -d "Don"\'"t give a long comment"
-complete $record_opt -l prompt-long-comment -d "Prompt for whether to edit the long comment"
-complete $record_opt -l ignore-times -d "Don"\'"t trust the file modification times"
-complete $record_opt -l dont-look-for-adds -d "Don"\'"t look for any files or directories that could be added, and don"\'"t add them automatically"
+complete $record_opt -s m -l patch-name -d (_ "Name of patch") -x
+complete $record_opt -s A -l author -d (_ "Specify author id") -x
+complete $record_opt -l logfile -d (_ "Give patch name and comment in file") -r
+complete $record_opt -s a -l all -d (_ "Answer yes to all patches")
+complete $record_opt -s l -l look-for-adds -d (_ "In addition to modifications, look for files that are not boring, and thus are potentially pending addition")
+complete $record_opt -l delete-logfile -d (_ "Delete the logfile when done")
+complete $record_opt -l standard-verbosity -d (_ "Don't give verbose output")
+complete $record_opt -l no-test -d (_ "Don't run the test script")
+complete $record_opt -l test -d (_ "Run the test script")
+complete $record_opt -l leave-test-directory -d (_ "Don't remove the test directory")
+complete $record_opt -l remove-test-directory -d (_ "Remove the test directory")
+complete $record_opt -l compress -d (_ "Create compressed patches")
+complete $record_opt -l dont-compress -d (_ "Don't create compressed patches")
+complete $record_opt -l pipe -d (_ "Expect to receive input from a pipe")
+complete $record_opt -l interactive -d (_ "Prompt user interactively")
+complete $record_opt -l ask-deps -d (_ "Ask for extra dependencies")
+complete $record_opt -l no-ask-deps -d (_ "Don't ask for extra dependencies")
+complete $record_opt -l edit-long-comment -d (_ "Edit the long comment by default")
+complete $record_opt -l skip-long-comment -d (_ "Don't give a long comment")
+complete $record_opt -l prompt-long-comment -d (_ "Prompt for whether to edit the long comment")
+complete $record_opt -l ignore-times -d (_ "Don't trust the file modification times")
+complete $record_opt -l dont-look-for-adds -d (_ "Don't look for any files or directories that could be added, and don't add them automatically")
 set -e record_opt
 
 
 set -- pull_opt -c darcs -n 'contains pull (commandline -poc)'
-complete $pull_opt -s p -l patches -d "select patches matching REGEXP" -x
-complete $pull_opt -s t -l tags -d "select tags matching REGEXP" -x
-complete $pull_opt -s a -l all -d "answer yes to all patches"
-complete $pull_opt -s s -l summary -d "summarize changes"
-complete $pull_opt -s q -l quiet -d "suppress informational output"
-complete $pull_opt -l matches -d "select patches matching PATTERN" -x
-complete $pull_opt -l external-merge -d "Use external tool to merge conflicts" -x
-complete $pull_opt -l interactive -d "prompt user interactively"
-complete $pull_opt -l compress -d "create compressed patches"
-complete $pull_opt -l dont-compress -d "don"\'"t create compressed patches"
-complete $pull_opt -l test -d "run the test script"
-complete $pull_opt -l no-test -d "don"\'"t run the test script"
-complete $pull_opt -l dry-run -d "don"\'"t actually take the action"
-complete $pull_opt -l no-summary -d "don"\'"t summarize changes"
-complete $pull_opt -l standard-verbosity -d "neither verbose nor quiet output"
-complete $pull_opt -l ignore-times -d "don"\'"t trust the file modification times"
-complete $pull_opt -l no-deps -d "don"\'"t automatically fulfill dependencies"
-complete $pull_opt -l set-default -d "set default repository [DEFAULT]"
-complete $pull_opt -l no-set-default -d "don"\'"t set default repository"
-complete $pull_opt -l set-scripts-executable -d "make scripts executable"
-complete $pull_opt -l dont-set-scripts-executable -d "don"\'"t make scripts executable"
+complete $pull_opt -s p -l patches -d (_ "Select patches matching REGEXP") -x
+complete $pull_opt -s t -l tags -d (_ "Select tags matching REGEXP") -x
+complete $pull_opt -s a -l all -d (_ "Answer yes to all patches")
+complete $pull_opt -s s -l summary -d (_ "Summarize changes")
+complete $pull_opt -s q -l quiet -d (_ "Suppress informational output")
+complete $pull_opt -l matches -d (_ "Select patches matching PATTERN") -x
+complete $pull_opt -l external-merge -d (_ "Use external tool to merge conflicts") -x
+complete $pull_opt -l interactive -d (_ "Prompt user interactively")
+complete $pull_opt -l compress -d (_ "Create compressed patches")
+complete $pull_opt -l dont-compress -d (_ "Don't create compressed patches")
+complete $pull_opt -l test -d (_ "Run the test script")
+complete $pull_opt -l no-test -d (_ "Don't run the test script")
+complete $pull_opt -l dry-run -d (_ "Don't actually take the action")
+complete $pull_opt -l no-summary -d (_ "Don't summarize changes")
+complete $pull_opt -l standard-verbosity -d (_ "Neither verbose nor quiet output")
+complete $pull_opt -l ignore-times -d (_ "Don't trust the file modification times")
+complete $pull_opt -l no-deps -d (_ "Don't automatically fulfill dependencies")
+complete $pull_opt -l set-default -d (_ "Set default repository [DEFAULT]")
+complete $pull_opt -l no-set-default -d (_ "Don't set default repository")
+complete $pull_opt -l set-scripts-executable -d (_ "Make scripts executable")
+complete $pull_opt -l dont-set-scripts-executable -d (_ "Don't make scripts executable")
 set -e pull_opt
 
 
 set -- apply_opt  -c darcs -n 'contains apply (commandline -poc)'
-complete $apply_opt -s a -l all -d "answer yes to all patches"
-complete $apply_opt -l verify -d "verify that the patch was signed by a key in PUBRING" -r
-complete $apply_opt -l verify-ssl -d "verify using openSSL with authorized keys from file "\'"KEYS"\'"" -r
-complete $apply_opt -l sendmail-command -d "specify sendmail command" -r
-complete $apply_opt -l reply -d "reply to email-based patch using FROM address" -x
-complete $apply_opt -l cc -d "mail results to additional EMAIL(s). Requires --reply" -x
-complete $apply_opt -l external-merge -d "Use external tool to merge conflicts" -r
-complete $apply_opt -l no-verify -d "don"\'"t verify patch signature"
-complete $apply_opt -l standard-verbosity -d "don"\'"t give verbose output"
-complete $apply_opt -l ignore-times -d "don"\'"t trust the file modification times"
-complete $apply_opt -l compress -d "create compressed patches"
-complete $apply_opt -l dont-compress -d "don"\'"t create compressed patches"
-complete $apply_opt -l interactive -d "prompt user interactively"
-complete $apply_opt -l mark-conflicts -d "mark conflicts"
-complete $apply_opt -l allow-conflicts -d "allow conflicts, but don"\'"t mark them"
-complete $apply_opt -l no-resolve-conflicts -d "equivalent to --dont-allow-conflicts, for backwards compatibility"
-complete $apply_opt -l dont-allow-conflicts -d "fail on patches that create conflicts [DEFAULT]"
-complete $apply_opt -l no-test -d "don"\'"t run the test script"
-complete $apply_opt -l test -d "run the test script"
-complete $apply_opt -l happy-forwarding -d "forward unsigned messages without extra header"
-complete $apply_opt -l leave-test-directory -d "don"\'"t remove the test directory"
-complete $apply_opt -l remove-test-directory -d "remove the test directory"
-complete $apply_opt -l set-scripts-executable -d "make scripts executable"
-complete $apply_opt -l dont-set-scripts-executable -d "don"\'"t make scripts executable"
+complete $apply_opt -s a -l all -d (_ "Answer yes to all patches")
+complete $apply_opt -l verify -d (_ "Verify that the patch was signed by a key in PUBRING") -r
+complete $apply_opt -l verify-ssl -d (_ "Verify using openSSL with authorized keys from file 'KEYS'") -r
+complete $apply_opt -l sendmail-command -d (_ "Specify sendmail command") -r
+complete $apply_opt -l reply -d (_ "Reply to email-based patch using FROM address") -x
+complete $apply_opt -l cc -d (_ "Mail results to additional EMAIL(s). Requires --reply") -x
+complete $apply_opt -l external-merge -d (_ "Use external tool to merge conflicts") -r
+complete $apply_opt -l no-verify -d (_ "Don't verify patch signature")
+complete $apply_opt -l standard-verbosity -d (_ "Don't give verbose output")
+complete $apply_opt -l ignore-times -d (_ "Don't trust the file modification times")
+complete $apply_opt -l compress -d (_ "Create compressed patches")
+complete $apply_opt -l dont-compress -d (_ "Don't create compressed patches")
+complete $apply_opt -l interactive -d (_ "Prompt user interactively")
+complete $apply_opt -l mark-conflicts -d (_ "Mark conflicts")
+complete $apply_opt -l allow-conflicts -d (_ "Allow conflicts, but don't mark them")
+complete $apply_opt -l dont-allow-conflicts -d (_ "Fail on patches that create conflicts [DEFAULT]")
+complete $apply_opt -l no-test -d (_ "Don't run the test script")
+complete $apply_opt -l test -d (_ "Run the test script")
+complete $apply_opt -l happy-forwarding -d (_ "Forward unsigned messages without extra header")
+complete $apply_opt -l leave-test-directory -d (_ "Don't remove the test directory")
+complete $apply_opt -l remove-test-directory -d (_ "Remove the test directory")
+complete $apply_opt -l set-scripts-executable -d (_ "Make scripts executable")
+complete $apply_opt -l dont-set-scripts-executable -d (_ "Don't make scripts executable")
 set -e apply_opt
 
 set -- check_opt  -c darcs -n 'contains check (commandline -poc)'
-complete $check_opt -s v -l verbose -d "give verbose output"
-complete $check_opt -s q -l quiet -d "suppress informational output"
-complete $check_opt -l complete -d "check the entire repository"
-complete $check_opt -l partial -d "check patches since latest checkpoint"
-complete $check_opt -l standard-verbosity -d "neither verbose nor quiet output"
-complete $check_opt -l no-test -d "don"\'"t run the test script"
-complete $check_opt -l test -d "run the test script"
-complete $check_opt -l leave-test-directory -d "don"\'"t remove the test directory"
-complete $check_opt -l remove-test-directory -d "remove the test directory"
+complete $check_opt -s v -l verbose -d (_ "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 standard-verbosity -d (_ "Neither verbose nor quiet output")
+complete $check_opt -l no-test -d (_ "Don't run the test script")
+complete $check_opt -l test -d (_ "Run the test script")
+complete $check_opt -l leave-test-directory -d (_ "Don't remove the test directory")
+complete $check_opt -l remove-test-directory -d (_ "Remove the test directory")
 set -e check_opt
 
 set -- mv_opt  -c darcs -n 'contains mv (commandline -poc)'
-complete $mv_opt -s v -l verbose -d "give verbose output"
-complete $mv_opt -l case-ok -d "don"\'"t refuse to add files differing only in case"
-complete $mv_opt -l standard-verbosity -d "don"\'"t give verbose output"
+complete $mv_opt -s v -l verbose -d (_ "Verbose mode")
+complete $mv_opt -l case-ok -d (_ "Don't refuse to add files differing only in case")
+complete $mv_opt -l standard-verbosity -d (_ "Don't give verbose output")
 set -e mv_opt
 
 set -- send_opt -c darcs -n 'contains send (commandline -poc)'
-complete $send_opt -s v -l verbose -d "give verbose output"
-complete $send_opt -s q -l quiet -d "suppress informational output"
-complete $send_opt -xs p -l patches -d "select patches matching REGEXP"
-complete $send_opt -xs t -l tags -d "select tags matching REGEXP"
-complete $send_opt -s a -l all -d "answer yes to all patches"
-complete $send_opt -xs A  -l author -d "specify author id"
-complete $send_opt -rs o -l output -d "specify output filename"
-complete $send_opt -s u -l unified -d "output patch in a darcs-specific format similar to diff -u"
-complete $send_opt -s s -l summary -d "summarize changes"
-complete $send_opt -l standard-verbosity -d "neither verbose nor quiet output"
-complete $send_opt -xl matches -d "select patches matching PATTERN"
-complete $send_opt -l interactive -d "prompt user interactively"
-complete $send_opt -xl from -d "specify email address"
-complete $send_opt -xl to -d "specify destination email"
-complete $send_opt -xl cc -d "mail results to additional EMAIL(s). Requires --reply"
-complete $send_opt -l sign -d "sign the patch with your gpg key"
-complete $send_opt -xl sign-as -d "sign the patch with a given keyid"
-complete $send_opt -rl sign-ssl -d "sign the patch using openssl with a given private key"
-complete $send_opt -l dont-sign -d "do not sign the patch"
-complete $send_opt -l dry-run -d "don"\'"t actually take the action"
-complete $send_opt -l no-summary -d "don"\'"t summarize changes"
-complete $send_opt -rl context -d "send to context stored in FILENAME"
-complete $send_opt -l edit-description -d "edit the patch bundle description"
-complete $send_opt -l set-default -d "set default repository [DEFAULT]"
-complete $send_opt -l no-set-default -d "don"\'"t set default repository"
-complete $send_opt -rl sendmail-command -d "specify sendmail command"
+complete $send_opt -s v -l verbose -d (_ "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 -l standard-verbosity -d (_ "Neither verbose nor quiet output")
+complete $send_opt -xl matches -d (_ "Select patches matching PATTERN")
+complete $send_opt -l interactive -d (_ "Prompt user interactively")
+complete $send_opt -xl from -d (_ "Specify email address")
+complete $send_opt -xl to -d (_ "Specify destination email")
+complete $send_opt -xl cc -d (_ "Mail results to additional EMAIL(s). Requires --reply")
+complete $send_opt -l sign -d (_ "Sign the patch with your gpg key")
+complete $send_opt -xl sign-as -d (_ "Sign the patch with a given keyid")
+complete $send_opt -rl sign-ssl -d (_ "Sign the patch using openssl with a given private key")
+complete $send_opt -l dont-sign -d (_ "Do not sign the patch")
+complete $send_opt -l dry-run -d (_ "Don't actually take the action")
+complete $send_opt -l no-summary -d (_ "Don't summarize changes")
+complete $send_opt -rl context -d (_ "Send to context stored in FILENAME")
+complete $send_opt -l edit-description -d (_ "Edit the patch bundle description")
+complete $send_opt -l set-default -d (_ "Set default repository [DEFAULT]")
+complete $send_opt -l no-set-default -d (_ "Don't set default repository")
+complete $send_opt -rl sendmail-command -d (_ "Specify sendmail command")
 set -e send_opt
 
 set -- init_opt  -c darcs -n 'contains initialize (commandline -poc)'
-complete $init_opt -l plain-pristine-tree -d "Use a plain pristine tree [DEFAULT]"
-complete $init_opt -l no-pristine-tree -d "Use no pristine tree"
+complete $init_opt -l plain-pristine-tree -d (_ "Use a plain pristine tree [DEFAULT]")
+complete $init_opt -l no-pristine-tree -d (_ "Use no pristine tree")
 set -e init_opt
 

init/completions/date.fish

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

init/completions/df.fish

@@ -1,18 +1,43 @@
+#
+# Completions for df
+#
+
+#
+# Completions for mount define the $__fish_filesystems variable
+#
 complete -y mount
 
-complete -c df -s a -l all -d "Include empty filesystems"
-complete -c df -s B -l block-size -r -d "Block size"
-complete -c df -s h -l human-readable -d "Human readable sizes"
-complete -c df -s H -l si -d "Human readable sizes, powers of 1000"
-complete -c df -s i -l inodes -d "List inode information"
-complete -c df -s k -d "Use 1KB block size"
-complete -c df -s l -l local -d "List only local filesystems"
-complete -c df -l no-sync -d "Do not sync before getting usage info"
-complete -c df -s P -l portability -d "Use Posix format"
-complete -c df -l sync -d "Sync before getting usage info"
-complete -c df -s t -l type -r -d "Filesystem type" -x -a $__fish_filesystems
-complete -c df -s T -l print-type -d "Print filesystem type"
-complete -c df -s x -l exclude-type -d "Excluded filesystem type" -r -x -a $__fish_filesystems
-complete -c df -l help -d "Display help and exit"
-complete -c df -l version -d "Display version and exit"
+#
+# Test if we are using GNU sed
+#
 
+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_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_filesystems
+	complete -c df -l help -d (_ "Display help and exit")
+	complete -c df -l version -d (_ "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")
+
+end

init/completions/diff.fish

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

init/completions/du.fish

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

init/completions/echo.fish

@@ -1,5 +1,5 @@
-complete -c echo -s n -d "No newline"
-complete -c echo -s e -d "Use backslashe-escaped characters"
-complete -c echo -s E -d "Do not use backslash escaped characters"
-complete -c echo -l help -d "Display help and exit"
-complete -c echo -l version -d "Display version and exit"
+complete -c echo -s n -d (_ "No newline")
+complete -c echo -s e -d (_ "Use 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")

init/completions/emacs.fish

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

init/completions/fish.fish

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

init/completions/function.fish

@@ -1,7 +1,7 @@
-complete -c function -s d -l description -d "Set function description" -x
-complete -c function -xa "(functions -n)" -d "Function"
-complete -c function -xa "(builtin -n)" -d "Builtin"
-complete -c function -s j -l on-job-exit -d "Make the function a job exit event handler" -x
-complete -c function -s p -l on-process-exit -d "Make the function a process exit event handler" -x
-complete -c function -s s -l on-signal -d "Make the function a signal event handler" -x
-complete -c function -s v -l on-variable -d "Make the function a variable update event handler" -x
+complete -c function -s d -l description -d (_ "Set function description") -x
+complete -c function -xa "(functions -n)" -d (_ "Function")
+complete -c function -xa "(builtin -n)" -d (_ "Builtin")
+complete -c function -s j -l on-job-exit -d (_ "Make the function a job exit event handler") -x
+complete -c function -s p -l on-process-exit -d (_ "Make the function a process exit event handler") -x
+complete -c function -s s -l on-signal -d (_ "Make the function a signal event handler") -x
+complete -c function -s v -l on-variable -d (_ "Make the function a variable update event handler") -x

init/completions/functions.fish

@@ -1,6 +1,6 @@
-complete -c functions -s e -l erase -d "Erase function" -x -a "(functions -n)"
-complete -c functions -xa "(functions -n)" -d "Function"
-complete -c functions -s a -l all -d "Show hidden functions"
-complete -c functions -s h -l help -d "Display help and exit"
-complete -c functions -s d -l description -d "Set function description" -x
+complete -c functions -s e -l erase -d (_ "Erase function") -x -a "(functions -n)"
+complete -c functions -xa "(functions -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
 

init/completions/gcc.fish

@@ -2,7 +2,7 @@
 # The gcc completion list is incomplete. There are just so many of them...
 #
 
-complete -c gcc -s x -d 'Language' -x -a '
+complete -c gcc -s x -d (_ "Language") -x -a '
 	c
 	c-header
 	cpp-output
@@ -20,16 +20,16 @@ complete -c gcc -s x -d 'Language' -x -a '
 	treelang
 	none
 '
-complete -c gcc -o pass-exit-codes -d 'Pass program exit codes'
-complete -c gcc -s c -d 'Stop after assembler'
-complete -c gcc -s S -d 'Stop after compile'
-complete -c gcc -s E -d 'Stop after preprocesswor'
-complete -c gcc -s o -r -d 'Output file'
-complete -c gcc -s v -d 'Print commands to stderr'
-complete -c gcc -o \#\#\# -d 'Print quoted commands to stderr, do not run'
-complete -c gcc -o pipe -d 'Use pipes'
-complete -c gcc -o ansi -d 'Use ansi mode'
-complete -c gcc -o std -d 'Standard mode' -x -a '
+complete -c gcc -o pass-exit-codes -d (_ "Pass program exit codes")
+complete -c gcc -s c -d (_ "Stop after assembler")
+complete -c gcc -s S -d (_ "Stop after compile")
+complete -c gcc -s E -d (_ "Stop after preprocesswor")
+complete -c gcc -s o -r -d (_ "Output file")
+complete -c gcc -s v -d (_ "Print commands to stderr")
+complete -c gcc -o \#\#\# -d (_ "Print quoted commands to stderr, do not run")
+complete -c gcc -o pipe -d (_ "Use pipes")
+complete -c gcc -o ansi -d (_ "Use ansi mode")
+complete -c gcc -o std -d (_ "Standard mode") -x -a '
 	c89\t"ISO C90"
 	iso9899:1990\t"ISO C90"
 	iso9899:199409\t"ISO C90 as modified in amendment 1"
@@ -43,54 +43,54 @@ complete -c gcc -o std -d 'Standard mode' -x -a '
 	c++98\t"ISO C++98"
 	gnu++98\t"ISO C++98 plus GNU extentions"
 '
-complete -c gcc -o aux-info -r -d 'Write prototypes to file'
-complete -c gcc -o fno-asm -d 'Do not recognize asm, inline or typeof keywords'
-complete -c gcc -o fno-builtin -d 'Do not use builtin functions'
-complete -c gcc -o fhosted -d 'Assert hosted environment'
-complete -c gcc -o ffreestanding -d 'Assert freestanding environment'
-complete -c gcc -o fms-extensions -d 'Use Microsoft extensions'
-complete -c gcc -o trigraphs -d 'Use ANSI trigraphs'
-complete -c gcc -o no-integrated-cpp -d 'Do not use integrated preprocessor'
-complete -c gcc -o funsigned-char -d 'char is unsigned'
-complete -c gcc -o fsigned-char -d 'char is signed'
-complete -c gcc -o funsigned-bitfields -d 'bifield is unsigned'
-complete -c gcc -o fsigned-bitfields -d 'bifield is signed'
-complete -c gcc -o fno-unsigned-bitfields -d 'All bifields are signed'
-complete -c gcc -o fno-signed-bitfields -d 'All bifield are signed'
-complete -c gcc -o fwritable-strings -d 'String constants are not const'
-complete -c gcc -o fabi-version -d 'C++ ABI version' -r -x -a '1 0'
-complete -c gcc -o fno-access-control -d 'Turn off access checking'
-complete -c gcc -o fcheck-new -d 'Check pointer returned by new'
-complete -c gcc -o fconserve-space -d 'Put globals in the common segment'
-complete -c gcc -o fno-const-strings -d 'String constants are not const'
-complete -c gcc -o fdollars-in-identifiers -d 'Accept $ in identifiers'
-complete -c gcc -o fno-dollars-in-identifiers -d 'Reject $ in identifiers'
-complete -c gcc -o fno-elide-constructors -d 'Do not omit unneeded temporarys'
-complete -c gcc -o fno-enforce-eh-specs -d 'Allow exception violations'
-complete -c gcc -o ffor-scope -d 'Do not extend for-loop scope'
-complete -c gcc -o fno-for-scope -d 'Extend for-loop scope'
-complete -c gcc -o fno-gnu-keywords -d 'Do not recognize typeof as keyword'
-complete -c gcc -o fno-implicit-templates -d 'Do not emit code for implicit templates'
-complete -c gcc -o fno-implicit-inline-templates -d 'Do not emit code for implicit inline templates'
-complete -c gcc -o fno-implement-inlines -d 'Do not emit out-of-line code for inline functions'
-complete -c gcc -o fms-extensions -d 'Disable warnings about MFC'
-complete -c gcc -o fno-nonansi-builtins -d 'Disable some built-in functions'
-complete -c gcc -o fno-operator-names -d 'Disable operator keywords'
-complete -c gcc -o fno-optional-diags -d 'Disable optional diagnostics'
-complete -c gcc -o fpermissive -d 'Downgrade some errors to warnings'
-complete -c gcc -o frepo -d 'Enable automatic template instantiation at link time'
-complete -c gcc -o fno-rtti -d 'Disable generation of C++ runtime type information'
-#complete -c gcc -o fstats -d 'Emit front-end usage statistics'
+complete -c gcc -o aux-info -r -d (_ "Write prototypes to file")
+complete -c gcc -o fno-asm -d (_ "Do not recognize asm, inline or typeof keywords")
+complete -c gcc -o fno-builtin -d (_ "Do not use builtin functions")
+complete -c gcc -o fhosted -d (_ "Assert hosted environment")
+complete -c gcc -o ffreestanding -d (_ "Assert freestanding environment")
+complete -c gcc -o fms-extensions -d (_ "Use Microsoft extensions")
+complete -c gcc -o trigraphs -d (_ "Use ANSI trigraphs")
+complete -c gcc -o no-integrated-cpp -d (_ "Do not use integrated preprocessor")
+complete -c gcc -o funsigned-char -d (_ "char is unsigned")
+complete -c gcc -o fsigned-char -d (_ "char is signed")
+complete -c gcc -o funsigned-bitfields -d (_ "bitfield is unsigned")
+complete -c gcc -o fsigned-bitfields -d (_ "bitfield is signed")
+complete -c gcc -o fno-unsigned-bitfields -d (_ "All bitfields are signed")
+complete -c gcc -o fno-signed-bitfields -d (_ "All bitfields are unsigned")
+complete -c gcc -o fwritable-strings -d (_ "String constants are not const")
+complete -c gcc -o fabi-version -d (_ "C++ ABI version") -r -x -a '1 0'
+complete -c gcc -o fno-access-control -d (_ "Turn off access checking")
+complete -c gcc -o fcheck-new -d (_ "Check pointer returned by new")
+complete -c gcc -o fconserve-space -d (_ "Put globals in the common segment")
+complete -c gcc -o fno-const-strings -d (_ "String constants are not const")
+complete -c gcc -o fdollars-in-identifiers -d (_ "Accept \$ in identifiers")
+complete -c gcc -o fno-dollars-in-identifiers -d (_ "Reject \$ in identifiers")
+complete -c gcc -o fno-elide-constructors -d (_ "Do not omit unneeded temporarys")
+complete -c gcc -o fno-enforce-eh-specs -d (_ "Allow exception violations")
+complete -c gcc -o ffor-scope -d (_ "Do not extend for-loop scope")
+complete -c gcc -o fno-for-scope -d (_ "Extend for-loop scope")
+complete -c gcc -o fno-gnu-keywords -d (_ "Do not recognize typeof as keyword")
+complete -c gcc -o fno-implicit-templates -d (_ "Do not emit code for implicit templates")
+complete -c gcc -o fno-implicit-inline-templates -d (_ "Do not emit code for implicit inline templates")
+complete -c gcc -o fno-implement-inlines -d (_ "Do not emit out-of-line code for inline functions")
+complete -c gcc -o fms-extensions -d (_ "Disable warnings about MFC")
+complete -c gcc -o fno-nonansi-builtins -d (_ "Disable some built-in functions")
+complete -c gcc -o fno-operator-names -d (_ "Disable operator keywords")
+complete -c gcc -o fno-optional-diags -d (_ "Disable optional diagnostics")
+complete -c gcc -o fpermissive -d (_ "Downgrade some errors to warnings")
+complete -c gcc -o frepo -d (_ "Enable automatic template instantiation at link time")
+complete -c gcc -o fno-rtti -d (_ "Disable generation of C++ runtime type information")
+#complete -c gcc -o fstats -d (_ "Emit front-end usage statistics")
 
 for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17;
-	complete -c gcc -o ftemplate-depth-1 -d Set\ maximum\ template\ depth\ to\ $i;
+	complete -c gcc -o ftemplate-depth-1 -d (printf (_ "Set maximum template depth to %s") $i);
 end;
 
-complete -c gcc -o fno-threadsafe-statistics -d 'Do not emit code for thread-safe initialization of local statics'
-complete -c gcc -o fuse-cxa-atexit -d 'Use __cxa_atexit for destructors'
-complete -c gcc -o fvisibility-inlines-hidden -d 'Hides inline methods from export table'
-complete -c gcc -o fno-weak -d 'Do not use weak symbol support'
+complete -c gcc -o fno-threadsafe-statistics -d (_ "Do not emit code for thread-safe initialization of local statics")
+complete -c gcc -o fuse-cxa-atexit -d (_ "Use __cxa_atexit for destructors")
+complete -c gcc -o fvisibility-inlines-hidden -d (_ "Hides inline methods from export table")
+complete -c gcc -o fno-weak -d (_ "Do not use weak symbol support")
 # gcc completion listing is incomplete.
-#complete -c gcc -o -d ''
+#complete -c gcc -o -d (_ "")
 
 

init/completions/gpg.fish

@@ -0,0 +1,324 @@
+#
+# Completions for the gpg command. 
+#
+# This program accepts an rather large number of switches. It allows
+# you to do things like changing what file descriptor errors should be
+# written to, to make gpg use a different locale than the one
+# specified in the environment or to specify an alternative home
+# directory.
+
+# Switches related to debugging, switches whose use is not
+# recommended, switches whose behaviour is as of yet undefined,
+# switches for experimental features, switches to make gpg compliant
+# to legacy pgp-versions, dos-specific switches, switches meant for
+# the options file and deprecated or obsolete switches have all been
+# removed. The remaining list of completions is still quite
+# impressive.
+
+#
+# Various functions used for dynamic completions
+#
+
+function __fish_complete_gpg_user_id -d "Complete using gpg user ids"
+	# gpg doesn't seem to like it when you use the whole key name as a
+	# completion, so we skip the <EMAIL> part and use it a s a
+	# description.	
+	gpg --list-keys --with-colon|cut -d : -f 10|sed -ne 's/\(.*\) <\(.*\)>/\1\t\2/p'
+end
+
+function __fish_complete_gpg_key_id -d 'Complete using gpg key ids'
+	# Use user_id as the description
+	gpg --list-keys --with-colons|cut -d : -f 5,10|sed -ne "s/\(.*\):\(.*\)/\1\t\2/p"
+end
+
+function __fish_print_gpg_algo -d "Complete using all algorithms of the type specified in argv[1] supported by gpg. argv[1] is a regexp"
+	# Set a known locale, so that the output format of 'gpg --version'
+	# is at least somewhat predictable. The locale will automatically
+	# expire when the function goes out of scope, and the original locale
+	# will take effect again.
+	set -lx LC_ALL C
+	gpg --version | grep "$argv:"| grep -v "Home:"|cut -d : -f 2 |tr , \n|tr -d " "
+end
+
+
+#
+# gpg subcommands
+#
+
+complete -c gpg -s s -l sign -d (_ "Make a signature")
+complete -c gpg -l clearsign -d (_ "Make a clear text signature")
+complete -c gpg -s b -l detach-sign -d (_ "Make a detached signature")
+complete -c gpg -s e -l encrypt -d (_ "Encrypt data")
+complete -c gpg -s c -l symmetric -d (_ "Encrypt with a symmetric cipher using a passphrase") 
+complete -c gpg -l store -d (_ "Store only (make a simple RFC1991 packet)")
+complete -c gpg -l decrypt -d (_ "Decrypt specified file or stdin")
+complete -c gpg -l verify -d (_ "Assume specified file or stdin is sigfile and verify it")
+complete -c gpg -l multifile -d (_ "Modify certain other commands to accept multiple files for processing")
+complete -c gpg -l verify-files -d (_ "Identical to '--multifile --verify'")
+complete -c gpg -l encrypt-files -d (_ "Identical to '--multifile --encrypt'")
+complete -c gpg -l decrypt-files -d (_ "Identical to --multifile --decrypt")
+
+complete -c gpg -l list-keys -xa "(__fish_append , (__fish_complete_gpg_user_id) )" -d (_ "List all keys from the public keyrings, or just the ones given on the command line")
+complete -c gpg -l list-public-keys -xa "(__fish_append , (__fish_complete_gpg_user_id) )" -d (_ "List all keys from the public keyrings, or just the ones given on the command line")
+complete -c gpg -s K -l list-secret-keys -xa "(__fish_append , (__fish_complete_gpg_user_id) )" -d (_ "List all keys from the secret keyrings, or just the ones given on the command line")
+complete -c gpg -l list-sigs -xa "(__fish_append , (__fish_complete_gpg_user_id))" -d (_ "Same as --list-keys, but the signatures are listed too")
+
+complete -c gpg -l check-sigs -xa "(__fish_append , (__fish_complete_gpg_user_id))" -d (_ "Same as --list-keys, but the signatures are listed and verified")
+complete -c gpg -l fingerprint -xa "(__fish_append , (__fish_complete_gpg_user_id))" -d (_ "List all keys with their fingerprints")
+complete -c gpg -l gen-key -d (_ "Generate a new key pair")
+
+complete -c gpg -l edit-key -d (_ "Present a menu which enables you to do all key related tasks") -xa "(__fish_complete_gpg_user_id)"
+
+complete -c gpg -l sign-key -xa "(__fish_complete_gpg_user_id)" -d (_ "Sign a public key with your secret key")
+complete -c gpg -l lsign-key -xa "(__fish_complete_gpg_user_id)" -d (_ "Sign a public key with your secret key but mark it as non exportable")
+
+complete -c gpg -l delete-key -xa "(__fish_complete_gpg_user_id)" -d (_ "Remove key from the public keyring")
+complete -c gpg -l delete-secret-key -xa "(__fish_complete_gpg_user_id)" -d (_ "Remove key from the secret and public keyring")
+complete -c gpg -l delete-secret-and-public-key -xa "(__fish_complete_gpg_user_id)" -d (_ "Same as --delete-key, but if a secret key exists, it will be removed first")
+
+complete -c gpg -l gen-revoke -xa "(__fish_complete_gpg_user_id)" -d (_ "Generate a revocation certificate for the complete key") 
+complete -c gpg -l desig-revoke -xa "(__fish_complete_gpg_user_id)" -d (_ "Generate a designated revocation certificate for a key")
+
+complete -c gpg -l export -xa "(__fish_append , (__fish_complete_gpg_user_id))" -d (_ "Export all or the given keys from all keyrings" )
+complete -c gpg -l send-keys -xa "(__fish_append , (__fish_complete_gpg_user_id))" -d (_ "Same as --export but sends the keys to a keyserver")
+complete -c gpg -l export-secret-keys -xa "(__fish_complete_gpg_user_id)" -d (_ "Same as --export, but exports the secret keys instead")
+complete -c gpg -l export-secret-subkeys -xa "(__fish_complete_gpg_user_id)" -d (_ "Same as --export, but exports the secret keys instead")
+
+complete -c gpg -l import -xa "(__fish_complete_gpg_user_id)" -d (_ "Import/merge keys" )
+complete -c gpg -l fast-import -xa "(__fish_complete_gpg_user_id)" -d (_ "Import/merge keys" )
+
+complete -c gpg -l recv-keys -xa "(__fish_complete_gpg_key_id)" -d (_ "Import the keys with the given key IDs from a keyserver")
+complete -c gpg -l refresh-keys -xa "(__fish_complete_gpg_key_id)" -d (_ "Request updates from a keyserver for keys that already exist on the local keyring")
+complete -c gpg -l search-keys -xa "(__fish_append , (__fish_complete_gpg_user_id) )" -d (_ "Search the keyserver for the given names")
+complete -c gpg -l update-trustdb -d (_ "Do trust database maintenance")
+complete -c gpg -l check-trustdb -d (_ "Do trust database maintenance without user interaction") 
+
+complete -c gpg -l export-ownertrust -d (_ "Send the ownertrust values to stdout")
+complete -c gpg -l import-ownertrust -d (_ "Update the trustdb with the ownertrust values stored in specified files or stdin")
+
+complete -c gpg -l rebuild-keydb-caches -d (_ "Create signature caches in the keyring")
+
+complete -c gpg -l print-md -xa "(__fish_print_gpg_algo Hash)" -d (_ "Print message digest of specified algorithm for all given files or stdin")
+complete -c gpg -l print-mds -d (_ "Print message digest of all algorithms for all given files or stdin")
+
+complete -c gpg -l gen-random -xa "0 1 2" -d (_ "Emit specified number of random bytes of the given quality level")
+
+complete -c gpg -l version -d (_ "Display version and supported algorithms, and exit")
+complete -c gpg -l warranty -d (_ "Display warranty and exit")
+complete -c gpg -s h -l help -d (_ "Display help and exit")
+
+
+#
+# gpg options
+#
+
+complete -c gpg -s a -l armor -d (_ "Create ASCII armored output")
+complete -c gpg -s o -l output -r -d (_ "Write output to specified file")
+
+complete -c gpg -l max-output -d (_ "Sets a limit on the number of bytes that will be generated when processing a file") -x
+
+complete -c gpg -s u -l local-user -xa "(__fish_complete_gpg_user_id)" -d (_ "Use specified key as the key to sign with")
+complete -c gpg -l default-key -xa "(__fish_complete_gpg_user_id)" -d (_ "Use specified key as the default key to sign with")
+
+complete -c gpg -s r -l recipient -xa "(__fish_complete_gpg_user_id)" -d (_ "Encrypt for specified user id")
+complete -c gpg -s R -l hidden-recipient -xa "(__fish_complete_gpg_user_id)" -d (_ "Encrypt for specified user id, but hide the keyid of the key")
+complete -c gpg -l default-recipient -xa "(__fish_complete_gpg_user_id)" -d (_ "Use specified user id as default recipient")
+complete -c gpg -l default-recipient-self -d (_ "Use the default key as default recipient")
+complete -c gpg -l no-default-recipient -d (_ "Reset --default-recipient and --default-recipient-self")
+
+complete -c gpg -s v -l verbose -d (_ "Give more information during processing")
+complete -c gpg -s q -l quiet -d (_ "Quiet mode")
+
+complete -c gpg -s z -d (_ "Compression level") -xa "(seq 1 9)"
+complete -c gpg -l compress-level -d (_ "Compression level") -xa "(seq 1 9)"
+complete -c gpg -l bzip2-compress-level -d (_ "Compression level") -xa "(seq 1 9)"
+complete -c gpg -l bzip2-decompress-lowmem -d (_ "Use a different decompression method for BZIP2 compressed files")
+
+complete -c gpg -s t -l textmode -d (_ "Treat input files as text and store them in the OpenPGP canonical text form with standard 'CRLF' line endings")
+complete -c gpg -l no-textmode -d (_ "Don't treat input files as text and store them in the OpenPGP canonical text form with standard 'CRLF' line endings")
+
+complete -c gpg -s n -l dry-run -d (_ "Don't make any changes (this is not completely implemented)") 
+
+complete -c gpg -s i -l interactive -d (_ "Prompt before overwrite")
+
+complete -c gpg -l batch -d (_ "Batch mode")
+complete -c gpg -l no-batch -d (_ "Don't use batch mode")
+complete -c gpg -l no-tty -d (_ "Never write output to terminal")
+
+complete -c gpg -l yes -d (_ "Assume yes on most questions")
+complete -c gpg -l no -d (_ "Assume no on most questions")
+
+complete -c gpg -l ask-cert-level -d (_ "Prompt for a certification level when making a key signature")
+complete -c gpg -l no-ask-cert-level -d (_ "Don't prompt for a certification level when making a key signature")
+complete -c gpg -l default-cert-level -xa "0\t'Not verified' 1\t'Not verified' 2\t'Caual verification' 3\t'Extensive verification'" -d (_ "The default certification level to use for the level check when signing a key")
+complete -c gpg -l min-cert-level -xa "0 1 2 3" -d (_ "Disregard any signatures with a certification level below specified level when building the trust database")
+
+complete -c gpg -l trusted-key -xa "(__fish_complete_gpg_key_id)" -d (_ "Assume that the specified key is as trustworthy as one of your own secret keys")
+complete -c gpg -l trust-model -xa "pgp classic direct always" -d (_ "Specify trust model")
+
+complete -c gpg -l keyid-format -xa "short 0xshort long 0xlong" -d (_ "Select how to display key IDs")
+
+complete -c gpg -l keyserver -x -d (_ "Use specified keyserver")
+complete -c gpg -l keyserver-options -xa "(__fish_append , include-revoked include-disabled honor-keyserver-url include-subkeys use-temp-files keep-temp-files verbose timeout http-proxy auto-key-retrieve)" -d (_ "Options for the keyserver")
+
+complete -c gpg -l import-options -xa "(__fish_append , import-local-sigs repair-pks-subkey-bug merge-only)" -d (_ "Options for importing keys")
+complete -c gpg -l export-options -xa "(__fish_append , export-local-sigs export-attributes export-sensitive-revkeys export-minimal)" -d (_ "Options for exporting keys")
+complete -c gpg -l list-options -xa "(__fish_append , show-photos show-policy-urls show-notations show-std-notations show-user-notations show-keyserver-urls show-uid-validity show-unusable-uids show-unusable-subkeys show-keyring show-sig-expire show-sig-subpackets )" -d (_ "Options for listing keys and signatures")
+complete -c gpg -l verify-options -xa "(__fish_append , show-photos show-policy-urls show-notations show-std-notations show-user-notations show-keyserver-urls show-uid-validity show-unusable-uids)" -d (_ "Options for verifying signatures")
+
+complete -c gpg -l photo-viewer -r -d (_ "The command line that should be run to view a photo ID")
+complete -c gpg -l exec-path -r -d (_ "Sets a list of directories to search for photo viewers and keyserver helpers")
+
+complete -c gpg -l show-keyring -d (_ "Display the keyring name at the head of key listings to show which keyring a given key resides on")
+complete -c gpg -l keyring -r -d (_ "Add specified file to the current list of keyrings")
+
+complete -c gpg -l secret-keyring -r -d (_ "Add specified file to the current list of secret keyrings")
+complete -c gpg -l primary-keyring -r -d (_ "Designate specified file as the primary public keyring")
+
+complete -c gpg -l trustdb-name -r -d (_ "Use specified file instead of the default trustdb")
+complete -c gpg -l homedir -xa "(__fish_complete_directory (commandline -ct))" -d (_ "Set the home directory")
+complete -c gpg -l display-charset -xa " iso-8859-1 iso-8859-2 iso-8859-15 koi8-r utf-8 " -d (_ "Set the native character set")
+
+complete -c gpg -l utf8-strings -d (_ "Assume that following command line arguments are given in UTF8")
+complete -c gpg -l no-utf8-strings -d (_ "Assume that following arguments are encoded in the character set specified by --display-charset")
+complete -c gpg -l options -r -d (_ "Read options from specified file, do not read the default options file")
+complete -c gpg -l no-options -d (_ "Shortcut for '--options /dev/null'")
+complete -c gpg -l load-extension -x -d (_ "Load an extension module")
+
+complete -c gpg -l status-fd -x -d (_ "Write special status strings to the specified file descriptor")
+complete -c gpg -l logger-fd -x -d (_ "Write log output to the specified file descriptor")
+complete -c gpg -l attribute-fd -d (_ "Write attribute subpackets to the specified file descriptor")
+
+complete -c gpg -l sk-comments -d (_ "Include secret key comment packets when exporting secret keys")
+complete -c gpg -l no-sk-comments -d (_ "Don't include secret key comment packets when exporting secret keys")
+
+complete -c gpg -l comment -x -d (_ "Use specified string as comment string")
+complete -c gpg -l no-comments -d (_ "Don't use a comment string")
+
+complete -c gpg -l emit-version -d (_ "Include the version string in ASCII armored output")
+complete -c gpg -l no-emit-version -d (_ "Don't include the version string in ASCII armored output")
+
+complete -c gpg -l sig-notation -x
+complete -c gpg -l cert-notation -x
+
+complete -c gpg -s N -l set-notation -x -d (_ "Put the specified name value pair into the signature as notation data")
+complete -c gpg -l sig-policy-url -x -d (_ "Set signature policy")
+complete -c gpg -l cert-policy-url -x -d (_ "Set certificate policy")
+complete -c gpg -l set-policy-url -x -d (_ "Set signature and certificate policy")
+complete -c gpg -l sig-keyserver-url -x -d (_ "Use specified URL as a preferred keyserver for data signatures")
+
+complete -c gpg -l set-filename -x -d (_ "Use specified string as the filename which is stored inside messages")
+
+complete -c gpg -l for-your-eyes-only -d (_ "Set the 'for your eyes only' flag in the message")
+complete -c gpg -l no-for-your-eyes-only -d (_ "Clear the 'for your eyes only' flag in the message") 
+
+complete -c gpg -l use-embedded-filename -d (_ "Create file with name as given in data")
+complete -c gpg -l no-use-embedded-filename -d (_ "Don't create file with name as given in data")
+
+complete -c gpg -l completes-needed -x -d (_ "Number of completely trusted users to introduce a new key signer (defaults to 1)")
+complete -c gpg -l marginals-needed -x -d (_ "Number of marginally trusted users to introduce a new key signer (defaults to 3)")
+
+complete -c gpg -l max-cert-depth -x -d (_ "Maximum depth of a certification chain (default is 5)")
+
+complete -c gpg -l cipher-algo -xa "(__fish_print_gpg_algo Cipher)" -d (_ "Use specified cipher algorithm")
+complete -c gpg -l digest-algo -xa "(__fish_print_gpg_algo Hash)" -d (_ "Use specified message digest algorithm")
+complete -c gpg -l compress-algo -xa "(__fish_print_gpg_algo Compression)" -d (_ "Use specified compression algorithm")
+complete -c gpg -l cert-digest-algo -xa "(__fish_print_gpg_algo Hash)" -d (_ "Use specified message digest algorithm when signing a key")
+complete -c gpg -l s2k-cipher-algo -xa "(__fish_print_gpg_algo Cipher)" -d (_ "Use specified cipher algorithm to protect secret keys")
+complete -c gpg -l s2k-digest-algo -xa "(__fish_print_gpg_algo Hash)" -d (_ "Use specified digest algorithm to mangle the passphrases")
+complete -c gpg -l s2k-mode -xa "0\t'Plain passphrase' 1\t'Salted passphrase' 3\t'Repeated salted mangling'" -d (_ "Selects how passphrases are mangled")
+
+complete -c gpg -l simple-sk-checksum -d (_ "Integrity protect secret keys by using a SHA-1 checksum" )
+
+complete -c gpg -l disable-cipher-algo -xa "(__fish_print_gpg_algo Cipher)" -d (_ "Never allow the use of specified cipher algorithm")
+complete -c gpg -l disable-pubkey-algo -xa "(__fish_print_gpg_algo Pubkey)" -d (_ "Never allow the use of specified public key algorithm")
+
+complete -c gpg -l no-sig-cache -d (_ "Do not cache the verification status of key signatures")
+complete -c gpg -l no-sig-create-check -d (_ "Do not verify each signature right after creation")
+
+complete -c gpg -l auto-check-trustdb -d (_ "Automatically run the --check-trustdb command internally when needed")
+complete -c gpg -l no-auto-check-trustdb -d (_ "Never automatically run the --check-trustdb")
+
+complete -c gpg -l throw-keyids -d (_ "Do not put the recipient keyid into encrypted packets")
+complete -c gpg -l no-throw-keyids -d (_ "Put the recipient keyid into encrypted packets")
+complete -c gpg -l not-dash-escaped -d (_ "Change the behavior of cleartext signatures so that they can be used for patch files")
+
+complete -c gpg -l escape-from-lines -d (_ "Mangle From-field of email headers (default)")
+complete -c gpg -l no-escape-from-lines -d (_ "Do not mangle From-field of email headers")
+
+complete -c gpg -l passphrase-fd -x -d (_ "Read passphrase from specified file descriptor")
+complete -c gpg -l command-fd -x -d (_ "Read user input from specified file descriptor")
+
+complete -c gpg -l use-agent -d (_ "Try to use the GnuPG-Agent")
+complete -c gpg -l no-use-agent -d (_ "Do not try to use the GnuPG-Agent")
+complete -c gpg -l gpg-agent-info -x -d (_ "Override value of GPG_AGENT_INFO environment variable")
+
+complete -c gpg -l force-v3-sigs -d (_ "Force v3 signatures for signatures on data")
+complete -c gpg -l no-force-v3-sigs -d (_ "Do not force v3 signatures for signatures on data")
+
+complete -c gpg -l force-v4-certs -d (_ "Always use v4 key signatures even on v3 keys")
+complete -c gpg -l no-force-v4-certs -d (_ "Don't use v4 key signatures on v3 keys")
+
+complete -c gpg -l force-mdc -d (_ "Force the use of encryption with a modification detection code")
+complete -c gpg -l disable-mdc -d (_ "Disable the use of the modification detection code")
+
+complete -c gpg -l allow-non-selfsigned-uid -d (_ "Allow the import and use of keys with user IDs which are not self-signed")
+complete -c gpg -l no-allow-non-selfsigned-uid -d (_ "Do not allow the import and use of keys with user IDs which are not self-signed")
+
+complete -c gpg -l allow-freeform-uid -d (_ "Disable all checks on the form of the user ID while generating a new one")
+
+complete -c gpg -l ignore-time-conflict -d (_ "Do not fail if signature is older than key")
+complete -c gpg -l ignore-valid-from -d (_ "Allow subkeys that have a timestamp from the future")
+complete -c gpg -l ignore-crc-error -d (_ "Ignore CRC errors")
+complete -c gpg -l ignore-mdc-error -d (_ "Do not fail on MDC integrity protection failiure")
+
+complete -c gpg -l lock-once -d (_ "Lock the databases the first time a lock is requested and do not release the lock until the process terminates")
+complete -c gpg -l lock-multiple -d (_ "Release the locks every time a lock is no longer needed")
+
+complete -c gpg -l no-random-seed-file -d (_ "Do not create an internal pool file for quicker generation of random numbers")
+complete -c gpg -l no-verbose -d (_ "Reset verbose level to 0")
+complete -c gpg -l no-greeting -d (_ "Suppress the initial copyright message")
+complete -c gpg -l no-secmem-warning -d (_ "Suppress the warning about 'using insecure memory'")
+complete -c gpg -l no-permission-warning -d (_ "Suppress the warning about unsafe file and home directory (--homedir) permissions")
+complete -c gpg -l no-mdc-warning -d (_ "Suppress the warning about missing MDC integrity protection")
+
+complete -c gpg -l require-secmem -d (_ "Refuse to run if GnuPG cannot get secure memory")
+
+complete -c gpg -l no-require-secmem -d (_ "Do not refuse to run if GnuPG cannot get secure memory (default)")
+complete -c gpg -l no-armor -d (_ "Assume the input data is not in ASCII armored format")
+
+complete -c gpg -l no-default-keyring -d (_ "Do not add the default keyrings to the list of keyrings")
+
+complete -c gpg -l skip-verify -d (_ "Skip the signature verification step")
+
+complete -c gpg -l with-colons -d (_ "Print key listings delimited by colons")
+complete -c gpg -l with-key-data -d (_ "Print key listings delimited by colons (like --with-colons) and print the public key data")
+complete -c gpg -l with-fingerprint -d (_ "Same as the command --fingerprint but changes only the format of the output and may be used together with another command")
+
+complete -c gpg -l fast-list-mode -d (_ "Changes the output of the list commands to work faster")
+complete -c gpg -l fixed-list-mode -d (_ "Do not merge primary user ID and primary key in --with-colon listing mode and print all timestamps as UNIX timestamps")
+
+complete -c gpg -l list-only -d (_ "Changes the behaviour of some commands. This is like --dry-run but different")
+
+complete -c gpg -l show-session-key -d (_ "Display the session key used for one message")
+complete -c gpg -l override-session-key -x -d (_ "Don't use the public key but the specified session key")
+
+complete -c gpg -l ask-sig-expire -d (_ "Prompt for an expiration time")
+complete -c gpg -l no-ask-sig-expire -d (_ "Do not prompt for an expiration time")
+
+complete -c gpg -l ask-cert-expire -d (_ "Prompt for an expiration time")
+complete -c gpg -l no-ask-cert-expire -d (_ "Do not prompt for an expiration time")
+
+complete -c gpg -l try-all-secrets -d (_ "Don't look at the key ID as stored in the message but try all secret keys in turn to find the right decryption key")
+complete -c gpg -l enable-special-filenames -d (_ "Enable a mode in which filenames of the form -&n, where n is a non-negative decimal number, refer to the file descriptor n and not to a file with that name")
+
+complete -c gpg -l group -x -d (_ "Sets up a named group, which is similar to aliases in email programs")
+complete -c gpg -l ungroup -d (_ "Remove a given entry from the --group list")
+complete -c gpg -l no-groups -d (_ "Remove all entries from the --group list")
+
+complete -c gpg -l preserve-permissions -d (_ "Don't change the permissions of a secret keyring back to user read/write only")
+
+complete -c gpg -l personal-cipher-preferences -x -d (_ "Set the list of personal cipher preferences to the specified string")
+complete -c gpg -l personal-digest-preferences -x -d (_ "Set the list of personal digest preferences to the specified string")
+complete -c gpg -l personal-compress-preferences -x -d (_ "Set the list of personal compression preferences to the specified string")
+complete -c gpg -l default-preference-list -x -d (_ "Set the list of default preferences to the specified string")

init/completions/gprof.fish

@@ -1,34 +1,34 @@
-complete -c gprof -s A -l annoted-source -d "Print annotated source"
-complete -c gprof -s b -l brief -d "Do not print explanations"
-complete -c gprof -s C -l exec-counts -d "Print tally"
-complete -c gprof -s i -l file-info -d "Display summary"
-complete -c gprof -s I -l directory-path -d "Search directories for source"
-complete -c gprof -s J -l no-annotated-source -d "No annotated source"
-complete -c gprof -s L -l print-path -d "Print full path of source"
-complete -c gprof -s p -l flat-profile -d "Print flat profile"
-complete -c gprof -s P -l no-flat-profile -d "No flat profile"
-complete -c gprof -s q -l graph -d "Print call graph"
-complete -c gprof -s Q -l no-graph -d "No call graph"
-complete -c gprof -s y -l separate-files -d "Annotate to file"
-complete -c gprof -s Z -l no-exec-counts -d "No tally"
-complete -c gprof -l function-ordering -d "Suggest function ordering"
-complete -rc gprof -l file-ordering -d "Suggest file ordering"
-complete -c gprof -s T -l traditional -d "Traditional mode"
-complete -xc gprof -s w -l width -d "Set width of output"
-complete -c gprof -s x -l all-lines -d "Anotate every line"
-complete -xc gprof -l demangle -d "Set demangling style"
-complete -c gprof -l no-demangle -d "Turn of demangling"
-complete -xc gprof -s a -l no-static -d "Supress static functions"
-complete -xc gprof -s c -l static-call-graph -d ""
-complete -xc gprof -s D -l ignore-non-functions -d "Ignore symbols not known to be functions"
-complete -xc gprof -s k -r -d "Delete arcs from callgraph"
-complete -xc gprof -s l -l line -d "Line by line profiling"
-complete -xc gprof -s m -l min-count -r -d "Supress output when executed less than specified times"
-complete -xc gprof -s n -l time -d "Only propagate times for matching symbols"
-complete -xc gprof -s N -l no-time -d "Do not propagate times for matching symbols"
-complete -xc gprof -s z -l display-unused-functions -d "Mention unused functions in flat profile"
-complete -xc gprof -s d -l debug -d "Specify debugging options"
-complete -xc gprof -s h -l help -d "Print help and exit"
-complete -xc gprof -s v -l version -d "Print version and exit"
-complete -xc gprof -s O -l file-format -x -a "auto bsd 4.4bsd magic prof" -d "Profile data format"
-complete -xc gprof -s s -l sum -d "Print summary"
+complete -c gprof -s A -l annoted-source -d (_ "Print annotated source")
+complete -c gprof -s b -l brief -d (_ "Do not print explanations")
+complete -c gprof -s C -l exec-counts -d (_ "Print tally")
+complete -c gprof -s i -l file-info -d (_ "Display summary")
+complete -c gprof -s I -l directory-path -d (_ "Search directories for source")
+complete -c gprof -s J -l no-annotated-source -d (_ "No annotated source")
+complete -c gprof -s L -l print-path -d (_ "Print full path of source")
+complete -c gprof -s p -l flat-profile -d (_ "Print flat profile")
+complete -c gprof -s P -l no-flat-profile -d (_ "No flat profile")
+complete -c gprof -s q -l graph -d (_ "Print call graph")
+complete -c gprof -s Q -l no-graph -d (_ "No call graph")
+complete -c gprof -s y -l separate-files -d (_ "Annotate to file")
+complete -c gprof -s Z -l no-exec-counts -d (_ "No tally")
+complete -c gprof -l function-ordering -d (_ "Suggest function ordering")
+complete -rc gprof -l file-ordering -d (_ "Suggest file ordering")
+complete -c gprof -s T -l traditional -d (_ "Traditional mode")
+complete -xc gprof -s w -l width -d (_ "Set width of output")
+complete -c gprof -s x -l all-lines -d (_ "Anotate every line")
+complete -xc gprof -l demangle -d (_ "Set demangling style")
+complete -c gprof -l no-demangle -d (_ "Turn of demangling")
+complete -xc gprof -s a -l no-static -d (_ "Supress static functions")
+complete -xc gprof -s c -l static-call-graph 
+complete -xc gprof -s D -l ignore-non-functions -d (_ "Ignore symbols not known to be functions")
+complete -xc gprof -s k -r -d (_ "Delete arcs from callgraph")
+complete -xc gprof -s l -l line -d (_ "Line by line profiling")
+complete -xc gprof -s m -l min-count -r -d (_ "Supress output when executed less than specified times")
+complete -xc gprof -s n -l time -d (_ "Only propagate times for matching symbols")
+complete -xc gprof -s N -l no-time -d (_ "Do not propagate times for matching symbols")
+complete -xc gprof -s z -l display-unused-functions -d (_ "Mention unused functions in flat profile")
+complete -xc gprof -s d -l debug -d (_ "Specify debugging options")
+complete -xc gprof -s h -l help -d (_ "Display help and exit")
+complete -xc gprof -s v -l version -d (_ "Display version and exit")
+complete -xc gprof -s O -l file-format -x -a "auto bsd 4.4bsd magic prof" -d (_ "Profile data format")
+complete -xc gprof -s s -l sum -d (_ "Print summary")

init/completions/grep.fish

@@ -1,47 +1,50 @@
+#
+# Completions for the grep command
+#
 
-complete -c grep -s A -l after-context -d "Print NUM lines of trailing context"
-complete -c grep -s a -l text -d "Process binary file as text"
-complete -c grep -s B -l before-context -d "Print NUM lines of leading context"
-complete -c grep -s C -l context -d "Print NUM lines of context"
-complete -c grep -s b -l byte-offset -d "Print byte offset of matches"
-complete -c grep -l binary-files -d "Assume data type for binary files" -x -a "binary text"
+complete -c grep -s A -l after-context -d (_ "Print NUM lines of trailing context")
+complete -c grep -s a -l text -d (_ "Process binary file as text")
+complete -c grep -s B -l before-context -d (_ "Print NUM lines of leading context")
+complete -c grep -s C -l context -d (_ "Print NUM lines of context")
+complete -c grep -s b -l byte-offset -d (_ "Print byte offset of matches")
+complete -c grep -l binary-files -d (_ "Assume data type for binary files") -x -a "binary text"
 complete -c grep -l colour -x -a "never always auto"
 complete -c grep -l color -x -a "never always auto"
-complete -c grep -s c -l count -d "Only print number of matches"
-complete -c grep -s D -l devices -x -a "read skip" -d "Action for devices"
-complete -c grep -s d -l directories -x -a "read skip recurse" -d "Action for directories"
-complete -c grep -s E -l extended-regexp -d "Pattern is extended regexp"
-complete -xc grep -s e -l regexp -d "Pattern is a regexp"
-complete -c grep -s F -l fixed -d "Pattern is a fixed string"
-complete -c grep -s f -l file -r -d "Use pattern from file"
-complete -c grep -s G -l basic-regexp -d "Pattern is basic regex"
-complete -c grep -s H -l with-filename -d "Print filename"
-complete -c grep -s h -l no-filename -d "Supress printing filename"
-complete -c grep -l help -d "Display help and exit"
-complete -c grep -s I -d "Skip binary files"
-complete -c grep -s i -l ignore-case -d "Ignore case"
-complete -c grep -s L -l files-without-match -d "Print first non-matching file"
-complete -c grep -s l -l files-with-match -d "Print first matching file"
-complete -c grep -s m -l max-count -d "Stop reading after NUM matches"
-complete -c grep -l mmap -d "Use the mmap system call to read input"
-complete -c grep -s n -l line-number -d "Print linenumber"
-complete -c grep -s o -l only-matching -d "Show only matching part"
-complete -c grep -l label -d "Rename stdin"
-complete -c grep -l line-buffered -d "Use line buffering"
-complete -c grep -s q -l quiet -d "Do not write anything"
-complete -c grep -l silent -d "Do not write anything"
-complete -c grep -s R -l recursive -d "Read files under each directory"
-complete -c grep -s r -d "Read files under each directory"
-complete -c grep -l include -d "Recurse, search file matching PATTERN"
-complete -c grep -l exclude -d "Recurse, skip file matching PATTERN"
-complete -c grep -s s -l no-messages -d "Suppress error messages"
-complete -c grep -s U -l binary -d "Treat files as binary"
-complete -c grep -s u -l unix-byte-offsets -d "Report Unix-style byte offsets"
-complete -c grep -s V -l version -d "Print the version number"
-complete -c grep -s v -l invert-match -d "Invert the sense of matching"
-complete -c grep -s w -l word-regexp -d "Only whole matching words"
-complete -c grep -s x -l line-regexp -d "Only whole matching lines"
-complete -c grep -s y -d "Synonym for -i"
-complete -c grep -s Z -l null -d "Output a zero byte after filename"
+complete -c grep -s c -l count -d (_ "Only print number of matches")
+complete -c grep -s D -l devices -x -a "read skip" -d (_ "Action for devices")
+complete -c grep -s d -l directories -x -a "read skip recurse" -d (_ "Action for directories")
+complete -c grep -s E -l extended-regexp -d (_ "Pattern is extended regexp")
+complete -xc grep -s e -l regexp -d (_ "Pattern is a regexp")
+complete -c grep -s F -l fixed -d (_ "Pattern is a fixed string")
+complete -c grep -s f -l file -r -d (_ "Use pattern from file")
+complete -c grep -s G -l basic-regexp -d (_ "Pattern is basic regex")
+complete -c grep -s H -l with-filename -d (_ "Print filename")
+complete -c grep -s h -l no-filename -d (_ "Supress printing filename")
+complete -c grep -l help -d (_ "Display help and exit")
+complete -c grep -s I -d (_ "Skip binary files")
+complete -c grep -s i -l ignore-case -d (_ "Ignore case")
+complete -c grep -s L -l files-without-match -d (_ "Print first non-matching file")
+complete -c grep -s l -l files-with-match -d (_ "Print first matching file")
+complete -c grep -s m -l max-count -d (_ "Stop reading after NUM matches")
+complete -c grep -l mmap -d (_ "Use the mmap system call to read input")
+complete -c grep -s n -l line-number -d (_ "Print linenumber")
+complete -c grep -s o -l only-matching -d (_ "Show only matching part")
+complete -c grep -l label -d (_ "Rename stdin")
+complete -c grep -l line-buffered -d (_ "Use line buffering")
+complete -c grep -s q -l quiet -d (_ "Do not write anything")
+complete -c grep -l silent -d (_ "Do not write anything")
+complete -c grep -s R -l recursive -d (_ "Read files under each directory")
+complete -c grep -s r -d (_ "Read files under each directory")
+complete -c grep -l include -d (_ "Recurse, search file matching PATTERN")
+complete -c grep -l exclude -d (_ "Recurse, skip file matching PATTERN")
+complete -c grep -s s -l no-messages -d (_ "Suppress error messages")
+complete -c grep -s U -l binary -d (_ "Treat files as binary")
+complete -c grep -s u -l unix-byte-offsets -d (_ "Report Unix-style byte offsets")
+complete -c grep -s V -l version -d (_ "Display version and exit")
+complete -c grep -s v -l invert-match -d (_ "Invert the sense of matching")
+complete -c grep -s w -l word-regexp -d (_ "Only whole matching words")
+complete -c grep -s x -l line-regexp -d (_ "Only whole matching lines")
+complete -c grep -s y -d (_ "Synonym for -i")
+complete -c grep -s Z -l null -d (_ "Output a zero byte after filename")
 
 

init/completions/gunzip.fish

@@ -1,21 +1,21 @@
-complete -c gunzip -s c -l stdout -d "Compress to stdout"
+complete -c gunzip -s c -l stdout -d (_ "Compress to stdout")
 complete -c gunzip -x -a "(
 	__fish_complete_suffix (commandline -ct) .gz 'Compressed file'
 	__fish_complete_suffix (commandline -ct) .tgz 'Compressed archive'
 )
 "
-complete -c gunzip -s f -l force -d "Overwrite"
-complete -c gunzip -s h -l help -d "Display help"
-complete -c gunzip -s l -l list -d "List compression information"
-complete -c gunzip -s L -l license -d "Print license"
-complete -c gunzip -s n -l no-name -d "Do not save/restore filename"
-complete -c gunzip -s N -l name -d "Save/restore filename"
-complete -c gunzip -s q -l quiet -d "Supress warnings"
-complete -c gunzip -s r -l recursive -d "Recurse directories"
-complete -c gunzip -s S -l suffix -r -d "Suffix"
-complete -c gunzip -s t -l test -d "Check integrity"
-complete -c gunzip -s v -l verbose -d "Display compression ratios"
-complete -c gunzip -s V -l version -d "Display version"
+complete -c gunzip -s f -l force -d (_ "Overwrite")
+complete -c gunzip -s h -l help -d (_ "Display help and exit")
+complete -c gunzip -s l -l list -d (_ "List compression information")
+complete -c gunzip -s L -l license -d (_ "Print license")
+complete -c gunzip -s n -l no-name -d (_ "Do not save/restore filename")
+complete -c gunzip -s N -l name -d (_ "Save/restore filename")
+complete -c gunzip -s q -l quiet -d (_ "Supress warnings")
+complete -c gunzip -s r -l recursive -d (_ "Recurse directories")
+complete -c gunzip -s S -l suffix -r -d (_ "Suffix")
+complete -c gunzip -s t -l test -d (_ "Check integrity")
+complete -c gunzip -s v -l verbose -d (_ "Display compression ratios")
+complete -c gunzip -s V -l version -d (_ "Display version and exit")
 
 complete -c gunzip -x -a "(
 	__fish_complete_suffix (commandline -ct) .gz 'Compressed file'

init/completions/gzip.fish

@@ -1,4 +1,4 @@
-complete -c gzip -s c -l stdout -d "Compress to stdout"
+complete -c gzip -s c -l stdout -d (_ "Compress to stdout")
 complete -c gzip -s d -l decompress -x -a "
 (
 	__fish_complete_suffix (commandline -ct) .gz 'Compressed file'
@@ -6,18 +6,18 @@ complete -c gzip -s d -l decompress -x -a "
 )
 "
 
-complete -c gzip -s f -l force -d "Overwrite"
-complete -c gzip -s h -l help -d "Display help"
-complete -c gzip -s l -l list -d "List compression information"
-complete -c gzip -s L -l license -d "Print license"
-complete -c gzip -s n -l no-name -d "Do not save/restore filename"
-complete -c gzip -s N -l name -d "Save/restore filename"
-complete -c gzip -s q -l quiet -d "Supress warnings"
-complete -c gzip -s r -l recursive -d "Recurse directories"
-complete -c gzip -s S -l suffix -r -d "Suffix"
-complete -c gzip -s t -l test -d "Check integrity"
-complete -c gzip -s v -l verbose -d "Display compression ratios"
-complete -c gzip -s V -l version -d "Display version"
-complete -c gzip -s 1 -l fast -d "Use fast setting"
-complete -c gzip -s 9 -l best -d "Use high compression setting"
+complete -c gzip -s f -l force -d (_ "Overwrite")
+complete -c gzip -s h -l help -d (_ "Display help and exit")
+complete -c gzip -s l -l list -d (_ "List compression information")
+complete -c gzip -s L -l license -d (_ "Print license")
+complete -c gzip -s n -l no-name -d (_ "Do not save/restore filename")
+complete -c gzip -s N -l name -d (_ "Save/restore filename")
+complete -c gzip -s q -l quiet -d (_ "Supress warnings")
+complete -c gzip -s r -l recursive -d (_ "Recurse directories")
+complete -c gzip -s S -l suffix -r -d (_ "Suffix")
+complete -c gzip -s t -l test -d (_ "Check integrity")
+complete -c gzip -s v -l verbose -d (_ "Display compression ratios")
+complete -c gzip -s V -l version -d (_ "Display version and exit")
+complete -c gzip -s 1 -l fast -d (_ "Use fast setting")
+complete -c gzip -s 9 -l best -d (_ "Use high compression setting")
 

init/completions/help.fish

@@ -3,37 +3,34 @@
 #
 
 for i in (builtin -n)
-	complete -c help -x -a $i -d 'Help for the '$i' builtin'
+	complete -c help -x -a $i -d (printf (_ "Help for the '%s' builtin") $i)
 end
 
-for i in count dirh dirs help mimedb nextd open popd prevd pushd set_color tokenize psub umask type 
-	complete -c help -x -a $i -d 'Help for the '$i' command'
+for i in count dirh dirs help mimedb nextd open popd prevd pushd set_color psub umask type 
+	complete -c help -x -a $i -d (printf (_ "Help for the '%s' command") $i )
 end
 
 for i in syntax todo bugs history;
-	complete -c help -x -a $i -d 'Help section on '$i
+	complete -c help -x -a $i -d (printf (_ "Help section on %s") $i)
 end
 
-complete -c help -x -a completion -d "Help on how tab-completion works"
-complete -c help -x -a job-control -d "Help on how job control works"
-complete -c help -x -a difference -d "Summary on how fish differs from other shells"
+complete -c help -x -a completion -d (_ "Help on how tab-completion works")
+complete -c help -x -a job-control -d (_ "Help on how job control works")
+complete -c help -x -a difference -d (_ "Summary on how fish differs from other shells")
 
-complete -c help -x -a prompt -d "Help on how to set the prompt"
-complete -c help -x -a title -d "Help on how to set the titlebar message"
-complete -c help -x -a killring -d "Help on how to copy and paste"
-complete -c help -x -a editor -d "Help on editor shortcuts"
-complete -c help -x -a variables -d "Help on environment variables"
-complete -c help -x -a color -d "Help on setting syntax highlighting colors"
-complete -c help -x -a prompt -d "Help on changing the prompt"
-complete -c help -x -a title -d "Help on changing the titlebar messages"
-complete -c help -x -a builtin-overview -d "A short summary of all builtin commands"
-complete -c help -x -a changes -d "The changelog"
+complete -c help -x -a prompt -d (_ "Help on how to set the prompt")
+complete -c help -x -a title -d (_ "Help on how to set the titlebar message")
+complete -c help -x -a killring -d (_ "Help on how to copy and paste")
+complete -c help -x -a editor -d (_ "Help on editor shortcuts")
+complete -c help -x -a variables -d (_ "Help on environment variables")
+complete -c help -x -a color -d (_ "Help on setting syntax highlighting colors")
+complete -c help -x -a builtin-overview -d (_ "A short summary of all builtin commands")
 
-complete -c help -x -a globbing -d "Help on parameter expansion (Globbing)"
-complete -c help -x -a expand -d "Help on parameter expansion (Globbing)"
-complete -c help -x -a expand-variable -d "Help on variable exapantion \$VARNAME"
-complete -c help -x -a expand-home -d "Help on home directory expansion ~USER"
-complete -c help -x -a expand-brace -d "Help on brace expansion {a,b,c}"
-complete -c help -x -a expand-wildcard -d "Help on wildcard expansion *.*"
-complete -c help -x -a expand-command-substitution -d "Help on command substututions (SUBCOMMAND)"
-complete -c help -x -a expand-process -d "Help on process expansion %JOB"
+complete -c help -x -a globbing -d (_ "Help on parameter expansion (Globbing)")
+complete -c help -x -a expand -d (_ "Help on parameter expansion (Globbing)")
+complete -c help -x -a expand-variable -d (_ "Help on variable expansion \$VARNAME")
+complete -c help -x -a expand-home -d (_ "Help on home directory expansion ~USER")
+complete -c help -x -a expand-brace -d (_ "Help on brace expansion {a,b,c}")
+complete -c help -x -a expand-wildcard -d (_ "Help on wildcard expansion *.*")
+complete -c help -x -a expand-command-substitution -d (_ "Help on command substututions (SUBCOMMAND)")
+complete -c help -x -a expand-process -d (_ "Help on process expansion %JOB")

init/completions/id.fish

@@ -1,8 +1,8 @@
-complete -c id -s g -l group -d "Print effective group id"
-complete -c id -s G -l groups -d "Print all group ids"
-complete -c id -s n -l name -d "Print name, not number"
-complete -c id -s r -l real -d "Print real ID, not effective"
-complete -c id -s u -l user -d "Print effective user ID"
-complete -c id -l help -d "Display help and exit"
-complete -c id -l version -d "Display version and exit"
+complete -c id -s g -l group -d (_ "Print effective group id")
+complete -c id -s G -l groups -d (_ "Print all group ids")
+complete -c id -s n -l name -d (_ "Print name, not number")
+complete -c id -s r -l real -d (_ "Print real ID, not effective")
+complete -c id -s u -l user -d (_ "Print effective user ID")
+complete -c id -l help -d (_ "Display help and exit")
+complete -c id -l version -d (_ "Display version and exit")
 

init/completions/ifconfig.fish

@@ -1,5 +1,5 @@
-complete -x -c ifconfig -a down -d "Stop interface"
-complete -x -c ifconfig -a up -d "Start interface"
+complete -x -c ifconfig -a down -d (_ "Stop interface")
+complete -x -c ifconfig -a up -d (_ "Start interface")
 complete -x -c ifconfig -a "
 	{,-}arp
 	{,-}promisc
@@ -22,4 +22,4 @@ complete -x -c ifconfig -a "
 	address
 	txqueuelen
 "
-complete -x -c ifconfig -a "(__fish_print_interfaces)" -d "Network interface"
+complete -x -c ifconfig -a "(__fish_print_interfaces)" -d (_ "Network interface")

init/completions/jobs.fish

@@ -1,6 +1,6 @@
 
 
-complete -c jobs -s p -l pid -d 'Show the process id of each process in the job'
-complete -c jobs -s g -l group -d 'Show group id of job'
-complete -c jobs -s c -l command -d 'Show commandname of each job'
-complete -c jobs -s l -l last -d 'Show status for last be started'
+complete -c jobs -s p -l pid -d (_ "Show the process id of each process in the job")
+complete -c jobs -s g -l group -d (_ "Show group id of job")
+complete -c jobs -s c -l command -d (_ "Show commandname of each job")
+complete -c jobs -s l -l last -d (_ "Only show status for last job to be started")

init/completions/kill.fish

@@ -31,5 +31,5 @@ else
 end
 
 complete -c kill -xa '(__fish_complete_pids)'
-complete -c kill -s l -d "List names of available signals"
+complete -c kill -s l -d (_ "List names of available signals")
 

init/completions/less.fish

@@ -1,52 +1,52 @@
-complete -c less -s \? -l help -d "Display help and exit"
-complete -c less -s a -l search-skip-screen -d "Search after end of screen"
-complete -c less -s b -l buffers -r -d "Buffer space"
-complete -c less -s B -l auto-buffers -d "Disable automtic buffer allocation"
-complete -c less -s c -l clear-screen -d "Repaint from top"
-complete -c less -s C -l CLEAR-SCREEN -d "Clear and repaint from top"
-complete -c less -s d -l dumb -d "Supress error for lacking terminal capability"
-complete -c less -s e -l quit-at-eof -d "Exit on second EOF"
-complete -c less -s E -l QUIT-AT-EOF -d "Exit on EOF"
-complete -c less -s f -l force -d "Open non-regular files"
-complete -c less -s F -l quit-if-one-screen -d "Quit if file shorter than one screen"
-complete -c less -s g -l hilite-search -d "Hilight one search target"
-complete -c less -s G -l HILITE-SEARCH -d "No search highlighting"
-complete -c less -s h -l max-back-scroll -d "Maximum backward scroll" -r -a "1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19"
-complete -c less -s i -l ignore-case -d "Search ignores lowercase case"
-complete -c less -s I -l IGNORE-CASE -d "Search ignores all case"
-complete -c less -s j -l jump-target -d "Target line" -r -a "0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 -1 -2 -3 -4 -5 -6 -7 -8 -9 -10 -11 -12 -13 -14 -15 -16 -17 -18 -19"
-complete -c less -s J -l status-column -d "Display status column"
-complete -c less -s k -l lesskey-file -d "Specify key bindings file" -r
+complete -c less -s \? -l help -d (_ "Display help and exit")
+complete -c less -s a -l search-skip-screen -d (_ "Search after end of screen")
+complete -c less -s b -l buffers -r -d (_ "Buffer space")
+complete -c less -s B -l auto-buffers -d (_ "Disable automtic buffer allocation")
+complete -c less -s c -l clear-screen -d (_ "Repaint from top")
+complete -c less -s C -l CLEAR-SCREEN -d (_ "Clear and repaint from top")
+complete -c less -s d -l dumb -d (_ "Supress error for lacking terminal capability")
+complete -c less -s e -l quit-at-eof -d (_ "Exit on second EOF")
+complete -c less -s E -l QUIT-AT-EOF -d (_ "Exit on EOF")
+complete -c less -s f -l force -d (_ "Open non-regular files")
+complete -c less -s F -l quit-if-one-screen -d (_ "Quit if file shorter than one screen")
+complete -c less -s g -l hilite-search -d (_ "Hilight one search target")
+complete -c less -s G -l HILITE-SEARCH -d (_ "No search highlighting")
+complete -c less -s h -l max-back-scroll -d (_ "Maximum backward scroll") -r -a "1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19"
+complete -c less -s i -l ignore-case -d (_ "Search ignores lowercase case")
+complete -c less -s I -l IGNORE-CASE -d (_ "Search ignores all case")
+complete -c less -s j -l jump-target -d (_ "Target line") -r -a "0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 -1 -2 -3 -4 -5 -6 -7 -8 -9 -10 -11 -12 -13 -14 -15 -16 -17 -18 -19"
+complete -c less -s J -l status-column -d (_ "Display status column")
+complete -c less -s k -l lesskey-file -d (_ "Specify key bindings file") -r
 complete -c less -s L -l no-lessopen -d 'Ignore $LESSOPEN'
-complete -c less -s m -l long-prompt -d "Prompt with percentage"
-complete -c less -s M -l LONG-PROMPT -d "Verbose prompt"
-complete -c less -s n -l line-numbers -d "Display line number"
-complete -c less -s N -l LINE-NUMBERS -d "Display line number for each line"
-complete -c less -s o -l log-file -d "Log input to file" -r
-complete -c less -s O -l LOG-FILE -d "Log to file, overwrite" -r
-complete -c less -s p -l pattern -d "Start at first occorance of pattern" -r
-complete -c less -s P -l prompt -d "Prompt string" -r
-complete -c less -s q -l quiet -d "Silent mode"
-complete -c less -l silent -d "Silent mode"
-complete -c less -s Q -l QUIET -d "Completly silent mode"
-complete -c less -l SILENT -d "Completly silent mode"
-complete -c less -s r -l raw-control-chars -d "Display control chars"
-complete -c less -s R -l RAW-CONTROL-CHARS -d "Display control chars, guess screen appearance"
-complete -c less -s s -l squeeze-blank-lines -d "Miltiple blank lines sqeezed"
-complete -c less -s S -l chop-long-lines -d "Do not fold long lines"
-complete -c less -s t -l tag -d "Edit tag" -r
-complete -c less -s T -l tag-file -d "Set tag file" -r
-complete -c less -s u -l underline-special -d "Allow backspace and carriage return"
-complete -c less -s U -l UNDERLINE-SPECIAL -d "Allow backspace, tab and carriage return"
-complete -c less -s V -l version -d "Display version and exit"
-complete -c less -s w -l hilite-unread -d "Flash first unread line on new page"
-complete -c less -s W -l HILITE-UNREAD -d "Flash first unread line on any movement"
-complete -c less -s x -l tabs -d "set tab stops" -r -a "1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16"
-complete -c less -s X -l no-init -d "No termcap init"
-complete -c less -l no-keypad -d "No keypad init"
-complete -c less -s y -l max-forw-scroll -d "Maximum forward scroll" -r -a "1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19"
-complete -c less -s z -l window -d "Max scroll window" -r -d "1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19"
-complete -c less -s \" -l quotes -d "Set quote char" -r
-complete -c less -s \~ -l tilde -d "Lines after EOF are blank"
-complete -c less -s \# -l shift -d "Scroll on arrows" -a "0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19"
+complete -c less -s m -l long-prompt -d (_ "Prompt with percentage")
+complete -c less -s M -l LONG-PROMPT -d (_ "Verbose prompt")
+complete -c less -s n -l line-numbers -d (_ "Display line number")
+complete -c less -s N -l LINE-NUMBERS -d (_ "Display line number for each line")
+complete -c less -s o -l log-file -d (_ "Log input to file") -r
+complete -c less -s O -l LOG-FILE -d (_ "Log to file, overwrite") -r
+complete -c less -s p -l pattern -d (_ "Start at first occorance of pattern") -r
+complete -c less -s P -l prompt -d (_ "Prompt string") -r
+complete -c less -s q -l quiet -d (_ "Silent mode")
+complete -c less -l silent -d (_ "Silent mode")
+complete -c less -s Q -l QUIET -d (_ "Completly silent mode")
+complete -c less -l SILENT -d (_ "Completly silent mode")
+complete -c less -s r -l raw-control-chars -d (_ "Display control chars")
+complete -c less -s R -l RAW-CONTROL-CHARS -d (_ "Display control chars, guess screen appearance")
+complete -c less -s s -l squeeze-blank-lines -d (_ "Multiple blank lines sqeezed")
+complete -c less -s S -l chop-long-lines -d (_ "Do not fold long lines")
+complete -c less -s t -l tag -d (_ "Edit tag") -r
+complete -c less -s T -l tag-file -d (_ "Set tag file") -r
+complete -c less -s u -l underline-special -d (_ "Allow backspace and carriage return")
+complete -c less -s U -l UNDERLINE-SPECIAL -d (_ "Allow backspace, tab and carriage return")
+complete -c less -s V -l version -d (_ "Display version and exit")
+complete -c less -s w -l hilite-unread -d (_ "Highlight first unread line on new page")
+complete -c less -s W -l HILITE-UNREAD -d (_ "Highlight first unread line on any movement")
+complete -c less -s x -l tabs -d (_ "Set tab stops") -r -a "1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16"
+complete -c less -s X -l no-init -d (_ "No termcap init")
+complete -c less -l no-keypad -d (_ "No keypad init")
+complete -c less -s y -l max-forw-scroll -d (_ "Maximum forward scroll") -r -a "1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19"
+complete -c less -s z -l window -d (_ "Max scroll window") -r -a "1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19"
+complete -c less -s \" -l quotes -d (_ "Set quote char") -r
+complete -c less -s \~ -l tilde -d (_ "Lines after EOF are blank")
+complete -c less -s \# -l shift -d (_ "Characters to scroll on left/right arrows") -a "0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19"
 

init/completions/ls.fish

@@ -1,75 +1,106 @@
+#
+# Completions for the ls command and its aliases
+#
+
+# Test if we are using GNU ls
+
+set -l is_gnu 
+ls --version >/dev/null ^/dev/null; and set is_gnu --is-gnu
 
 for i in ls ll la
 
-	complete -c $i -s a -l all -d "Show hidden"
-	complete -c $i -s A -l almost-all -d "Show hidden except . and .."
-	complete -c $i -l author -d "Print author"
-	complete -c $i -s b -l escape -d "Octal escapes for non graphic"
-	complete -c $i -l blocksize -x -d "Use SIZE-byte blocks"
-	complete -c $i -s B -l ignore-backups -d "Ignore files ending with ~"
-	complete -c $i -s c -d "Show and sort by ctime"
-	complete -c $i -s C -d "List by columns"
-	complete -c $i -l color -f -a "never always auto" -d "Show colors"
-	complete -c $i -s d -l directory -d "List directories"
-	complete -c $i -s D -l dired -d "Generate dired output"
-	complete -c $i -s f -d "Do not sort"
-	complete -c $i -s F -l classify -d "Append filetype indicator"
-	complete -c $i -l format -x -a "across commas horizontal long single-column verbose vertical" -d "List format"
-	complete -c $i -l full-time -d "Long forma, full-iso time"
-	complete -c $i -s g -d "Long format without owner"
-	complete -c $i -s G -l no-group -d "Do not print group information"
-	complete -c $i -s h -l human-readable -d "Human readable size"
-	complete -c $i -l si -d "Human readable size, base 1000"
-	complete -c $i -s H -l dereference-command-line -d "Follow symlinks"
-	complete -c $i -l dereference-command-line-symlink-to-dir #-d "Follow directory symlinks from command line"
-	complete -c $i -l indicator-style -x -a "none classify file-type" -d "Append indicator to entry"
-	complete -c $i -s i -l inode -d "Print index number of files"
-	complete -c $i -s I -l ignore -r -d "Skip entries matching pattern"
-	complete -c $i -s k -d "like --block-size=1K"
-	complete -c $i -s l -d "Long format"
-	complete -c $i -s L -l dereference -d "Follow symlinks"
-	complete -c $i -s m -d "Comma separated format"
-	complete -c $i -s n -l numeric-uid-gid -d "Long format, numeric IDs"
-	complete -c $i -s N -l literal -d "Print raw entry names"
-	complete -c $i -s o -d "Long format without groups"
-	complete -c $i -s p -l file-type -d "Append indicator"
-	complete -c $i -s q -l hide-control-chars -d "? fo non graphic"
-	complete -c $i -l show-control-chars -d "Non graphic as-is"
-	complete -c $i -s Q -l quote-name -d "Enclose entry in quotes"
-	complete -c $i -l quoting-style -x -a "literal locale shell shell-always c escape" -d "Select quoting style"
-	complete -c $i -s r -l reverse -d "Reverse sort order"
-	complete -c $i -s R -l recursive -d "List subdirectory recursively"
-	complete -c $i -s s -l size -d "Print size of files"
-	complete -c $i -s S -d "Sort by size"
-	complete -c $i -l sort -x -d "Sort criteria" -a "
-	extension\t'Sort by file extension'
-	none\t'Do not sort'
-		size\t'Sort by size'
-		time\t'Sort by modification time'
-		version\t'Sort by version'
-		status\t'Sort by file status modification time'
-		atime\t'Sort by access time'
-		access\t'Sort by access time'
-		use\t'Sort by access time'
-	"
-	complete -c $i -l time -x -d "Show time type" -a "
-		time\t'Sort by modification time'
-		access\t'Sort by access time'
-		use\t'Sort by use time'
-		ctime\t'Sort by file status modification time'
-		status\t'Sort by status time'
-	"
-	complete -c $i -l time-style -x -a "full-iso long-iso iso locale" -d "Select time style"
-	complete -c $i -s t -d "Sort by modification time"
-	complete -c $i -s T -l tabsize -x -a "1 2 3 4 5 6 7 8 9 10 11 12" -d "Assume tab stops at each COLS"
-	complete -c $i -s u -d "Show access time"
-	complete -c $i -s U -d "Do not sort"
-	complete -c $i -s v -d "Sort by version"
-	complete -c $i -s w -l width -x -d "Assume screen width"
-	complete -c $i -s x -d "List entries by lines"
-	complete -c $i -s X -d "sort by extension"
-	complete -c $i -s 1 -d "List one file per line"
-	complete -c $i -l help -d "Display help and exit"
-	complete -c $i -l version -d "Output version and exit"
+	# Shared ls switches
 
+	__fish_gnu_complete -c $i -s a -l all -d (_ "Show hidden") $is_gnu
+	__fish_gnu_complete -c $i -s A -l almost-all -d (_ "Show hidden except . and ..") $is_gnu
+	__fish_gnu_complete -c $i -s F -l classify -d (_ "Append filetype indicator") $is_gnu
+	__fish_gnu_complete -c $i -s H -l dereference-command-line -d (_ "Follow symlinks") $is_gnu
+	__fish_gnu_complete -c $i -s L -l dereference -d (_ "Follow symlinks") $is_gnu
+	__fish_gnu_complete -c $i -s R -l recursive -d (_ "List subdirectory recursively") $is_gnu
+	__fish_gnu_complete -c $i -s b -l escape -d (_ "Octal escapes for non graphic characters") $is_gnu
+	__fish_gnu_complete -c $i -s d -l directory -d (_ "List directories, not their content") $is_gnu
+	__fish_gnu_complete -c $i -s h -l human-readable -d (_ "Human readable sizes") $is_gnu
+	__fish_gnu_complete -c $i -s i -l inode -d (_ "Print inode number of files") $is_gnu
+	__fish_gnu_complete -c $i -s n -l numeric-uid-gid -d (_ "Long format, numeric IDs") $is_gnu
+	__fish_gnu_complete -c $i -s p -l file-type -d (_ "Append filetype indicator") $is_gnu
+	__fish_gnu_complete -c $i -s q -l hide-control-chars -d (_ "Replace non-graphic characters with '?'") $is_gnu
+	__fish_gnu_complete -c $i -s r -l reverse -d (_ "Reverse sort order") $is_gnu
+	__fish_gnu_complete -c $i -s s -l size -d (_ "Print size of files") $is_gnu
+
+	complete -c $i -s C -d (_ "List by columns")
+	complete -c $i -s S -d (_ "Sort by size")
+	complete -c $i -s c -d (_ "Show and sort by ctime")
+	complete -c $i -s f -d (_ "Don't sort")
+	complete -c $i -s g -d (_ "Long format without owner")
+	complete -c $i -s k -d (_ "Set blocksize to 1kB")
+	complete -c $i -s l -d (_ "Long format")
+	complete -c $i -s m -d (_ "Comma separated format")
+	complete -c $i -s t -d (_ "Sort by modification time")
+	complete -c $i -s u -d (_ "Show access time")
+	complete -c $i -s x -d (_ "List entries by lines")
+	complete -c $i -s 1 -d (_ "List one file per line")
+
+	if test -n "$is_gnu"
+
+		# GNU specific features
+
+		complete -c $i -l author -d (_ "Print author")
+		complete -c $i -l blocksize -x -d (_ "Set block size")
+		complete -c $i -s B -l ignore-backups -d (_ "Ignore files ending with ~")
+		complete -c $i -l color -f -a "never always auto" -d (_ "Use colors")
+		complete -c $i -s D -l dired -d (_ "Generate dired output")
+		complete -c $i -l format -x -a "across commas horizontal long single-column verbose vertical" -d (_ "List format")
+		complete -c $i -l full-time -d (_ "Long format, full-iso time")
+		complete -c $i -s G -l no-group -d (_ "Don't print group information")
+		complete -c $i -l si -d (_ "Human readable sizes, powers of 1000")
+		complete -c $i -l dereference-command-line-symlink-to-dir #-d (_ "Follow directory symlinks from command line")
+		complete -c $i -l indicator-style -x -a "none classify file-type" -d (_ "Append filetype indicator")
+		complete -c $i -s I -l ignore -r -d (_ "Skip entries matching pattern")
+		complete -c $i -s N -l literal -d (_ "Print raw entry names")
+		complete -c $i -s o -d (_ "Long format without groups")
+		complete -c $i -l show-control-chars -d (_ "Non graphic as-is")
+		complete -c $i -s Q -l quote-name -d (_ "Enclose entry in quotes")
+		complete -c $i -l quoting-style -x -a "literal locale shell shell-always c escape" -d (_ "Select quoting style")
+		complete -c $i -l sort -x -d (_ "Sort criteria") -a "
+			extension\t'Sort by file extension'
+			none\tDon't\ sort
+			size\t'Sort by size'
+			time\t'Sort by modification time'
+			version\t'Sort by version'
+			status\t'Sort by file status modification time'
+			atime\t'Sort by access time'
+			access\t'Sort by access time'
+			use\t'Sort by access time'
+		"
+		complete -c $i -l time -x -d (_ "Show time type") -a "
+			time\t'Sort by modification time'
+			access\t'Sort by access time'
+			use\t'Sort by use time'
+			ctime\t'Sort by file status modification time'
+			status\t'Sort by status time'
+		"
+		complete -c $i -l time-style -x -a "full-iso long-iso iso locale" -d (_ "Select time style")
+		complete -c $i -s T -l tabsize -x -a "1 2 3 4 5 6 7 8 9 10 11 12" -d (_ "Assume tab stops at each COLS")
+		complete -c $i -s U -d (_ "Do not sort")
+		complete -c $i -s v -d (_ "Sort by version")
+		complete -c $i -s w -l width -x -d (_ "Assume screen width")
+		complete -c $i -s X -d (_ "Sort by extension")
+		complete -c $i -l help -d (_ "Display help and exit")
+		complete -c $i -l version -d (_ "Display version and exit")
+
+	else
+
+		# If not a GNU system, assume we have standard BSD ls features instead
+
+		complete -c $i -s B -d (_ "Octal escapes for non graphic characters")
+		complete -c $i -s G -d (_ "Use colors")
+		complete -c $i -s I -d (_ "Prevent -A from being automatically set for root")
+		complete -c $i -s P -d (_ "Don't follow symlinks")
+		complete -c $i -s T -d (_ "Show modification time")
+		complete -c $i -s W -d (_ "Show whiteouts when scanning directories")
+		complete -c $i -s Z -d (_ "Display each file's MAC label")
+		complete -c $i -s o -d (_ "Include the file flags in a long (-l) output")
+		complete -c $i -s w -d (_ "Print raw entry names")
+
+	end
 end

init/completions/make.fish

@@ -5,25 +5,25 @@ function __fish_print_make_targets
 	grep -h -E '^[^#%=$[:space:]][^#%=$]*:([^=]|$)' $files | cut -d ":" -f 1 | sed -e 's/^ *//;s/ *$//;s/  */\n/g' ^/dev/null
 end
 
-complete -x -c make -a "(__fish_print_make_targets)" -d "Target"
-complete -r -c make -s f -d "Use file as makefile" -r
-complete -x -c make -s C -x -a "(__fish_complete_directory (commandline -ct))" -d "Change directory"
-complete -c make -s d -d "Debug"
-complete -c make -s e -d "Environment before makefile"
-complete -c make -s i -d "Ignore errors"
-complete -x -c make -s I -d "Search directory for Makefile" -a "(__fish_complete_directory (commandline -ct))"
-complete -x -c make -s j -d "Number of jobs"
-complete -c make -s k -d "Continue after an error"
-complete -c make -s l -d "Start when load drops"
-complete -c make -s n -d "Do not execute commands"
-complete -c make -s o -r -d "Ignore specified file"
-complete -c make -s p -d "Print database"
-complete -c make -s q -d "Question mode"
-complete -c make -s r -d "Eliminate implicit rules"
-complete -c make -s s -d "Silent operation"
-complete -c make -s S -d "Cancel the effect of -k"
-complete -c make -s t -d "Touch files, dont run commands"
-complete -c make -s v -d "Print version"
-complete -c make -s w -d "Print working directory"
-complete -c make -s W -r -d "Pretend file is modified"
+complete -x -c make -a "(__fish_print_make_targets)" -d (_ "Target")
+complete -r -c make -s f -d (_ "Use file as makefile") -r
+complete -x -c make -s C -x -a "(__fish_complete_directory (commandline -ct))" -d (_ "Change directory")
+complete -c make -s d -d (_ "Debug mode")
+complete -c make -s e -d (_ "Environment before makefile")
+complete -c make -s i -d (_ "Ignore errors")
+complete -x -c make -s I -d (_ "Search directory for makefile") -a "(__fish_complete_directory (commandline -ct))"
+complete -x -c make -s j -d (_ "Number of concurrent jobs")
+complete -c make -s k -d (_ "Continue after an error")
+complete -c make -s l -d (_ "Start when load drops")
+complete -c make -s n -d (_ "Do not execute commands")
+complete -c make -s o -r -d (_ "Ignore specified file")
+complete -c make -s p -d (_ "Print database")
+complete -c make -s q -d (_ "Question mode")
+complete -c make -s r -d (_ "Eliminate implicit rules")
+complete -c make -s s -d (_ "Quiet mode")
+complete -c make -s S -d (_ "Don't continue after an error")
+complete -c make -s t -d (_ "Touch files, don't run commands")
+complete -c make -s v -d (_ "Display version and exit")
+complete -c make -s w -d (_ "Print working directory")
+complete -c make -s W -r -d (_ "Pretend file is modified")
 

init/completions/makedepend.fish

@@ -1,13 +1,13 @@
-complete -c makedepend -s D -r -d "Define"
-complete -c makedepend -s I -r -d "Include directory"
-complete -c makedepend -s Y -r -d "Replace include directories"
-complete -c makedepend -s a -d "Append dependencies to makefile"
-complete -c makedepend -s f -r -d "Specify makefile"
-complete -c makedepend -o include -r -d "Prepend file to input"
-complete -c makedepend -s o -r -d "Object file suffix"
-complete -c makedepend -s p -r -d "Object file prefix"
-complete -c makedepend -s s -r -d "Starting string delimiter"
-complete -c makedepend -s w -r -d "Line width"
-complete -c makedepend -s v -d "Verbose mode"
-complete -c makedepend -s m -d "Warn about multiple inclusion"
+complete -c makedepend -s D -r -d (_ "Define")
+complete -c makedepend -s I -r -d (_ "Include directory")
+complete -c makedepend -s Y -r -d (_ "Replace include directories")
+complete -c makedepend -s a -d (_ "Append dependencies to makefile")
+complete -c makedepend -s f -r -d (_ "Specify makefile")
+complete -c makedepend -o include -r -d (_ "Prepend file to input")
+complete -c makedepend -s o -r -d (_ "Object file suffix")
+complete -c makedepend -s p -r -d (_ "Object file prefix")
+complete -c makedepend -s s -r -d (_ "Starting string delimiter")
+complete -c makedepend -s w -r -d (_ "Line width")
+complete -c makedepend -s v -d (_ "Verbose mode")
+complete -c makedepend -s m -d (_ "Warn about multiple inclusion")
 

init/completions/man.fish

@@ -29,36 +29,36 @@ end
 
 complete -xc man -a "(__fish_complete_man)"
 
-complete -xc man -a 1 -d "Program section"
-complete -xc man -a 2 -d "Syscall section"
-complete -xc man -a 3 -d "Library section"
-complete -xc man -a 4 -d "Device section"
-complete -xc man -a 5 -d "File format section"
-complete -xc man -a 6 -d "Games section"
-complete -xc man -a 7 -d "Misc section"
-complete -xc man -a 8 -d "Admin section"
-complete -xc man -a 9 -d "Kernel section"
-complete -xc man -a tcl -d "Tcl section"
-complete -xc man -a n -d "New section"
-complete -xc man -a l -d "Local section"
+complete -xc man -a 1 -d (_ "Program section")
+complete -xc man -a 2 -d (_ "Syscall section")
+complete -xc man -a 3 -d (_ "Library section")
+complete -xc man -a 4 -d (_ "Device section")
+complete -xc man -a 5 -d (_ "File format section")
+complete -xc man -a 6 -d (_ "Games section")
+complete -xc man -a 7 -d (_ "Misc section")
+complete -xc man -a 8 -d (_ "Admin section")
+complete -xc man -a 9 -d (_ "Kernel section")
+complete -xc man -a tcl -d (_ "Tcl section")
+complete -xc man -a n -d (_ "New section")
+complete -xc man -a l -d (_ "Local section")
 complete -xc man -a p
-complete -xc man -a o -d "Old section"
-complete -rc man -s C -d "Configuration file"
-complete -xc man -s M -a "(__fish_complete_directory (commandline -ct))" -d "Manpath"
-complete -rc man -s P -d "Pager"
-complete -xc man -s S -d "Manual sections"
-complete -c man -s a -d "Display all matches"
-complete -c man -s c -d "Always reformat"
-complete -c man -s d -d "Debug"
-complete -c man -s D -d "Debug and run"
-complete -c man -s f -d "Whatis"
-complete -c man -s F -l preformat -d "Format only"
-complete -c man -s h -d "Display help and exit"
-complete -c man -s k -d "Apropos"
-complete -c man -s K -d "Search in all man pages"
-complete -xc man -s m -d "Set system"
-complete -xc man -s p -d "Preprocessors"
-complete -c man -s t -d "Format for printing"
-complete -c man -s w -l path -d "Only print locations"
-complete -c man -s W -d "Only print locations"
+complete -xc man -a o -d (_ "Old section")
+complete -rc man -s C -d (_ "Configuration file")
+complete -xc man -s M -a "(__fish_complete_directory (commandline -ct))" -d (_ "Manpath")
+complete -rc man -s P -d (_ "Pager")
+complete -xc man -s S -d (_ "Manual sections")
+complete -c man -s a -d (_ "Display all matches")
+complete -c man -s c -d (_ "Always reformat")
+complete -c man -s d -d (_ "Debug")
+complete -c man -s D -d (_ "Debug and run")
+complete -c man -s f -d (_ "Show whatis information")
+complete -c man -s F -l preformat -d (_ "Format only")
+complete -c man -s h -d (_ "Display help and exit")
+complete -c man -s k -d (_ "Show apropos information")
+complete -c man -s K -d (_ "Search in all man pages")
+complete -xc man -s m -d (_ "Set system")
+complete -xc man -s p -d (_ "Preprocessors")
+complete -c man -s t -d (_ "Format for printing")
+complete -c man -s w -l path -d (_ "Only print locations")
+complete -c man -s W -d (_ "Only print locations")
 

init/completions/mimedb.fish

@@ -1,9 +1,9 @@
-complete -c mimedb -s t -l input-file-data -d "Input is a file, use name and contents to determine mimetype"
-complete -c mimedb -s f -l input-filename -d "Input is a file, use name to determine mimetype"
-complete -c mimedb -s i -l input-mime -d "Input is a mimetype"
-complete -c mimedb -s m -l output-mime -d "Output mimetype"
-complete -c mimedb -s d -l output-description -d "Output description of mimetype"
-complete -c mimedb -s a -l output-action -d "Output default action for mimetype"
-complete -c mimedb -s l -l launch -d "Launch default action for each file"
-complete -c mimedb -s h -l help -d "Display help and exit"
-complete -c mimedb -s v -l version -d "Display version and exit"
+complete -c mimedb -s t -l input-file-data -d (_ "Input is a file, use name and contents to determine mimetype")
+complete -c mimedb -s f -l input-filename -d (_ "Input is a file, use name to determine mimetype")
+complete -c mimedb -s i -l input-mime -d (_ "Input is a mimetype")
+complete -c mimedb -s m -l output-mime -d (_ "Output mimetype")
+complete -c mimedb -s d -l output-description -d (_ "Output description of mimetype")
+complete -c mimedb -s a -l output-action -d (_ "Output default action for mimetype")
+complete -c mimedb -s l -l launch -d (_ "Launch default action for each file")
+complete -c mimedb -s h -l help -d (_ "Display help and exit")
+complete -c mimedb -s v -l version -d (_ "Display version and exit")

init/completions/modprobe.fish

@@ -3,24 +3,24 @@
 #
 
 complete -c modprobe -d Module -a "(/sbin/modprobe -l | sed -e 's/\/.*\/\([^\/.]*\).*/\1/')"
-complete -c modprobe -s v -l verbose -d "Print messages about what the program is doing"
-complete -c modprobe -s C -l config -d "Configuration file" -r
-complete -c modprobe -s c -l showconfig -d "Dump configuration file"
-complete -c modprobe -s n -l dry-run -d "Do not actually insert/remove module"
-complete -c modprobe -s i -l ingnore-install -d "Ignore install and remove commands in configuration file"
-complete -c modprobe -l ingnore-remove -d "Ignore install and remove commands in configuration file"
-complete -c modprobe -s q -l quiet -d "Ignore bogus module names"
-complete -c modprobe -s r -l remove -d "Remove modules"
-complete -c modprobe -s V -l version -d "Display version and exit"
-complete -c modprobe -s f -l force -d "Ignore all version information"
-complete -c modprobe -l force-vermagic -d "Ignore version magic information"
-complete -c modprobe -l force-modversion -d "Ignore module interface version"
-complete -c modprobe -s l -l list -d "List all modules matching the given wildcard" 
-complete -c modprobe -s a -l all -d "Insert modules matching the given wildcard"
-complete -c modprobe -s t -l type -d "Restrict wildcards to specified directory"
-complete -c modprobe -s s -l syslog -d "Send error messages through syslog"
-complete -c modprobe -l set-version -d "Specify kernel version"
-complete -c modprobe -l show-depends -d "List dependencies of module"
-complete -c modprobe -s o -l name -d "Rename module"
-complete -c modprobe -l first-time -d "Fail if inserting already loaded module"
+complete -c modprobe -s v -l verbose -d (_ "Print messages about what the program is doing")
+complete -c modprobe -s C -l config -d (_ "Configuration file") -r
+complete -c modprobe -s c -l showconfig -d (_ "Dump configuration file")
+complete -c modprobe -s n -l dry-run -d (_ "Do not actually insert/remove module")
+complete -c modprobe -s i -l ingnore-install -d (_ "Ignore install and remove commands in configuration file")
+complete -c modprobe -l ingnore-remove -d (_ "Ignore install and remove commands in configuration file")
+complete -c modprobe -s q -l quiet -d (_ "Ignore bogus module names")
+complete -c modprobe -s r -l remove -d (_ "Remove modules")
+complete -c modprobe -s V -l version -d (_ "Display version and exit")
+complete -c modprobe -s f -l force -d (_ "Ignore all version information")
+complete -c modprobe -l force-vermagic -d (_ "Ignore version magic information")
+complete -c modprobe -l force-modversion -d (_ "Ignore module interface version")
+complete -c modprobe -s l -l list -d (_ "List all modules matching the given wildcard") 
+complete -c modprobe -s a -l all -d (_ "Insert modules matching the given wildcard")
+complete -c modprobe -s t -l type -d (_ "Restrict wildcards to specified directory")
+complete -c modprobe -s s -l syslog -d (_ "Send error messages through syslog")
+complete -c modprobe -l set-version -d (_ "Specify kernel version")
+complete -c modprobe -l show-depends -d (_ "List dependencies of module")
+complete -c modprobe -s o -l name -d (_ "Rename module")
+complete -c modprobe -l first-time -d (_ "Fail if inserting already loaded module")
 

init/completions/mount.fish

@@ -42,27 +42,27 @@ set -g __fish_filesystems '
 '
 
 # Completions for mount
-complete -x -c mount -a '(cat /etc/fstab|sed -e "s/^\([^ \t]*\)[ \t]*\([^ \t]*\).*/\1\n\2/"|grep "^/")' -d 'Mount point'
-complete -c mount -s V -d 'Display version and exit'
-complete -c mount -s h -d 'Display help and exit'
-complete -c mount -s v -d 'Verbose mode'
-complete -c mount -s a -d 'Mount filesystems in fstab'
-complete -c mount -s F -d 'Fork process for each mount'
-complete -c mount -s f -d 'Fake mounting'
-complete -c mount -s l -d 'Add label to output'
-complete -c mount -s n -d 'Do not write mtab'
-complete -c mount -s s -d 'Tolerate sloppy mount options'
-complete -c mount -s r -d 'Read only'
-complete -c mount -s w -d 'Read/Write mode'
-complete -x -c mount -s L -d 'Mount partition with specified label'
-complete -x -c mount -s U -d 'Mount partition with specified UID'
-complete -c mount -s O -x -d 'Exclude filesystems'
-complete -c mount -l bind -f -d 'Remount a subtree to a second position'
-complete -c mount -l move -f -d 'Move a subtree to a new position'
-complete -c mount -x -s t -d 'Filesystem' -a $__fish_filesystems
+complete -x -c mount -a '(cat /etc/fstab|sed -e "s/^\([^ \t]*\)[ \t]*\([^ \t]*\).*/\1\n\2/"|grep "^/")' -d (_ 'Mount point')
+complete -c mount -s V -d (_ 'Display version and exit')
+complete -c mount -s h -d (_ 'Display help and exit')
+complete -c mount -s v -d (_ 'Verbose mode')
+complete -c mount -s a -d (_ 'Mount filesystems in fstab')
+complete -c mount -s F -d (_ 'Fork process for each mount')
+complete -c mount -s f -d (_ 'Fake mounting')
+complete -c mount -s l -d (_ 'Add label to output')
+complete -c mount -s n -d (_ 'Do not write mtab')
+complete -c mount -s s -d (_ 'Tolerate sloppy mount options')
+complete -c mount -s r -d (_ 'Read only')
+complete -c mount -s w -d (_ 'Read/Write mode')
+complete -x -c mount -s L -d (_ 'Mount partition with specified label')
+complete -x -c mount -s U -d (_ 'Mount partition with specified UID')
+complete -c mount -s O -x -d (_ 'Exclude filesystems')
+complete -c mount -l bind -f -d (_ 'Remount a subtree to a second position')
+complete -c mount -l move -f -d (_ 'Move a subtree to a new position')
+complete -c mount -x -s t -d (_ 'Filesystem') -a $__fish_filesystems
 
-complete -c mount -x -s o -d 'Mount option' -a '(__fish_append , $__fish_mount_opts)'
+complete -c mount -x -s o -d (_ 'Mount option') -a '(__fish_append , $__fish_mount_opts)'
 
-set -g __fish_mount_opts async\tUse\ asynchronous\ I/O atime\tUpdate\ time\ on\ each\ access auto\tMounted\ with\ -a defaults\tUse\ default\ options dev\tInterpret\ character/block\ special\ devices exec\tPermit\ executables _netdev\tFilesystem\ uses\network noatime\tDo\ not\ update\ time\ on\ each\ access noauto\tNot\ mounted\ by\ -a nodev\tDo\ not\ interpret\ character/block\ special\ devices noexec\tDo\ not\ permit\ executables nosuid\tIgnore\ suid\ bits nouser\tOnly\ root\ may\ mount remount\tRemount\ read-only\ filesystem ro\tMount\ read-only rw\tMount\ read-write suid\tAllow\ suid\ bits sync\tUse\ synchronous\ I/O dirsync\tUse\ synchronous\ directory\ operations user\tAny\ user\ may\ mount users\tAny\ user\ may\ mount\ and\ unmount
+set -g __fish_mount_opts async\tUse\ asynchronous\ I/O atime\tUpdate\ time\ on\ each\ access auto\tMounted\ with\ -a defaults\tUse\ default\ options dev\tInterpret\ character/block\ special\ devices exec\tPermit\ executables _netdev\tFilesystem\ uses\ network noatime\tDo\ not\ update\ time\ on\ each\ access noauto\tNot\ mounted\ by\ -a nodev\tDo\ not\ interpret\ character/block\ special\ devices noexec\tDo\ not\ permit\ executables nosuid\tIgnore\ suid\ bits nouser\tOnly\ root\ may\ mount remount\tRemount\ read-only\ filesystem ro\tMount\ read-only rw\tMount\ read-write suid\tAllow\ suid\ bits sync\tUse\ synchronous\ I/O dirsync\tUse\ synchronous\ directory\ operations user\tAny\ user\ may\ mount users\tAny\ user\ may\ mount\ and\ unmount
 
 

init/completions/mplayer.fish

@@ -24,62 +24,62 @@ set mplayer_lang "
 	se\Swedish
 "
 
-complete -c mplayer -o autoq -d "Dynamically change postprocessing" -x
-complete -c mplayer -o autosync -x -d "A/V sync speed"
-complete -c mplayer -o framedrop -d "Skip frames to maintain A/V sync"
-complete -c mplayer -s h -o help -d "Show help and exit"
-complete -c mplayer -o hardframedrop -d "Skip frames to maintain A/V sync"
-complete -c mplayer -o loop -x -d "Loop playback" -r -a "0 1 2 3 4 5 6 7 8 9"
-complete -c mplayer -o shuffle -d "Play in random order"
+complete -c mplayer -o autoq -d (_ "Dynamically change postprocessing") -x
+complete -c mplayer -o autosync -x -d (_ "A/V sync speed")
+complete -c mplayer -o framedrop -d (_ "Skip frames to maintain A/V sync")
+complete -c mplayer -s h -o help -d (_ "Display help and exit")
+complete -c mplayer -o hardframedrop -d (_ "Skip frames to maintain A/V sync")
+complete -c mplayer -o loop -x -d (_ "Loop playback") -r -a "0 1 2 3 4 5 6 7 8 9"
+complete -c mplayer -o shuffle -d (_ "Play in random order")
 
-complete -c mplayer -s h -o help -d "Display help and exit"
-complete -c mplayer -o fs -d "Full screen"
-complete -c mplayer -o playlist -d "Set playlist"-r
-complete -c mplayer -o alang -d "Audio language" -x -a $mplayer_lang
-complete -c mplayer -o audiofile -d "Play audio from file" -r
-complete -c mplayer -o cdrom-device -d "Set default CD-ROM drive"
-complete -c mplayer -o channels -d "Set number of audio channels" -x -a "2 4 6"
-complete -c mplayer -o chapter -d "Set start chapter" -x
-complete -c mplayer -o dvd-device -d "Set default DVD-ROM drive"
-complete -c mplayer -o dvdangle -d "Set dvd viewing angle" -x -a "1 2 3 4 5 6 7 8"
-complete -c mplayer -o forceidx -d "Force rebuilding index"
-complete -c mplayer -o fps -d "Override framerate" -x -a "24 25 30"
-complete -c mplayer -o idx -d "Rebuild index if unavailable"
-complete -c mplayer -o loadidx -d "Load index from file" -r
-complete -c mplayer -o ni -d "Force non-interleaved AVI parser"
-complete -c mplayer -o saveidx -d "Rebuild index and save to file" -r
-complete -c mplayer -o ss -d "Seek to give time position" -x
-complete -c mplayer -o tv -d "TV capture mode"
-complete -c mplayer -o slang -d "Subtitle language" -x -a $mplayer_lang
-complete -c mplayer -o sub -d "Subtitle file" -r
-complete -c mplayer -o unicode -d "Handle subtitlefile as unicode"
-complete -c mplayer -o utf8 -d "Handle subtitlefile as utf8"
+complete -c mplayer -s h -o help -d (_ "Display help and exit")
+complete -c mplayer -o fs -d (_ "Full screen")
+complete -c mplayer -o playlist -d (_ "Set playlist")-r
+complete -c mplayer -o alang -d (_ "Audio language") -x -a $mplayer_lang
+complete -c mplayer -o audiofile -d (_ "Play audio from file") -r
+complete -c mplayer -o cdrom-device -d (_ "Set default CD-ROM drive")
+complete -c mplayer -o channels -d (_ "Set number of audio channels") -x -a "2 4 6"
+complete -c mplayer -o chapter -d (_ "Set start chapter") -x
+complete -c mplayer -o dvd-device -d (_ "Set default DVD-ROM drive")
+complete -c mplayer -o dvdangle -d (_ "Set dvd viewing angle") -x -a "1 2 3 4 5 6 7 8"
+complete -c mplayer -o forceidx -d (_ "Force rebuilding index")
+complete -c mplayer -o fps -d (_ "Override framerate") -x -a "24 25 30"
+complete -c mplayer -o idx -d (_ "Build index if unavailable")
+complete -c mplayer -o loadidx -d (_ "Load index from file") -r
+complete -c mplayer -o ni -d (_ "Force non-interleaved AVI parser")
+complete -c mplayer -o saveidx -d (_ "Rebuild index and save to file") -r
+complete -c mplayer -o ss -d (_ "Seek to give time position") -x
+complete -c mplayer -o tv -d (_ "TV capture mode")
+complete -c mplayer -o slang -d (_ "Subtitle language") -x -a $mplayer_lang
+complete -c mplayer -o sub -d (_ "Subtitle file") -r
+complete -c mplayer -o unicode -d (_ "Handle subtitlefile as unicode")
+complete -c mplayer -o utf8 -d (_ "Handle subtitlefile as utf8")
 
-complete -c mplayer -o vo -x -d "Video output" -a "
+complete -c mplayer -o vo -x -d (_ "Video output") -a "
 (
 	mplayer -vo help|grep \t.\*\t'\|^ *[a-zA-Z0-9][a-zA-Z0-9]*  '|sed -e 's/[\t ]*\([a-zA-Z0-9]*\)[\t ]*\(.*\)/\1\t\2/'
 )
 "
 
-complete -c mplayer -o ao -x -d "Audio output" -a "
+complete -c mplayer -o ao -x -d (_ "Audio output") -a "
 (
 	mplayer -ao help|grep \t.\*\t'\|^ *[a-zA-Z0-9][a-zA-Z0-9]*  '|sed -e 's/[\t ]*\([a-zA-Z0-9]*\)[\t ]*\(.*\)/\1\t\2/'
 )
 "
 
-complete -c mplayer -o afm -x -d "Audio output" -a "
+complete -c mplayer -o afm -x -d (_ "Audio output") -a "
 (
 	__fish_append ',' (mplayer -afm help|grep \t.\*\t'\|^ *[a-zA-Z0-9][a-zA-Z0-9]*  '|sed -e 's/[\t ]*\([a-zA-Z0-9]*\)[\t ]*\(.*\)/\1\t\2/')
 )
 "
 
-complete -c mplayer -o vfm -x -d "Video output" -a "
+complete -c mplayer -o vfm -x -d (_ "Video output") -a "
 (
 	__fish_append ',' (mplayer -vfm help|grep \t.\*\t'\|^ *[a-zA-Z0-9][a-zA-Z0-9]*  '|sed -e 's/[\t ]*\([a-zA-Z0-9]*\)[\t ]*\(.*\)/\1\t\2/')
 )
 "
 
-complete -c mplayer -l help -d "Display help and exit"
-complete -c mplayer -l version -d "Display version and exit"
+complete -c mplayer -l help -d (_ "Display help and exit")
+complete -c mplayer -l version -d (_ "Display version and exit")
 
 set -e mplayer_lang

init/completions/mv.fish

@@ -1,12 +1,12 @@
-complete -c mv -s b -l backup -d "Make backup of each existing destination file"
-complete -c mv -s f -l force -d "Do not prompt before overwriting"
-complete -c mv -s i -l interactive -d "Prompt before overwrite"
-complete -c mv -l reply -x -a "yes no query" -d "Answer for overwrite questions"
-complete -c mv -l strip-trailing-slashes -d "Remove trailing slashes from source"
-complete -c mv -s S -l suffix -r -d "Backup suffix"
-complete -c mv -l target-directory -d "Target directory" -x -a "(__fish_complete_directory (commandline -ct) 'Target directory')"
-complete -c mv -s u -l update -d "Do not overwrite newer files"
-complete -c mv -s v -l vervose -d "Explain what is done"
-complete -c mv -l help -d "Display help and exit"
-complete -c mv -l version -d "Display version and exit"
+complete -c mv -s b -l backup -d (_ "Make backup of each existing destination file")
+complete -c mv -s f -l force -d (_ "Do not prompt before overwriting")
+complete -c mv -s i -l interactive -d (_ "Prompt before overwrite")
+complete -c mv -l reply -x -a "yes no query" -d (_ "Answer for overwrite questions")
+complete -c mv -l strip-trailing-slashes -d (_ "Remove trailing slashes from source")
+complete -c mv -s S -l suffix -r -d (_ "Backup suffix")
+complete -c mv -l target-directory -d (_ "Target directory") -x -a "(__fish_complete_directory (commandline -ct) 'Target directory')"
+complete -c mv -s u -l update -d (_ "Do not overwrite newer files")
+complete -c mv -s v -l vervose -d (_ "Verbose mode")
+complete -c mv -l help -d (_ "Display help and exit")
+complete -c mv -l version -d (_ "Display version and exit")
 

init/completions/nextd.fish

@@ -1 +1 @@
-complete -c nextd -s l -d "Also print directory history"
+complete -c nextd -s l -d (_ "Also print directory history")