|
|
121.
|
|
|
Bazaar 2.4 or later is required for external mergetools support
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
lib\conflicts.py:265
|
|
|
122.
|
|
|
Set up external_merge app in qconfig under the Merge tab
|
|
|
|
|
Set up external_merge application in qconfig under the Merge tab
|
|
Translated and reviewed by
Dr Al
|
|
|
|
Located in
lib\conflicts.py:275
|
|
|
123.
|
|
|
External merge tool %(tool)s is not available
|
|
|
|
|
(no translation yet)
|
|
|
|
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.
|
|
|
|
|
The extmerge definition: '%(tool)s' is invalid.
Missing the flag: %(flags)s. This must be fixed in qconfig under the Merge tab. |
|
Translated and reviewed by
Dr Al
|
|
|
|
Located in
lib\conflicts.py:299
|
|
|
125.
|
|
|
Missing the flag: %s. Configure in qconfig under the merge tab.
|
|
|
|
|
Missing the flag: %s. Configure in qconfig under the merge tab.
|
|
Translated and reviewed by
Dr Al
|
|
|
|
Located in
lib\conflicts.py:305
|
|
|
126.
|
|
|
path conflict
|
|
|
|
|
path conflict
|
|
Translated and reviewed by
Dr Al
|
|
|
|
Located in
lib\conflicts.py:310
|
|
|
127.
|
|
|
contents conflict
|
|
|
|
|
contents conflict
|
|
Translated and reviewed by
Dr Al
|
|
|
|
Located in
lib\conflicts.py:311
|
|
|
128.
|
|
|
text conflict
|
|
|
|
|
text conflict
|
|
Translated and reviewed by
Dr Al
|
|
|
|
Located in
lib\conflicts.py:312
|
|
|
129.
|
|
|
duplicate id
|
|
|
|
|
duplicate id
|
|
Translated and reviewed by
Dr Al
|
|
|
|
Located in
lib\conflicts.py:313
|
|
|
130.
|
|
|
duplicate
|
|
|
|
|
duplicate
|
|
Translated and reviewed by
Dr Al
|
|
|
|
Located in
lib\conflicts.py:314
|
