Browsing Russian translation

Don't show this notice anymore
Before translating, be sure to go through Ubuntu Translators instructions and Russian guidelines.
515524 of 2380 results
515.
Redo a merge.
Повторить слияние.
Translated by Yuri Matronov on 2013-09-02
Reviewed by Alex on 2015-08-10
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.
There are line breaks here. Each one represents a line break. Start a new line in the equivalent position in the translation.
Используйте, если Вы хотите попробовать другой метод слияния при решении конфликтов.
Одни методы слияния лучше, чем другие, и remerge (повтор слияния)
позволяет попробовать различные варианты на разных файлах.
Translated and reviewed by Alex on 2015-08-12
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.
There are line breaks here. Each one represents a line break. Start a new line in the equivalent position in the translation.
(no translation yet)
Located in bzrlib/builtins.py:4659
518.
:Examples:
Re-do the merge of all conflicted files, and show the base text in
conflict regions, in addition to the usual THIS and OTHER texts::
There are line breaks here. Each one represents a line break. Start a new line in the equivalent position in the translation.
There are leading/trailing spaces here. Each one represents a space character. Enter a space in the equivalent position in the translation.
(no translation yet)
Located in bzrlib/builtins.py:4663
519.
bzr remerge --show-base
There are leading/trailing spaces here. Each one represents a space character. Enter a space in the equivalent position in the translation.
(no translation yet)
Located in bzrlib/builtins.py:4667
520.
Re-do the merge of "foobar", using the weave merge algorithm, with
additional processing to reduce the size of conflict regions::
There are line breaks here. Each one represents a line break. Start a new line in the equivalent position in the translation.
There are leading/trailing spaces here. Each one represents a space character. Enter a space in the equivalent position in the translation.
(no translation yet)
Located in bzrlib/builtins.py:4669
521.
bzr remerge --merge-type weave --reprocess foobar
There are leading/trailing spaces here. Each one represents a space character. Enter a space in the equivalent position in the translation.
(no translation yet)
Located in bzrlib/builtins.py:4672
522.
Show base revision text in conflicts.
(no translation yet)
Located in bzrlib/builtins.py:4679
523.
Sorry, remerge only works after normal merges. Not cherrypicking or multi-merges.
(no translation yet)
Located in bzrlib/builtins.py:4691
524.
Set files in the working tree back to the contents of a previous revision.
Вернуть файлы в рабочем дереве к содержанию предыдущей ревизии.
Translated and reviewed by Alex on 2015-08-10
Located in bzrlib/builtins.py:4749
515524 of 2380 results

This translation is managed by Russian Ubuntu Translators, assigned by Ubuntu Translators.

You are not logged in. Please log in to work on translations.

Contributors to this translation: Alex, AsstZD, Dennis Kowalski, Dmitriy Nogay, Oleg Koptev, Roman Kornev, Sergej セルゲイ, Sergey Basalaev, Yuri Matronov, gavenkoa, skybon, Денис, Руслан.