# British English messages for GNU diffutils # Copyright (C) 1998, 2001, 2002 Free Software Foundation, Inc. # Paul Eggert , 1998 # msgid "" msgstr "" "Project-Id-Version: GNU diffutils 2.7.8\n" "POT-Creation-Date: 2002-03-23 23:57-0800\n" "PO-Revision-Date: 2002-02-27 23:01-0800\n" "Last-Translator: Paul Eggert \n" "Language-Team: English \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=US-ASCII\n" "Content-Transfer-Encoding: 8bit\n" #: lib/c-stack.c:188 msgid "program error" msgstr "" #: lib/c-stack.c:189 msgid "stack overflow" msgstr "" #: lib/error.c:128 lib/error.c:156 msgid "Unknown system error" msgstr "" #: lib/freesoft.c:27 msgid "" "This program comes with NO WARRANTY, to the extent permitted by law.\n" "You may redistribute copies of this program\n" "under the terms of the GNU General Public License.\n" "For more information about these matters, see the file named COPYING." msgstr "" #: lib/getopt.c:693 #, c-format msgid "%s: option `%s' is ambiguous\n" msgstr "" #: lib/getopt.c:718 #, c-format msgid "%s: option `--%s' doesn't allow an argument\n" msgstr "" #: lib/getopt.c:723 #, c-format msgid "%s: option `%c%s' doesn't allow an argument\n" msgstr "" #: lib/getopt.c:741 lib/getopt.c:914 #, c-format msgid "%s: option `%s' requires an argument\n" msgstr "" # `Thou whoreson zed! Thou unnecessary letter!' -- Kent in _King Lear_ #: lib/getopt.c:770 #, c-format msgid "%s: unrecognized option `--%s'\n" msgstr "%s: unrecognised option `--%s'\n" #: lib/getopt.c:774 #, c-format msgid "%s: unrecognized option `%c%s'\n" msgstr "%s: unrecognised option `%c%s'\n" # POSIX requires the word "illegal" in the POSIX locale, but the error # is not really against the law. This is not the POSIX locale, so fix # the wording. #: lib/getopt.c:800 #, c-format msgid "%s: illegal option -- %c\n" msgstr "%s: unrecognised option `-%c'\n" #: lib/getopt.c:803 #, c-format msgid "%s: invalid option -- %c\n" msgstr "" #: lib/getopt.c:833 lib/getopt.c:963 #, c-format msgid "%s: option requires an argument -- %c\n" msgstr "" #: lib/getopt.c:880 #, c-format msgid "%s: option `-W %s' is ambiguous\n" msgstr "" #: lib/getopt.c:898 #, c-format msgid "%s: option `-W %s' doesn't allow an argument\n" msgstr "" #: lib/regex.c:1367 msgid "Success" msgstr "" #: lib/regex.c:1370 msgid "No match" msgstr "" #: lib/regex.c:1373 msgid "Invalid regular expression" msgstr "" #: lib/regex.c:1376 msgid "Invalid collation character" msgstr "" #: lib/regex.c:1379 msgid "Invalid character class name" msgstr "" #: lib/regex.c:1382 msgid "Trailing backslash" msgstr "" #: lib/regex.c:1385 msgid "Invalid back reference" msgstr "" #: lib/regex.c:1388 msgid "Unmatched [ or [^" msgstr "" #: lib/regex.c:1391 msgid "Unmatched ( or \\(" msgstr "" #: lib/regex.c:1394 msgid "Unmatched \\{" msgstr "" #: lib/regex.c:1397 msgid "Invalid content of \\{\\}" msgstr "" #: lib/regex.c:1400 msgid "Invalid range end" msgstr "" #: lib/regex.c:1403 msgid "Memory exhausted" msgstr "" #: lib/regex.c:1406 msgid "Invalid preceding regular expression" msgstr "" #: lib/regex.c:1409 msgid "Premature end of regular expression" msgstr "" #: lib/regex.c:1412 msgid "Regular expression too big" msgstr "" #: lib/regex.c:1415 msgid "Unmatched ) or \\)" msgstr "" #: lib/regex.c:8034 msgid "No previous regular expression" msgstr "" #: lib/xmalloc.c:63 msgid "memory exhausted" msgstr "" #: src/analyze.c:809 src/diff.c:1283 #, c-format msgid "Files %s and %s differ\n" msgstr "" #: src/analyze.c:812 #, c-format msgid "Binary files %s and %s differ\n" msgstr "" #: src/analyze.c:1057 src/diff3.c:1419 src/util.c:526 msgid "No newline at end of file" msgstr "" #: src/cmp.c:43 msgid "Written by Torbjorn Granlund and David MacKenzie." msgstr "" #: src/cmp.c:118 src/diff.c:817 src/diff3.c:426 src/sdiff.c:168 #, c-format msgid "Try `%s --help' for more information." msgstr "" #: src/cmp.c:137 #, c-format msgid "invalid --ignore-initial value `%s'" msgstr "" #: src/cmp.c:146 msgid "options -l and -s are incompatible" msgstr "" #: src/cmp.c:154 src/diff.c:826 src/diff3.c:434 src/sdiff.c:177 #: src/sdiff.c:313 src/sdiff.c:320 src/sdiff.c:910 src/util.c:194 #: src/util.c:286 src/util.c:293 msgid "write failed" msgstr "" #: src/cmp.c:156 src/diff.c:828 src/diff.c:1354 src/diff3.c:436 #: src/sdiff.c:179 msgid "standard output" msgstr "" #: src/cmp.c:160 msgid "-b --print-bytes Print differing bytes." msgstr "" #: src/cmp.c:161 msgid "-i SKIP --ignore-initial=SKIP Skip the first SKIP bytes of input." msgstr "" #: src/cmp.c:162 msgid "-i SKIP1:SKIP2 --ignore-initial=SKIP1:SKIP2" msgstr "" #: src/cmp.c:163 msgid "" " Skip the first SKIP1 bytes of FILE1 and the first SKIP2 bytes of FILE2." msgstr "" #: src/cmp.c:164 msgid "-l --verbose Output byte numbers and values of all differing bytes." msgstr "" #: src/cmp.c:165 msgid "-n LIMIT --bytes=LIMIT Compare at most LIMIT bytes." msgstr "" #: src/cmp.c:166 msgid "-s --quiet --silent Output nothing; yield exit status only." msgstr "" #: src/cmp.c:167 src/diff.c:904 src/diff3.c:454 src/sdiff.c:204 msgid "-v --version Output version info." msgstr "" #: src/cmp.c:168 src/diff.c:905 src/diff3.c:455 src/sdiff.c:205 msgid "--help Output this help." msgstr "" #: src/cmp.c:177 #, c-format msgid "Usage: %s [OPTION]... FILE1 [FILE2 [SKIP1 [SKIP2]]]\n" msgstr "" #: src/cmp.c:179 msgid "Compare two files byte by byte." msgstr "" #: src/cmp.c:183 msgid "SKIP1 and SKIP2 are the number of bytes to skip in each file." msgstr "" #: src/cmp.c:184 msgid "" "SKIP values may be followed by the following multiplicative suffixes:\n" "kB 1000, K 1024, MB 1,000,000, M 1,048,576,\n" "GB 1,000,000,000, G 1,073,741,824, and so on for T, P, E, Z, Y." msgstr "" #: src/cmp.c:187 msgid "If a FILE is `-' or missing, read standard input." msgstr "" #: src/cmp.c:188 src/diff.c:911 src/diff3.c:474 src/sdiff.c:223 msgid "Report bugs to ." msgstr "" #: src/cmp.c:231 #, c-format msgid "invalid --bytes value `%s'" msgstr "" #: src/cmp.c:258 src/diff.c:734 src/diff3.c:332 src/sdiff.c:558 #, c-format msgid "missing operand after `%s'" msgstr "" #: src/cmp.c:270 src/diff.c:736 src/diff3.c:334 src/sdiff.c:560 #, c-format msgid "extra operand `%s'" msgstr "" #: src/cmp.c:483 #, c-format msgid "%s %s differ: byte %s, line %s\n" msgstr "" #: src/cmp.c:501 #, c-format msgid "%s %s differ: byte %s, line %s is %3o %s %3o %s\n" msgstr "" #: src/cmp.c:549 #, c-format msgid "cmp: EOF on %s\n" msgstr "" #: src/diff.c:41 msgid "" "Written by Paul Eggert, Mike Haertel, David Hayes,\n" "Richard Stallman, and Len Tower." msgstr "" #: src/diff.c:322 #, c-format msgid "invalid context length `%s'" msgstr "" #: src/diff.c:405 msgid "pagination not supported on this host" msgstr "" #: src/diff.c:420 src/diff3.c:314 msgid "too many file label options" msgstr "" #: src/diff.c:498 #, c-format msgid "invalid width `%s'" msgstr "" #: src/diff.c:502 msgid "conflicting width options" msgstr "" #: src/diff.c:526 #, c-format msgid "invalid horizon length `%s'" msgstr "" #: src/diff.c:629 #, c-format msgid "`-%ld' option is obsolete; use `-%c %ld'" msgstr "" #: src/diff.c:641 #, c-format msgid "`-%ld' option is obsolete; omit it" msgstr "" #: src/diff.c:709 msgid "--from-file and --to-file both specified" msgstr "" #: src/diff.c:832 msgid "Compare files line by line." msgstr "" #: src/diff.c:834 msgid "-i --ignore-case Ignore case differences in file contents." msgstr "" #: src/diff.c:835 msgid "--ignore-file-name-case Ignore case when comparing file names." msgstr "" #: src/diff.c:836 msgid "--no-ignore-file-name-case Consider case when comparing file names." msgstr "" #: src/diff.c:837 src/sdiff.c:186 msgid "-E --ignore-tab-expansion Ignore changes due to tab expansion." msgstr "" #: src/diff.c:838 src/sdiff.c:187 msgid "-b --ignore-space-change Ignore changes in the amount of white space." msgstr "" #: src/diff.c:839 msgid "-w --ignore-all-space Ignore all white space." msgstr "" #: src/diff.c:840 src/sdiff.c:189 msgid "-B --ignore-blank-lines Ignore changes whose lines are all blank." msgstr "" #: src/diff.c:841 src/sdiff.c:190 msgid "" "-I RE --ignore-matching-lines=RE Ignore changes whose lines all match RE." msgstr "" #: src/diff.c:842 src/sdiff.c:191 msgid "--strip-trailing-cr Strip trailing carriage return on input." msgstr "" #: src/diff.c:844 msgid "--binary Read and write data in binary mode." msgstr "" #: src/diff.c:846 src/diff3.c:450 src/sdiff.c:192 msgid "-a --text Treat all files as text." msgstr "" #: src/diff.c:848 msgid "" "-c -C NUM --context[=NUM] Output NUM (default 3) lines of copied " "context.\n" "-u -U NUM --unified[=NUM] Output NUM (default 3) lines of unified " "context.\n" " --label LABEL Use LABEL instead of file name.\n" " -p --show-c-function Show which C function each change is in.\n" " -F RE --show-function-line=RE Show the most recent line matching RE." msgstr "" #: src/diff.c:853 msgid "-q --brief Output only whether files differ." msgstr "" #: src/diff.c:854 msgid "-e --ed Output an ed script." msgstr "" #: src/diff.c:855 msgid "--normal Output a normal diff." msgstr "" #: src/diff.c:856 msgid "-n --rcs Output an RCS format diff." msgstr "" #: src/diff.c:857 msgid "" "-y --side-by-side Output in two columns.\n" " -W NUM --width=NUM Output at most NUM (default 130) print columns.\n" " --left-column Output only the left column of common lines.\n" " --suppress-common-lines Do not output common lines." msgstr "" #: src/diff.c:861 msgid "-D NAME --ifdef=NAME Output merged file to show `#ifdef NAME' diffs." msgstr "" #: src/diff.c:862 msgid "" "--GTYPE-group-format=GFMT Similar, but format GTYPE input groups with GFMT." msgstr "" #: src/diff.c:863 msgid "--line-format=LFMT Similar, but format all input lines with LFMT." msgstr "" #: src/diff.c:864 msgid "" "--LTYPE-line-format=LFMT Similar, but format LTYPE input lines with LFMT." msgstr "" #: src/diff.c:865 msgid " LTYPE is `old', `new', or `unchanged'. GTYPE is LTYPE or `changed'." msgstr "" #: src/diff.c:866 msgid "" " GFMT may contain:\n" " %< lines from FILE1\n" " %> lines from FILE2\n" " %= lines common to FILE1 and FILE2\n" " %[-][WIDTH][.[PREC]]{doxX}LETTER printf-style spec for LETTER\n" " LETTERs are as follows for new group, lower case for old group:\n" " F first line number\n" " L last line number\n" " N number of lines = L-F+1\n" " E F-1\n" " M L+1" msgstr "" #: src/diff.c:877 msgid "" " LFMT may contain:\n" " %L contents of line\n" " %l contents of line, excluding any trailing newline\n" " %[-][WIDTH][.[PREC]]{doxX}n printf-style spec for input line number" msgstr "" #: src/diff.c:881 msgid "" " Either GFMT or LFMT may contain:\n" " %% %\n" " %c'C' the single character C\n" " %c'\\OOO' the character with octal code OOO" msgstr "" #: src/diff.c:886 msgid "-l --paginate Pass the output through `pr' to paginate it." msgstr "" #: src/diff.c:887 src/sdiff.c:198 msgid "-t --expand-tabs Expand tabs to spaces in output." msgstr "" #: src/diff.c:888 src/diff3.c:451 msgid "-T --initial-tab Make tabs line up by prepending a tab." msgstr "" #: src/diff.c:890 msgid "-r --recursive Recursively compare any subdirectories found." msgstr "" #: src/diff.c:891 msgid "-N --new-file Treat absent files as empty." msgstr "" #: src/diff.c:892 msgid "--unidirectional-new-file Treat absent first files as empty." msgstr "" #: src/diff.c:893 msgid "-s --report-identical-files Report when two files are the same." msgstr "" #: src/diff.c:894 msgid "-x PAT --exclude=PAT Exclude files that match PAT." msgstr "" #: src/diff.c:895 msgid "" "-X FILE --exclude-from=FILE Exclude files that match any pattern in FILE." msgstr "" #: src/diff.c:896 msgid "" "-S FILE --starting-file=FILE Start with FILE when comparing directories." msgstr "" #: src/diff.c:897 msgid "" "--from-file=FILE1 Compare FILE1 to all operands. FILE1 can be a directory." msgstr "" #: src/diff.c:898 msgid "" "--to-file=FILE2 Compare all operands to FILE2. FILE2 can be a directory." msgstr "" #: src/diff.c:900 msgid "--horizon-lines=NUM Keep NUM lines of the common prefix and suffix." msgstr "" #: src/diff.c:901 src/sdiff.c:200 msgid "-d --minimal Try hard to find a smaller set of changes." msgstr "" #: src/diff.c:902 msgid "" "--speed-large-files Assume large files and many scattered small changes." msgstr "" #: src/diff.c:907 msgid "" "FILES are `FILE1 FILE2' or `DIR1 DIR2' or `DIR FILE...' or `FILE... DIR'." msgstr "" #: src/diff.c:908 msgid "" "If --from-file or --to-file is given, there are no restrictions on FILES." msgstr "" #: src/diff.c:909 src/diff3.c:473 src/sdiff.c:222 msgid "If a FILE is `-', read standard input." msgstr "" #: src/diff.c:920 #, c-format msgid "Usage: %s [OPTION]... FILES\n" msgstr "" #: src/diff.c:949 #, c-format msgid "conflicting %s option value `%s'" msgstr "" #: src/diff.c:962 msgid "conflicting output style options" msgstr "" #: src/diff.c:976 msgid "regular empty file" msgstr "" #: src/diff.c:976 msgid "regular file" msgstr "" #: src/diff.c:978 msgid "directory" msgstr "" #: src/diff.c:981 msgid "block special file" msgstr "" #: src/diff.c:984 msgid "character special file" msgstr "" #: src/diff.c:987 msgid "fifo" msgstr "" #: src/diff.c:991 msgid "socket" msgstr "" #: src/diff.c:994 msgid "message queue" msgstr "" #: src/diff.c:997 msgid "semaphore" msgstr "" #: src/diff.c:1000 msgid "shared memory object" msgstr "" #: src/diff.c:1003 msgid "typed memory object" msgstr "" #: src/diff.c:1006 msgid "weird file" msgstr "" #: src/diff.c:1070 src/diff.c:1256 #, c-format msgid "Only in %s: %s\n" msgstr "" #: src/diff.c:1193 msgid "cannot compare `-' to a directory" msgstr "" #: src/diff.c:1220 msgid "-D option not supported with directories" msgstr "" #: src/diff.c:1229 #, c-format msgid "Common subdirectories: %s and %s\n" msgstr "" #: src/diff.c:1266 #, c-format msgid "File %s is a %s while file %s is a %s\n" msgstr "" #: src/diff.c:1345 #, c-format msgid "Files %s and %s are identical\n" msgstr "" #: src/diff3.c:26 msgid "Written by Randy Smith." msgstr "" #: src/diff3.c:327 msgid "incompatible options" msgstr "" #: src/diff3.c:367 msgid "`-' specified for more than one input file" msgstr "" #: src/diff3.c:407 src/diff3.c:1234 src/diff3.c:1651 src/diff3.c:1706 #: src/sdiff.c:305 src/sdiff.c:879 src/sdiff.c:890 msgid "read failed" msgstr "" #: src/diff3.c:440 msgid "-e --ed Output unmerged changes from OLDFILE to YOURFILE into MYFILE." msgstr "" #: src/diff3.c:441 msgid "-E --show-overlap Output unmerged changes, bracketing conflicts." msgstr "" #: src/diff3.c:442 msgid "-A --show-all Output all changes, bracketing conflicts." msgstr "" #: src/diff3.c:443 msgid "-x --overlap-only Output overlapping changes." msgstr "" #: src/diff3.c:444 msgid "-X Output overlapping changes, bracketing them." msgstr "" #: src/diff3.c:445 msgid "-3 --easy-only Output unmerged nonoverlapping changes." msgstr "" #: src/diff3.c:447 msgid "-m --merge Output merged file instead of ed script (default -A)." msgstr "" #: src/diff3.c:448 msgid "-L LABEL --label=LABEL Use LABEL instead of file name." msgstr "" #: src/diff3.c:449 msgid "-i Append `w' and `q' commands to ed scripts." msgstr "" #: src/diff3.c:452 src/sdiff.c:202 msgid "--diff-program=PROGRAM Use PROGRAM to compare files." msgstr "" #: src/diff3.c:464 #, c-format msgid "Usage: %s [OPTION]... MYFILE OLDFILE YOURFILE\n" msgstr "" #: src/diff3.c:466 msgid "Compare three files line by line." msgstr "" #: src/diff3.c:672 msgid "internal error: screwup in format of diff blocks" msgstr "" #: src/diff3.c:970 #, c-format msgid "%s: diff failed: " msgstr "" #: src/diff3.c:992 msgid "internal error: invalid diff type in process_diff" msgstr "" #: src/diff3.c:1017 msgid "invalid diff format; invalid change separator" msgstr "" #: src/diff3.c:1248 msgid "invalid diff format; incomplete last line" msgstr "" #: src/diff3.c:1271 src/sdiff.c:273 #, c-format msgid "subsidiary program `%s' not executable" msgstr "" #: src/diff3.c:1274 src/sdiff.c:276 src/util.c:298 #, c-format msgid "subsidiary program `%s' not found" msgstr "" #: src/diff3.c:1278 src/sdiff.c:268 src/util.c:301 #, c-format msgid "subsidiary program `%s' failed" msgstr "" #: src/diff3.c:1300 msgid "invalid diff format; incorrect leading line chars" msgstr "" #: src/diff3.c:1376 msgid "internal error: invalid diff type passed to output" msgstr "" #: src/diff3.c:1653 src/diff3.c:1710 msgid "input file shrank" msgstr "" #: src/dir.c:162 #, c-format msgid "cannot compare file names `%s' and `%s'" msgstr "" #: src/sdiff.c:35 msgid "Written by Thomas Lord." msgstr "" #: src/sdiff.c:183 msgid "-o FILE --output=FILE Operate interactively, sending output to FILE." msgstr "" #: src/sdiff.c:185 msgid "-i --ignore-case Consider upper- and lower-case to be the same." msgstr "" #: src/sdiff.c:188 msgid "-W --ignore-all-space Ignore all white space." msgstr "" #: src/sdiff.c:194 msgid "-w NUM --width=NUM Output at most NUM (default 130) columns per line." msgstr "" #: src/sdiff.c:195 msgid "-l --left-column Output only the left column of common lines." msgstr "" #: src/sdiff.c:196 msgid "-s --suppress-common-lines Do not output common lines." msgstr "" #: src/sdiff.c:201 msgid "" "-H --speed-large-files Assume large files and many scattered small changes." msgstr "" #: src/sdiff.c:214 #, c-format msgid "Usage: %s [OPTION]... FILE1 FILE2\n" msgstr "" #: src/sdiff.c:215 msgid "Side-by-side merge of file differences." msgstr "" #: src/sdiff.c:327 msgid "cannot interactively merge standard input" msgstr "" #: src/sdiff.c:588 msgid "both files to be compared are directories" msgstr "" #: src/sdiff.c:853 msgid "" "ed:\tEdit then use both versions, each decorated with a header.\n" "eb:\tEdit then use both versions.\n" "el:\tEdit then use the left version.\n" "er:\tEdit then use the right version.\n" "e:\tEdit a new version.\n" "l:\tUse the left version.\n" "r:\tUse the right version.\n" "s:\tSilently include common lines.\n" "v:\tVerbosely include common lines.\n" "q:\tQuit.\n" msgstr ""