|
|
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
|
|
|
124.
|
|
|
The extmerge definition: '%(tool)s' is invalid. 
Missing the flag: %(flags)s. This must be fixed in qconfig under the Merge tab. |
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
lib\conflicts.py:299
|
|
|
125.
|
|
|
Missing the flag: %s. Configure in qconfig under the merge tab.
|
|
|
|
|
De vlag %s ontbreekt. Configureer dit in qconfig onder het tabblad Samenvoegen.
|
|
Translated and reviewed by
Hannie Dumoleyn
|
|
|
|
Located in
lib\conflicts.py:305
|
|
|
126.
|
|
|
path conflict
|
|
|
|
|
padconflict
|
|
Translated and reviewed by
Hannie Dumoleyn
|
|
|
|
Located in
lib\conflicts.py:310
|
|
|
127.
|
|
|
contents conflict
|
|
|
|
|
conflicterende inhoud
|
|
Translated and reviewed by
Jeroen Hellingman
|
|
|
|
Located in
lib\conflicts.py:311
|
|
|
128.
|
|
|
text conflict
|
|
|
|
|
conflicterende text
|
|
Translated and reviewed by
Jeroen Hellingman
|
|
|
|
Located in
lib\conflicts.py:312
|
