|
|
988.
|
|
|
Patch failed at %s %.*s
|
|
|
|
|
El pedaç ha fallat a %s %.*s
|
|
Translated by
Alex Henrie
|
|
|
|
Located in
builtin/am.c:1821
|
|
|
989.
|
|
|
Use 'git am --show-current-patch' to see the failed patch
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
builtin/am.c:1766
|
|
|
990.
|
|
|
No changes - did you forget to use 'git add'? 
If there is nothing left to stage, chances are that something else
already introduced the same changes; you might want to skip this patch. |
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
|
Cap canvi - heu oblidat d'usar «git add»?
Si no hi ha res per a fer «stage», probablement alguna altra cosa ja ha
introduït els mateixos canvis; potser voleu ometre aquest pedaç. |
|
Translated by
Jordi Mas
|
|
|
|
Located in
builtin/am.c:1868
|
|
|
991.
|
|
|
You still have unmerged paths in your index.
You should 'git add' each file with resolved conflicts to mark them as such.
You might run `git rm` on a file to accept "deleted by them" for it. |
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
|
Encara teniu camins sense fusionar a l'índex.
Heu de fer «git add» a cada fitxer amb conflictes resolts per a marcar-los com a tal.
Podeu executar «git rm» en un fitxer per a acceptar «suprimit per ells» pel fitxer. |
|
Translated by
Jordi Mas
|
|
|
|
Located in
builtin/am.c:1875
|
|
|
992.
|
|
|
Could not parse object '%s'.
|
|
|
|
|
No s'ha pogut analitzar l'objecte «%s».
|
|
Translated by
Jordi Mas
|
|
|
|
Located in
builtin/am.c:1983 builtin/am.c:1987 builtin/am.c:1999 builtin/reset.c:353
builtin/reset.c:361
|
|
|
993.
|
|
|
failed to clean index
|
|
|
|
|
s'ha produït un error en netejar l'índex
|
|
Translated by
Jordi Mas
|
|
|
|
Located in
builtin/am.c:2035 builtin/am.c:2111
|
|
|
994.
|
|
|
You seem to have moved HEAD since the last 'am' failure.
Not rewinding to ORIG_HEAD |
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
|
Sembla que heu mogut HEAD després de l'última fallada de «am».
No s'està rebobinant a ORIG_HEAD |
|
Translated by
Jordi Mas
|
|
|
|
Located in
builtin/am.c:2079
|
|
|
995.
|
|
|
Invalid value for --patch-format: %s
|
|
|
|
|
Valor no vàlid per a --patch-format: %s
|
|
Translated by
Alex Henrie
|
|
|
|
Located in
builtin/am.c:2187
|
|
|
996.
|
|
|
git am [<options>] [(<mbox> | <Maildir>)...]
|
|
|
|
|
git am [<opcions>] [(<bústia> | <directori-de-correu>)...]
|
|
Translated by
Alex Henrie
|
|
|
|
Located in
builtin/am.c:2264
|
|
|
997.
|
|
|
git am [<options>] (--continue | --skip | --abort)
|
|
|
|
|
git am [<opcions>] (--continue | --skip | --abort)
|
|
Translated by
Alex Henrie
|
|
|
|
Located in
builtin/am.c:2265
|
