|
|
501.
|
|
|
Instead of merging, show a diff of the merge.
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
bzrlib/builtins.py:4367
|
|
|
502.
|
|
|
Select changes interactively.
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
bzrlib/builtins.py:4369
|
|
|
503.
|
|
|
Merging into empty branches not currently supported, https://bugs.launchpad.net/bzr/+bug/308562
|
|
|
|
|
Слияние в пустые ветки в настоящее время не поддерживается, https://bugs.launchpad.net/bzr/+bug/308562
|
|
Translated by
Yuri Matronov
|
|
Reviewed by
Alex
|
|
|
|
Located in
bzrlib/builtins.py:4391
|
|
|
504.
|
|
|
Cannot use --uncommitted with bundles or merge directives.
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
bzrlib/builtins.py:4418
|
|
|
505.
|
|
|
Cannot use --uncommitted and --revision at the same time.
|
|
|
|
|
Нельзя использовать одновременно --uncommitted и --revision
|
|
Translated and reviewed by
Alex
|
|
|
|
Located in
bzrlib/builtins.py:4429
|
|
|
506.
|
|
|
merger:
|
|
|
represents a space character.
Enter a space in the equivalent position in the translation.
|
|
|
|
|
слияние:
|
|
Translated by
Руслан
|
|
Reviewed by
Alex
|
|
|
|
Located in
bzrlib/builtins.py:4449
|
|
|
507.
|
|
|
Nothing to do.
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
bzrlib/builtins.py:4451 bzrlib/bundle/apply_bundle.py:71
|
|
|
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
|
