|
|
825.
|
|
|
Unable to create ' %s.lock': %s. 
Another git process seems to be running in this repository, e.g.
an editor opened by 'git commit'. Please make sure all processes
are terminated then try again. If it still fails, a git process
may have crashed in this repository earlier:
remove the file manually to continue. |
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
|
No s'ha pogut crear « %s.lock»: %s.
Sembla que un altre procés git s'està executant en aquest
repositori, per exemple, un editor obert per «git commit».
Assegureu-vos que tots els processos s'hagin acabat i
llavors proveu de nou. Si encara falla, pot ser un procés git
ha fallat en aquest repositori abans:
elimineu el fitxer manualment per a continuar. |
|
Translated by
Jordi Mas
|
|
|
|
Located in
lockfile.c:152
|
|
|
826.
|
|
|
Unable to create '%s.lock': %s
|
|
|
|
|
No s'ha pogut crear «%s.lock»: %s
|
|
Translated by
Jordi Mas
|
|
|
|
Located in
lockfile.c:160
|
|
|
827.
|
|
|
expected flush after ls-refs arguments
|
|
|
|
|
s'esperava una neteja després dels arguments ls-refs
|
|
Translated by
Jordi Mas
|
|
|
|
Located in
ls-refs.c:178
|
|
|
828.
|
|
|
(bad commit)
|
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
|
(comissió errònia)
|
|
Translated by
Jordi Mas
|
|
|
|
Located in
merge-recursive.c:353
|
|
|
829.
|
|
|
add_cacheinfo failed for path '%s'; merge aborting.
|
|
|
|
|
add_cacheinfo ha fallat per al camí «%s»; interrompent la fusió.
|
|
Translated by
Alex Henrie
|
|
|
|
Located in
merge-recursive.c:381
|
|
|
830.
|
|
|
add_cacheinfo failed to refresh for path '%s'; merge aborting.
|
|
|
|
|
add_cacheinfo ha fallat al refrescar el camí «%s»; interrompent la fusió.
|
|
Translated by
Alex Henrie
|
|
|
|
Located in
merge-recursive.c:390
|
|
|
831.
|
|
|
failed to create path '%s'%s
|
|
|
|
|
s'ha produït un error en crear el camí «%s»%s
|
|
Translated by
Jordi Mas
|
|
|
|
Located in
merge-recursive.c:881
|
|
|
832.
|
|
|
Removing %s to make room for subdirectory
|
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
|
S'està eliminant %s per a fer espai per al subdirectori
|
|
Translated by
Alex Henrie
|
|
|
|
Located in
merge-recursive.c:892
|
|
|
833.
|
|
|
: perhaps a D/F conflict?
|
|
|
|
|
: potser un conflicte D/F?
|
|
Translated by
Alex Henrie
|
|
|
|
Located in
merge-recursive.c:906 merge-recursive.c:925
|
|
|
834.
|
|
|
refusing to lose untracked file at '%s'
|
|
|
|
|
s'està refusant perdre el fitxer no seguit a «%s»
|
|
Translated by
Jordi Mas
|
|
|
|
Located in
merge-recursive.c:915
|
