|
9.
|
|
|
Exiting because of an unresolved conflict.
|
|
|
|
Wird wegen eines unaufgelösten Konfliktes beendet.
|
|
Translated and reviewed by
Tobias Bannert
|
In upstream: |
|
Beende wegen unaufgelöstem Konflikt.
|
|
|
Suggested by
Ralf Thielow
|
|
|
|
Located in
advice.c:204
|
|
14.
|
|
|
unrecognized whitespace option '%s '
|
|
|
|
Nicht erkannte Whitespace-Option: '%s '
|
|
Translated by
Matthias Rüster
|
|
Reviewed by
Christoph Gerlach
|
In upstream: |
|
nicht erkannte Whitespace-Option: '%s '
|
|
|
Suggested by
Ralf Thielow
|
|
|
|
Located in
apply.c:70
|
|
18.
|
|
|
--3way outside a repository
|
|
|
|
--3way kann nicht außerhalb eines Repositories verwendet werden
|
|
Translated by
Matthias Rüster
|
|
Reviewed by
Torsten Franz
|
In upstream: |
|
Die Option --3way kann nicht außerhalb eines Repositories verwendet werden.
|
|
|
Suggested by
Ralf Thielow
|
|
|
|
Located in
apply.c:139
|
|
19.
|
|
|
--index outside a repository
|
|
|
|
--index kann nicht außerhalb eines Repositories verwendet werden
|
|
Translated by
Matthias Rüster
|
|
Reviewed by
Torsten Franz
|
In upstream: |
|
Die Option --index kann nicht außerhalb eines Repositories verwendet werden.
|
|
|
Suggested by
Ralf Thielow
|
|
|
|
Located in
apply.c:150
|
|
20.
|
|
|
--cached outside a repository
|
|
|
|
--cached kann nicht außerhalb eines Repositories verwendet werden
|
|
Translated by
Matthias Rüster
|
|
Reviewed by
Torsten Franz
|
In upstream: |
|
Die Option --cached kann nicht außerhalb eines Repositories verwendet werden.
|
|
|
Suggested by
Ralf Thielow
|
|
|
|
Located in
apply.c:153
|
|
23.
|
|
|
unable to find filename in patch at line %d
|
|
|
|
konnte keinen Dateinamen in Zeile %d des Patches finden
|
|
Translated by
Matthias Rüster
|
|
Reviewed by
Torsten Franz
|
In upstream: |
|
Konnte keinen Dateinamen in Zeile %d des Patches finden.
|
|
|
Suggested by
Ralf Thielow
|
|
|
|
Located in
apply.c:883
|
|
29.
|
|
|
inconsistent header lines %d and %d
|
|
|
|
inkonsistente Kopfzeilen %d und %d
|
|
Translated by
Matthias Rüster
|
|
Reviewed by
Christoph Gerlach
|
In upstream: |
|
Inkonsistente Kopfzeilen %d und %d .
|
|
|
Suggested by
Ralf Thielow
|
|
|
|
Located in
apply.c:1281
|
|
39.
|
|
|
** warning: file %s becomes empty but is not deleted
|
|
|
|
** Warnung: Datei %s wird leer, aber ist nicht entfernt
|
|
Translated by
Matthias Rüster
|
|
Reviewed by
Christoph Gerlach
|
In upstream: |
|
** Warnung: Datei %s wird leer, aber nicht entfernt.
|
|
|
Suggested by
Ralf Thielow
|
|
|
|
Located in
apply.c:1830
|
|
47.
|
|
|
Context reduced to (%ld /%ld ) to apply fragment at %d
|
|
|
|
Kontext reduziert zu (%ld /%ld ), um Patch-Bereich bei %d anzuwenden
|
|
Translated by
Ralf Thielow
|
|
Reviewed by
Torsten Franz
|
In upstream: |
|
Kontext reduziert zu (%ld /%ld ) um Patch-Bereich bei %d anzuwenden
|
|
|
Suggested by
Ralf Thielow
|
|
|
|
Located in
apply.c:3069
|
|
52.
|
|
|
the patch applies to '%s ' (%s ), which does not match the current contents.
|
|
|
|
der Patch wird angewendet auf ' %s ' ( %s ), was nicht den aktuellen Inhalten
entspricht.
|
|
Translated by
Matthias Rüster
|
|
Reviewed by
Christoph Gerlach
|
In upstream: |
|
der Patch wird angewendet auf ' %s ' ( %s ), was nicht den aktuellen Inhalten
entspricht
|
|
|
Suggested by
Ralf Thielow
|
|
|
|
Located in
apply.c:3163
|