|
66.
|
|
|
text conflict
|
|
|
|
текстовый конфликт
|
|
Translated and reviewed by
Petr E. Antonov
|
|
|
|
Located in
../conflicts.py:118
|
|
67.
|
|
|
duplicate id
|
|
|
|
совпадающий id
|
|
Translated by
Mikhail Pitertsev
|
|
Reviewed by
Oleg Koptev
|
|
|
|
Located in
../conflicts.py:120
|
|
68.
|
|
|
duplicate
|
|
|
|
дубликат
|
|
Translated and reviewed by
Rail Aliiev
|
|
|
|
Located in
../conflicts.py:122
|
|
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
|