(original) (raw)

# �� wdiff # Copyright (C) 1998 Free Software Foundation, Inc. # Oleg S. Tihonov tihonov@ffke-campus.mipt.ru, 1998, 2001. # msgid "" msgstr "" "Project-Id-Version: wdiff 0.5g\n" "Report-Msgid-Bugs-To: wdiff-bugs@gnu.org\n" "POT-Creation-Date: 2010-02-02 17:12+0100\n" "PO-Revision-Date: 2001-06-14 14:16+04:00\n" "Last-Translator: Oleg S. Tihonov tihonov@ffke-campus.mipt.ru\n" "Language-Team: Russian ru@li.org\n" "X-Bugs: Report translation errors to the Language-Team address.\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=koi8-r\n" "Content-Transfer-Encoding: 8bit\n" #: src/mdiff.c:387 #, c-format msgid "%s (for regexp `%s')" msgstr "%s (�� `%s')" #: src/mdiff.c:905 src/wdiff.c:1488 #, fuzzy, c-format msgid "only one file may be standard input" msgstr "�� ." #: src/mdiff.c:920 src/wdiff.c:702 #, fuzzy, c-format msgid "directories not supported" msgstr "�� " #: src/mdiff.c:1064 #, c-format msgid "Reading %s" msgstr "�� %s" #: src/mdiff.c:1189 #, c-format msgid ", %d items\n" msgstr ", %d ��\n" #: src/mdiff.c:1267 #, c-format msgid "Read summary: %d files, %d items\n" msgstr "�� : ��: %d, ��: %d\n" #: src/mdiff.c:1663 #, c-format msgid "Sorting" msgstr "��" #: src/mdiff.c:1680 #, c-format msgid ", clustering" msgstr ", ��" #: src/mdiff.c:1848 src/mdiff.c:1911 #, c-format msgid ", done\n" msgstr ", ��\n" #: src/mdiff.c:1898 #, c-format msgid "Sorting members" msgstr "�� " #: src/mdiff.c:1930 #, c-format msgid "Work summary: %d clusters, %d members\n" msgstr "�� : ��: %d, ��: %d\n" #: src/mdiff.c:2310 #, c-format msgid "Work summary: %d clusters, %d members, %d overlaps\n" msgstr "�� : ��: %d, ��: %d, ��: %d\n" #: src/mdiff.c:2365 src/wdiff.c:242 #, fuzzy, c-format msgid "select a terminal through the TERM environment variable" msgstr "�� TERM." #: src/mdiff.c:2368 src/wdiff.c:245 #, fuzzy, c-format msgid "could not access the termcap data base" msgstr "�� termcap." #: src/mdiff.c:2370 src/wdiff.c:247 #, fuzzy, c-format msgid "terminal type `%s' is not defined" msgstr "�� `%s' �� ." #: src/mdiff.c:3749 src/mdiff.c:3761 src/wdiff.c:1187 src/wdiff.c:1199 #, c-format msgid "%s: %d words" msgstr "%s: %d ��" #: src/mdiff.c:3752 src/mdiff.c:3764 src/wdiff.c:1190 src/wdiff.c:1202 #, c-format msgid " %d %d%% common" msgstr " %d %d%% ��" #: src/mdiff.c:3754 src/wdiff.c:1192 #, c-format msgid " %d %d%% deleted" msgstr " %d %d%% ��" #: src/mdiff.c:3756 src/mdiff.c:3768 src/wdiff.c:1194 src/wdiff.c:1206 #, c-format msgid " %d %d%% changed" msgstr " %d %d%% ��" #: src/mdiff.c:3766 src/wdiff.c:1204 #, c-format msgid " %d %d%% inserted" msgstr " %d %d%% ��" #: src/mdiff.c:3795 src/wdiff.c:1246 src/wdiff2.c:178 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "�� `%s --help' �� .\n" #: src/mdiff.c:3799 msgid "" "mdiff - Studies multiple files and searches for similar sequences, it then\n" "produces possibly detailed lists of differences and similarities.\n" msgstr "" "mdiff - �� \n" "��, �� (��, ��) ��\n" "� ��.\n" #: src/mdiff.c:3804 #, fuzzy, c-format msgid "Usage: %s [OPTION]... [FILE]...\n" msgstr "" "\n" "��: %s [��]... [��]...\n" #: src/mdiff.c:3808 msgid "" "\n" "Operation modes:\n" msgstr "" #: src/mdiff.c:3809 msgid " -h (ignored)\n" msgstr "" #: src/mdiff.c:3810 msgid " -v, --verbose report a few statistics on stderr\n" msgstr "" #: src/mdiff.c:3811 src/unify.c:293 msgid " --help display this help then exit\n" msgstr "" #: src/mdiff.c:3812 src/unify.c:294 msgid " --version display program version then exit\n" msgstr "" #: src/mdiff.c:3814 msgid "" "\n" "Formatting output:\n" msgstr "" #: src/mdiff.c:3815 msgid " -T, --initial-tab produce TAB instead of initial space\n" msgstr "" #: src/mdiff.c:3816 msgid " -l, --paginate paginate output through `pr'\n" msgstr "" #: src/mdiff.c:3817 msgid " -S, --string[=STRING] take note of another user STRING\n" msgstr "" #: src/mdiff.c:3818 msgid " -V, --show-links give file and line references in annotations\n" msgstr "" #: src/mdiff.c:3819 msgid " -t, --expand-tabs expand tabs to spaces in the output\n" msgstr "" #: src/mdiff.c:3822 msgid "" "\n" "Debugging:\n" msgstr "" #: src/mdiff.c:3823 #, fuzzy msgid " -0, --debugging output many details about what is going on\n" msgstr "" "\n" "��:\n" " -0, --debugging �� , �� \n" #: src/mdiff.c:3826 msgid "" "\n" "Word mode options:\n" msgstr "" #: src/mdiff.c:3827 src/wdiff.c:1264 src/wdiff2.c:196 msgid " -1, --no-deleted inhibit output of deleted words\n" msgstr "" #: src/mdiff.c:3828 src/wdiff.c:1265 src/wdiff2.c:197 msgid " -2, --no-inserted inhibit output of inserted words\n" msgstr "" #: src/mdiff.c:3829 src/wdiff.c:1266 src/wdiff2.c:198 msgid " -3, --no-common inhibit output of common words\n" msgstr "" #: src/mdiff.c:3830 msgid " -A, --auto-pager automatically calls a pager\n" msgstr "" #: src/mdiff.c:3831 msgid " -k, --less-mode variation of printer mode for \"less\"\n" msgstr "" #: src/mdiff.c:3832 msgid " -m, --avoid-wraps do not extend fields through newlines\n" msgstr "" #: src/mdiff.c:3833 msgid " -o, --printer overstrike as for printers\n" msgstr "" #: src/mdiff.c:3834 msgid " -z, --terminal use termcap as for terminal displays\n" msgstr "" #: src/mdiff.c:3835 msgid " -K, --no-init-term like -z, but no termcap init/term strings\n" msgstr "" #: src/mdiff.c:3836 msgid " -O, --item-regexp=REGEXP compare items as defined by REGEXP\n" msgstr "" #: src/mdiff.c:3837 msgid " -W, --word-mode compare words instead of lines\n" msgstr "" #: src/mdiff.c:4022 #, fuzzy msgid "With no FILE, or when FILE is -, read standard input.\n" msgstr "" "\n" "�� , �� -, �� .\n" #: src/mdiff.c:4024 src/unify.c:298 src/wdiff.c:1282 src/wdiff2.c:216 #, fuzzy msgid "Report bugs to wdiff-bugs@gnu.org.\n" msgstr "" "\n" "�� wdiff-bugs@iro.umontreal.ca.\n" #: src/mdiff.c:4035 #, c-format msgid "ignoring option %s (not implemented)" msgstr "" #: src/mdiff.c:4332 #, fuzzy, c-format msgid "cannot use -z, termcap not available" msgstr "�� -z, termcap ��." #: src/mdiff.c:4371 #, fuzzy, c-format msgid "word merging for two files only (so far)" msgstr "�� (��)." #: src/mdiff.c:4387 #, fuzzy msgid "" "\n" "Copyright (C) 1992, 1997, 1998, 1999, 2010 Free Software Foundation, Inc.\n" msgstr "" "\n" "Copyright (C) 1992, 1997 Free Software Foundation, Inc.\n" #: src/mdiff.c:4391 src/unify.c:407 src/wdiff.c:1408 src/wdiff2.c:134 msgid "" "This is free software; see the source for copying conditions. There is NO\n" "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" msgstr "" "�� ; �� \n" "� �� . �� ; �� \n" "�� .\n" #: src/mdiff.c:4395 src/wdiff.c:1412 src/wdiff2.c:138 msgid "" "\n" "Written by Franc,ois Pinard pinard@iro.umontreal.ca.\n" msgstr "" "\n" "�� -- Franc,ois Pinard pinard@iro.umontreal.ca.\n" #: src/mdiff.c:4431 #, fuzzy, c-format msgid "options -123RSYZ meaningful only when two inputs" msgstr "�� -123RSYZ �� , �� ." #: src/unify.c:144 #, fuzzy, c-format msgid "could not find a name for the diff at line %ld" msgstr "�� %ld" #: src/unify.c:273 #, fuzzy, c-format msgid "try `%s --help' for more information\n" msgstr "�� `%s --help' �� .\n" #: src/unify.c:277 msgid "unify - Transforms context diffs into unidiffs, or vice-versa.\n" msgstr "unify - �� diff �� .\n" #: src/unify.c:281 #, fuzzy, c-format msgid "Usage: %s [OPTION]... [FILE]\n" msgstr "" "\n" "��: %s [��]... [��]\n" #: src/unify.c:284 msgid " -c, --context-diffs force output to context diffs\n" msgstr "" #: src/unify.c:285 msgid " -e, --echo-comments echo comments to standard error\n" msgstr "" #: src/unify.c:286 msgid " -o, --old-diffs output old-style diffs, no matter what\n" msgstr "" #: src/unify.c:287 msgid " -p, --patch-format generate patch format\n" msgstr "" #: src/unify.c:288 msgid " -P same as -p\n" msgstr "" #: src/unify.c:289 msgid " -s, --strip-comments strip comment lines\n" msgstr "" #: src/unify.c:290 msgid " -u, --unidiffs force output to unidiffs\n" msgstr "" #: src/unify.c:291 msgid " -U same as -p and -u\n" msgstr "" #: src/unify.c:292 msgid " -=, --use-equals replace spaces by equal signs in unidiffs\n" msgstr "" #: src/unify.c:296 #, fuzzy msgid "If FILE is not specified, read standard input.\n" msgstr "" "\n" "�� , �� -, �� .\n" #: src/unify.c:388 #, fuzzy, c-format msgid "unable to open `%s'" msgstr "�� `%s'" #: src/unify.c:394 #, fuzzy, c-format msgid "only one filename allowed" msgstr "�� " #: src/unify.c:403 msgid "" "\n" "Copyright (C) 1994, 1997 Free Software Foundation, Inc.\n" msgstr "" "\n" "Copyright (C) 1994, 1997 Free Software Foundation, Inc.\n" #: src/unify.c:411 msgid "" "\n" "Written by Wayne Davison davison@borland.com.\n" msgstr "" "\n" "�� -- Wayne Davison davison@borland.com.\n" #: src/unify.c:550 #, fuzzy, c-format msgid "invalid unified diff header at line %ld" msgstr "�� %ld" #: src/unify.c:592 #, fuzzy, c-format msgid "malformed unified diff at line %ld" msgstr "�� %ld" #: src/unify.c:623 #, fuzzy, c-format msgid "context diff missing `old' header at line %ld" msgstr "�� `�� ' �� %ld" #: src/unify.c:667 src/unify.c:686 src/unify.c:757 src/unify.c:775 #, fuzzy, c-format msgid "malformed context diff at line %ld" msgstr "�� %ld" #: src/unify.c:722 #, fuzzy, c-format msgid "context diff missing `new' header at line %ld" msgstr "�� `�� ' �� %ld" #: src/wdiff.c:606 src/wdiff.c:725 #, c-format msgid "no suitable temporary directory exists" msgstr "" #: src/wdiff.c:1222 src/wdiff2.c:110 #, fuzzy msgid "" "This program is free software: you can redistribute it and/or modify\n" "it under the terms of the GNU General Public License as published by\n" "the Free Software Foundation, either version 3 of the License, or\n" "(at your option) any later version.\n" "\n" "This program is distributed in the hope that it will be useful,\n" "but WITHOUT ANY WARRANTY; without even the implied warranty of\n" "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" "GNU General Public License for more details.\n" "\n" "You should have received a copy of the GNU General Public License\n" "along with this program. If not, see .\n" msgstr "" "�� ; �� /�� \n" "�� GNU, ��\n" "�� , �� 2 �� \n" "(�� ).\n" "\n" "�� , �� , �� \n" "��-�� ; �� \n" "�� . �� \n" "�� GNU.\n" "\n" "�� GNU �� \n" "�� , �� , �� Free Software Foundation, Inc., 59 Temple\n" "Place - Suite 330, Boston, MA 02111-1307, USA.\n" #: src/wdiff.c:1250 msgid "wdiff - Compares words in two files and report differences.\n" msgstr "wdiff - �� .\n" #: src/wdiff.c:1254 #, fuzzy, c-format msgid "" "Usage: %s [OPTION]... FILE1 FILE2\n" " %s -d [OPTION]... [FILE]\n" msgstr "" "\n" "��: %s [��]... ��1 ��2\n" #: src/wdiff.c:1259 src/wdiff2.c:191 msgid "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "" #: src/wdiff.c:1262 src/wdiff2.c:194 msgid " -C, --copyright display copyright then exit\n" msgstr "" #: src/wdiff.c:1263 src/wdiff2.c:195 msgid " -K, --no-init-term like -t, but no termcap init/term strings\n" msgstr "" #: src/wdiff.c:1267 src/wdiff2.c:199 msgid " -a, --auto-pager automatically calls a pager\n" msgstr "" #: src/wdiff.c:1268 msgid " -d, --diff-input use single unified diff as input\n" msgstr "" #: src/wdiff.c:1269 src/wdiff2.c:200 msgid " -h, --help display this help then exit\n" msgstr "" #: src/wdiff.c:1270 src/wdiff2.c:201 msgid " -i, --ignore-case fold character case while comparing\n" msgstr "" #: src/wdiff.c:1271 src/wdiff2.c:202 msgid " -l, --less-mode variation of printer mode for \"less\"\n" msgstr "" #: src/wdiff.c:1272 src/wdiff2.c:203 msgid " -n, --avoid-wraps do not extend fields through newlines\n" msgstr "" #: src/wdiff.c:1273 src/wdiff2.c:204 msgid " -p, --printer overstrike as for printers\n" msgstr "" #: src/wdiff.c:1274 src/wdiff2.c:206 msgid " -s, --statistics say how many words deleted, inserted etc.\n" msgstr "" #: src/wdiff.c:1275 src/wdiff2.c:207 msgid " -t, --terminal use termcap as for terminal displays\n" msgstr "" #: src/wdiff.c:1276 src/wdiff2.c:208 msgid " -v, --version display program version then exit\n" msgstr "" #: src/wdiff.c:1277 src/wdiff2.c:209 msgid " -w, --start-delete=STRING string to mark beginning of delete region\n" msgstr "" #: src/wdiff.c:1278 src/wdiff2.c:210 msgid " -x, --end-delete=STRING string to mark end of delete region\n" msgstr "" #: src/wdiff.c:1279 src/wdiff2.c:211 msgid " -y, --start-insert=STRING string to mark beginning of insert region\n" msgstr "" #: src/wdiff.c:1280 src/wdiff2.c:212 msgid " -z, --end-insert=STRING string to mark end of insert region\n" msgstr "" #: src/wdiff.c:1398 #, fuzzy, c-format msgid "cannot use -t, termcap not available" msgstr "�� -t, termcap ��." #: src/wdiff.c:1403 #, fuzzy msgid "" "\n" "Copyright (C) 1992, 1997, 1998, 1999, 2009, 2010 Free Software\n" "Foundation, Inc.\n" msgstr "" "\n" "Copyright (C) 1992, 1997 Free Software Foundation, Inc.\n" #: src/wdiff.c:1451 src/wdiff.c:1469 #, fuzzy, c-format msgid "too many file arguments" msgstr "�� , �� " #: src/wdiff.c:1464 src/wdiff2.c:323 #, fuzzy, c-format msgid "missing file arguments" msgstr "�� , �� " #: src/wdiff2.c:130 #, fuzzy msgid "" "\n" "Copyright (C) 1997, 1998, 1999 Free Software Foundation, Inc.\n" msgstr "" "\n" "Copyright (C) 1994, 1997 Free Software Foundation, Inc.\n" #: src/wdiff2.c:182 msgid "" "wdiff - Compute word differences by internally launching `mdiff -W'.\n" "This program exists mainly to support the now oldish `wdiff' syntax.\n" msgstr "" #: src/wdiff2.c:187 #, fuzzy, c-format msgid "Usage: %s [OPTION]... FILE1 FILE2\n" msgstr "" "\n" "��: %s [��]... ��1 ��2\n" #: src/wdiff2.c:205 msgid " -q, --quiet inhibit the `mdiff' call message\n" msgstr "" #: src/wdiff2.c:214 msgid "This program also tells how `mdiff' could have been called directly.\n" msgstr "" #. TRANSLATORS: This and the next string are one message. #: src/wdiff2.c:335 #, fuzzy, c-format msgid "Launching `%s" msgstr "�� %s" #: src/wdiff2.c:338 #, c-format msgid "'\n" msgstr "" #~ msgid "" #~ "\n" #~ "Operation modes:\n" #~ " -h (ignored)\n" #~ " -v, --verbose report a few statistics on stderr\n" #~ " --help display this help and exit\n" #~ " --version output version information and exit\n" #~ msgstr "" #~ "\n" #~ "�� :\n" #~ " -h (��)\n" #~ " -v, --verbose �� \n" #~ " ��\n" #~ " --help �� \n" #~ " --version �� \n" # -S, --string[=STRING] take note of another user STRING??? #~ msgid "" #~ "\n" #~ "Formatting output:\n" #~ " -T, --initial-tab produce TAB instead of initial space\n" #~ " -l, --paginate paginate output through `pr'\n" #~ " -S, --string[=STRING] take note of another user STRING\n" #~ " -V, --show-links give file and line references in annotations\n" #~ " -t, --expand-tabs expand tabs to spaces in the output\n" #~ msgstr "" #~ "\n" #~ "�� :\n" #~ " -T, --initial-tab �� TAB �� \n" #~ " -l, --paginate �� `pr'\n" #~ " -S, --string[=STRING] take note of another user STRING\n" #~ " -V, --show-links �� \n" #~ " -t, --expand-tabs �� \n" #~ msgid "" #~ "\n" #~ "Word mode options:\n" #~ " -1, --no-deleted inhibit output of deleted words\n" #~ " -2, --no-inserted inhibit output of inserted words\n" #~ " -3, --no-common inhibit output of common words\n" #~ " -A, --auto-pager automatically calls a pager\n" #~ " -k, --less-mode variation of printer mode for \"less\"\n" #~ " -m, --avoid-wraps do not extend fields through newlines\n" #~ " -o, --printer overstrike as for printers\n" #~ " -z, --terminal use termcap as for terminal displays\n" #~ " -K, --no-init-term like -z, but no termcap init/term strings\n" #~ " -O, --item-regexp=REGEXP compare items as defined by REGEXP\n" #~ " -W, --word-mode compare words instead of lines\n" #~ msgstr "" #~ "\n" #~ "�� :\n" #~ " -1, --no-deleted �� \n" #~ " -2, --no-inserted �� \n" #~ " -3, --no-common �� \n" #~ " -A, --auto-pager �� \n" #~ " -k, --less-mode �� , �� \"less\"\n" #~ " -m, --avoid-wraps �� \n" #~ " -o, --printer �� , �� \n" #~ " -z, --terminal �� termcap\n" #~ " -K, --no-init-term �� -z, �� termcap init/term\n" #~ " -O, --item-regexp=�� , �� \n" #~ " �� \n" #~ " -W, --word-mode �� , � �� \n" #~ msgid "" #~ "\n" #~ "Comparing files:\n" #~ "* -H, --speed-large-files go faster, for when numerous small changes\n" #~ "* -a, --text report line differences (text file default)\n" #~ "* -d, --minimal try harder for a smaller set of changes\n" #~ "* -q, --brief only says if files differ (binary default)\n" #~ "* --horizon-lines=LINES keep LINES lines in common prefixes/suffixes\n" #~ msgstr "" #~ "\n" #~ "��:\n" #~ "* -H, --speed-large-files �� , �� \n" #~ " �� \n" #~ "* -a, --text �� (�� \n" #~ " �� )\n" #~ "* -d, --minimal �� \n" #~ "* -q, --brief �� , �� (�� \n" #~ " �� )\n" #~ "* --horizon-lines=�� /��\n" #~ msgid "" #~ "\n" #~ "Comparing directories:\n" #~ "* -N, --new-file consider missing files to be empty\n" #~ "* -P, --unidirectional-new-file consider missing old files to be empty\n" #~ "* -S, --starting-file=FILE resume directory comparison with FILE\n" #~ "* -X, --exclude-from=FILE ignore files matching patterns from FILE\n" #~ "* -r, --recursive recursively compare subdirectories\n" #~ "* -s, --report-identical-files report when two files are the same\n" #~ "* -x, --exclude=PATTERN ignore files (dirs) matching PATTERN\n" #~ msgstr "" #~ "\n" #~ "�� :\n" #~ "* -N, --new-file �� \n" #~ "* -P, --unidirectional-new-file �� \n" #~ "* -S, --starting-file=�� \n" #~ "* -X, --exclude-from=�� , �� \n" #~ " �� \n" #~ "* -r, --recursive �� \n" #~ "* -s, --report-identical-files ��, �� \n" #~ "* -x, --exclude=�� (��), �� \n" #~ " �� \n" #~ msgid "" #~ "\n" #~ "Ignoring text:\n" #~ " -B, --ignore-blank-lines ignore blank lines\n" #~ "* -I, --ignore-matching-lines=REGEXP ignore lines matching REGEXP\n" #~ " -b, --ignore-space-change ignore amount of white space\n" #~ " -i, --ignore-case ignore case differences\n" #~ " -w, --ignore-all-space ignore white space\n" #~ msgstr "" #~ "\n" #~ "�� :\n" #~ " -B, --ignore-blank-lines �� \n" #~ "* -I, --ignore-matching-lines=�� , �� \n" #~ " �� \n" #~ " -b, --ignore-space-change �� \n" #~ " -i, --ignore-case �� \n" #~ " -w, --ignore-all-space �� \n" #~ msgid "" #~ "\n" #~ "Clustering:\n" #~ " -G, --relist-files list all input files with annotations\n" #~ " -J, --minimum-size=ITEMS ignore clusters not having that many ITEMS\n" #~ " -j, --ignore-delimiters do not count items having only delimiters\n" #~ msgstr "" #~ "\n" #~ "��:\n" #~ " -G, --relist-files �� \n" #~ " -J, --minimum-size=�� , � �� \n" #~ " �� \n" #~ " -j, --ignore-delimiters �� , �� \n" #~ msgid "" #~ "\n" #~ "Detailed output formats:\n" #~ "* -D, --ifdef=NAME output `#ifdef NAME' format\n" #~ "* --changed-group-format=FORMAT use FORMAT for changed lines\n" #~ "* --new-group-format=FORMAT use FORMAT for inserted lines\n" #~ "* --new-line-format=FORMAT use FORMAT for inserted line\n" #~ "* --old-group-format=FORMAT use FORMAT for deleted lines\n" #~ "* --old-line-format=FORMAT use FORMAT for deleted line\n" #~ "* --unchanged-group-format=FORMAT use FORMAT for unchanged lines\n" #~ "* --unchanged-line-format=FORMAT use FORMAT for unchanged line\n" #~ "* --line-format=FORMAT --{old,new,unchanged}-line-format\n" #~ msgstr "" #~ "\n" #~ "�� :\n" #~ "* -D, --ifdef=�� `#ifdef ��'\n" #~ "* --changed-group-format=�� \n" #~ "* --new-group-format=�� \n" #~ "* --new-line-format=�� \n" #~ "* --old-group-format=�� \n" #~ "* --old-line-format=�� \n" #~ "* --unchanged-group-format=�� \n" #~ "* --unchanged-line-format=�� \n" #~ "* --line-format=�� --{old,new,unchanged}-line-format\n" #~ msgid "" #~ "\n" #~ "Script-like formats:\n" #~ " (none of -CDUcefnuy) output normal diffs\n" #~ "* -e, --ed output a valid `ed' script\n" #~ "* -f, --forward-ed mix between -e and -n (not very useful)\n" #~ "* -n, --rcs output RCS format (internally used by RCS)\n" #~ msgstr "" #~ "\n" #~ "��, �� :\n" #~ " (�� -CDUcefnuy) �� diff\n" #~ "* -e, --ed �� `ed'\n" #~ "* -f, --forward-ed �� -e � -n (�� )\n" #~ "* -n, --rcs �� RCS (�� \n" #~ " �� RCS)\n" #~ msgid "" #~ "\n" #~ "Context and unified formats:\n" #~ "* -F, --show-function-line=REGEXP show previous context matching REGEXP\n" #~ "* -p, --show-c-function show which C function for each change\n" #~ msgstr "" #~ "\n" #~ "�� :\n" #~ "* -F, --show-function-line=�� . ��\n" #~ " �� \n" #~ "* -p, --show-c-function �� , �� \n" #~ " �� \n" #~ msgid "" #~ "\n" #~ "* -C, --context=LINES as -c, also select context size in lines\n" #~ "* -L, --label=LABEL use from/to LABEL instead of file name (twice)\n" #~ "* -U, --unified=LINES as -u, also select context size in lines\n" #~ "* -c, --context output context diffs (default 3 context lines)\n" #~ "* -u, --unified output unidiffs (default 3 context lines)\n" #~ "* -LINES (obsolete: select context size in lines)\n" #~ msgstr "" #~ "\n" #~ "* -C, --context=�� -c, �� \n" #~ "* -L, --label=�� , �� \n" #~ " �� (��)\n" #~ "* -U, --unified=�� -u, �� \n" #~ "* -c, --context �� diff (�� \n" #~ " �� 3 �� )\n" #~ "* -u, --unified �� diff (��\n" #~ " �� 3 �� )\n" #~ "* -LINES (��: �� )\n" #~ msgid "" #~ "\n" #~ "Side by side format:\n" #~ "* -W, --width=COLUMNS use width of COLUMNS\n" #~ "* -y, --side-by-side use side by side output format\n" #~ "* --left-column print only left column line when common\n" #~ "* --sdiff-merge-assist (internally used by `sdiff')\n" #~ "* --suppress-common-lines do not print common lines\n" #~ msgstr "" #~ "\n" #~ "�� :\n" #~ "* -W, --width=�� \n" #~ "* -y, --side-by-side �� \n" #~ "* --left-column �� \n" #~ "* --sdiff-merge-assist (�� `sdiff')\n" #~ "* --suppress-common-lines �� \n" #~ msgid "" #~ "\n" #~ "FORMAT is made up of characters standing for themselves, except:\n" #~ " %%%% a single %%\n" #~ " %%c'C' quoted character C\n" #~ " %%c'\\O' character having value O, from 1 to 3 octal digits\n" #~ " %%(A=B?T:E) if A is B then T else E; A B number or VARIABLE; T E FORMAT\n" #~ " %%FN use SPECIF specification F to print VARIABLE value N\n" #~ " %%< [group] old, each line through --old-line-format\n" #~ " %%> [group] new, each line through --new-line-format\n" #~ " %%= [group] unchanged, each line through --unchanged-line-format\n" #~ " %%l [line] without its possible trailing newline\n" #~ " %%L [line] with its possible trailing newline\n" #~ msgstr "" #~ "\n" #~ "�� , �� , �� :\n" #~ " %%%% �� %%\n" #~ " %%c'C' �� C\n" #~ " %%c'\\O' �� O, �� 1 �� 3 �� \n" #~ " %%(A=B?T:E) �� A �� B, �� T, �� E; A B -- �� ;\n" #~ " T E -- �� \n" #~ " %%FN �� N �� F\n" #~ " %%< [��] ��, �� --old-line-format\n" #~ " %%> [��] ��, �� --new-line-format\n" #~ " %%= [��] ��, �� --unchanged-line-format\n" #~ " %%l [��] �� \n" #~ " %%L [��] ��, � �� \n" #~ msgid "" #~ "\n" #~ "SPECIF is [-][W[.D]]{doxX} as in C printf\n" #~ msgstr "" #~ "\n" #~ "�� -- �� [-][W[.D]]{doxX} �� -�� printf\n" #~ msgid "" #~ "\n" #~ "VARIABLE is {eflmn} for old group or {EFLMN} for new group\n" #~ " {eE} line number just before group\n" #~ " {fF} first line number of group\n" #~ " {lL} last line number of group\n" #~ " {mM} line number just after group\n" #~ " {nN} number of lines in the group\n" #~ msgstr "" #~ "\n" #~ "�� -- �� {eflmn} �� {EFLMN} �� \n" #~ " {eE} �� , �� \n" #~ " {fF} �� \n" #~ " {lL} �� \n" #~ " {mM} �� , �� \n" #~ " {nN} �� \n" #~ msgid "" #~ "\n" #~ "Standard diff options:\n" #~ " -i, --ignore-case consider upper- and lower-case to be the same\n" #~ " -w, --ignore-all-space ignore all white space\n" #~ " -b, --ignore-space-change ignore changes in the amount of white space\n" #~ " -B, --ignore-blank-lines ignore changes whose lines are all blank\n" #~ " -I, --ignore-matching-lines=RE ignore changes whose lines all match RE\n" #~ " -a, --text treat all files as text\n" #~ " -c, --context[=NUMBER] output regular context diffs,\n" #~ " changing to NUMBER lines of context\n" #~ " -u, --unified[=NUMBER] output unified context diffs or unidiffs,\n" #~ " with NUMBER lines of context\n" #~ " -C, --context=NUM output NUM lines of copied context\n" #~ " -U, --unified=NUM output NUM lines of unified context\n" #~ " -L, --label=LABEL use LABEL instead of file name\n" #~ " -p, --show-c-function show which C function each change is in\n" #~ " -F, --show-function-line=RE show the most recent line matching RE\n" #~ msgstr "" #~ "\n" #~ "�� diff:\n" #~ " -i, --ignore-case �� \n" #~ " -w, --ignore-all-space �� \n" #~ " -b, --ignore-space-change �� \n" #~ " -B, --ignore-blank-lines �� , �� \n" #~ " -I, --ignore-matching-lines=�� , �� \n" #~ " �� \n" #~ " -a, --text �� \n" #~ " -c, --context[=��] �� diff,\n" #~ " � �� \n" #~ " -u, --unified[=��] �� diff,\n" #~ " � �� \n" #~ " -C, --context=�� \n" #~ " -U, --unified=�� \n" #~ " -L, --label=�� \n" #~ " -p, --show-c-function ��, �� -�� \n" #~ " ��\n" #~ " -F, --show-function-line=�� , ��\n" #~ " �� \n" #~ msgid "" #~ " -q, --brief output only whether files differ\n" #~ " -e, --ed output an ed script\n" #~ " -n, --rcs output an RCS format diff\n" #~ " -y, --side-by-side output in two columns\n" #~ " -w, --width=NUM output at most NUM (default 130) characters per line\n" #~ " --left-column output only the left column of common lines\n" #~ " --suppress-common-lines do not output common lines\n" #~ " -D, --ifdef=NAME output merged file to show `#ifdef NAME' diffs\n" #~ " --GTYPE-group-format=GFMT GTYPE input groups with GFMT\n" #~ " --line-format=LFMT all input lines with LFMT\n" #~ " --LTYPE-line-format=LFMT LTYPE input lines with LFMT\n" #~ " -l, --paginate pass the output through `pr' to paginate it\n" #~ " -t, --expand-tabs expand tabs to spaces in output\n" #~ msgstr "" #~ " -q, --brief �� , �� \n" #~ " -e, --ed �� ed\n" #~ " -n, --rcs �� RCS\n" #~ " -y, --side-by-side �� \n" #~ " -w, --width=�� (�� 130) ��\n" #~ " �� \n" #~ " --left-column �� \n" #~ " --suppress-common-lines �� \n" #~ " -D, --ifdef=�� output merged file to show `#ifdef NAME' diffs\n" #~ " --��-group-format=�� \n" #~ " --line-format=�� \n" #~ " --��-line-format=�� \n" #~ " -l, --paginate �� `pr' �� \n" #~ " -t, --expand-tabs �� \n" #~ msgid "" #~ " -T, --initial-tab make tabs line up by prepending a tab\n" #~ " -r, --recursive recursively compare any subdirectories found\n" #~ " -N, --new-file treat absent files as empty\n" #~ " -P, --unidirectional-new-file treat absent first files as empty\n" #~ " -s, --report-identical-files report when two files are the same\n" #~ " -x, --exclude=PAT exclude files that match PAT\n" #~ " -X, --exclude-from=FILE exclude files that match any pattern in FILE\n" #~ " -S, --starting-file=FILE start with FILE when comparing directories\n" #~ " --horizon-lines=NUM keep NUM lines of the common prefix and suffix\n" #~ " -d, --minimal try hard to find a smaller set of changes\n" #~ " -H, --speed-large-files assume large files and many scattered small changes\n" #~ msgstr "" #~ " -T, --initial-tab �� , �� TAB � ��\n" #~ " -r, --recursive �� \n" #~ " -N, --new-file �� \n" #~ " -P, --unidirectional-new-file �� \n" #~ " -s, --report-identical-files ��, �� \n" #~ " -x, --exclude=�� , �� \n" #~ " -X, --exclude-from=�� , �� -��\n" #~ " �� \n" #~ " -S, --starting-file=�� \n" #~ " --horizon-lines=�� /��\n" #~ " -d, --minimal �� \n" #~ " -H, --speed-large-files ��, �� \n" #~ " �� \n" #~ msgid "" #~ "\n" #~ "By default, context diffs have an horizon of two lines.\n" #~ msgstr "" #~ "\n" #~ "�� , �� diffs �� .\n" #~ msgid "" #~ "\n" #~ "LTYPE is `old', `new', or `unchanged'. GTYPE is LTYPE or `changed'.\n" #~ "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\n" #~ msgstr "" #~ "\n" #~ "�� -- �� `old', `new' �� `unchanged' (�� , ��\n" #~ "�� , ��). �� -- �� `changed'.\n" #~ "�� :\n" #~ " %< �� 1\n" #~ " %> �� 2\n" #~ " %= ��, �� 1 � ��2\n" #~ " %[-][��][.[��]]{doxX}�� printf\n" #~ " �� , �� , �� \n" #~ " F �� \n" #~ " L �� \n" #~ " N �� = L-F+1\n" #~ " E F-1\n" #~ " M L+1\n" #~ 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\n" #~ "Either GFMT or LFMT may contain:\n" #~ " %% %\n" #~ " %c'C' the single character C\n" #~ " %c'\\OOO' the character with octal code OOO\n" #~ msgstr "" #~ "�� :\n" #~ " %L �� \n" #~ " %l �� \n" #~ " %[-][��][.[��]]{doxX}n \n" #~ " �� printf\n" #~ "�� :\n" #~ " %% %\n" #~ " %c'C' �� C\n" #~ " %c'\\OOO' �� OOO\n" #~ msgid "" #~ "\n" #~ "Old mdiff options:\n" #~ "* -f, --fuzz-items=ITEMS no more than ITEMS non matching in a cluster\n" #~ msgstr "" #~ "\n" #~ "�� mdiff:\n" #~ "* -f, --fuzz-items=�� \n" #~ msgid "" #~ "\n" #~ "Copyright (C) 1997 Free Software Foundation, Inc.\n" #~ msgstr "" #~ "\n" #~ "Copyright (C) 1997 Free Software Foundation, Inc.\n" #~ msgid "" #~ "\n" #~ " -c, --context-diffs force output to context diffs\n" #~ " -e, --echo-comments echo comments to standard error\n" #~ " -o, --old-diffs output old-style diffs, no matter what\n" #~ " -p, --patch-format generate patch format\n" #~ " -P same as -p\n" #~ " -s, --strip-comments strip comment lines\n" #~ " -u, --unidiffs force output to unidiffs\n" #~ " -U same as -p and -u\n" #~ " -=, --use-equals replace spaces by equal signs in unidiffs\n" #~ " --help display this help and exit\n" #~ " --version output version information and exit\n" #~ "\n" #~ "If FILE is not specified, read standard input.\n" #~ msgstr "" #~ "\n" #~ " -c, --context-diffs �� \n" #~ " -e, --echo-comments �� \n" #~ " -o, --old-diffs �� \n" #~ " -p, --patch-format �� patch\n" #~ " -P �� -p\n" #~ " -s, --strip-comments �� \n" #~ " -u, --unidiffs �� \n" #~ " -U �� -p -u\n" #~ " -=, --use-equals �� \n" #~ " ��\n" #~ " --help �� \n" #~ " --version �� \n" #~ "\n" #~ "�� -, �� \n" #~ msgid "" #~ "Mandatory arguments to long options are mandatory for short options too.\n" #~ "\n" #~ " -C, --copyright print copyright then exit\n" #~ " -K, --no-init-term like -t, but no termcap init/term strings\n" #~ " -V, --version print program version then exit\n" #~ " -1, --no-deleted inhibit output of deleted words\n" #~ " -2, --no-inserted inhibit output of inserted words\n" #~ " -3, --no-common inhibit output of common words\n" #~ " -a, --auto-pager automatically calls a pager\n" #~ " -h, --help print this help\n" #~ " -i, --ignore-case fold character case while comparing\n" #~ " -l, --less-mode variation of printer mode for \"less\"\n" #~ " -n, --avoid-wraps do not extend fields through newlines\n" #~ " -p, --printer overstrike as for printers\n" #~ " -s, --statistics say how many words deleted, inserted etc.\n" #~ " -t, --terminal use termcap as for terminal displays\n" #~ " -w, --start-delete=STRING string to mark beginning of delete region\n" #~ " -x, --end-delete=STRING string to mark end of delete region\n" #~ " -y, --start-insert=STRING string to mark beginning of insert region\n" #~ " -z, --end-insert=STRING string to mark end of insert region\n" #~ msgstr "" #~ "��, �� , �� .\n" #~ "\n" #~ " -C, --copyright �� \n" #~ " -K, --no-init-term �� -t, �� termcap init/term\n" #~ " -V, --version �� \n" #~ " -1, --no-deleted �� \n" #~ " -2, --no-inserted �� \n" #~ " -3, --no-common �� \n" #~ " -a, --auto-pager �� \n" #~ " -h, --help �� \n" #~ " -i, --ignore-case �� \n" #~ " -l, --less-mode �� , �� less\n" #~ " -n, --avoid-wraps �� \n" #~ " -p, --printer �� \n" #~ " -s, --statistics �� , �� .�\n" #~ " -t, --terminal �� termcap\n" #~ " -w, --start-delete=�� , �� \n" #~ " -x, --end-delete=�� , �� \n" #~ " -y, --start-insert=�� , �� \n" #~ " -z, --end-insert=�� , �� \n"/davison@borland.com /davison@borland.com /pinard@iro.umontreal.ca /pinard@iro.umontreal.ca /wdiff-bugs@iro.umontreal.ca /wdiff-bugs@gnu.org /ru@li.org /tihonov@ffke-campus.mipt.ru /tihonov@ffke-campus.mipt.ru