|
|
92.
|
|
|
Merge location is already fully merged in working tree.
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
../errors.py:41
|
|
|
93.
|
|
|
Conflicts in tree
|
|
|
|
|
Конфликты в дереве
|
|
Translated by
Pavel A. Bragin
|
|
Reviewed by
Oleg Koptev
|
|
|
|
Located in
../errors.py:43
|
|
|
94.
|
|
|
You need to resolve the conflicts before committing.
|
|
|
|
|
Вам необходимо устранить все конфликты перед публикацией.
|
|
Translated by
Mikhail Pitertsev
|
|
Reviewed by
Oleg Koptev
|
|
|
|
Located in
../errors.py:44
|
|
|
95.
|
|
|
Strict commit failed
|
|
|
|
|
Ошибка точной публикации
|
|
Translated by
Mikhail Pitertsev
|
|
Reviewed by
XPEH
|
|
|
|
Located in
../errors.py:46
|
|
|
96.
|
|
|
There are unknown files in the working tree. 
Please add or delete them. |
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
|
В рабочем дереве содержаться неизвестные файлы.
Пожалуйста добавьте или удалите их. |
|
Translated by
Mikhail Pitertsev
|
|
Reviewed by
XPEH
|
|
|
|
Located in
../errors.py:47
|
|
|
97.
|
|
|
Bound branch is out of date
|
|
|
|
|
Связанная ветвь устарела
|
|
Translated by
Mikhail Pitertsev
|
|
Reviewed by
Oleg Koptev
|
|
|
|
Located in
../errors.py:49
|
|
|
98.
|
|
|
%s
|
|
|
FIXME: Really ? Internationalizing %s ?? --vila080505
|
|
|
|
|
%s
|
|
Translated and reviewed by
Oleg Koptev
|
|
|
|
Located in
../errors.py:51
|
|
|
99.
|
|
|
File not versioned
|
|
|
|
|
Файл без версии
|
|
Translated by
XPEH
|
|
Reviewed by
XPEH
|
|
|
|
Located in
../errors.py:53
|
|
|
100.
|
|
|
The selected file is not versioned.
|
|
|
|
|
Выбранный файл без версии
|
|
Translated by
XPEH
|
|
Reviewed by
XPEH
|
|
|
|
Located in
../errors.py:54
|
|
|
101.
|
|
|
Branches have been diverged
|
|
|
|
|
Ветви не совпадают
|
|
Translated by
Pavel A. Bragin
|
|
Reviewed by
XPEH
|
|
|
|
Located in
../errors.py:56 ../push.py:100
|
