|
|
103.
|
|
|
Select base directory for checkouts
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
lib\config.py:726
|
|
|
104.
|
|
|
Select default directory for branch sources
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
lib\config.py:733
|
|
|
105.
|
|
|
Command Line
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
lib\config.py:974
|
|
|
106.
|
|
|
Conflicts
|
|
|
|
|
Конфликты
|
|
Translated and reviewed by
Alexander Belchenko
|
|
|
|
Located in
lib\conflicts.py:50 lib\conflicts.py:170 lib\conflicts.py:192
lib\conflicts.py:199
|
|
|
107.
|
|
|
File
|
|
|
|
|
Файл
|
|
Translated by
Alexander Belchenko
|
|
|
|
Located in
lib\conflicts.py:61 lib\ignore.py:57
|
|
|
108.
|
|
|
Conflict
|
|
|
|
|
Конфликт
|
|
Translated and reviewed by
Alexander Belchenko
|
|
|
|
Located in
lib\conflicts.py:62
|
|
|
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
|
