|
|
115.
|
|
|
Mark as &resolved
|
|
|
|
|
Oznacz jako &resolved
|
|
Translated and reviewed by
PPln
|
|
|
|
Located in
lib\conflicts.py:158
|
|
|
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
|
|
|
117.
|
|
|
&OK
|
|
|
|
|
&OK
|
|
Translated and reviewed by
Jakub Wieczorek
|
|
|
|
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.
|
|
|
|
|
Wszystkie konflikty rozwiązane
|
|
Translated and reviewed by
PPln
|
|
|
|
Located in
lib\conflicts.py:200
|
|
|
119.
|
|
|
Error while running merge tool (code %d)
|
|
|
|
|
Błąd podczas działania merge tool (kod %d)
|
|
Translated and reviewed by
janisozaur
|
|
|
|
Located in
lib\conflicts.py:235
|
|
|
120.
|
|
|
Error
|
|
|
|
|
Błąd
|
|
Translated and reviewed by
Jakub Wieczorek
|
|
|
|
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
|
|
|
|
|
(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
|
