|
|
114.
|
|
|
Take "&OTHER" version
|
|
|
|
|
"&ANDERE" versie nemen
|
|
Translated and reviewed by
Hannie Dumoleyn
|
|
|
|
Located in
lib\conflicts.py:156
|
|
|
115.
|
|
|
Mark as &resolved
|
|
|
|
|
Markeren als &opgelost
|
|
Translated and reviewed by
Hannie Dumoleyn
|
|
|
|
Located in
lib\conflicts.py:158
|
|
|
116.
|
|
|
%d conflict auto-resolved.
|
|
|
|
%d conflicts auto-resolved.
|
|
|
|
|
%d conflict is automatisch opgelost.
|
|
Translated and reviewed by
Hannie Dumoleyn
|
|
|
|
%d conflicten zijn automatisch opgelost.
|
|
Translated and reviewed by
Hannie Dumoleyn
|
|
|
|
Located in
lib\conflicts.py:193
|
|
|
117.
|
|
|
&OK
|
|
|
|
|
&OK
|
|
Translated and reviewed by
ubby
|
|
|
|
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 conflicten zijn opgelost.
|
|
Translated and reviewed by
Jeroen Hellingman
|
|
|
|
Located in
lib\conflicts.py:200
|
|
|
119.
|
|
|
Error while running merge tool (code %d)
|
|
|
|
|
Fout tijdens het gebruik van de merge tool (code %d)
|
|
Translated and reviewed by
Jeroen Hellingman
|
|
|
|
Located in
lib\conflicts.py:235
|
|
|
120.
|
|
|
Error
|
|
|
|
|
Fout
|
|
Translated and reviewed by
Jeroen Hellingman
|
|
|
|
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
|
|
|
|
|
Voor de ondersteuning van externe samenvoeghulpmiddelen is Bazaar 2.4 of later vereist
|
|
Translated and reviewed by
Hannie Dumoleyn
|
|
|
|
Located in
lib\conflicts.py:265
|
|
|
122.
|
|
|
Set up external_merge app in qconfig under the Merge tab
|
|
|
|
|
(no translation yet)
|
|
Translated and reviewed by
Hannie Dumoleyn
|
|
|
|
Located in
lib\conflicts.py:275
|
|
|
123.
|
|
|
External merge tool %(tool)s is not available
|
|
|
|
|
Extern samenvoeghulpmiddel %(tool)s is niet beschikbaar
|
|
Translated and reviewed by
Hannie Dumoleyn
|
|
|
|
Located in
lib\conflicts.py:279
|
