|
|
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
|
|
|
116.
|
|
|
%d conflict auto-resolved.
|
|
|
|
%d conflicts auto-resolved.
|
|
|
|
|
%d konflikt automatycznie rozwiązany.
|
|
Translated and reviewed by
janisozaur
|
|
|
|
%d konfliktów automatycznie rozwiązanych.
|
|
Translated and reviewed by
janisozaur
|
|
|
|
(no translation yet)
|
|
Translated and reviewed by
janisozaur
|
|
|
|
Located in
lib\conflicts.py:193
|
|
|
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
|
|
|
|
|
(no translation yet)
|
|
|
|
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.
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
lib\conflicts.py:299
|
|
|
125.
|
|
|
Missing the flag: %s. Configure in qconfig under the merge tab.
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
lib\conflicts.py:305
|
|
|
131.
|
|
|
parent loop
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
lib\conflicts.py:315
|
|
|
132.
|
|
|
unversioned parent
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
lib\conflicts.py:316
|
