1 # British English messages for GNU diffutils
2 # Copyright (C) 1998, 2001, 2002 Free Software Foundation, Inc.
3 # Paul Eggert <eggert@twinsun.com>, 1998
7 "Project-Id-Version: GNU diffutils 2.7.8\n"
8 "POT-Creation-Date: 2002-04-05 14:10-0800\n"
9 "PO-Revision-Date: 2002-02-27 23:01-0800\n"
10 "Last-Translator: Paul Eggert <eggert@twinsun.com>\n"
11 "Language-Team: English <en@translate.freefriends.org>\n"
13 "Content-Type: text/plain; charset=US-ASCII\n"
14 "Content-Transfer-Encoding: 8bit\n"
21 msgid "stack overflow"
24 #: lib/error.c:128 lib/error.c:156
25 msgid "Unknown system error"
30 "This program comes with NO WARRANTY, to the extent permitted by law.\n"
31 "You may redistribute copies of this program\n"
32 "under the terms of the GNU General Public License.\n"
33 "For more information about these matters, see the file named COPYING."
38 msgid "%s: option `%s' is ambiguous\n"
43 msgid "%s: option `--%s' doesn't allow an argument\n"
48 msgid "%s: option `%c%s' doesn't allow an argument\n"
51 #: lib/getopt.c:741 lib/getopt.c:914
53 msgid "%s: option `%s' requires an argument\n"
56 # `Thou whoreson zed! Thou unnecessary letter!' -- Kent in _King Lear_
59 msgid "%s: unrecognized option `--%s'\n"
60 msgstr "%s: unrecognised option `--%s'\n"
64 msgid "%s: unrecognized option `%c%s'\n"
65 msgstr "%s: unrecognised option `%c%s'\n"
67 # POSIX requires the word "illegal" in the POSIX locale, but the error
68 # is not really against the law. This is not the POSIX locale, so fix
72 msgid "%s: illegal option -- %c\n"
73 msgstr "%s: unrecognised option `-%c'\n"
77 msgid "%s: invalid option -- %c\n"
80 #: lib/getopt.c:833 lib/getopt.c:963
82 msgid "%s: option requires an argument -- %c\n"
87 msgid "%s: option `-W %s' is ambiguous\n"
92 msgid "%s: option `-W %s' doesn't allow an argument\n"
104 msgid "Invalid regular expression"
108 msgid "Invalid collation character"
112 msgid "Invalid character class name"
116 msgid "Trailing backslash"
120 msgid "Invalid back reference"
124 msgid "Unmatched [ or [^"
128 msgid "Unmatched ( or \\("
132 msgid "Unmatched \\{"
136 msgid "Invalid content of \\{\\}"
140 msgid "Invalid range end"
144 msgid "Memory exhausted"
148 msgid "Invalid preceding regular expression"
152 msgid "Premature end of regular expression"
156 msgid "Regular expression too big"
160 msgid "Unmatched ) or \\)"
164 msgid "No previous regular expression"
168 msgid "memory exhausted"
171 #: src/analyze.c:809 src/diff.c:1283
173 msgid "Files %s and %s differ\n"
178 msgid "Binary files %s and %s differ\n"
181 #: src/analyze.c:1058 src/diff3.c:1413 src/util.c:526
182 msgid "No newline at end of file"
186 msgid "Written by Torbjorn Granlund and David MacKenzie."
189 #: src/cmp.c:118 src/diff.c:817 src/diff3.c:427 src/sdiff.c:168
191 msgid "Try `%s --help' for more information."
196 msgid "invalid --ignore-initial value `%s'"
200 msgid "options -l and -s are incompatible"
203 #: src/cmp.c:154 src/diff.c:826 src/diff3.c:435 src/sdiff.c:177
204 #: src/sdiff.c:313 src/sdiff.c:320 src/sdiff.c:910 src/util.c:194
205 #: src/util.c:286 src/util.c:293
209 #: src/cmp.c:156 src/diff.c:828 src/diff.c:1354 src/diff3.c:437
211 msgid "standard output"
215 msgid "-b --print-bytes Print differing bytes."
219 msgid "-i SKIP --ignore-initial=SKIP Skip the first SKIP bytes of input."
223 msgid "-i SKIP1:SKIP2 --ignore-initial=SKIP1:SKIP2"
228 " Skip the first SKIP1 bytes of FILE1 and the first SKIP2 bytes of FILE2."
232 msgid "-l --verbose Output byte numbers and values of all differing bytes."
236 msgid "-n LIMIT --bytes=LIMIT Compare at most LIMIT bytes."
240 msgid "-s --quiet --silent Output nothing; yield exit status only."
243 #: src/cmp.c:167 src/diff.c:904 src/diff3.c:455 src/sdiff.c:204
244 msgid "-v --version Output version info."
247 #: src/cmp.c:168 src/diff.c:905 src/diff3.c:456 src/sdiff.c:205
248 msgid "--help Output this help."
253 msgid "Usage: %s [OPTION]... FILE1 [FILE2 [SKIP1 [SKIP2]]]\n"
257 msgid "Compare two files byte by byte."
261 msgid "SKIP1 and SKIP2 are the number of bytes to skip in each file."
266 "SKIP values may be followed by the following multiplicative suffixes:\n"
267 "kB 1000, K 1024, MB 1,000,000, M 1,048,576,\n"
268 "GB 1,000,000,000, G 1,073,741,824, and so on for T, P, E, Z, Y."
272 msgid "If a FILE is `-' or missing, read standard input."
275 #: src/cmp.c:188 src/diff.c:911 src/diff3.c:475 src/sdiff.c:223
276 msgid "Report bugs to <bug-gnu-utils@gnu.org>."
281 msgid "invalid --bytes value `%s'"
284 #: src/cmp.c:258 src/diff.c:734 src/diff3.c:333 src/sdiff.c:558
286 msgid "missing operand after `%s'"
289 #: src/cmp.c:270 src/diff.c:736 src/diff3.c:335 src/sdiff.c:560
291 msgid "extra operand `%s'"
296 msgid "%s %s differ: byte %s, line %s\n"
301 msgid "%s %s differ: byte %s, line %s is %3o %s %3o %s\n"
306 msgid "cmp: EOF on %s\n"
311 "Written by Paul Eggert, Mike Haertel, David Hayes,\n"
312 "Richard Stallman, and Len Tower."
317 msgid "invalid context length `%s'"
321 msgid "pagination not supported on this host"
324 #: src/diff.c:420 src/diff3.c:315
325 msgid "too many file label options"
330 msgid "invalid width `%s'"
334 msgid "conflicting width options"
339 msgid "invalid horizon length `%s'"
344 msgid "`-%ld' option is obsolete; use `-%c %ld'"
349 msgid "`-%ld' option is obsolete; omit it"
353 msgid "--from-file and --to-file both specified"
357 msgid "Compare files line by line."
361 msgid "-i --ignore-case Ignore case differences in file contents."
365 msgid "--ignore-file-name-case Ignore case when comparing file names."
369 msgid "--no-ignore-file-name-case Consider case when comparing file names."
372 #: src/diff.c:837 src/sdiff.c:186
373 msgid "-E --ignore-tab-expansion Ignore changes due to tab expansion."
376 #: src/diff.c:838 src/sdiff.c:187
377 msgid "-b --ignore-space-change Ignore changes in the amount of white space."
381 msgid "-w --ignore-all-space Ignore all white space."
384 #: src/diff.c:840 src/sdiff.c:189
385 msgid "-B --ignore-blank-lines Ignore changes whose lines are all blank."
388 #: src/diff.c:841 src/sdiff.c:190
390 "-I RE --ignore-matching-lines=RE Ignore changes whose lines all match RE."
393 #: src/diff.c:842 src/sdiff.c:191
394 msgid "--strip-trailing-cr Strip trailing carriage return on input."
398 msgid "--binary Read and write data in binary mode."
401 #: src/diff.c:846 src/diff3.c:451 src/sdiff.c:192
402 msgid "-a --text Treat all files as text."
407 "-c -C NUM --context[=NUM] Output NUM (default 3) lines of copied "
409 "-u -U NUM --unified[=NUM] Output NUM (default 3) lines of unified "
411 " --label LABEL Use LABEL instead of file name.\n"
412 " -p --show-c-function Show which C function each change is in.\n"
413 " -F RE --show-function-line=RE Show the most recent line matching RE."
417 msgid "-q --brief Output only whether files differ."
421 msgid "-e --ed Output an ed script."
425 msgid "--normal Output a normal diff."
429 msgid "-n --rcs Output an RCS format diff."
434 "-y --side-by-side Output in two columns.\n"
435 " -W NUM --width=NUM Output at most NUM (default 130) print columns.\n"
436 " --left-column Output only the left column of common lines.\n"
437 " --suppress-common-lines Do not output common lines."
441 msgid "-D NAME --ifdef=NAME Output merged file to show `#ifdef NAME' diffs."
446 "--GTYPE-group-format=GFMT Similar, but format GTYPE input groups with GFMT."
450 msgid "--line-format=LFMT Similar, but format all input lines with LFMT."
455 "--LTYPE-line-format=LFMT Similar, but format LTYPE input lines with LFMT."
459 msgid " LTYPE is `old', `new', or `unchanged'. GTYPE is LTYPE or `changed'."
464 " GFMT may contain:\n"
465 " %< lines from FILE1\n"
466 " %> lines from FILE2\n"
467 " %= lines common to FILE1 and FILE2\n"
468 " %[-][WIDTH][.[PREC]]{doxX}LETTER printf-style spec for LETTER\n"
469 " LETTERs are as follows for new group, lower case for old group:\n"
470 " F first line number\n"
471 " L last line number\n"
472 " N number of lines = L-F+1\n"
479 " LFMT may contain:\n"
480 " %L contents of line\n"
481 " %l contents of line, excluding any trailing newline\n"
482 " %[-][WIDTH][.[PREC]]{doxX}n printf-style spec for input line number"
487 " Either GFMT or LFMT may contain:\n"
489 " %c'C' the single character C\n"
490 " %c'\\OOO' the character with octal code OOO"
494 msgid "-l --paginate Pass the output through `pr' to paginate it."
497 #: src/diff.c:887 src/sdiff.c:198
498 msgid "-t --expand-tabs Expand tabs to spaces in output."
501 #: src/diff.c:888 src/diff3.c:452
502 msgid "-T --initial-tab Make tabs line up by prepending a tab."
506 msgid "-r --recursive Recursively compare any subdirectories found."
510 msgid "-N --new-file Treat absent files as empty."
514 msgid "--unidirectional-new-file Treat absent first files as empty."
518 msgid "-s --report-identical-files Report when two files are the same."
522 msgid "-x PAT --exclude=PAT Exclude files that match PAT."
527 "-X FILE --exclude-from=FILE Exclude files that match any pattern in FILE."
532 "-S FILE --starting-file=FILE Start with FILE when comparing directories."
537 "--from-file=FILE1 Compare FILE1 to all operands. FILE1 can be a directory."
542 "--to-file=FILE2 Compare all operands to FILE2. FILE2 can be a directory."
546 msgid "--horizon-lines=NUM Keep NUM lines of the common prefix and suffix."
549 #: src/diff.c:901 src/sdiff.c:200
550 msgid "-d --minimal Try hard to find a smaller set of changes."
555 "--speed-large-files Assume large files and many scattered small changes."
560 "FILES are `FILE1 FILE2' or `DIR1 DIR2' or `DIR FILE...' or `FILE... DIR'."
565 "If --from-file or --to-file is given, there are no restrictions on FILES."
568 #: src/diff.c:909 src/diff3.c:474 src/sdiff.c:222
569 msgid "If a FILE is `-', read standard input."
574 msgid "Usage: %s [OPTION]... FILES\n"
579 msgid "conflicting %s option value `%s'"
583 msgid "conflicting output style options"
587 msgid "regular empty file"
599 msgid "block special file"
603 msgid "character special file"
615 msgid "message queue"
623 msgid "shared memory object"
627 msgid "typed memory object"
634 #: src/diff.c:1070 src/diff.c:1256
636 msgid "Only in %s: %s\n"
640 msgid "cannot compare `-' to a directory"
644 msgid "-D option not supported with directories"
649 msgid "Common subdirectories: %s and %s\n"
654 msgid "File %s is a %s while file %s is a %s\n"
659 msgid "Files %s and %s are identical\n"
663 msgid "Written by Randy Smith."
667 msgid "incompatible options"
671 msgid "`-' specified for more than one input file"
674 #: src/diff3.c:408 src/diff3.c:1232 src/diff3.c:1645 src/diff3.c:1700
675 #: src/sdiff.c:305 src/sdiff.c:879 src/sdiff.c:890
680 msgid "-e --ed Output unmerged changes from OLDFILE to YOURFILE into MYFILE."
684 msgid "-E --show-overlap Output unmerged changes, bracketing conflicts."
688 msgid "-A --show-all Output all changes, bracketing conflicts."
692 msgid "-x --overlap-only Output overlapping changes."
696 msgid "-X Output overlapping changes, bracketing them."
700 msgid "-3 --easy-only Output unmerged nonoverlapping changes."
704 msgid "-m --merge Output merged file instead of ed script (default -A)."
708 msgid "-L LABEL --label=LABEL Use LABEL instead of file name."
712 msgid "-i Append `w' and `q' commands to ed scripts."
715 #: src/diff3.c:453 src/sdiff.c:202
716 msgid "--diff-program=PROGRAM Use PROGRAM to compare files."
721 msgid "Usage: %s [OPTION]... MYFILE OLDFILE YOURFILE\n"
725 msgid "Compare three files line by line."
729 msgid "internal error: screwup in format of diff blocks"
734 msgid "%s: diff failed: "
738 msgid "internal error: invalid diff type in process_diff"
742 msgid "invalid diff format; invalid change separator"
746 msgid "invalid diff format; incomplete last line"
749 #: src/diff3.c:1265 src/sdiff.c:273
751 msgid "subsidiary program `%s' not executable"
754 #: src/diff3.c:1268 src/sdiff.c:276 src/util.c:298
756 msgid "subsidiary program `%s' not found"
759 #: src/diff3.c:1272 src/sdiff.c:268 src/util.c:301
761 msgid "subsidiary program `%s' failed"
765 msgid "invalid diff format; incorrect leading line chars"
769 msgid "internal error: invalid diff type passed to output"
772 #: src/diff3.c:1647 src/diff3.c:1704
773 msgid "input file shrank"
778 msgid "cannot compare file names `%s' and `%s'"
782 msgid "Written by Thomas Lord."
786 msgid "-o FILE --output=FILE Operate interactively, sending output to FILE."
790 msgid "-i --ignore-case Consider upper- and lower-case to be the same."
794 msgid "-W --ignore-all-space Ignore all white space."
798 msgid "-w NUM --width=NUM Output at most NUM (default 130) columns per line."
802 msgid "-l --left-column Output only the left column of common lines."
806 msgid "-s --suppress-common-lines Do not output common lines."
811 "-H --speed-large-files Assume large files and many scattered small changes."
816 msgid "Usage: %s [OPTION]... FILE1 FILE2\n"
820 msgid "Side-by-side merge of file differences."
824 msgid "cannot interactively merge standard input"
828 msgid "both files to be compared are directories"
833 "ed:\tEdit then use both versions, each decorated with a header.\n"
834 "eb:\tEdit then use both versions.\n"
835 "el:\tEdit then use the left version.\n"
836 "er:\tEdit then use the right version.\n"
837 "e:\tEdit a new version.\n"
838 "l:\tUse the left version.\n"
839 "r:\tUse the right version.\n"
840 "s:\tSilently include common lines.\n"
841 "v:\tVerbosely include common lines.\n"