|
|
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
|
|
|
87.
|
|
|
Directory is not a checkout
|
|
|
|
|
Каталог не проверен
|
|
Translated by
XPEH
|
|
Reviewed by
XPEH
|
|
|
|
Located in
../errors.py:34
|
|
|
88.
|
|
|
You can perform local commit only on checkouts.
|
|
|
|
|
Вы можете выполнить локальную публикацию только после проверки.
|
|
Translated by
XPEH
|
|
Reviewed by
XPEH
|
|
|
|
Located in
../errors.py:35
|
|
|
89.
|
|
|
No changes to commit
|
|
|
|
|
Нет изменений для публикации
|
|
Translated by
Mikhail Pitertsev
|
|
Reviewed by
XPEH
|
|
|
|
Located in
../errors.py:37
|
|
|
90.
|
|
|
Try force commit if you want to commit anyway.
|
|
|
|
|
Попытаться опубликовать если вы хотите опубликовать в любом случае.
|
|
Translated by
XPEH
|
|
Reviewed by
XPEH
|
|
|
|
Located in
../errors.py:38
|
|
|
91.
|
|
|
No changes to merge
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
../errors.py:40
|
