|
69.
|
|
|
parent loop
|
|
|
|
начальный контур
|
|
Translated by
XPEH
|
|
Reviewed by
XPEH
|
|
|
|
Located in
../conflicts.py:124
|
|
70.
|
|
|
unversioned parent
|
|
|
|
вне версионный предок
|
|
Translated by
XPEH
|
|
Reviewed by
XPEH
|
|
|
|
Located in
../conflicts.py:126
|
|
71.
|
|
|
missing parent
|
|
|
|
отсутствует предок
|
|
Translated by
XPEH
|
|
Reviewed by
XPEH
|
|
|
|
Located in
../conflicts.py:128
|
|
72.
|
|
|
deleting parent
|
|
|
|
удален предок
|
|
Translated by
XPEH
|
|
Reviewed by
XPEH
|
|
|
|
Located in
../conflicts.py:130
|
|
73.
|
|
|
unknown type of conflict
|
|
|
|
неизвестный тип конфликта
|
|
Translated by
Mikhail Pitertsev
|
|
Reviewed by
Oleg Koptev
|
|
|
|
Located in
../conflicts.py:132
|
|
74.
|
|
|
No file was selected
|
|
|
|
Файл не был выбран
|
|
Translated by
Pavel A. Bragin
|
|
Reviewed by
Oleg Koptev
|
|
|
|
Located in
../conflicts.py:161
|
|
75.
|
|
|
Please select a file from the list.
|
|
|
|
Пожалуйста, выберите файл из списка.
|
|
Translated and reviewed by
Petr E. Antonov
|
|
|
|
Located in
../conflicts.py:162
|
|
76.
|
|
|
Call to external utility failed
|
|
|
|
Вызов внешнего приложения неудачен
|
|
Translated by
Mikhail Pitertsev
|
|
Reviewed by
Oleg Koptev
|
|
|
|
Located in
../conflicts.py:172
|
|
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
|