|
835.
|
|
|
cannot read object %s '%s '
|
|
|
|
no es pot llegir l'objecte %s «%s »
|
|
Translated by
Jordi Mas
|
|
|
|
Located in
merge-recursive.c:956 builtin/cat-file.c:41
|
|
836.
|
|
|
blob expected for %s '%s '
|
|
|
|
blob esperat per a %s «%s »
|
|
Translated by
Jordi Mas
|
|
|
|
Located in
merge-recursive.c:961
|
|
837.
|
|
|
failed to open '%s ': %s
|
|
|
|
s'ha produït un error en obrir «%s »: %s
|
|
Translated by
Jordi Mas
|
|
|
|
Located in
merge-recursive.c:986
|
|
838.
|
|
|
failed to symlink '%s ': %s
|
|
|
|
s'ha produït un error en fer l'enllaç simbòlic «%s »: %s
|
|
Translated by
Jordi Mas
|
|
|
|
Located in
merge-recursive.c:997
|
|
839.
|
|
|
do not know what to do with %06o %s '%s '
|
|
|
|
no se sap què fer amb %06o %s '%s '
|
|
Translated by
Alex Henrie
|
|
Reviewed by
JoanColl
|
In upstream: |
|
no se sap què fer amb %06o %s «%s »
|
|
|
Suggested by
Jordi Mas
|
|
|
|
Located in
merge-recursive.c:1002
|
|
840.
|
|
|
Failed to merge submodule %s (not checked out)
|
|
|
|
S'ha produït un error en fusionar el submòdul %s (no està agafat)
|
|
Translated by
Jordi Mas
|
|
|
|
Located in
merge-ort.c:1584 merge-recursive.c:1211
|
|
841.
|
|
|
Failed to merge submodule %s (commits not present)
|
|
|
|
S'ha produït un error en fusionar el submòdul %s (no hi ha comissions)
|
|
Translated by
Jordi Mas
|
|
|
|
Located in
merge-ort.c:1593 merge-recursive.c:1218
|
|
842.
|
|
|
Failed to merge submodule %s (commits don't follow merge-base)
|
|
|
|
S'ha produït un error en fusionar el submòdul %s (les comissions no segueixen merge-base)
|
|
Translated by
Jordi Mas
|
|
|
|
Located in
merge-ort.c:1602 merge-recursive.c:1225
|
|
843.
|
|
|
Fast-forwarding submodule %s to the following commit:
|
|
|
|
Avançament ràpid del submòdul %s a la següent comissió:
|
|
Translated by
Jordi Mas
|
|
|
|
Located in
merge-recursive.c:1233 merge-recursive.c:1246
|
|
844.
|
|
|
Fast-forwarding submodule %s
|
|
|
|
Avançament ràpid al submòdul %s
|
|
Translated by
Jordi Mas
|
|
|
|
Located in
merge-recursive.c:1236 merge-recursive.c:1249
|