|
|
77.
|
|
|
Cannot resolve conflict
|
|
|
|
|
Невозможно разрешить конфликт
|
|
Translated and reviewed by
Petr E. Antonov
|
|
|
|
Located in
../conflicts.py:174
|
|
|
78.
|
|
|
Only conflicts on the text of files can be resolved with Olive at the moment. Content conflicts, on the structure of the tree, need to be resolved using the command line.
|
|
|
|
|
В настоящее время, при помощи Olive можно разрешить только конфликты текста в файлах. Конфликты содержимого, структуры дерева должны разрешаться используя командную строку.
|
|
Translated by
Mikhail Pitertsev
|
|
Reviewed by
Oleg Koptev
|
|
|
|
Located in
../conflicts.py:175
|
|
|
79.
|
|
|
_View
|
|
|
View menu
|
|
|
|
|
_Просмотр
|
|
Translated and reviewed by
Rail Aliiev
|
|
|
|
Located in
../diff.py:445
|
|
|
80.
|
|
|
Wrap _Long Lines
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
../diff.py:448
|
|
|
81.
|
|
|
Merge successful
|
|
|
No conflicts found.
|
|
|
|
|
Объединение прошло успешно
|
|
Translated by
Mikhail Pitertsev
|
|
Reviewed by
XPEH
|
|
|
|
Located in
../diff.py:493 ../merge.py:144
|
|
|
82.
|
|
|
All changes applied successfully.
|
|
|
|
|
Все изменения применены успешно .
|
|
Translated and reviewed by
Petr E. Antonov
|
|
|
|
Located in
../diff.py:494 ../merge.py:145
|
|
|
83.
|
|
|
Conflicts encountered
|
|
|
There are conflicts to be resolved.
|
|
|
|
|
Обнаружены конфликты
|
|
Translated and reviewed by
Petr E. Antonov
|
|
|
|
Located in
../diff.py:497 ../merge.py:148
|
|
|
84.
|
|
|
Please resolve the conflicts manually before committing.
|
|
|
|
|
Пожалуйста, разрешите конфликты вручную перед публикацией.
|
|
Translated by
Mikhail Pitertsev
|
|
Reviewed by
XPEH
|
|
|
|
Located in
../diff.py:498 ../merge.py:149
|
|
|
85.
|
|
|
Directory is not a branch
|
|
|
|
|
Каталог не является ветвью
|
|
Translated by
Pavel A. Bragin
|
|
Reviewed by
XPEH
|
|
|
|
Located in
../errors.py:31
|
|
|
86.
|
|
|
You can perform this action only in a branch.
|
|
|
|
|
Вы можете применить это действие только к ветви.
|
|
Translated by
Mikhail Pitertsev
|
|
Reviewed by
XPEH
|
|
|
|
Located in
../errors.py:32
|
