|
|
113.
|
|
|
Take "&THIS" version
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
lib\conflicts.py:154
|
|
|
114.
|
|
|
Take "&OTHER" version
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
lib\conflicts.py:156
|
|
|
115.
|
|
|
Mark as &resolved
|
|
|
|
|
Markiere als &gelöst
|
|
Translated by
Matthäus G. Chajdas
|
|
Reviewed by
Eduard Gotwig
|
|
|
|
Located in
lib\conflicts.py:158
|
|
|
116.
|
|
|
%d conflict auto-resolved.
|
|
|
|
%d conflicts auto-resolved.
|
|
|
|
|
%d Konflikt automatisch aufgelöst.
|
|
Translated by
zsquareplusc
|
|
Reviewed by
marco.jahn
|
|
|
|
%d Konflikte automatisch aufgelöst.
|
|
Translated by
zsquareplusc
|
|
Reviewed by
marco.jahn
|
|
|
|
Located in
lib\conflicts.py:193
|
|
|
117.
|
|
|
&OK
|
|
|
|
|
&OK
|
|
Translated and reviewed by
hangy
|
|
|
|
Located in
lib\conflicts.py:196 lib\conflicts.py:201 lib\diffwindow.py:461
lib\util.py:69 lib/widgets\shelve.py:630 lib/widgets\shelve.py:674
lib/widgets\shelve.py:721 lib/widgets\shelve.py:725
|
|
|
118.
|
|
|
All conflicts resolved.
|
|
|
|
|
Alle Konflikte gelöst
|
|
Translated and reviewed by
Christian Faulhammer
|
|
|
|
Located in
lib\conflicts.py:200
|
|
|
119.
|
|
|
Error while running merge tool (code %d)
|
|
|
|
|
Fehler während der Ausführung vom Verschmelzungswerkzeug (code %d)
|
|
Translated and reviewed by
Eduard Gotwig
|
|
|
|
Located in
lib\conflicts.py:235
|
|
|
120.
|
|
|
Error
|
|
|
|
|
Fehler
|
|
Translated by
besy
|
|
|
|
Located in
lib\conflicts.py:236 lib\conflicts.py:298 lib\tag.py:194 lib\trace.py:193
lib\trace.py:200 lib\tree_branch.py:95 lib\util.py:420 lib\util.py:1011
lib\util.py:1021
|
|
|
121.
|
|
|
Bazaar 2.4 or later is required for external mergetools support
|
|
|
|
|
Bazaar 2.4 oder neuer wird für die Unterstützung von externen Merge-Tools benötigt.
|
|
Translated by
André Bachmann
|
|
Reviewed by
Daniel Winzen
|
|
|
|
Located in
lib\conflicts.py:265
|
|
|
122.
|
|
|
Set up external_merge app in qconfig under the Merge tab
|
|
|
|
|
Richten Sie die external_merge-Anwendung in qconfig im Merge-Reiter ein
|
|
Translated and reviewed by
Daniel Winzen
|
|
|
|
Located in
lib\conflicts.py:275
|
