|
|
11.
|
|
|
make_cache_entry failed for path '%s'
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
add-interactive.c:733 apply.c:4149 builtin/checkout.c:298
builtin/reset.c:151
|
|
|
43.
|
|
|
path
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
add-interactive.c:1148 apply.c:5016 apply.c:5019 builtin/am.c:2311
builtin/am.c:2314 builtin/bugreport.c:107 builtin/clone.c:128
builtin/fetch.c:152 builtin/merge.c:286 builtin/pull.c:194
builtin/submodule--helper.c:404 builtin/submodule--helper.c:1857
builtin/submodule--helper.c:1860 builtin/submodule--helper.c:2503
builtin/submodule--helper.c:2506 builtin/submodule--helper.c:2573
builtin/submodule--helper.c:2578 builtin/submodule--helper.c:2811
git-add--interactive.perl:213
|
|
|
116.
|
|
|
Cherry-picking is not possible because you have unmerged files.
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
advice.c:178
|
|
|
117.
|
|
|
Committing is not possible because you have unmerged files.
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
advice.c:180
|
|
|
118.
|
|
|
Merging is not possible because you have unmerged files.
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
advice.c:182
|
|
|
119.
|
|
|
Pulling is not possible because you have unmerged files.
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
advice.c:184
|
|
|
120.
|
|
|
Reverting is not possible because you have unmerged files.
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
advice.c:186
|
|
|
121.
|
|
|
It is not possible to %s because you have unmerged files.
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
advice.c:188
|
|
|
122.
|
|
|
Fix them up in the work tree, and then use 'git add/rm <file>' 
as appropriate to mark resolution and make a commit. |
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
advice.c:196
|
|
|
123.
|
|
|
Exiting because of an unresolved conflict.
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
advice.c:204
|
