|
|
10.
|
|
|
Base branch is descendant of current branch. Pulling instead. 
|
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
|
Base branch is descendant of current branch. Pulling instead.
|
|
Translated and reviewed by
Jelmer Vernooij
|
|
|
|
Located in
commands.py:181
|
|
|
11.
|
|
|
%d revisions will be rebased:
|
|
|
|
|
%d revisions will be rebased:
|
|
Translated and reviewed by
Vibhav Pant
|
|
|
|
Located in
commands.py:200
|
|
|
12.
|
|
|
A conflict occurred replaying a commit. Resolve the conflict and run 'bzr rebase-continue' or run 'bzr rebase-abort'.
|
|
|
|
|
A conflict occurred replaying a commit. Resolve the conflict and run 'bzr rebase-continue' or run 'bzr rebase-abort'.
|
|
Translated and reviewed by
Vibhav Pant
|
|
|
|
Located in
commands.py:214 commands.py:291
|
|
|
13.
|
|
|
There are still conflicts present. Resolve the conflicts and then run 'bzr resolve' and try again.
|
|
|
|
|
There are still conflicts present. Resolve the conflicts and then run 'bzr resolve' and try again.
|
|
Translated and reviewed by
Vibhav Pant
|
|
|
|
Located in
commands.py:275
|
|
|
14.
|
|
|
No rebase to continue
|
|
|
|
|
No rebase to continue
|
|
Translated and reviewed by
Vibhav Pant
|
|
|
|
Located in
commands.py:282
|
|
|
15.
|
|
|
No rebase in progress
|
|
|
|
|
No rebase in progress
|
|
Translated and reviewed by
Vibhav Pant
|
|
|
|
Located in
commands.py:324
|
|
|
16.
|
|
|
Currently replaying: %s
|
|
|
|
|
Currently replaying: %s
|
|
Translated and reviewed by
Vibhav Pant
|
|
|
|
Located in
commands.py:327
|
|
|
17.
|
|
|
{0} -> {1}
|
|
|
|
|
{0} -> {1}
|
|
Translated and reviewed by
Vibhav Pant
|
|
|
|
Located in
commands.py:329
|
|
|
18.
|
|
|
--revision is mandatory
|
|
|
|
|
--revision is mandatory
|
|
Translated and reviewed by
Vibhav Pant
|
|
|
|
Located in
commands.py:374
|
|
|
19.
|
|
|
replaying commits
|
|
|
|
|
replaying commits
|
|
Translated and reviewed by
Vibhav Pant
|
|
|
|
Located in
commands.py:384
|
