|
24.
|
|
|
Your branch is ahead of ' %s ' by %d commit.
|
|
|
Your branch is ahead of ' %s ' by %d commits.
|
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
(no translation yet)
|
|
|
|
Located in
remote.c:2037
|
|
25.
|
|
|
Your branch is behind ' %s ' by %d commit, and can be fast-forwarded.
|
|
|
Your branch is behind ' %s ' by %d commits, and can be fast-forwarded.
|
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
(no translation yet)
|
|
|
|
Located in
remote.c:2046
|
|
26.
|
|
|
Your branch and ' %s ' have diverged, ![](/@@/translation-newline)
and have %d and %d different commit each, respectively.
|
|
|
Your branch and ' %s ' have diverged, ![](/@@/translation-newline)
and have %d and %d different commits each, respectively.
|
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
(no translation yet)
|
|
|
|
Located in
remote.c:2057
|
|
27.
|
|
|
Could not open '%s ' for writing
|
|
|
|
(no translation yet)
|
|
|
|
Located in
refs.c:706
|
|
28.
|
|
|
Could not write to '%s '
|
|
|
|
(no translation yet)
|
|
|
|
Located in
builtin/merge.c:344 builtin/merge.c:763 builtin/merge.c:975
builtin/merge.c:988
|
|
29.
|
|
|
after resolving the conflicts, mark the corrected paths ![](/@@/translation-newline)
with 'git add <paths>' or 'git rm <paths>'
|
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
(no translation yet)
|
|
|
|
Located in
sequencer.c:387
|
|
30.
|
|
|
after resolving the conflicts, mark the corrected paths ![](/@@/translation-newline)
with 'git add <paths>' or 'git rm <paths>' ![](/@@/translation-newline)
and commit the result with 'git commit'
|
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
(no translation yet)
|
|
|
|
Located in
sequencer.c:390
|
|
31.
|
|
|
Could not write to %s
|
|
|
|
(no translation yet)
|
|
|
|
Located in
sequencer.c:199 sequencer.c:842 sequencer.c:922
|
|
32.
|
|
|
Error wrapping up %s
|
|
|
|
(no translation yet)
|
|
|
|
Located in
sequencer.c:202
|
|
33.
|
|
|
Your local changes would be overwritten by cherry-pick.
|
|
|
|
(no translation yet)
|
|
|
|
Located in
sequencer.c:217
|