|
138.
|
|
|
File %s is a %s while file %s is a %s
|
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
A(z) %s fájl egy %s , viszont a(z) %s fájl egy %s
|
|
Translated and reviewed by
Andras Timar
|
|
|
|
Located in
src/diff.c:1411 src/diff.c:1461
|
|
139.
|
|
|
Files %s and %s are identical
|
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
A(z) %s és a(z) %s fájlok azonosak
|
|
Translated by
Balázs Úr
|
In upstream: |
|
%s és %s fájlok azonosak
|
|
|
Suggested by
Andras Timar
|
|
|
|
Located in
src/diff.c:1534
|
|
140.
|
|
|
Written by Randy Smith.
|
|
|
|
(no translation yet)
|
|
|
|
Located in
src/diff3.c:26
|
|
141.
|
|
|
incompatible options
|
|
|
|
összeférhetetlen kapcsolók
|
|
Translated and reviewed by
Andras Timar
|
|
|
|
Located in
src/diff3.c:363
|
|
142.
|
|
|
`-' 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
|
|
143.
|
|
|
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
|
|
144.
|
|
|
-e --ed Output unmerged changes from OLDFILE to YOURFILE into MYFILE.
|
|
|
|
-e --ed A RÉGI fájlból az ÚJ fájlba át nem került változásokat kiírja a SAJÁT fájlba.
|
|
Translated and reviewed by
Andras Timar
|
|
|
|
Located in
src/diff3.c:429
|
|
145.
|
|
|
-E --show-overlap Output unmerged changes, bracketing conflicts.
|
|
|
|
-E --show-overlap Kiírja az át nem vitt változásokat, zárójelezi az ütközéseket.
|
|
Translated and reviewed by
Andras Timar
|
|
|
|
Located in
src/diff3.c:430
|
|
146.
|
|
|
-A --show-all Output all changes, bracketing conflicts.
|
|
|
|
-A --show-all Kiírja az összes változást, zárójelezi az ütközéseket.
|
|
Translated and reviewed by
Andras Timar
|
|
|
|
Located in
src/diff3.c:431
|
|
147.
|
|
|
-x --overlap-only Output overlapping changes.
|
|
|
|
-x --overlap-only Kiírja az átfedő változtatásokat.
|
|
Translated and reviewed by
Andras Timar
|
|
|
|
Located in
src/diff3.c:432
|