|
35.
|
|
|
Files %s and %s differ
|
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
ファイル %s と %s は異なります
|
|
Translated by
Yasuaki Taniguchi
|
|
Reviewed by
Shushi Kurose
|
In upstream: |
|
ファイル %s と %s は違います
|
|
|
Suggested by
IIDA Yosiaki
|
|
|
|
Located in
src/analyze.c:455 src/diff.c:1478
|
|
36.
|
|
|
Binary files %s and %s differ
|
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
バイナリーファイル %s と %s は異なります
|
|
Translated by
Yasuaki Taniguchi
|
|
Reviewed by
Shushi Kurose
|
In upstream: |
|
バイナリファイル %s と %s は異なります
|
|
|
Suggested by
Yasuaki Taniguchi
|
|
|
|
Located in
src/analyze.c:456
|
|
37.
|
|
|
No newline at end of file
|
|
|
|
ファイル末尾に改行がありません
|
|
Translated and reviewed by
IIDA Yosiaki
|
|
|
|
Located in
src/analyze.c:707 src/diff3.c:1457 src/util.c:1354
|
|
38.
|
|
|
Written by Torbjorn Granlund and David MacKenzie.
|
|
|
|
作成: Torbjorn Granlund ならびに David MacKenzie
|
|
Translated and reviewed by
Shushi Kurose
|
In upstream: |
|
作成は、Torbjorn GranlundとDavid MacKenzie。
|
|
|
Suggested by
IIDA Yosiaki
|
|
|
|
39.
|
|
|
Try `%s --help' for more information.
|
|
|
|
詳しくは`%s --help'を実行してください。
|
|
Translated by
Yasuaki Taniguchi
|
In upstream: |
|
「%s --help」で、より詳細な情報を調べてみてください。
|
|
|
Suggested by
IIDA Yosiaki
|
|
|
|
Located in
src/cmp.c:118 src/diff.c:836 src/diff3.c:414 src/sdiff.c:155
|
|
40.
|
|
|
invalid --ignore-initial value `%s '
|
|
|
|
無効な --ignore-initial の値 `%s ' です
|
|
Translated by
Yasuaki Taniguchi
|
|
Reviewed by
Shushi Kurose
|
In upstream: |
|
無効な--ignore-initialの値「%s 」
|
|
|
Suggested by
IIDA Yosiaki
|
|
|
|
Located in
src/cmp.c:137
|
|
41.
|
|
|
options -l and -s are incompatible
|
|
|
|
オプション -l と -s は同時に指定できません
|
|
Translated by
Yasuaki Taniguchi
|
|
Reviewed by
Shushi Kurose
|
In upstream: |
|
オプション-lと-sは両立しません
|
|
|
Suggested by
IIDA Yosiaki
|
|
|
|
Located in
src/cmp.c:152
|
|
42.
|
|
|
write failed
|
|
|
|
書き込みに失敗しました
|
|
Translated by
Yasuaki Taniguchi
|
|
Reviewed by
Shushi Kurose
|
In upstream: |
|
書込み失敗
|
|
|
Suggested by
IIDA Yosiaki
|
|
|
|
Located in
src/cmp.c:160 src/diff.c:947 src/diff3.c:472 src/sdiff.c:167 src/sdiff.c:314
src/sdiff.c:321 src/sdiff.c:873 src/util.c:952 src/util.c:1052
src/util.c:1059
|
|
43.
|
|
|
standard output
|
|
|
|
標準出力
|
|
Translated and reviewed by
IIDA Yosiaki
|
|
|
|
Located in
src/cmp.c:162 src/diff.c:949 src/diff.c:1543 src/diff3.c:474 src/sdiff.c:169
|
|
44.
|
|
|
-b --print-bytes Print differing bytes.
|
|
|
|
-b --print-bytes 異なるバイトを表示。
|
|
Translated and reviewed by
IIDA Yosiaki
|
|
|
|
Located in
src/cmp.c:161
|