|
187.
|
|
|
Randy Smith
|
|
|
This is a proper name. See the gettext manual, section Names.
|
|
|
|
Randy Smith
|
|
Translated by
Daniel Winzen
|
|
Reviewed by
Hendrik Schrieber
|
|
|
|
Located in
src/diff3.c:51
|
|
188.
|
|
|
incompatible options
|
|
|
|
Inkompatible Optionen.
|
|
Translated and reviewed by
Martin v. Löwis
|
|
|
|
Located in
src/diff3.c:363
|
|
189.
|
|
|
`-' specified for more than one input file
|
|
|
|
»-« für mehr als eine Eingabedatei angegeben.
|
|
Translated and reviewed by
Martin v. Löwis
|
|
|
|
Located in
src/diff3.c:353
|
|
190.
|
|
|
read failed
|
|
|
|
Lesefehler.
|
|
Translated and reviewed by
Martin v. Löwis
|
|
|
|
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 Alle Änderungen ausgeben, Konflikte in Klammern.
|
|
Translated by
Mario Blättermann
|
|
|
|
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 ed-Script ausgeben, das die Änderungen
von ALTEDATEI hin zu DEINEDATEI in
MEINEDATEI integriert.
|
|
Translated by
Mario Blättermann
|
|
|
|
Located in
src/diff3.c:480
|
|
193.
|
|
|
-E, --show-overlap like -e, but bracket conflicts
|
|
|
|
-E --show-overlap Wie -e, aber Konflikte in Klammern.
|
|
Translated by
Mario Blättermann
|
|
|
|
Located in
src/diff3.c:482
|
|
194.
|
|
|
-3, --easy-only like -e, but incorporate only nonoverlapping changes
|
|
|
|
-3, --easy-only Wie -e, aber nur nichtüberlappende Änderungen
integrieren.
|
|
Translated by
Mario Blättermann
|
|
|
|
Located in
src/diff3.c:483
|
|
195.
|
|
|
-x, --overlap-only like -e, but incorporate only overlapping changes
|
|
|
|
-x, --overlap-only Wie -e, aber nur überlappende Änderungen
integrieren.
|
|
Translated by
Mario Blättermann
|
|
|
|
Located in
src/diff3.c:484
|
|
196.
|
|
|
-X like -x, but bracket conflicts
|
|
|
|
-X Wie -x, aber Konflikte in Klammern.
|
|
Translated by
Mario Blättermann
|
|
|
|
Located in
src/diff3.c:485
|