|
188.
|
|
|
incompatible options
|
|
|
|
összeférhetetlen kapcsolók
|
|
Translated and reviewed by
Andras Timar
|
|
|
|
Located in
src/diff3.c:363
|
|
189.
|
|
|
`-' specified for more than one input file
|
|
|
|
`-' több mint egy bemeneti fájlhoz lett megadva
|
|
Translated and reviewed by
Andras Timar
|
|
|
|
Located in
src/diff3.c:353
|
|
190.
|
|
|
read failed
|
|
|
|
olvasás sikertelen
|
|
Translated and reviewed by
Andras Timar
|
|
|
|
Located in
src/diff3.c:445 src/diff3.c:1284 src/diff3.c:1683 src/diff3.c:1738
src/sdiff.c:306 src/sdiff.c:843 src/sdiff.c:854
|
|
191.
|
|
|
-A, --show-all output all changes, bracketing conflicts
|
|
|
|
-A, --show-all minden változás kiírása, zárójelbe téve az
ütközéseket
|
|
Translated by
Balázs Úr
|
|
|
|
Located in
src/diff3.c:478
|
|
192.
|
|
|
-e, --ed output ed script incorporating changes
from OLDFILE to YOURFILE into MYFILE
|
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
represents a space character.
Enter a space in the equivalent position in the translation.
|
|
|
|
-e, --ed egy ed parancsfájlt ír ki, amely a SAJÁTFÁJLBAN
tartalmazza a RÉGIFÁJL és ÖNFÁJLJA változásait
|
|
Translated by
Balázs Úr
|
|
|
|
Located in
src/diff3.c:480
|
|
193.
|
|
|
-E, --show-overlap like -e, but bracket conflicts
|
|
|
|
-E, --show-overlap mint a -e, de zárójelbe teszi az ütközéseket
|
|
Translated by
Balázs Úr
|
|
|
|
Located in
src/diff3.c:482
|
|
194.
|
|
|
-3, --easy-only like -e, but incorporate only nonoverlapping changes
|
|
|
|
-3, --easy-only mint a -e, de csak a nem átfedő változásokat
tartalmazza
|
|
Translated by
Balázs Úr
|
|
|
|
Located in
src/diff3.c:483
|
|
195.
|
|
|
-x, --overlap-only like -e, but incorporate only overlapping changes
|
|
|
|
-x, --overlap-only mint a -e, de csak az átfedő változásokat
tartalmazza
|
|
Translated by
Balázs Úr
|
|
|
|
Located in
src/diff3.c:484
|
|
196.
|
|
|
-X like -x, but bracket conflicts
|
|
|
|
-X mint a -x, de zárójelbe teszi az ütközéseket
|
|
Translated by
Balázs Úr
|
|
|
|
Located in
src/diff3.c:485
|
|
197.
|
|
|
-i append `w' and `q' commands to ed scripts
|
|
|
|
(no translation yet)
|
|
|
|
Located in
src/diff3.c:436
|