From 48ca253097e8597f680c24eda4eb0c3e40fc82c8 Mon Sep 17 00:00:00 2001
From: axel <axel@liljencrantz.se>
Date: Sun, 4 Jun 2006 08:32:28 +1000
Subject: [PATCH] Minor spelling fixes

darcs-hash:20060603223228-ac50b-b4f7b190baf3c41bf23c224f5d68e8888dd4eaed.gz
---
 builtin.c                 | 2 +-
 share/completions/cp.fish | 6 +++---
 share/completions/mv.fish | 2 +-
 share/fish.in             | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/builtin.c b/builtin.c
index 74eb3f2aa..220f80148 100644
--- a/builtin.c
+++ b/builtin.c
@@ -2185,7 +2185,7 @@ static int builtin_fg( wchar_t **argv )
 		if( *end )
 		{
 				sb_printf( sb_err,
-						   _( L"%ls: Argument must be a number: %ls\n" ),
+						   _( L"%ls: Argument '%ls' is not a number\n" ),
 						   argv[0],
 						   argv[1] );
 				builtin_print_help( argv[0], sb_err );
diff --git a/share/completions/cp.fish b/share/completions/cp.fish
index b6bbecbd5..4139cf490 100644
--- a/share/completions/cp.fish
+++ b/share/completions/cp.fish
@@ -15,9 +15,9 @@ complete -c cp -l help -d (N_ "Display help and exit")
 complete -c cp -l version -d (N_ "Display version and exit")
 complete -c cp -s L -l dereference -d (N_ "Always follow symbolic links")
 complete -c cp -s P -l no-dereference -d (N_ "Never follow symbolic links")
-complete -c cp -s p  -d (N_ ""Same as --preserve=mode,ownership,timestamps)
-complete -c cp -l preserve -d (N_ "Preserve the specified attributes (default: mode,ownership,timestamps) and security contexts, if possible additional attributes: links, all")
-complete -c cp -l no-preserve -r -d (N_ "Don't preserve the specified attributes")
+complete -c cp -s p  -d (N_ "Same as --preserve=mode,ownership,timestamps")
+complete -c cp -l preserve -d (N_ "Preserve the specified attributes and security contexts, if possible") -a "mode ownership timestamps links all"
+complete -c cp -l no-preserve -r -d (N_ "Don't preserve the specified attributes") -a "mode ownership timestamps links all"
 complete -c cp -l parents -d (N_ "Use full source file name under DIRECTORY")
 complete -c cp -s r -s R -l recursive -d (N_ "Copy directories recursively")
 complete -c cp -l remove-destination -d (N_ "Remove each existing destination file before attempting to open it (contrast with --force)")
diff --git a/share/completions/mv.fish b/share/completions/mv.fish
index 5ceefa60c..26b375825 100644
--- a/share/completions/mv.fish
+++ b/share/completions/mv.fish
@@ -6,7 +6,7 @@ complete -c mv -l strip-trailing-slashes -d (N_ "Remove trailing slashes from so
 complete -c mv -s S -l suffix -r -d (N_ "Backup suffix")
 complete -c mv -l target-directory -d (N_ "Target directory") -x -a "(__fish_complete_directory (commandline -ct) 'Target directory')"
 complete -c mv -s u -l update -d (N_ "Do not overwrite newer files")
-complete -c mv -s v -l vervose -d (N_ "Verbose mode")
+complete -c mv -s v -l verbose -d (N_ "Verbose mode")
 complete -c mv -l help -d (N_ "Display help and exit")
 complete -c mv -l version -d (N_ "Display version and exit")
 
diff --git a/share/fish.in b/share/fish.in
index 1028b32f9..a4226237d 100644
--- a/share/fish.in
+++ b/share/fish.in
@@ -19,7 +19,7 @@ for idx in (seq (count $PATH))
    set i $PATH[$idx]
    if not test -d $i
        set erase_idx $erase_idx $idx
-       printf (_ '%s: Warning: The directory %s has been removed from your PATH, because it does not exist\n') fish $i
+       printf (_ '%s: Warning: The directory %s has been removed from your PATH because it does not exist\n') fish $i
    end
 end