|
|
179.
|
|
|
conflicting %s option value `%s'
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
src/diff.c:984
|
|
|
182.
|
|
|
cannot compare `-' to a directory
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
src/diff.c:1183
|
|
|
189.
|
|
|
`-' specified for more than one input file
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
src/diff3.c:353
|
|
|
197.
|
|
|
-i append `w' and `q' commands to ed scripts
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
src/diff3.c:436
|
|
|
208.
|
|
|
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.
|
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
src/diff3.c:520
|
|
|
215.
|
|
|
subsidiary program `%s' could not be invoked
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
src/diff3.c:1296 src/sdiff.c:272 src/util.c:301
|
|
|
219.
|
|
|
cannot compare file names `%s' and `%s'
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
src/dir.c:158
|
|
|
245.
|
|
|
ed: [tab]Edit then use both versions, each decorated with a header.
eb: [tab]Edit then use both versions.
el or e1: [tab]Edit then use the left version.
er or e2: [tab]Edit then use the right version.
e: [tab]Discard both versions then edit a new one.
l or 1: [tab]Use the left version.
r or 2: [tab]Use the right version.
s: [tab]Silently include common lines.
v: [tab]Verbosely include common lines.
q: [tab]Quit.
|
|
|
[tab] represents a tab character.
Please write it exactly the same way, [tab], in your
translation.
|
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
src/sdiff.c:817
|
