Þ•Ì|Ü 0h1CšBÞB!9d8žy×7Q6‰5À3öG*ErI¸@GC@‹LÌGDaC¦Mê88KqM½y A…¾Ç£†µ*iàJ0j›¯Á(Ý#%()PRD£Eè(.CW@›:ÜC M[ ~© ;(!Jd!C¯!Aó!35"Li":¶"Lñ">>#;}#7¹#4ñ#3&$KZ$H¦$0ï$L %Fm%B´%1÷%‡)&H±&Jú&FE'†Œ'H(H\(„¥(6*)7a)J™)Eä);**Lf*5³*@é*7*+=b+< +MÝ+@+,?l,>¬,<ë,6(-K_-<«-Mè-36.j.!‰.«.!Ç.é. //F%/=l/&ª/Ñ/ð/K0T0k0ˆ0¤0$¼0á0ó0 1I1b1 s1€1‰1£1Â1Ò1â1 ÷1#2 '232N2e2±v2:(3c3qk3 Ý3é3û34#454 G4"T44w4¬4.É4ø4;53K5/5+¯5'Û5#6'6G6c6s6u6)ˆ6)²6Ü6 ó6707 J7nT7 Ã8ä8é8þ8192B90u9)¦91Ð9-:0: A:"O:%r: ˜: ¦:²: Å: Ò:Ü:ñ:ø:;;;$; +;9;U;i; x; ƒ;Á;ØR=S+?G?YÇ?J!@Il@ž¶@GUAFAKäAC0BTtBYÉBH#CMlCVºCNDd`D]ÅD\#E[€EfÜE?CFVƒFUÚFž0GeÏG®5HÚäHÇ¿J©‡K-1L;_L›L »L%ÜL7M@:M{M}MDMeÆMa,N_ŽNKîNY:OV”OLëON8Ph‡P˜ðP\‰Q_æQ]FR[¤RDS^ESL¤SañSJSTGžTVæTS=UR‘UVäUS;V<VqÌV_>W[žW?úW³:XhîXDWY^œYŸûYG›ZWãZ²;[@î[@/\Mp\E¾\T]VY]B°]có]>W^N–^Må^q3_M¥_Ló_K@`IŒ`GÖ`]aN|a_Ëa4+b8`b0™b'Êb4òb:'c bcncž~c€dGžd'æd*e^9e˜e!´eÖeòe!f2fNf jfˆtf$ýf "g/g-Bg'pg˜g°g"Îg ñg*ýg (h!4h4Vh‹hÌœhJii ´išÁi \jhj!zjœj!»j!Ýjÿj&k80o nÄzvq76§Ë(LÁ ­™@•<\ObXD›j„U±Ÿ{ŒŠÅ†$)`«WÂY/|E#JÈS½wCšQGa³c·©hžŽ+t1˜€%À! V≠HKZ Æ~9RÇx®°*¯r‡ 8dA^,‚¾.[¢-’¤œ4‰k¼I'»¥5¦É&e”MÃ?²‹:ƒ3N]¡¶p‘¨ f—_ªgyT“B"¹s}lm¬ The default output format is a somewhat human-readable representation of the changes. The -e, -E, -x, -X (and corresponding long) options cause an ed script to be output instead of the default. Finally, the -m (--merge) option causes diff3 to do the merge internally and output the actual merged file. For unusual input, this is more robust than using ed. --GTYPE-group-format=GFMT format GTYPE input groups with GFMT --LTYPE-line-format=LFMT format LTYPE input lines with LFMT --binary read and write data in binary mode --diff-program=PROGRAM use PROGRAM to compare files --diff-program=PROGRAM use PROGRAM to compare files --from-file=FILE1 compare FILE1 to all operands; FILE1 can be a directory --help display this help and exit --help display this help and exit --help display this help and exit --help display this help and exit --horizon-lines=NUM keep NUM lines of the common prefix and suffix --ignore-file-name-case ignore case when comparing file names --left-column output only the left column of common lines --line-format=LFMT format all input lines with LFMT --no-ignore-file-name-case consider case when comparing file names --normal output a normal diff (the default) --speed-large-files assume large files and many scattered small changes --strip-trailing-cr strip trailing carriage return on input --strip-trailing-cr strip trailing carriage return on input --strip-trailing-cr strip trailing carriage return on input --suppress-blank-empty suppress space or tab before empty output lines --suppress-common-lines do not output common lines --tabsize=NUM tab stops every NUM (default 8) print columns --tabsize=NUM tab stops at every NUM (default 8) print columns --to-file=FILE2 compare all operands to FILE2; FILE2 can be a directory --unidirectional-new-file treat absent first files as empty Both GFMT and LFMT may contain: %% % %c'C' the single character C %c'\OOO' the character with octal code OOO C the character C (other characters represent themselves) GFMT (only) may contain: %< lines from FILE1 %> lines from FILE2 %= lines common to FILE1 and FILE2 %[-][WIDTH][.[PREC]]{doxX}LETTER printf-style spec for LETTER LETTERs are as follows for new group, lower case for old group: F first line number L last line number N number of lines = L-F+1 E F-1 M L+1 %(A=B?T:E) if A equals B then T else E LFMT (only) may contain: %L contents of line %l contents of line, excluding any trailing newline %[-][WIDTH][.[PREC]]{doxX}n printf-style spec for input line number These format options provide fine-grained control over the output of diff, generalizing -D/--ifdef.%s %s differ: byte %s, line %s %s %s differ: byte %s, line %s is %3o %s %3o %s %s home page: <%s> %s: diff failed: %s: invalid option -- '%c' %s: option requires an argument -- '%c' %s: recursive directory loop'(C)--from-file and --to-file both specified-3, --easy-only like -e, but incorporate only nonoverlapping changes-A, --show-all output all changes, bracketing conflicts-B, --ignore-blank-lines ignore changes whose lines are all blank-D option not supported with directories-E, --ignore-tab-expansion ignore changes due to tab expansion-E, --ignore-tab-expansion ignore changes due to tab expansion-E, --show-overlap like -e, but bracket conflicts-F, --show-function-line=RE show the most recent line matching RE-H, --speed-large-files assume large files, many scattered small changes-L, --label=LABEL use LABEL instead of file name (can be repeated up to three times)-N, --new-file treat absent files as empty-S, --starting-file=FILE start with FILE when comparing directories-T, --initial-tab make tabs line up by prepending a tab-T, --initial-tab make tabs line up by prepending a tab-W, --ignore-all-space ignore all white space-W, --width=NUM output at most NUM (default 130) print columns-X like -x, but bracket conflicts-X, --exclude-from=FILE exclude files that match any pattern in FILE-Z, --ignore-trailing-space ignore white space at line end-Z, --ignore-trailing-space ignore white space at line end-a, --text treat all files as text-a, --text treat all files as text-a, --text treat all files as text-b, --ignore-space-change ignore changes in the amount of white space-b, --ignore-space-change ignore changes in the amount of white space-b, --print-bytes print differing bytes-c, -C NUM, --context[=NUM] output NUM (default 3) lines of copied context-d, --minimal try hard to find a smaller set of changes-d, --minimal try hard to find a smaller set of changes-e, --ed output an ed script-e, --ed output ed script incorporating changes from OLDFILE to YOURFILE into MYFILE-i, --ignore-case ignore case differences in file contents-i, --ignore-case consider upper- and lower-case to be the same-i, --ignore-initial=SKIP skip first SKIP bytes of both inputs-i, --ignore-initial=SKIP1:SKIP2 skip first SKIP1 bytes of FILE1 and first SKIP2 bytes of FILE2-l, --left-column output only the left column of common lines-l, --verbose output byte numbers and differing byte values-m, --merge output actual merged file, according to -A if no other options are given-n, --bytes=LIMIT compare at most LIMIT bytes-n, --rcs output an RCS format diff-o, --output=FILE operate interactively, sending output to FILE-p, --show-c-function show which C function each change is in-q, --brief report only when files differ-r, --recursive recursively compare any subdirectories found-s, --quiet, --silent suppress all normal output-s, --report-identical-files report when two files are the same-s, --suppress-common-lines do not output common lines-t, --expand-tabs expand tabs to spaces in output-t, --expand-tabs expand tabs to spaces in output-u, -U NUM, --unified[=NUM] output NUM (default 3) lines of unified context-v, --version output version information and exit-v, --version output version information and exit-v, --version output version information and exit-v, --version output version information and exit-w, --ignore-all-space ignore all white space-w, --width=NUM output at most NUM (default 130) print columns-x, --exclude=PAT exclude files that match PAT-x, --overlap-only like -e, but incorporate only overlapping changes-y, --side-by-side output in two columnsBinary files %s and %s differ Common subdirectories: %s and %s Compare FILES line by line.Compare three files line by line.Compare two files byte by byte.David HayesDavid MacKenzieExit status is 0 if inputs are the same, 1 if different, 2 if trouble.Exit status is 0 if successful, 1 if conflicts, 2 if trouble.File %s is a %s while file %s is a %s Files %s and %s are identical Files %s and %s differ If --from-file or --to-file is given, there are no restrictions on FILE(s).Invalid back referenceInvalid character class nameInvalid collation characterInvalid content of \{\}Invalid preceding regular expressionInvalid range endInvalid regular expressionLen TowerMandatory arguments to long options are mandatory for short options too. Memory exhaustedMike HaertelNo matchNo newline at end of fileNo previous regular expressionOnly in %s: %s Packaged by %s Packaged by %s (%s) Paul EggertPremature end of regular expressionRandy SmithRegular expression too bigReport %s bugs to: %s Richard StallmanSKIP values may be followed by the following multiplicative suffixes: kB 1000, K 1024, MB 1,000,000, M 1,048,576, GB 1,000,000,000, G 1,073,741,824, and so on for T, P, E, Z, Y.Side-by-side merge of differences between FILE1 and FILE2.SuccessThe optional SKIP1 and SKIP2 specify the number of bytes to skip at the beginning of each file (zero by default).Thomas LordTorbjorn GranlundTrailing backslashUnknown system errorUnmatched ( or \(Unmatched ) or \)Unmatched \{Usage: %s [OPTION]... FILE1 FILE2 Usage: %s [OPTION]... FILE1 [FILE2 [SKIP1 [SKIP2]]] Usage: %s [OPTION]... FILES Usage: %s [OPTION]... MYFILE OLDFILE YOURFILE Written by %s and %s. Written by %s, %s, %s, %s, %s, %s, %s, %s, %s, and others. Written by %s, %s, %s, %s, %s, %s, %s, %s, and %s. Written by %s, %s, %s, %s, %s, %s, %s, and %s. Written by %s, %s, %s, %s, %s, %s, and %s. Written by %s, %s, %s, %s, %s, and %s. Written by %s, %s, %s, %s, and %s. Written by %s, %s, %s, and %s. Written by %s, %s, and %s. Written by %s. `block special fileboth files to be compared are directoriescannot interactively merge standard inputcharacter special fileconflicting output style optionsconflicting tabsize optionsconflicting width optionsdirectoryed: Edit then use both versions, each decorated with a header. eb: Edit then use both versions. el or e1: Edit then use the left version. er or e2: Edit then use the right version. e: Discard both versions then edit a new one. l or 1: Use the left version. r or 2: Use the right version. s: Silently include common lines. v: Verbosely include common lines. q: Quit. failed to reopen %s with mode %sfifoincompatible optionsinput file shrankinternal error: invalid diff type in process_diffinternal error: invalid diff type passed to outputinternal error: screwup in format of diff blocksinvalid diff format; incomplete last lineinvalid diff format; incorrect leading line charsinvalid diff format; invalid change separatormemory exhaustedmessage queueoptions -l and -s are incompatiblepagination not supported on this hostprogram errorread failedregular empty fileregular filesemaphoreshared memory objectsocketstack overflowstandard outputstderrstdinstdoutsymbolic linktoo many file label optionstyped memory objectunknown streamweird filewrite failedProject-Id-Version: GNU diffutils 3.2 Report-Msgid-Bugs-To: bug-diffutils@gnu.org PO-Revision-Date: 2011-09-08 14:13+0900 Last-Translator: Yasuaki Taniguchi Language-Team: Japanese Language: ja MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Bugs: Report translation errors to the Language-Team address. Plural-Forms: nplurals=1; plural=0; デフォルトã§ã¯é•ã„ãŒäººé–“ã«ã¨ã£ã¦èª­ã¿ã‚„ã™ã„出力形å¼ã§ã™ã€‚ -eã€-Eã€-xã€-X (ãŠã‚ˆã³ãã®é•·ã„å½¢å¼) オプションを指定ã—ãŸå ´åˆã¯ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆ ã®ä»£ã‚ã‚Šã« ed スクリプトを出力ã—ã¾ã™ã€‚ 最後ã«ã€-m (--merge) オプションã«ã‚ˆã‚Š diff3 ã¯å†…部ã§ä½µåˆã‚’è¡Œã„ã€å®Ÿéš›ã« ä½µåˆã•ã‚ŒãŸãƒ•ã‚¡ã‚¤ãƒ«ã‚’出力ã—ã¾ã™ã€‚通常ã®å…¥åŠ›ã¨ã—ã¦ã¯ã€ã“れ㯠ed を使用㙠るより強固ã§ã™ã€‚ --GTYPE-group-format=GFMT GTYPE ã®å…¥åŠ›ã‚°ãƒ«ãƒ¼ãƒ—ã‚’ GFMT ã§æ•´å½¢ã™ã‚‹ --LTYPE-line-format=LFMT LTYPE 入力行を LFMT ã§æ•´å½¢ã™ã‚‹ --binary ãƒã‚¤ãƒŠãƒªãƒ¼ãƒ¢ãƒ¼ãƒ‰ã§ãƒ‡ãƒ¼ã‚¿ã‚’読ã¿æ›¸ãã™ã‚‹ --diff-program=PROGRAM ファイル比較㫠PROGRAM を使用ã™ã‚‹ --diff-program=PROGRAM ファイル比較㫠PROGRAM を使用ã™ã‚‹ --from-file=FILE1 ã™ã¹ã¦ã®è¢«æ¼”ç®—å­ã¨ FILE1 を比較ã™ã‚‹ FILE1 ã¯ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªãƒ¼ã§ã‚‚よㄠ--help ã“ã®ãƒ˜ãƒ«ãƒ—を表示ã—ã¦çµ‚了ã™ã‚‹ --help ã“ã®ãƒ˜ãƒ«ãƒ—を表示ã—ã¦çµ‚了ã™ã‚‹ --help ã“ã®ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’表示ã—ã¦çµ‚了ã™ã‚‹ --help ã“ã®ãƒ˜ãƒ«ãƒ—を表示ã—ã¦çµ‚了ã™ã‚‹ --horizon-lines=NUM 差分ã®å‰å¾Œã«ã‚る共通部分を NUM è¡Œä¿æŒã™ã‚‹ --ignore-file-name-case ファイルåã®å¤§æ–‡å­—ã¨å°æ–‡å­—を区別ã—ãªã„ --left-column 共通行ã¯å·¦å´ã®åˆ—ã®ã¿è¡¨ç¤ºã™ã‚‹ --line-format=LFMT ã™ã¹ã¦ã®å…¥åŠ›è¡Œã‚’ LFMT ã§æ•´å½¢ã™ã‚‹ --no-ignore-file-name-case ファイルåã®å¤§æ–‡å­—ã¨å°æ–‡å­—を区別ã™ã‚‹ --normal 通常㮠diff を出力ã™ã‚‹ (デフォルト) --speed-large-files 巨大ãªãƒ•ã‚¡ã‚¤ãƒ«ã«å°ã•ãªå·®åˆ†ãŒåˆ†æ•£ã—ã¦ã„ã‚‹ã¨ä»®å®šã™ã‚‹ --strip-trailing-cr 入力ã‹ã‚‰ CR (キャリッジリターン) を除去ã™ã‚‹ --strip-trailing-cr 入力ã‹ã‚‰æœ«å°¾ã®ã‚­ãƒ£ãƒªãƒƒã‚¸ãƒªã‚¿ãƒ¼ãƒ³ã‚’除去ã™ã‚‹ --strip-trailing-cr 入力ã‹ã‚‰æœ«å°¾ã®ã‚­ãƒ£ãƒªãƒƒã‚¸ãƒªã‚¿ãƒ¼ãƒ³ã‚’除去ã™ã‚‹ --suppress-blank-empty 空ã®å‡ºåŠ›è¡Œã®å‰å¾Œã§ã¯ã‚¹ãƒšãƒ¼ã‚¹ã¾ãŸã¯ã‚¿ãƒ–を抑止ã™ã‚‹ --suppress-common-lines 共通行ã®å‡ºåŠ›ã‚’抑止ã™ã‚‹ --tabsize=NUM タブ幅を NUM (デフォルト: 8) 列ã«è¨­å®šã™ã‚‹ --tabsize=NUM タブ幅を NUM (デフォルト: 8) 列ã«è¨­å®šã™ã‚‹ --to-file=FILE2 ã™ã¹ã¦ã®è¢«æ¼”ç®—å­ã‚’ FILE2 を比較ã™ã‚‹ FILE2 ã¯ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªãƒ¼ã§ã‚‚よㄠ--unidirectional-new-file 存在ã—ãªã„最åˆã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’空ファイルã¨ã—ã¦æ‰±ã† GFMT 㨠LFMT ã®ä¸¡æ–¹ã§æŒ‡æ‘˜ã§ãる書å¼: %% % %c'C' å˜ä¸€æ–‡å­— C %c'\OOO' 八進数コード OOO C 文字 C (ä»–ã®æ–‡å­—ã‚‚åŒæ§˜ã«è¡¨ã™) GFMT ã§ã®ã¿æŒ‡å®šã§ãる書å¼: %< FILE1 ã‹ã‚‰ã®è¡Œ %> FILE2 ã‹ã‚‰ã®è¡Œ %= FILE1 㨠FILE2 ã§å…±é€šã®è¡Œ %[-][WIDTH][.[PREC]]{doxX}LETTER printf 書å¼ã® LETTER LETTER ã¯æ¬¡ã®é€šã‚Šã§ã™ã€‚ãŸã ã—å¤ã„グループã§ã¯å°æ–‡å­—ã§ã™: F 最åˆã®è¡Œç•ªå· L 最後ã®è¡Œç•ªå· N 行数 = L-F+1 E F-1 M L+1 %(A=B?T:E) A 㨠B ãŒç­‰ã—ã„å ´åˆã¯ Tã€ç­‰ã—ããªã„å ´åˆã¯ E LFMT ã§ã®ã¿æŒ‡å®šã§ãる書å¼: %L è¡Œã®å†…容 %l 行末ã«ã‚ã‚‹ã™ã¹ã¦ã®ç¨®é¡žã®æ”¹è¡Œæ–‡å­—を除ã„ãŸè¡Œã®å†…容 %[-][WIDTH][.[PREC]]{doxX}n printf 書å¼ã®å…¥åŠ›è¡Œ ã“れらã®æ›¸å¼æ•´å½¢ã‚ªãƒ—ション㯠-D/--ifdef ã«é©ç”¨ã•ã‚Œã‚‹ diff ã®å‡ºåŠ›ã‚’ãã‚Œã„㫠見ãˆã‚‹ã‚ˆã†ã«åˆ¶å¾¡ã™ã‚‹ãŸã‚ã«æä¾›ã•ã‚Œã¾ã™ã€‚%s %s ç•°ãªã‚Šã¾ã™: ãƒã‚¤ãƒˆ %sã€è¡Œ %s %s %s ç•°ãªã‚Šã¾ã™: ãƒã‚¤ãƒˆ %sã€è¡Œ %s %3o %s %3o %s %s ã®ãƒ›ãƒ¼ãƒ ãƒšãƒ¼ã‚¸: <%s> %s: diff ã«å¤±æ•—ã—ã¾ã—ãŸ: %s: 無効ãªã‚ªãƒ—ション -- '%c' %s: オプションã«ã¯å¼•æ•°ãŒå¿…è¦ã§ã™ -- '%c' %s: ディレクトリーãŒå†å¸°çš„ã«ãƒ«ãƒ¼ãƒ—ã—ã¦ã„ã¾ã™'(C)--from-file ãŠã‚ˆã³ --to-file ã®ä¸¡æ–¹ãŒæŒ‡å®šã•ã‚Œã¦ã„ã¾ã™-3, --easy-only -e ã¨åŒæ§˜ã ãŒã€3ファイル競åˆã§ç„¡ã„部分ã®ã¿å‡ºåŠ›ã™ã‚‹-A, --show-all 競åˆã‚’ã™ã¹ã¦æ‹¬å¼§ã§ããã‚Šã€å¤‰æ›´ã‚’ã™ã¹ã¦å‡ºåŠ›ã™ã‚‹-B, --ignore-blank-lines 空白類文字ã ã‘ã®è¡Œã«ã‚ˆã‚Šç”Ÿã˜ã‚‹é•ã„を無視ã™ã‚‹-D オプションã¯ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªãƒ¼ã«ã¯ã‚µãƒãƒ¼ãƒˆã•ã‚Œã¾ã›ã‚“-E, --ignore-tab-expansion タブ展開ã«ã‚ˆã£ã¦ç™ºç”Ÿã™ã‚‹é•ã„を無視ã™ã‚‹-E, --ignore-tab-expansion タブ展開ã«ã‚ˆã£ã¦ç™ºç”Ÿã™ã‚‹é•ã„を無視ã™ã‚‹-E, --show-overlap -e ã¨åŒæ§˜ã ãŒã€ç«¶åˆã‚’括弧ã§ããã‚‹-F, --show-function-line=RE RE ã«ä¸€è‡´ã™ã‚‹æœ€ã‚‚è¿‘ã„行を表示ã™ã‚‹-H, --speed-large-files 巨大ãªãƒ•ã‚¡ã‚¤ãƒ«ã«å°ã•ãªå·®åˆ†ãŒåˆ†æ•£ã—ã¦ã„ã‚‹ã¨ä»®å®šã™ã‚‹-L, --label=LABEL ファイルåã®ä»£ã‚ã‚Šã« LABEL を使用ã™ã‚‹ (3回ã¾ã§ç¹°ã‚Šè¿”ã—指定ã§ãã‚‹)-N, --new-file 存在ã—ãªã„ファイルを空ファイルã¨ã—ã¦æ‰±ã†-S, --starting-file=FILE ディレクトリーを比較ã™ã‚‹æ™‚ã« FILE ã‹ã‚‰å§‹ã‚ã‚‹-T, --initial-tab タブã§å§‹ã¾ã‚‹è¡Œã¯ã€å‰ã«ã‚¿ãƒ–ã‚’ç½®ã„ã¦ãã‚ãˆã‚‹-T, --initial-tab タブã§å§‹ã¾ã‚‹è¡Œã¯ã€å‰ã«ã‚¿ãƒ–ã‚’ç½®ã„ã¦ãã‚ãˆã‚‹-W, --ignore-all-space ã™ã¹ã¦ã®ã‚¹ãƒšãƒ¼ã‚¹ã‚’無視ã™ã‚‹-W, --width=NUM 表示ã™ã‚‹åˆ—を最大 NUM (デフォルト: 130) 列ã«ã™ã‚‹-X -x ã¨åŒæ§˜ã ãŒã€ç«¶åˆã‚’括弧ã§ããã‚‹-X, --exclude-from=FILE FILE 内ã®ãƒ‘ターンã«ä¸€è‡´ã™ã‚‹ãƒ•ã‚¡ã‚¤ãƒ«ã‚’除外ã™ã‚‹-Z, --ignore-trailing-space 行末ã«ã‚るスペースを無視ã™ã‚‹-Z, --ignore-trailing-space 行末ã«ã‚るスペースを無視ã™ã‚‹-a, --text ã™ã¹ã¦ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’テキストã¨ã—ã¦æ‰±ã†-a, --text ã™ã¹ã¦ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’テキストã¨ã—ã¦æ‰±ã†-a, --text ã™ã¹ã¦ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’テキストã¨ã—ã¦æ‰±ã†-b, --ignore-space-change スペース数ã«ã‚ˆã‚Šç”Ÿã˜ã‚‹é•ã„を無視ã™ã‚‹-b, --ignore-space-change スペース数ã«ã‚ˆã‚Šç”Ÿã˜ã‚‹é•ã„を無視ã™ã‚‹-b, --print-bytes ç•°ãªã‚‹ãƒã‚¤ãƒˆã‚’表示ã™ã‚‹-c, -C NUM, --context[=NUM] コンテキスト diff å½¢å¼ã§å‰å¾Œ NUM (デフォルト: 3) 行を表示ã™ã‚‹-d, --minimal 差分ã®å¤§ãã•ãŒæœ€å°ã¨ãªã‚‹ã‚ˆã†ã«é•ã„を検出ã™ã‚‹-d, --minimal 差分ã®å¤§ãã•ãŒæœ€å°ã¨ãªã‚‹ã‚ˆã†ã«é•ã„を検出ã™ã‚‹-e, --ed ed スクリプトを出力ã™ã‚‹-e, --ed OLDFILEã€YOURFILEã€MYFILE ã®é–“ã®é•ã„ã‚’ ed スクリプトã¨ã—ã¦å‡ºåŠ›ã™ã‚‹ -i, --ignore-case ファイル内容ã®æ¯”較時ã«å¤§æ–‡å­—ã¨å°æ–‡å­—を区別ã—ãªã„-i, --ignore-case 大文字ã¨å°æ–‡å­—を区別ã—ãªã„-i, --ignore-initial=SKIP 両方ã®å…¥åŠ›ã®å…ˆé ­ SKIP ãƒã‚¤ãƒˆã‚’スキップã™ã‚‹-i, --ignore-initial=SKIP1:SKIP2 FILE1 ã®å…ˆé ­ SKIP1 ãƒã‚¤ãƒˆã¨ FILE2 ã®å…ˆé ­ SKIP2 ãƒã‚¤ãƒˆã‚’スキップã™ã‚‹-l, --left-column 共通行ã¯å·¦å´ã®åˆ—ã®ã¿è¡¨ç¤ºã™ã‚‹-l, --verbose ãƒã‚¤ãƒˆæ•°ãŠã‚ˆã³ç•°ãªã‚‹ãƒã‚¤ãƒˆã®å€¤ã‚’出力ã™ã‚‹-m, --merge ä»–ã®ã‚ªãƒ—ションを指定ã—ã¦ã„ãªã„å ´åˆã€-A 従ã£ã¦ 実際ã«ä½µåˆã•ã‚ŒãŸãƒ•ã‚¡ã‚¤ãƒ«ã‚’出力ã™ã‚‹-n, --bytes=LIMIT 最大 LIMIT ãƒã‚¤ãƒˆã‚’比較ã™ã‚‹-n, --rcs RCS å½¢å¼ã® diff を出力ã™ã‚‹-o, --output=FILE 対話的ã«æ“作ã—ã€å‡ºåŠ›ã‚’ FILE ã«é€ã‚‹-p, --show-c-function 変更ãŒã‚ã‚‹ C 関数を表示ã™ã‚‹-q, --brief ファイルãŒç•°ãªã‚‹ã‹ã©ã†ã‹ã®ã¿è¡¨ç¤ºã™ã‚‹-r, --recursive サブディレクトリーをå†å¸°çš„ã«æ¯”較ã™ã‚‹-s, --quiet, --silent 通常ã®è¡¨ç¤ºã‚’ã™ã¹ã¦æŠ‘æ­¢ã™ã‚‹-s, --report-identical-files 両方ã®ãƒ•ã‚¡ã‚¤ãƒ«ãŒåŒä¸€ã§ã‚ã‚‹ã‹ã©ã†ã‹ã®ã¿è¡¨ç¤ºã™ã‚‹-s, --suppress-common-lines 共通行ã®å‡ºåŠ›ã‚’抑止ã™ã‚‹-t, --expand-tabs 出力時ã«ã‚¿ãƒ–をスペースã«å±•é–‹ã™ã‚‹-t, --expand-tabs 出力時ã«ã‚¿ãƒ–をスペースã«å±•é–‹ã™ã‚‹-u, -U NUM, --unified[=NUM] ユニファイド diff å½¢å¼ã§å‰å¾Œ NUM (デフォルト: 3) 行を表示ã™ã‚‹-v, --version ãƒãƒ¼ã‚¸ãƒ§ãƒ³æƒ…報を表示ã—ã¦çµ‚了ã™ã‚‹-v, --version ãƒãƒ¼ã‚¸ãƒ§ãƒ³æƒ…報を表示ã—ã¦çµ‚了ã™ã‚‹-v, --version ãƒãƒ¼ã‚¸ãƒ§ãƒ³æƒ…報を表示ã—ã¦çµ‚了ã™ã‚‹-v, --version ãƒãƒ¼ã‚¸ãƒ§ãƒ³æƒ…報を表示ã—ã¦çµ‚了ã™ã‚‹-w, --ignore-all-space ã™ã¹ã¦ã®ã‚¹ãƒšãƒ¼ã‚¹ã‚’無視ã™ã‚‹-w, --width=NUM 表示ã™ã‚‹åˆ—を最大 NUM (デフォルト: 130) 列ã«ã™ã‚‹-x, --exclude=PAT PAT ã«ä¸€è‡´ã™ã‚‹ãƒ•ã‚¡ã‚¤ãƒ«ã‚’除外ã™ã‚‹-x, --overlap-only -e ã¨åŒæ§˜ã ãŒã€3ファイル競åˆã®éƒ¨åˆ†ã®ã¿å‡ºåŠ›ã™ã‚‹-y, --side-by-side 出力を2列ã«ã™ã‚‹ãƒã‚¤ãƒŠãƒªãƒ¼ãƒ•ã‚¡ã‚¤ãƒ« %s ã¨%s ã¯ç•°ãªã‚Šã¾ã™ 共通ã®ã‚µãƒ–ディレクトリー: %s 㨠%s FILES ã‚’è¡Œã”ã¨ã«æ¯”較ã—ã¾ã™ã€‚3ã¤ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’è¡Œã”ã¨ã«æ¯”較ã—ã¾ã™ã€‚2ã¤ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’ãƒã‚¤ãƒˆã”ã¨ã«æ¯”較ã—ã¾ã™ã€‚David HayesDavid MacKenzie終了コードã¯ã€å…¥åŠ›ãƒ•ã‚¡ã‚¤ãƒ«ãŒåŒã˜å ´åˆã¯ 0ã€å…¥åŠ›ãƒ•ã‚¡ã‚¤ãƒ«ãŒç•°ãªã‚‹å ´åˆã¯ 1〠å•é¡ŒãŒç™ºç”Ÿã—ãŸã¨ã㯠2 ã«ãªã‚Šã¾ã™ã€‚終了コードã¯ã€æˆåŠŸã—ãŸå ´åˆã¯ 0ã€ç«¶åˆãŒã‚ã‚‹å ´åˆã¯ 1〠å•é¡ŒãŒç™ºç”Ÿã—ãŸã¨ã㯠2 ã«ãªã‚Šã¾ã™ã€‚ファイル %s 㯠%s ã§ã™ã€‚一方ã€ãƒ•ã‚¡ã‚¤ãƒ« %s 㯠%s ã§ã™ ファイル %s 㨠%s ã¯åŒä¸€ã§ã™ ファイル %s 㨠%s ã¯ç•°ãªã‚Šã¾ã™ --from-file ã¾ãŸã¯ --to-file ãŒä¸Žãˆã‚‰ã‚ŒãŸå ´åˆã€FILE ã«åˆ¶é™ã¯ã‚ã‚Šã¾ã›ã‚“。無効ãªå‰æ–¹å‚ç…§ã§ã™ç„¡åŠ¹ãªæ–‡å­—クラスåã§ã™ç„¡åŠ¹ãªç…§åˆæ–‡å­—ã§ã™\{\} ã®ä¸­èº«ãŒç„¡åŠ¹ã§ã™ç„¡åŠ¹ãªå‰æ–¹æ­£è¦è¡¨ç¾ã§ã™ç„¡åŠ¹ãªç¯„囲終了ã§ã™ç„¡åŠ¹ãªæ­£è¦è¡¨ç¾ã§ã™Len Toweré•·ã„å½¢å¼ã®ã‚ªãƒ—ションã§å¿…é ˆã®å¼•æ•°ã¯ã€ãã‚Œã«å¯¾å¿œã™ã‚‹çŸ­ã„å½¢å¼ã®ã‚ªãƒ—ションã§ã‚‚åŒæ§˜ã«å¿…é ˆã§ã™ã€‚ メモリを使ã„æžœãŸã—ã¾ã—ãŸMike Haertel一致ã—ã¾ã›ã‚“ファイル末尾ã«æ”¹è¡ŒãŒã‚ã‚Šã¾ã›ã‚“以å‰ã«æ­£è¦è¡¨ç¾ãŒã‚ã‚Šã¾ã›ã‚“%s ã®ã¿ã«å­˜åœ¨: %s パッケージ作æˆè€…: %s パッケージ作æˆè€…: %s (%s) Paul Eggertæ­£è¦è¡¨ç¾ãŒé€”中ã§çµ‚了ã—ã¾ã—ãŸRandy Smithæ­£è¦è¡¨ç¾ãŒå¤§ãã™ãŽã¾ã™%s ã®ãƒã‚°ã¯ <%s> ã«å ±å‘Šã—ã¦ãã ã•ã„。 Richard StallmanSKIP ã®å€¤ã«ã¯æ¬¡ã®å€æ•°ã‚’表ã™æŽ¥å°¾è¾žã‚’付ã‘ã‚‹ã“ã¨ã‚‚出æ¥ã¾ã™: kB 1000, K 1024, MB 1,000,000, M 1,048,576, GB 1,000,000,000, G 1,073,741,824。ã¾ãŸã€ T, P, E, Z, Y ã‚‚åŒæ§˜ã§ã™ã€‚FILE1 㨠FILE2 ã®å·®åˆ†ã‚’2段組ã§æ¯”較ã—ãªãŒã‚‰ä½µåˆã—ã¾ã™ã€‚æˆåŠŸã§ã™ã‚ªãƒ—ション㮠SKIP1 㨠SKIP2 ã¯ãã‚Œãžã‚Œã®ãƒ•ã‚¡ã‚¤ãƒ«ã®å…ˆé ­ã‹ã‚‰ã‚¹ã‚­ãƒƒãƒ—ã™ã‚‹ ãƒã‚¤ãƒˆæ•°ã‚’指定ã—ã¾ã™(デフォルト㯠0)。Thomas LordTorbjorn Granlund終端ã®ãƒãƒƒã‚¯ã‚¹ãƒ©ãƒƒã‚·ãƒ¥ä¸æ˜Žãªã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼( ã¾ãŸã¯ \( ãŒä¸ä¸€è‡´ã§ã™) ã¾ãŸã¯ \) ãŒä¸ä¸€è‡´ã§ã™\{ ãŒä¸ä¸€è‡´ã§ã™ä½¿ç”¨æ³•: %s [OPTION]... FILE1 FILE2 使用法: %s [OPTION]... FILE1 [FILE2 [SKIP1 [SKIP2]]] 使用法: %s [OPTION]... FILES Usage: %s [OPTION]... MYFILE OLDFILE YOURFILE 作者 %s ãŠã‚ˆã³ %s。 作者 %s〠%s〠%s〠%s〠%s〠%s〠%s〠%s〠%s〠ãŠã‚ˆã³ä»–ã®æ–¹ã€…。 作者 %s〠%s〠%s〠%s〠%s〠%s〠%s〠%sã€ãŠã‚ˆã³ %s。 作者 %s〠%s〠%s〠%s〠%s〠%s〠%s〠ãŠã‚ˆã³ %s。 作者 %s〠%s〠%s〠%s〠%s〠%sã€ãŠã‚ˆã³ %s。 作者 %s〠%s〠%s〠%s〠%sã€ãŠã‚ˆã³ %s。 作者 %s〠%s〠%s〠%sã€ãŠã‚ˆã³ %s。 作者 %s〠%s〠%s〠ãŠã‚ˆã³ %s。 作者 %s〠%sã€ãŠã‚ˆã³ %s。 作者 %s。 `ブロックスペシャルファイル比較対象ã¯ä¸¡æ–¹ã¨ã‚‚ディレクトリーã§ã™æ¨™æº–出力ã¯å¯¾è©±çš„ã«ä½µåˆã§ãã¾ã›ã‚“キャラクタスペシャルファイル出力形å¼ã‚ªãƒ—ションãŒç«¶åˆã—ã¦ã„ã¾ã™ã‚¿ãƒ–å¹…ã®ã‚ªãƒ—ションãŒç«¶åˆã—ã¦ã„ã¾ã™å¹…ã®ã‚ªãƒ—ションãŒç«¶åˆã—ã¦ã„ã¾ã™ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªãƒ¼ed: 両方ã«ãƒ˜ãƒƒãƒ€ãƒ¼ã‚’付加ã—ã€ä¸¡æ–¹ã®ç‰ˆã‚’編集ã—ã¦ä½¿ç”¨ã™ã‚‹ã€‚ eb: 両方ã®ç‰ˆã‚’編集ã—ã¦ä½¿ç”¨ã™ã‚‹ã€‚ el ã¾ãŸã¯ e1: å·¦å´ã®ç‰ˆã‚’編集ã—ã¦ä½¿ç”¨ã™ã‚‹ã€‚ er ã¾ãŸã¯ e2: å³å´ã®ç‰ˆã‚’編集ã—ã¦ä½¿ç”¨ã™ã‚‹ã€‚ e: 両方ã®ç‰ˆã‚’破棄ã—ã€æ–°è¦è¡Œã‚’編集ã™ã‚‹ã€‚ l ã¾ãŸã¯ 1: å·¦å´ã®ç‰ˆã‚’使用ã™ã‚‹ã€‚ r ã¾ãŸã¯ 2: å³å´ã®ç‰ˆã‚’使用ã™ã‚‹ã€‚ s: 共通行を暗黙的ã«å«ã‚る。 v: 共通行を明示ã—ã¦å«ã‚る。 q: 終了ã™ã‚‹ã€‚ %s をモード %s ã§å†åº¦é–‹ãã“ã¨ã«å¤±æ•—ã—ã¾ã—ãŸfifoåŒæ™‚ã«æŒ‡å®šã§ããªã„オプションã§ã™å…¥åŠ›ãƒ•ã‚¡ã‚¤ãƒ«ãŒå°ã•ããªã‚Šã¾ã—ãŸå†…部エラー: process_diff 内ã«ç„¡åŠ¹ãªå·®åˆ†åž‹ãŒã‚ã‚Šã¾ã™å†…部エラー: 無効ãªå·®åˆ†åž‹ãŒå‡ºåŠ›ã«æ¸¡ã•ã‚Œã¾ã—ãŸå†…部エラー: 差分ブロックã®å½¢å¼ã‚’ã†ã¾ã処ç†ã§ãã¾ã›ã‚“ã§ã—ãŸç„¡åŠ¹ãªå·®åˆ†å½¢å¼ã§ã™ã€‚最後ã®è¡ŒãŒä¸å®Œå…¨ã§ã™ç„¡åŠ¹ãªå·®åˆ†å½¢å¼ã§ã™ã€‚è¡Œã®å…ˆé ­æ–‡å­—ãŒèª¤ã£ã¦ã„ã¾ã™ç„¡åŠ¹ãªå·®åˆ†å½¢å¼ã§ã™ã€‚無効ãªå¤‰æ›´åŒºåˆ‡ã‚Šã§ã™ãƒ¡ãƒ¢ãƒªã‚’使ã„æžœãŸã—ã¾ã—ãŸãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚­ãƒ¥ãƒ¼ã‚ªãƒ—ション -l 㨠-s ã¯åŒæ™‚ã«æŒ‡å®šã§ãã¾ã›ã‚“ã“ã®ãƒ›ã‚¹ãƒˆã§ã¯ãƒšãƒ¼ã‚¸å‰²ä»˜ã‘をサãƒãƒ¼ãƒˆã—ã¾ã›ã‚“プログラムエラー読ã¿è¾¼ã¿ã«å¤±æ•—ã—ã¾ã—ãŸé€šå¸¸ã®ç©ºãƒ•ã‚¡ã‚¤ãƒ«é€šå¸¸ãƒ•ã‚¡ã‚¤ãƒ«ã‚»ãƒžãƒ•ã‚©å…±æœ‰ãƒ¡ãƒ¢ãƒªã‚ªãƒ–ジェクトソケットスタックオーãƒãƒ¼ãƒ•ãƒ­ãƒ¼æ¨™æº–出力標準エラー出力標準入力標準出力シンボリックリンクファイル・ラベル・オプションãŒå¤šã™ãŽã¾ã™åž‹ä»˜ãƒ¡ãƒ¢ãƒªã‚ªãƒ–ジェクトä¸æ˜Žãªã‚¹ãƒˆãƒªãƒ¼ãƒ ä¸æ˜Žãªãƒ•ã‚¡ã‚¤ãƒ«æ›¸ãè¾¼ã¿ã«å¤±æ•—ã—ã¾ã—ãŸ