|
|
109.
|
|
|
&Launch...
|
|
|
|
|
Запустить...
|
|
Translated and reviewed by
Alexander Belchenko
|
|
|
|
Located in
lib\conflicts.py:94
|
|
|
110.
|
|
|
M&erge tool:
|
|
|
|
|
Программа для объединения изменений:
|
|
Translated and reviewed by
Alexander Belchenko
|
|
|
|
Located in
lib\conflicts.py:100
|
|
|
111.
|
|
|
Auto-resolve
|
|
|
|
|
Автоматически
|
|
Translated and reviewed by
Alexander Belchenko
|
|
|
|
Located in
lib\conflicts.py:116
|
|
|
112.
|
|
|
&Merge conflict
|
|
|
|
|
&Объединить конфликты
|
|
Translated and reviewed by
Alex L.
|
|
|
|
Located in
lib\conflicts.py:148 lib\treewidget.py:1706
|
|
|
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
|
|
|
115.
|
|
|
Mark as &resolved
|
|
|
|
|
Снять пометку о конфликте
|
|
Translated and reviewed by
Alexander Belchenko
|
|
|
|
Located in
lib\conflicts.py:158
|
|
|
116.
|
|
|
%d conflict auto-resolved.
|
|
|
|
%d conflicts auto-resolved.
|
|
|
|
|
Автоматически решён %d конфликт.
|
|
Translated and reviewed by
Alexander Belchenko
|
|
|
|
Автоматически решены %d конфликта.
|
|
Translated and reviewed by
Alexander Belchenko
|
|
|
|
Автоматически решены %d конфликтов.
|
|
Translated and reviewed by
Alexander Belchenko
|
|
|
|
Located in
lib\conflicts.py:193
|
|
|
117.
|
|
|
&OK
|
|
|
|
|
&ОК
|
|
Translated and reviewed by
Alexander Belchenko
|
|
|
|
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.
|
|
|
|
|
Все конфликты автоматически решены.
|
|
Translated and reviewed by
Alexander Belchenko
|
|
|
|
Located in
lib\conflicts.py:200
|
