1 # English (British) translation.
2 # Copyright (C) 2004 Free Software Foundation, Inc.
3 # Gareth Owen <gowen72@yahoo.com>, 2004.
7 "Project-Id-Version: wdiff 0.5g\n"
8 "Report-Msgid-Bugs-To: wdiff-bugs@gnu.org\n"
9 "POT-Creation-Date: 2013-03-09 02:55+0100\n"
10 "PO-Revision-Date: 2010-02-01 20:21+0100\n"
11 "Last-Translator: Gareth Owen <gowen72@yahoo.com>\n"
12 "Language-Team: English (British) <en_gb@li.org>\n"
15 "Content-Type: text/plain; charset=UTF-8\n"
16 "Content-Transfer-Encoding: 8-bit\n"
20 msgid "%s (for regexp `%s')"
21 msgstr "%s (for regexp `%s')"
23 #: src/mdiff.c:890 src/wdiff.c:1473
25 msgid "only one file may be standard input"
26 msgstr "Only one file may be standard input."
28 #: src/mdiff.c:905 src/wdiff.c:678
30 msgid "directories not supported"
31 msgstr "Directories not supported"
41 msgid_plural ", %d items\n"
42 msgstr[0] ", %d items\n"
43 msgstr[1] ", %d items\n"
53 msgid_plural " %d files,"
54 msgstr[0] ", %d items\n"
55 msgstr[1] ", %d items\n"
60 msgid_plural " %d items\n"
61 msgstr[0] ", %d items\n"
62 msgstr[1] ", %d items\n"
74 #: src/mdiff.c:1833 src/mdiff.c:1895
81 msgid "Sorting members"
82 msgstr "Sorting members"
84 #: src/mdiff.c:1915 src/mdiff.c:2298
89 #: src/mdiff.c:1916 src/mdiff.c:2299
92 msgid_plural " %d clusters,"
93 msgstr[0] ", clustering"
94 msgstr[1] ", clustering"
99 msgid_plural " %d members\n"
100 msgstr[0] ", %d items\n"
101 msgstr[1] ", %d items\n"
106 msgid_plural " %d members,"
112 msgid " %d overlap\n"
113 msgid_plural " %d overlaps\n"
117 #: src/mdiff.c:2353 src/wdiff.c:228
119 msgid "select a terminal through the TERM environment variable"
120 msgstr "Select a terminal through the TERM environment variable."
122 #: src/mdiff.c:2356 src/wdiff.c:231
124 msgid "could not access the termcap data base"
125 msgstr "Could not access the termcap data base."
127 #: src/mdiff.c:2358 src/wdiff.c:233
129 msgid "terminal type `%s' is not defined"
130 msgstr "Terminal type `%s' is not defined."
132 #: src/mdiff.c:3709 src/mdiff.c:3725 src/wdiff.c:1167 src/wdiff.c:1183
135 msgid_plural "%s: %d words"
136 msgstr[0] "%s: %d words"
137 msgstr[1] "%s: %d words"
139 #: src/mdiff.c:3713 src/mdiff.c:3729 src/wdiff.c:1171 src/wdiff.c:1187
141 msgid " %d %.0f%% common"
142 msgid_plural " %d %.0f%% common"
143 msgstr[0] " %d %d%% common"
144 msgstr[1] " %d %d%% common"
146 #: src/mdiff.c:3716 src/wdiff.c:1174
148 msgid " %d %.0f%% deleted"
149 msgid_plural " %d %.0f%% deleted"
150 msgstr[0] " %d %d%% deleted"
151 msgstr[1] " %d %d%% deleted"
153 #: src/mdiff.c:3719 src/mdiff.c:3735 src/wdiff.c:1177 src/wdiff.c:1193
155 msgid " %d %.0f%% changed"
156 msgid_plural " %d %.0f%% changed"
157 msgstr[0] " %d %d%% changed"
158 msgstr[1] " %d %d%% changed"
160 #: src/mdiff.c:3732 src/wdiff.c:1190
162 msgid " %d %.0f%% inserted"
163 msgid_plural " %d %.0f%% inserted"
164 msgstr[0] " %d %d%% inserted"
165 msgstr[1] " %d %d%% inserted"
167 #: src/mdiff.c:3763 src/wdiff.c:1233 src/wdiff2.c:172
169 msgid "Try `%s --help' for more information.\n"
170 msgstr "Try `%s --help' for more information.\n"
174 "mdiff - Studies multiple files and searches for similar sequences, it then\n"
175 "produces possibly detailed lists of differences and similarities.\n"
177 "mdiff - Studies multiple files and searches for similar sequences, it then\n"
178 "produces possibly detailed lists of differences and similarities.\n"
182 msgid "Usage: %s [OPTION]... [FILE]...\n"
183 msgstr "Usage: %s [OPTION]... [FILE]...\n"
196 msgid " -h (ignored)\n"
197 msgstr " -h (ignored)\n"
201 msgid " -v, --verbose report a few statistics on stderr\n"
202 msgstr " -v, --verbose report a few statistics on stderr\n"
204 #: src/mdiff.c:3780 src/unify.c:295
206 msgid " --help display this help then exit\n"
207 msgstr " --help display this help and exit\n"
209 #: src/mdiff.c:3781 src/unify.c:296
211 msgid " --version display program version then exit\n"
212 msgstr " --version output version information and exit\n"
218 "Formatting output:\n"
221 "Formatting output:\n"
225 msgid " -T, --initial-tab produce TAB instead of initial space\n"
226 msgstr " -T, --initial-tab produce TAB instead of initial space\n"
230 msgid " -l, --paginate paginate output through `pr'\n"
231 msgstr " -l, --paginate paginate output through `pr'\n"
235 msgid " -S, --string[=STRING] take note of another user STRING\n"
236 msgstr " -S, --string[=STRING] take note of another user STRING\n"
241 " -V, --show-links give file and line references in annotations\n"
243 " -V, --show-links give file and line references in annotations\n"
247 msgid " -t, --expand-tabs expand tabs to spaces in the output\n"
248 msgstr " -t, --expand-tabs expand tabs to spaces in the output\n"
261 msgid " -0, --debugging output many details about what is going on\n"
262 msgstr " -0, --debugging output many details about what is going on\n"
268 "Word mode options:\n"
271 "Word mode options:\n"
273 #: src/mdiff.c:3796 src/wdiff.c:1251 src/wdiff2.c:190
275 msgid " -1, --no-deleted inhibit output of deleted words\n"
276 msgstr " -1, --no-deleted inhibit output of deleted words\n"
278 #: src/mdiff.c:3797 src/wdiff.c:1252 src/wdiff2.c:191
280 msgid " -2, --no-inserted inhibit output of inserted words\n"
281 msgstr " -2, --no-inserted inhibit output of inserted words\n"
283 #: src/mdiff.c:3798 src/wdiff.c:1253 src/wdiff2.c:192
285 msgid " -3, --no-common inhibit output of common words\n"
286 msgstr " -3, --no-common inhibit output of common words\n"
290 msgid " -A, --auto-pager automatically calls a pager\n"
291 msgstr " -A, --auto-pager automatically calls a pager\n"
295 msgid " -k, --less-mode variation of printer mode for \"less\"\n"
296 msgstr " -k, --less-mode variation of printer mode for \"less\"\n"
300 msgid " -m, --avoid-wraps do not extend fields through newlines\n"
301 msgstr " -m, --avoid-wraps do not extend fields through newlines\n"
305 msgid " -o, --printer overstrike as for printers\n"
306 msgstr " -o, --printer overstrike as for printers\n"
310 msgid " -z, --terminal use termcap as for terminal displays\n"
311 msgstr " -z, --terminal use termcap as for terminal displays\n"
315 msgid " -O, --item-regexp=REGEXP compare items as defined by REGEXP\n"
316 msgstr " -O, --item-regexp=REGEXP compare items as defined by REGEXP\n"
320 msgid " -W, --word-mode compare words instead of lines\n"
321 msgstr " -W, --word-mode compare words instead of lines\n"
325 msgid "With no FILE, or when FILE is -, read standard input.\n"
326 msgstr "With no FILE, or when FILE is -, read standard input.\n"
328 #: src/mdiff.c:3992 src/unify.c:300 src/wdiff.c:1269 src/wdiff2.c:210
330 msgid "Report bugs to <wdiff-bugs@gnu.org>.\n"
331 msgstr "Report bugs to <wdiff-bugs@gnu.org>.\n"
335 msgid "ignoring option %s (not implemented)"
340 msgid "cannot use -z, termcap not available"
341 msgstr "Cannot use -z, termcap not available."
345 msgid "word merging for two files only (so far)"
346 msgstr "Word merging for two files only (so far)"
352 "Copyright (C) 1992, 1997, 1998, 1999, 2010 Free Software Foundation, Inc.\n"
355 "Copyright (C) 1992, 1997 Free Software Foundation, Inc.\n"
357 #: src/mdiff.c:4358 src/unify.c:407 src/wdiff.c:1395 src/wdiff2.c:131
359 "This is free software; see the source for copying conditions. There is NO\n"
360 "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
362 "This is free software; see the source for copying conditions. There is NO\n"
363 "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
365 #: src/mdiff.c:4361 src/wdiff.c:1398 src/wdiff2.c:134
368 "Written by Franc,ois Pinard <pinard@iro.umontreal.ca>.\n"
371 "Written by Franc,ois Pinard <pinard@iro.umontreal.ca>.\n"
375 msgid "options -123RSYZ meaningful only when two inputs"
376 msgstr "Options -123RSYZ meaningful only when two inputs."
380 msgid "error redirecting stream"
385 msgid "failed to execute %s"
390 msgid "could not find a name for the diff at line %ld"
391 msgstr "Could not find a name for the diff at line %ld"
395 msgid "try `%s --help' for more information\n"
396 msgstr "Try `%s --help' for more information.\n"
399 msgid "unify - Transforms context diffs into unidiffs, or vice-versa.\n"
400 msgstr "unify - Transforms context diffs into unidiffs, or vice-versa.\n"
404 msgid "Usage: %s [OPTION]... [FILE]\n"
405 msgstr "Usage: %s [OPTION]... [FILE]\n"
409 msgid " -c, --context-diffs force output to context diffs\n"
410 msgstr " -c, --context-diffs force output to context diffs\n"
414 msgid " -e, --echo-comments echo comments to standard error\n"
415 msgstr " -e, --echo-comments echo comments to standard error\n"
419 msgid " -o, --old-diffs output old-style diffs, no matter what\n"
420 msgstr " -o, --old-diffs output old-style diffs, no matter what\n"
424 msgid " -p, --patch-format generate patch format\n"
425 msgstr " -p, --patch-format generate patch format\n"
429 msgid " -P same as -p\n"
430 msgstr " -P same as -p\n"
434 msgid " -s, --strip-comments strip comment lines\n"
435 msgstr " -s, --strip-comments strip comment lines\n"
439 msgid " -u, --unidiffs force output to unidiffs\n"
440 msgstr " -u, --unidiffs force output to unidiffs\n"
444 msgid " -U same as -p and -u\n"
445 msgstr " -U same as -p and -u\n"
449 msgid " -=, --use-equals replace spaces by equal signs in unidiffs\n"
450 msgstr " -=, --use-equals replace spaces by equal signs in unidiffs\n"
454 msgid "If FILE is not specified, read standard input.\n"
455 msgstr "If FILE is not specified, read standard input.\n"
459 msgid "unable to open `%s'"
460 msgstr "Unable to open `%s'"
464 msgid "only one filename allowed"
465 msgstr "Only one filename allowed"
470 "Copyright (C) 1994, 1997 Free Software Foundation, Inc.\n"
473 "Copyright (C) 1994, 1997 Free Software Foundation, Inc.\n"
478 "Written by Wayne Davison <davison@borland.com>.\n"
481 "Written by Wayne Davison <davison@borland.com>.\n"
485 msgid "invalid unified diff header at line %ld"
486 msgstr "Invalid unified diff header at line %ld"
490 msgid "malformed unified diff at line %ld"
491 msgstr "Malformed unified diff at line %ld"
495 msgid "context diff missing `old' header at line %ld"
496 msgstr "Context diff missing `old' header at line %ld"
498 #: src/unify.c:664 src/unify.c:683 src/unify.c:753 src/unify.c:771
500 msgid "malformed context diff at line %ld"
501 msgstr "Malformed context diff at line %ld"
505 msgid "context diff missing `new' header at line %ld"
506 msgstr "Context diff missing `new' header at line %ld"
508 #: src/wdiff.c:582 src/wdiff.c:701
510 msgid "no suitable temporary directory exists"
515 msgid "%s: input program killed by signal %d\n"
520 msgid "%s: output program killed by signal %d\n"
523 #: src/wdiff.c:1210 src/wdiff2.c:109
526 "This program is free software: you can redistribute it and/or modify\n"
527 "it under the terms of the GNU General Public License as published by\n"
528 "the Free Software Foundation, either version 3 of the License, or\n"
529 "(at your option) any later version.\n"
531 "This program is distributed in the hope that it will be useful,\n"
532 "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
533 "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n"
534 "GNU General Public License for more details.\n"
536 "You should have received a copy of the GNU General Public License\n"
537 "along with this program. If not, see <http://www.gnu.org/licenses/>.\n"
539 "This program is free software; you can redistribute it and/or modify\n"
540 "it under the terms of the GNU General Public Licence as published by\n"
541 "the Free Software Foundation; either version 2, or (at your option)\n"
542 "any later version.\n"
544 "This program is distributed in the hope that it will be useful,\n"
545 "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
546 "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n"
547 "GNU General Public Licence for more details.\n"
549 "You should have received a copy of the GNU General Public Licence\n"
550 "along with this program; if not, write to the Free Software Foundation,\n"
551 "Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
554 msgid "wdiff - Compares words in two files and report differences.\n"
555 msgstr "wdiff - Compares words in two files and report differences.\n"
560 "Usage: %s [OPTION]... FILE1 FILE2\n"
561 " or: %s -d [OPTION]... [FILE]\n"
563 "Usage: %s [OPTION]... FILE1 FILE2\n"
564 " %s -d [OPTION]... [FILE]\n"
566 #: src/wdiff.c:1247 src/wdiff2.c:186
569 "Mandatory arguments to long options are mandatory for short options too.\n"
571 "Mandatory arguments to long options are mandatory for short options too.\n"
573 #: src/wdiff.c:1250 src/wdiff2.c:189
575 msgid " -C, --copyright display copyright then exit\n"
576 msgstr " -C, --copyright print copyright then exit\n"
578 #: src/wdiff.c:1254 src/wdiff2.c:193
580 msgid " -a, --auto-pager automatically calls a pager\n"
581 msgstr " -a, --auto-pager automatically calls a pager\n"
584 msgid " -d, --diff-input use single unified diff as input\n"
587 #: src/wdiff.c:1256 src/wdiff2.c:194
589 msgid " -h, --help display this help then exit\n"
590 msgstr " -h, --help print this help\n"
592 #: src/wdiff.c:1257 src/wdiff2.c:195
594 msgid " -i, --ignore-case fold character case while comparing\n"
595 msgstr " -i, --ignore-case fold character case while comparing\n"
597 #: src/wdiff.c:1258 src/wdiff2.c:196
599 msgid " -l, --less-mode variation of printer mode for \"less\"\n"
600 msgstr " -l, --less-mode variation of printer mode for \"less\"\n"
602 #: src/wdiff.c:1259 src/wdiff2.c:197
604 msgid " -n, --avoid-wraps do not extend fields through newlines\n"
605 msgstr " -n, --avoid-wraps do not extend fields through newlines\n"
607 #: src/wdiff.c:1260 src/wdiff2.c:198
609 msgid " -p, --printer overstrike as for printers\n"
610 msgstr " -p, --printer overstrike as for printers\n"
612 #: src/wdiff.c:1261 src/wdiff2.c:200
615 " -s, --statistics say how many words deleted, inserted etc.\n"
617 " -s, --statistics say how many words deleted, inserted etc.\n"
619 #: src/wdiff.c:1262 src/wdiff2.c:201
621 msgid " -t, --terminal use termcap as for terminal displays\n"
622 msgstr " -t, --terminal use termcap as for terminal displays\n"
624 #: src/wdiff.c:1263 src/wdiff2.c:202
626 msgid " -v, --version display program version then exit\n"
627 msgstr " -V, --version print program version then exit\n"
629 #: src/wdiff.c:1264 src/wdiff2.c:203
632 " -w, --start-delete=STRING string to mark beginning of delete region\n"
634 " -w, --start-delete=STRING string to mark beginning of delete region\n"
636 #: src/wdiff.c:1265 src/wdiff2.c:204
638 msgid " -x, --end-delete=STRING string to mark end of delete region\n"
639 msgstr " -x, --end-delete=STRING string to mark end of delete region\n"
641 #: src/wdiff.c:1266 src/wdiff2.c:205
644 " -y, --start-insert=STRING string to mark beginning of insert region\n"
646 " -y, --start-insert=STRING string to mark beginning of insert region\n"
648 #: src/wdiff.c:1267 src/wdiff2.c:206
650 msgid " -z, --end-insert=STRING string to mark end of insert region\n"
651 msgstr " -z, --end-insert=STRING string to mark end of insert region\n"
655 msgid "cannot use -t, termcap not available"
656 msgstr "Cannot use -t, termcap not available."
662 "Copyright (C) 1992, 1997, 1998, 1999, 2009, 2010, 2011, 2012 Free Software\n"
666 "Copyright (C) 1992, 1997 Free Software Foundation, Inc.\n"
668 #: src/wdiff.c:1436 src/wdiff.c:1454
670 msgid "too many file arguments"
671 msgstr "Missing file arguments"
673 #: src/wdiff.c:1449 src/wdiff2.c:320
675 msgid "missing file arguments"
676 msgstr "Missing file arguments"
682 "Copyright (C) 1997, 1998, 1999 Free Software Foundation, Inc.\n"
685 "Copyright (C) 1994, 1997 Free Software Foundation, Inc.\n"
689 "wdiff - Compute word differences by internally launching `mdiff -W'.\n"
690 "This program exists mainly to support the now oldish `wdiff' syntax.\n"
695 msgid "Usage: %s [OPTION]... FILE1 FILE2\n"
696 msgstr "Usage: %s [OPTION]... FILE1 FILE2\n"
699 msgid " -q, --quiet inhibit the `mdiff' call message\n"
703 msgid "This program also tells how `mdiff' could have been called directly.\n"
706 #. TRANSLATORS: This and the next string are one message.
709 msgid "Launching `%s"
717 #~ msgid "Read summary: %d files, %d items\n"
718 #~ msgstr "Read summary: %d files, %d items\n"
720 #~ msgid "Work summary: %d clusters, %d members\n"
721 #~ msgstr "Work summary: %d clusters, %d members\n"
723 #~ msgid "Work summary: %d clusters, %d members, %d overlaps\n"
724 #~ msgstr "Work summary: %d clusters, %d members, %d overlaps\n"
728 #~ " -K, --no-init-term like -z, but no termcap init/term strings\n"
730 #~ " -K, --no-init-term like -z, but no termcap init/term strings\n"
734 #~ " -K, --no-init-term like -t, but no termcap init/term strings\n"
736 #~ " -K, --no-init-term like -t, but no termcap init/term strings\n"
740 #~ "Operation modes:\n"
742 #~ " -v, --verbose report a few statistics on stderr\n"
743 #~ " --help display this help and exit\n"
744 #~ " --version output version information and exit\n"
747 #~ "Operation modes:\n"
749 #~ " -v, --verbose report a few statistics on stderr\n"
750 #~ " --help display this help and exit\n"
751 #~ " --version output version information and exit\n"
755 #~ "Formatting output:\n"
756 #~ " -T, --initial-tab produce TAB instead of initial space\n"
757 #~ " -l, --paginate paginate output through `pr'\n"
758 #~ " -S, --string[=STRING] take note of another user STRING\n"
759 #~ " -V, --show-links give file and line references in annotations\n"
760 #~ " -t, --expand-tabs expand tabs to spaces in the output\n"
763 #~ "Formatting output:\n"
764 #~ " -T, --initial-tab produce TAB instead of initial space\n"
765 #~ " -l, --paginate paginate output through `pr'\n"
766 #~ " -S, --string[=STRING] take note of another user STRING\n"
767 #~ " -V, --show-links give file and line references in annotations\n"
768 #~ " -t, --expand-tabs expand tabs to spaces in the output\n"
772 #~ "Word mode options:\n"
773 #~ " -1, --no-deleted inhibit output of deleted words\n"
774 #~ " -2, --no-inserted inhibit output of inserted words\n"
775 #~ " -3, --no-common inhibit output of common words\n"
776 #~ " -A, --auto-pager automatically calls a pager\n"
777 #~ " -k, --less-mode variation of printer mode for \"less\"\n"
778 #~ " -m, --avoid-wraps do not extend fields through newlines\n"
779 #~ " -o, --printer overstrike as for printers\n"
780 #~ " -z, --terminal use termcap as for terminal displays\n"
781 #~ " -K, --no-init-term like -z, but no termcap init/term strings\n"
782 #~ " -O, --item-regexp=REGEXP compare items as defined by REGEXP\n"
783 #~ " -W, --word-mode compare words instead of lines\n"
786 #~ "Word mode options:\n"
787 #~ " -1, --no-deleted inhibit output of deleted words\n"
788 #~ " -2, --no-inserted inhibit output of inserted words\n"
789 #~ " -3, --no-common inhibit output of common words\n"
790 #~ " -A, --auto-pager automatically calls a pager\n"
791 #~ " -k, --less-mode variation of printer mode for \"less\"\n"
792 #~ " -m, --avoid-wraps do not extend fields through newlines\n"
793 #~ " -o, --printer overstrike as for printers\n"
794 #~ " -z, --terminal use termcap as for terminal displays\n"
795 #~ " -K, --no-init-term like -z, but no termcap init/term strings\n"
796 #~ " -O, --item-regexp=REGEXP compare items as defined by REGEXP\n"
797 #~ " -W, --word-mode compare words instead of lines\n"
801 #~ "Comparing files:\n"
802 #~ "* -H, --speed-large-files go faster, for when numerous small "
804 #~ "* -a, --text report line differences (text file "
806 #~ "* -d, --minimal try harder for a smaller set of changes\n"
807 #~ "* -q, --brief only says if files differ (binary "
809 #~ "* --horizon-lines=LINES keep LINES lines in common prefixes/"
813 #~ "Comparing files:\n"
814 #~ "* -H, --speed-large-files go faster, for when numerous small "
816 #~ "* -a, --text report line differences (text file "
818 #~ "* -d, --minimal try harder for a smaller set of changes\n"
819 #~ "* -q, --brief only says if files differ (binary "
821 #~ "* --horizon-lines=LINES keep LINES lines in common prefixes/"
826 #~ "Comparing directories:\n"
827 #~ "* -N, --new-file consider missing files to be empty\n"
828 #~ "* -P, --unidirectional-new-file consider missing old files to be "
830 #~ "* -S, --starting-file=FILE resume directory comparison with FILE\n"
831 #~ "* -X, --exclude-from=FILE ignore files matching patterns from "
833 #~ "* -r, --recursive recursively compare subdirectories\n"
834 #~ "* -s, --report-identical-files report when two files are the same\n"
835 #~ "* -x, --exclude=PATTERN ignore files (dirs) matching PATTERN\n"
838 #~ "Comparing directories:\n"
839 #~ "* -N, --new-file consider missing files to be empty\n"
840 #~ "* -P, --unidirectional-new-file consider missing old files to be "
842 #~ "* -S, --starting-file=FILE resume directory comparison with FILE\n"
843 #~ "* -X, --exclude-from=FILE ignore files matching patterns from "
845 #~ "* -r, --recursive recursively compare subdirectories\n"
846 #~ "* -s, --report-identical-files report when two files are the same\n"
847 #~ "* -x, --exclude=PATTERN ignore files (dirs) matching PATTERN\n"
851 #~ "Ignoring text:\n"
852 #~ " -B, --ignore-blank-lines ignore blank lines\n"
853 #~ "* -I, --ignore-matching-lines=REGEXP ignore lines matching REGEXP\n"
854 #~ " -b, --ignore-space-change ignore amount of white space\n"
855 #~ " -i, --ignore-case ignore case differences\n"
856 #~ " -w, --ignore-all-space ignore white space\n"
859 #~ "Ignoring text:\n"
860 #~ " -B, --ignore-blank-lines ignore blank lines\n"
861 #~ "* -I, --ignore-matching-lines=REGEXP ignore lines matching REGEXP\n"
862 #~ " -b, --ignore-space-change ignore amount of white space\n"
863 #~ " -i, --ignore-case ignore case differences\n"
864 #~ " -w, --ignore-all-space ignore white space\n"
869 #~ " -G, --relist-files list all input files with annotations\n"
870 #~ " -J, --minimum-size=ITEMS ignore clusters not having that many ITEMS\n"
871 #~ " -j, --ignore-delimiters do not count items having only delimiters\n"
875 #~ " -G, --relist-files list all input files with annotations\n"
876 #~ " -J, --minimum-size=ITEMS ignore clusters not having that many ITEMS\n"
877 #~ " -j, --ignore-delimiters do not count items having only delimiters\n"
881 #~ "Detailed output formats:\n"
882 #~ "* -D, --ifdef=NAME output `#ifdef NAME' format\n"
883 #~ "* --changed-group-format=FORMAT use FORMAT for changed lines\n"
884 #~ "* --new-group-format=FORMAT use FORMAT for inserted lines\n"
885 #~ "* --new-line-format=FORMAT use FORMAT for inserted line\n"
886 #~ "* --old-group-format=FORMAT use FORMAT for deleted lines\n"
887 #~ "* --old-line-format=FORMAT use FORMAT for deleted line\n"
888 #~ "* --unchanged-group-format=FORMAT use FORMAT for unchanged lines\n"
889 #~ "* --unchanged-line-format=FORMAT use FORMAT for unchanged line\n"
890 #~ "* --line-format=FORMAT --{old,new,unchanged}-line-"
894 #~ "Detailed output formats:\n"
895 #~ "* -D, --ifdef=NAME output `#ifdef NAME' format\n"
896 #~ "* --changed-group-format=FORMAT use FORMAT for changed lines\n"
897 #~ "* --new-group-format=FORMAT use FORMAT for inserted lines\n"
898 #~ "* --new-line-format=FORMAT use FORMAT for inserted line\n"
899 #~ "* --old-group-format=FORMAT use FORMAT for deleted lines\n"
900 #~ "* --old-line-format=FORMAT use FORMAT for deleted line\n"
901 #~ "* --unchanged-group-format=FORMAT use FORMAT for unchanged lines\n"
902 #~ "* --unchanged-line-format=FORMAT use FORMAT for unchanged line\n"
903 #~ "* --line-format=FORMAT --{old,new,unchanged}-line-"
908 #~ "Script-like formats:\n"
909 #~ " (none of -CDUcefnuy) output normal diffs\n"
910 #~ "* -e, --ed output a valid `ed' script\n"
911 #~ "* -f, --forward-ed mix between -e and -n (not very useful)\n"
912 #~ "* -n, --rcs output RCS format (internally used by RCS)\n"
915 #~ "Script-like formats:\n"
916 #~ " (none of -CDUcefnuy) output normal diffs\n"
917 #~ "* -e, --ed output a valid `ed' script\n"
918 #~ "* -f, --forward-ed mix between -e and -n (not very useful)\n"
919 #~ "* -n, --rcs output RCS format (internally used by RCS)\n"
923 #~ "Context and unified formats:\n"
924 #~ "* -F, --show-function-line=REGEXP show previous context matching "
926 #~ "* -p, --show-c-function show which C function for each "
930 #~ "Context and unified formats:\n"
931 #~ "* -F, --show-function-line=REGEXP show previous context matching "
933 #~ "* -p, --show-c-function show which C function for each "
938 #~ "* -C, --context=LINES as -c, also select context size in lines\n"
939 #~ "* -L, --label=LABEL use from/to LABEL instead of file name "
941 #~ "* -U, --unified=LINES as -u, also select context size in lines\n"
942 #~ "* -c, --context output context diffs (default 3 context "
944 #~ "* -u, --unified output unidiffs (default 3 context lines)\n"
945 #~ "* -LINES (obsolete: select context size in lines)\n"
948 #~ "* -C, --context=LINES as -c, also select context size in lines\n"
949 #~ "* -L, --label=LABEL use from/to LABEL instead of file name "
951 #~ "* -U, --unified=LINES as -u, also select context size in lines\n"
952 #~ "* -c, --context output context diffs (default 3 context "
954 #~ "* -u, --unified output unidiffs (default 3 context lines)\n"
955 #~ "* -LINES (obsolete: select context size in lines)\n"
959 #~ "Side by side format:\n"
960 #~ "* -W, --width=COLUMNS use width of COLUMNS\n"
961 #~ "* -y, --side-by-side use side by side output format\n"
962 #~ "* --left-column print only left column line when common\n"
963 #~ "* --sdiff-merge-assist (internally used by `sdiff')\n"
964 #~ "* --suppress-common-lines do not print common lines\n"
967 #~ "Side by side format:\n"
968 #~ "* -W, --width=COLUMNS use width of COLUMNS\n"
969 #~ "* -y, --side-by-side use side by side output format\n"
970 #~ "* --left-column print only left column line when common\n"
971 #~ "* --sdiff-merge-assist (internally used by `sdiff')\n"
972 #~ "* --suppress-common-lines do not print common lines\n"
976 #~ "FORMAT is made up of characters standing for themselves, except:\n"
977 #~ " %%%% a single %%\n"
978 #~ " %%c'C' quoted character C\n"
979 #~ " %%c'\\O' character having value O, from 1 to 3 octal digits\n"
980 #~ " %%(A=B?T:E) if A is B then T else E; A B number or VARIABLE; T E "
982 #~ " %%FN use SPECIF specification F to print VARIABLE value N\n"
983 #~ " %%< [group] old, each line through --old-line-format\n"
984 #~ " %%> [group] new, each line through --new-line-format\n"
985 #~ " %%= [group] unchanged, each line through --unchanged-line-"
987 #~ " %%l [line] without its possible trailing newline\n"
988 #~ " %%L [line] with its possible trailing newline\n"
991 #~ "FORMAT is made up of characters standing for themselves, except:\n"
992 #~ " %%%% a single %%\n"
993 #~ " %%c'C' quoted character C\n"
994 #~ " %%c'\\O' character having value O, from 1 to 3 octal digits\n"
995 #~ " %%(A=B?T:E) if A is B then T else E; A B number or VARIABLE; T E "
997 #~ " %%FN use SPECIF specification F to print VARIABLE value N\n"
998 #~ " %%< [group] old, each line through --old-line-format\n"
999 #~ " %%> [group] new, each line through --new-line-format\n"
1000 #~ " %%= [group] unchanged, each line through --unchanged-line-"
1002 #~ " %%l [line] without its possible trailing newline\n"
1003 #~ " %%L [line] with its possible trailing newline\n"
1007 #~ "SPECIF is [-][W[.D]]{doxX} as in C printf\n"
1010 #~ "SPECIF is [-][W[.D]]{doxX} as in C printf\n"
1014 #~ "VARIABLE is {eflmn} for old group or {EFLMN} for new group\n"
1015 #~ " {eE} line number just before group\n"
1016 #~ " {fF} first line number of group\n"
1017 #~ " {lL} last line number of group\n"
1018 #~ " {mM} line number just after group\n"
1019 #~ " {nN} number of lines in the group\n"
1022 #~ "VARIABLE is {eflmn} for old group or {EFLMN} for new group\n"
1023 #~ " {eE} line number just before group\n"
1024 #~ " {fF} first line number of group\n"
1025 #~ " {lL} last line number of group\n"
1026 #~ " {mM} line number just after group\n"
1027 #~ " {nN} number of lines in the group\n"
1031 #~ "Standard diff options:\n"
1032 #~ " -i, --ignore-case consider upper- and lower-case to be the "
1034 #~ " -w, --ignore-all-space ignore all white space\n"
1035 #~ " -b, --ignore-space-change ignore changes in the amount of white space\n"
1036 #~ " -B, --ignore-blank-lines ignore changes whose lines are all blank\n"
1037 #~ " -I, --ignore-matching-lines=RE ignore changes whose lines all match RE\n"
1038 #~ " -a, --text treat all files as text\n"
1039 #~ " -c, --context[=NUMBER] output regular context diffs,\n"
1040 #~ " changing to NUMBER lines of context\n"
1041 #~ " -u, --unified[=NUMBER] output unified context diffs or unidiffs,\n"
1042 #~ " with NUMBER lines of context\n"
1043 #~ " -C, --context=NUM output NUM lines of copied context\n"
1044 #~ " -U, --unified=NUM output NUM lines of unified context\n"
1045 #~ " -L, --label=LABEL use LABEL instead of file name\n"
1046 #~ " -p, --show-c-function show which C function each change is in\n"
1047 #~ " -F, --show-function-line=RE show the most recent line matching RE\n"
1050 #~ "Standard diff options:\n"
1051 #~ " -i, --ignore-case consider upper- and lower-case to be the "
1053 #~ " -w, --ignore-all-space ignore all white space\n"
1054 #~ " -b, --ignore-space-change ignore changes in the amount of white space\n"
1055 #~ " -B, --ignore-blank-lines ignore changes whose lines are all blank\n"
1056 #~ " -I, --ignore-matching-lines=RE ignore changes whose lines all match RE\n"
1057 #~ " -a, --text treat all files as text\n"
1058 #~ " -c, --context[=NUMBER] output regular context diffs,\n"
1059 #~ " changing to NUMBER lines of context\n"
1060 #~ " -u, --unified[=NUMBER] output unified context diffs or unidiffs,\n"
1061 #~ " with NUMBER lines of context\n"
1062 #~ " -C, --context=NUM output NUM lines of copied context\n"
1063 #~ " -U, --unified=NUM output NUM lines of unified context\n"
1064 #~ " -L, --label=LABEL use LABEL instead of file name\n"
1065 #~ " -p, --show-c-function show which C function each change is in\n"
1066 #~ " -F, --show-function-line=RE show the most recent line matching RE\n"
1069 #~ " -q, --brief output only whether files differ\n"
1070 #~ " -e, --ed output an ed script\n"
1071 #~ " -n, --rcs output an RCS format diff\n"
1072 #~ " -y, --side-by-side output in two columns\n"
1073 #~ " -w, --width=NUM output at most NUM (default 130) characters "
1075 #~ " --left-column output only the left column of common lines\n"
1076 #~ " --suppress-common-lines do not output common lines\n"
1077 #~ " -D, --ifdef=NAME output merged file to show `#ifdef NAME' "
1079 #~ " --GTYPE-group-format=GFMT GTYPE input groups with GFMT\n"
1080 #~ " --line-format=LFMT all input lines with LFMT\n"
1081 #~ " --LTYPE-line-format=LFMT LTYPE input lines with LFMT\n"
1082 #~ " -l, --paginate pass the output through `pr' to paginate it\n"
1083 #~ " -t, --expand-tabs expand tabs to spaces in output\n"
1085 #~ " -q, --brief output only whether files differ\n"
1086 #~ " -e, --ed output an ed script\n"
1087 #~ " -n, --rcs output an RCS format diff\n"
1088 #~ " -y, --side-by-side output in two columns\n"
1089 #~ " -w, --width=NUM output at most NUM (default 130) characters "
1091 #~ " --left-column output only the left column of common lines\n"
1092 #~ " --suppress-common-lines do not output common lines\n"
1093 #~ " -D, --ifdef=NAME output merged file to show `#ifdef NAME' "
1095 #~ " --GTYPE-group-format=GFMT GTYPE input groups with GFMT\n"
1096 #~ " --line-format=LFMT all input lines with LFMT\n"
1097 #~ " --LTYPE-line-format=LFMT LTYPE input lines with LFMT\n"
1098 #~ " -l, --paginate pass the output through `pr' to paginate it\n"
1099 #~ " -t, --expand-tabs expand tabs to spaces in output\n"
1102 #~ " -T, --initial-tab make tabs line up by prepending a tab\n"
1103 #~ " -r, --recursive recursively compare any subdirectories found\n"
1104 #~ " -N, --new-file treat absent files as empty\n"
1105 #~ " -P, --unidirectional-new-file treat absent first files as empty\n"
1106 #~ " -s, --report-identical-files report when two files are the same\n"
1107 #~ " -x, --exclude=PAT exclude files that match PAT\n"
1108 #~ " -X, --exclude-from=FILE exclude files that match any pattern in FILE\n"
1109 #~ " -S, --starting-file=FILE start with FILE when comparing directories\n"
1110 #~ " --horizon-lines=NUM keep NUM lines of the common prefix and "
1112 #~ " -d, --minimal try hard to find a smaller set of changes\n"
1113 #~ " -H, --speed-large-files assume large files and many scattered small "
1116 #~ " -T, --initial-tab make tabs line up by prepending a tab\n"
1117 #~ " -r, --recursive recursively compare any subdirectories found\n"
1118 #~ " -N, --new-file treat absent files as empty\n"
1119 #~ " -P, --unidirectional-new-file treat absent first files as empty\n"
1120 #~ " -s, --report-identical-files report when two files are the same\n"
1121 #~ " -x, --exclude=PAT exclude files that match PAT\n"
1122 #~ " -X, --exclude-from=FILE exclude files that match any pattern in FILE\n"
1123 #~ " -S, --starting-file=FILE start with FILE when comparing directories\n"
1124 #~ " --horizon-lines=NUM keep NUM lines of the common prefix and "
1126 #~ " -d, --minimal try hard to find a smaller set of changes\n"
1127 #~ " -H, --speed-large-files assume large files and many scattered small "
1132 #~ "By default, context diffs have an horizon of two lines.\n"
1135 #~ "By default, context diffs have an horizon of two lines.\n"
1139 #~ "LTYPE is `old', `new', or `unchanged'. GTYPE is LTYPE or `changed'.\n"
1140 #~ "GFMT may contain:\n"
1141 #~ " %< lines from FILE1\n"
1142 #~ " %> lines from FILE2\n"
1143 #~ " %= lines common to FILE1 and FILE2\n"
1144 #~ " %[-][WIDTH][.[PREC]]{doxX}LETTER printf-style spec for LETTER\n"
1145 #~ " LETTERs are as follows for new group, lower case for old group:\n"
1146 #~ " F first line number\n"
1147 #~ " L last line number\n"
1148 #~ " N number of lines = L-F+1\n"
1153 #~ "LTYPE is `old', `new', or `unchanged'. GTYPE is LTYPE or `changed'.\n"
1154 #~ "GFMT may contain:\n"
1155 #~ " %< lines from FILE1\n"
1156 #~ " %> lines from FILE2\n"
1157 #~ " %= lines common to FILE1 and FILE2\n"
1158 #~ " %[-][WIDTH][.[PREC]]{doxX}LETTER printf-style spec for LETTER\n"
1159 #~ " LETTERs are as follows for new group, lower case for old group:\n"
1160 #~ " F first line number\n"
1161 #~ " L last line number\n"
1162 #~ " N number of lines = L-F+1\n"
1167 #~ "LFMT may contain:\n"
1168 #~ " %L contents of line\n"
1169 #~ " %l contents of line, excluding any trailing newline\n"
1170 #~ " %[-][WIDTH][.[PREC]]{doxX}n printf-style spec for input line number\n"
1171 #~ "Either GFMT or LFMT may contain:\n"
1173 #~ " %c'C' the single character C\n"
1174 #~ " %c'\\OOO' the character with octal code OOO\n"
1176 #~ "LFMT may contain:\n"
1177 #~ " %L contents of line\n"
1178 #~ " %l contents of line, excluding any trailing newline\n"
1179 #~ " %[-][WIDTH][.[PREC]]{doxX}n printf-style spec for input line number\n"
1180 #~ "Either GFMT or LFMT may contain:\n"
1182 #~ " %c'C' the single character C\n"
1183 #~ " %c'\\OOO' the character with octal code OOO\n"
1187 #~ "Old mdiff options:\n"
1188 #~ "* -f, --fuzz-items=ITEMS no more than ITEMS non matching in a "
1192 #~ "Old mdiff options:\n"
1193 #~ "* -f, --fuzz-items=ITEMS no more than ITEMS non matching in a "
1198 #~ "Copyright (C) 1997 Free Software Foundation, Inc.\n"
1201 #~ "Copyright (C) 1997 Free Software Foundation, Inc.\n"
1205 #~ " -c, --context-diffs force output to context diffs\n"
1206 #~ " -e, --echo-comments echo comments to standard error\n"
1207 #~ " -o, --old-diffs output old-style diffs, no matter what\n"
1208 #~ " -p, --patch-format generate patch format\n"
1209 #~ " -P same as -p\n"
1210 #~ " -s, --strip-comments strip comment lines\n"
1211 #~ " -u, --unidiffs force output to unidiffs\n"
1212 #~ " -U same as -p and -u\n"
1213 #~ " -=, --use-equals replace spaces by equal signs in unidiffs\n"
1214 #~ " --help display this help and exit\n"
1215 #~ " --version output version information and exit\n"
1217 #~ "If FILE is not specified, read standard input.\n"
1220 #~ " -c, --context-diffs force output to context diffs\n"
1221 #~ " -e, --echo-comments echo comments to standard error\n"
1222 #~ " -o, --old-diffs output old-style diffs, no matter what\n"
1223 #~ " -p, --patch-format generate patch format\n"
1224 #~ " -P same as -p\n"
1225 #~ " -s, --strip-comments strip comment lines\n"
1226 #~ " -u, --unidiffs force output to unidiffs\n"
1227 #~ " -U same as -p and -u\n"
1228 #~ " -=, --use-equals replace spaces by equal signs in unidiffs\n"
1229 #~ " --help display this help and exit\n"
1230 #~ " --version output version information and exit\n"
1232 #~ "If FILE is not specified, read standard input.\n"
1235 #~ "Mandatory arguments to long options are mandatory for short options too.\n"
1237 #~ " -C, --copyright print copyright then exit\n"
1238 #~ " -K, --no-init-term like -t, but no termcap init/term strings\n"
1239 #~ " -V, --version print program version then exit\n"
1240 #~ " -1, --no-deleted inhibit output of deleted words\n"
1241 #~ " -2, --no-inserted inhibit output of inserted words\n"
1242 #~ " -3, --no-common inhibit output of common words\n"
1243 #~ " -a, --auto-pager automatically calls a pager\n"
1244 #~ " -h, --help print this help\n"
1245 #~ " -i, --ignore-case fold character case while comparing\n"
1246 #~ " -l, --less-mode variation of printer mode for \"less\"\n"
1247 #~ " -n, --avoid-wraps do not extend fields through newlines\n"
1248 #~ " -p, --printer overstrike as for printers\n"
1249 #~ " -s, --statistics say how many words deleted, inserted etc.\n"
1250 #~ " -t, --terminal use termcap as for terminal displays\n"
1251 #~ " -w, --start-delete=STRING string to mark beginning of delete region\n"
1252 #~ " -x, --end-delete=STRING string to mark end of delete region\n"
1253 #~ " -y, --start-insert=STRING string to mark beginning of insert region\n"
1254 #~ " -z, --end-insert=STRING string to mark end of insert region\n"
1256 #~ "Mandatory arguments to long options are mandatory for short options too.\n"
1258 #~ " -C, --copyright print copyright then exit\n"
1259 #~ " -K, --no-init-term like -t, but no termcap init/term strings\n"
1260 #~ " -V, --version print program version then exit\n"
1261 #~ " -1, --no-deleted inhibit output of deleted words\n"
1262 #~ " -2, --no-inserted inhibit output of inserted words\n"
1263 #~ " -3, --no-common inhibit output of common words\n"
1264 #~ " -a, --auto-pager automatically calls a pager\n"
1265 #~ " -h, --help print this help\n"
1266 #~ " -i, --ignore-case fold character case while comparing\n"
1267 #~ " -l, --less-mode variation of printer mode for \"less\"\n"
1268 #~ " -n, --avoid-wraps do not extend fields through newlines\n"
1269 #~ " -p, --printer overstrike as for printers\n"
1270 #~ " -s, --statistics say how many words deleted, inserted etc.\n"
1271 #~ " -t, --terminal use termcap as for terminal displays\n"
1272 #~ " -w, --start-delete=STRING string to mark beginning of delete region\n"
1273 #~ " -x, --end-delete=STRING string to mark end of delete region\n"
1274 #~ " -y, --start-insert=STRING string to mark beginning of insert region\n"
1275 #~ " -z, --end-insert=STRING string to mark end of insert region\n"