|
|
508.
|
|
|
Cannot pull individual files
|
|
|
|
|
Невозможно получить отдельные файлы
|
|
Translated by
Руслан
|
|
Reviewed by
Alex
|
|
|
|
Located in
bzrlib/builtins.py:4455
|
|
|
509.
|
|
|
This branch has no commits. (perhaps you would prefer 'bzr pull')
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
bzrlib/builtins.py:4463
|
|
|
510.
|
|
|
Show-base is not supported for this merge type. %s
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
bzrlib/builtins.py:4521
|
|
|
511.
|
|
|
Conflict reduction is not supported for merge type %s.
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
bzrlib/builtins.py:4530
|
|
|
512.
|
|
|
Cannot do conflict reduction and show base.
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
bzrlib/builtins.py:4534
|
|
|
513.
|
|
|
No location specified or remembered
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
bzrlib/builtins.py:4645
|
|
|
514.
|
|
|
{0} remembered {1} location {2}
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
bzrlib/builtins.py:4647
|
|
|
515.
|
|
|
Redo a merge.
|
|
|
|
|
Повторить слияние.
|
|
Translated by
Yuri Matronov
|
|
Reviewed by
Alex
|
|
|
|
Located in
bzrlib/builtins.py:4653
|
|
|
516.
|
|
|
Use this if you want to try a different merge technique while resolving 
conflicts. Some merge techniques are better than others, and remerge
lets you try different ones on different files. |
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
|
Используйте, если Вы хотите попробовать другой метод слияния при решении конфликтов.
Одни методы слияния лучше, чем другие, и remerge (повтор слияния)
позволяет попробовать различные варианты на разных файлах. |
|
Translated and reviewed by
Alex
|
|
|
|
Located in
bzrlib/builtins.py:4655
|
|
|
517.
|
|
|
The options for remerge have the same meaning and defaults as the ones for
merge. The difference is that remerge can (only) be run when there is a
pending merge, and it lets you specify particular files. |
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
bzrlib/builtins.py:4659
|
