|
|
5.
|
|
|
Pulling is not possible because you have unmerged files.
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
advice.c:184
|
|
|
6.
|
|
|
Reverting is not possible because you have unmerged files.
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
advice.c:186
|
|
|
7.
|
|
|
It is not possible to %s because you have unmerged files.
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
advice.c:188
|
|
|
8.
|
|
|
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.
|
|
|
|
|
Popravite ih u radnom stablu, pa onda koristite 'git add/rm <file>'
prikladno da označite rješenje i napravite izvršenje. |
|
Translated by
Ajdin Karahasanović
|
|
Reviewed by
Samir Ribić
|
|
|
|
Located in
advice.c:196
|
|
|
9.
|
|
|
Exiting because of an unresolved conflict.
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
advice.c:204
|
|
|
10.
|
|
|
You have not concluded your merge (MERGE_HEAD exists).
|
|
|
|
|
Niste zaljučili vaše spajanje (MERGE_head exists).
|
|
Translated by
ena micto
|
|
Reviewed by
Samir Ribić
|
|
|
|
Located in
advice.c:209 builtin/merge.c:1379
|
|
|
11.
|
|
|
Please, commit your changes before merging.
|
|
|
|
|
Molimo Vas da spasite promjene prije spajanja.
|
|
Translated by
Nihad Jamaković
|
|
Reviewed by
Samir Ribić
|
|
|
|
Located in
advice.c:211
|
|
|
12.
|
|
|
Exiting because of unfinished merge.
|
|
|
|
|
Izlaz uslijed nedovršenog spajanja.
|
|
Translated by
Nihad Jamaković
|
|
Reviewed by
Samir Ribić
|
|
|
|
Located in
advice.c:212
|
|
|
13.
|
|
|
Note: checking out ' %s'.
You are in 'detached HEAD' state. You can look around, make experimental
changes and commit them, and you can discard any commits you make in this
state without impacting any branches by performing another checkout.
If you want to create a new branch to retain commits you create, you may
do so (now or later) by using -b with the checkout command again. Example:
git checkout -b <new-branch-name>
|
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
represents a space character.
Enter a space in the equivalent position in the translation.
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
advice.c:130
|
|
|
14.
|
|
|
unrecognized whitespace option '%s'
|
|
|
|
|
neprepoznati razmak u opciji '%s'
|
|
Translated and reviewed by
Samir Ribić
|
|
|
|
Located in
apply.c:70
|
