diff options
| -rw-r--r-- | po/es.po | 6628 | ||||
| -rw-r--r-- | po/fr.po | 6333 |
2 files changed, 7027 insertions, 5934 deletions
@@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2019-06-04 08:24+0800\n" -"PO-Revision-Date: 2019-06-04 18:51-0500\n" +"POT-Creation-Date: 2019-08-10 20:12+0800\n" +"PO-Revision-Date: 2019-08-10 12:55-0500\n" "Last-Translator: christopher.diaz.riv@gmail.com\n" "Language-Team: CodeLabora <codelabora@gmail.com>\n" "Language: es\n" @@ -18,38 +18,38 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Poedit 2.2\n" -#: advice.c:103 +#: advice.c:109 #, c-format msgid "%shint: %.*s%s\n" msgstr "%sayuda: %.*s%s\n" -#: advice.c:156 +#: advice.c:162 msgid "Cherry-picking is not possible because you have unmerged files." msgstr "" "No es posible ejecutar cherry-picking porque tienes archivos sin fusionar." -#: advice.c:158 +#: advice.c:164 msgid "Committing is not possible because you have unmerged files." msgstr "No es posible realizar un commit porque tienes archivos sin fusionar." -#: advice.c:160 +#: advice.c:166 msgid "Merging is not possible because you have unmerged files." msgstr "No es posible hacer merge porque tienes archivos sin fusionar." -#: advice.c:162 +#: advice.c:168 msgid "Pulling is not possible because you have unmerged files." msgstr "No es posible hacer pull porque tienes archivos sin fusionar." -#: advice.c:164 +#: advice.c:170 msgid "Reverting is not possible because you have unmerged files." msgstr "No es posible revertir porque tienes archivos sin fusionar." -#: advice.c:166 +#: advice.c:172 #, c-format msgid "It is not possible to %s because you have unmerged files." msgstr "No es posible %s porque tienes archivos sin fusionar." -#: advice.c:174 +#: advice.c:180 msgid "" "Fix them up in the work tree, and then use 'git add/rm <file>'\n" "as appropriate to mark resolution and make a commit." @@ -57,49 +57,63 @@ msgstr "" "Corrígelos en el árbol de trabajo y entonces usa 'git add/rm <archivo>',\n" "como sea apropiado, para marcar la resolución y realizar un commit." -#: advice.c:182 +#: advice.c:188 msgid "Exiting because of an unresolved conflict." msgstr "Saliendo porque existe un conflicto sin resolver." -#: advice.c:187 builtin/merge.c:1320 +#: advice.c:193 builtin/merge.c:1327 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "No has concluido tu fusión (MERGE_HEAD existe)." -#: advice.c:189 +#: advice.c:195 msgid "Please, commit your changes before merging." msgstr "Por favor, realiza un commit antes de fusionar." -#: advice.c:190 +#: advice.c:196 msgid "Exiting because of unfinished merge." msgstr "Saliendo por una fusión inconclusa." -#: advice.c:196 +#: advice.c:202 #, c-format msgid "" -"Note: checking out '%s'.\n" +"Note: switching to '%s'.\n" "\n" "You are in 'detached HEAD' state. You can look around, make experimental\n" "changes and commit them, and you can discard any commits you make in this\n" -"state without impacting any branches by performing another checkout.\n" +"state without impacting any branches by switching back to a branch.\n" "\n" "If you want to create a new branch to retain commits you create, you may\n" -"do so (now or later) by using -b with the checkout command again. Example:\n" +"do so (now or later) by using -c with the switch command. Example:\n" "\n" -" git checkout -b <new-branch-name>\n" +" git switch -c <new-branch-name>\n" +"\n" +"Or undo this operation with:\n" +"\n" +" git switch -\n" +"\n" +"Turn off this advice by setting config variable advice.detachedHead to " +"false\n" "\n" msgstr "" -"Nota: actualizando el árbol de trabajo '%s'.\n" +"Nota: cambiando a '%s'.\n" "\n" "Te encuentras en estado 'detached HEAD'. Puedes revisar por aquí, hacer\n" -"cambios experimentales y confirmarlos, y puedes descartar cualquier\n" +"cambios experimentales y hacer commits, y puedes descartar cualquier\n" "commit que hayas hecho en este estado sin impactar a tu rama realizando\n" "otro checkout.\n" "\n" "Si quieres crear una nueva rama para mantener los commits que has creado,\n" -"puedes hacerlo (ahora o después) usando -b con el comando checkout. " +"puedes hacerlo (ahora o después) usando -c con el comando checkout. " "Ejemplo:\n" "\n" -" git checkout -b <nombre-de-nueva-rama>\n" +" git switch -c <nombre-de-nueva-rama>\n" +"\n" +"O deshacer la operación con:\n" +"\n" +" git switch -\n" +"\n" +"Apaga este aviso mediante la variable de config advice.detachedHead en " +"false\n" "\n" #: alias.c:50 @@ -110,99 +124,99 @@ msgstr "cmdline termina en \\" msgid "unclosed quote" msgstr "comillas incompletas" -#: apply.c:63 +#: apply.c:69 #, c-format msgid "unrecognized whitespace option '%s'" msgstr "opción de espacios en blanco no reconocida '%s'" -#: apply.c:79 +#: apply.c:85 #, c-format msgid "unrecognized whitespace ignore option '%s'" msgstr "opción de ignorar espacios en blanco no reconocida '%s'" -#: apply.c:129 +#: apply.c:135 msgid "--reject and --3way cannot be used together." msgstr "--reject y --3way no se pueden utilizar juntas." -#: apply.c:131 +#: apply.c:137 msgid "--cached and --3way cannot be used together." msgstr "--cached y --3way no se pueden utilizar juntas." -#: apply.c:134 +#: apply.c:140 msgid "--3way outside a repository" msgstr "--3way está fuera de un repositorio" -#: apply.c:145 +#: apply.c:151 msgid "--index outside a repository" msgstr "--index está fuera de un repositorio" -#: apply.c:148 +#: apply.c:154 msgid "--cached outside a repository" msgstr "--cached está fuera de un repositorio" -#: apply.c:829 +#: apply.c:801 #, c-format msgid "Cannot prepare timestamp regexp %s" msgstr "No se puede preparar una marca de tiempo para la expresión regular %s" -#: apply.c:838 +#: apply.c:810 #, c-format msgid "regexec returned %d for input: %s" msgstr "regexec devolvió %d para la entrada: %s" -#: apply.c:912 +#: apply.c:884 #, c-format msgid "unable to find filename in patch at line %d" msgstr "" "no se puede encontrar el nombre del archivo en el parche en la línea %d" -#: apply.c:950 +#: apply.c:922 #, c-format msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" msgstr "" "git apply: git-diff erróneo - se esperaba /dev/null, se encontró %s en " "lalínea %d" -#: apply.c:956 +#: apply.c:928 #, c-format msgid "git apply: bad git-diff - inconsistent new filename on line %d" msgstr "" "git apply: git-diff erróneo - nuevo nombre de archivo inconsistente en " "lalínea %d" -#: apply.c:957 +#: apply.c:929 #, c-format msgid "git apply: bad git-diff - inconsistent old filename on line %d" msgstr "" "git apply: git-diff erróneo - viejo nombre de archivo inconsistente en " "lalínea %d" -#: apply.c:962 +#: apply.c:934 #, c-format msgid "git apply: bad git-diff - expected /dev/null on line %d" msgstr "git apply: git-diff erróneo - se esperaba /dev/null en la línea %d" -#: apply.c:991 +#: apply.c:963 #, c-format msgid "invalid mode on line %d: %s" msgstr "modo inválido en la línea %d: %s" -#: apply.c:1310 +#: apply.c:1282 #, c-format msgid "inconsistent header lines %d and %d" msgstr "header inconsistente en las líneas %d y %d" -#: apply.c:1482 +#: apply.c:1460 #, c-format msgid "recount: unexpected line: %.*s" msgstr "recount: línea inesperada: %.*s" -#: apply.c:1551 +#: apply.c:1529 #, c-format msgid "patch fragment without header at line %d: %.*s" msgstr "fragmento de parche sin header en la línea %d: %.*s" -#: apply.c:1571 +#: apply.c:1551 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -217,83 +231,83 @@ msgstr[1] "" "los headers de git diff carecen de información de los nombres de los " "archivos %d cuando los eliminan de la ruta principal componentes (línea %d)" -#: apply.c:1584 +#: apply.c:1564 #, c-format msgid "git diff header lacks filename information (line %d)" msgstr "" "el header de git diff carece de información del nombre del archivo (línea %d)" -#: apply.c:1772 +#: apply.c:1752 msgid "new file depends on old contents" msgstr "el nuevo archivo depende de contenidos viejos" -#: apply.c:1774 +#: apply.c:1754 msgid "deleted file still has contents" msgstr "el archivo eliminado todavía tiene contenido" -#: apply.c:1808 +#: apply.c:1788 #, c-format msgid "corrupt patch at line %d" msgstr "parche corrupto en la línea %d" -#: apply.c:1845 +#: apply.c:1825 #, c-format msgid "new file %s depends on old contents" msgstr "nuevo archivo %s depende en contenidos viejos" -#: apply.c:1847 +#: apply.c:1827 #, c-format msgid "deleted file %s still has contents" msgstr "el archivo borrado %s todavía tiene contenido" -#: apply.c:1850 +#: apply.c:1830 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "** peligro: el archivo %s está vacío pero no es borrado" -#: apply.c:1997 +#: apply.c:1977 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "parche binario corrupto en la línea %d: %.*s" -#: apply.c:2034 +#: apply.c:2014 #, c-format msgid "unrecognized binary patch at line %d" msgstr "parche binario no reconocido en la línea %d" -#: apply.c:2196 +#: apply.c:2176 #, c-format msgid "patch with only garbage at line %d" msgstr "parche que solo contiene basura en la línea %d" -#: apply.c:2282 +#: apply.c:2262 #, c-format msgid "unable to read symlink %s" msgstr "no es posible leer el enlace simbólico %s" -#: apply.c:2286 +#: apply.c:2266 #, c-format msgid "unable to open or read %s" msgstr "no es posible abrir o leer %s" -#: apply.c:2945 +#: apply.c:2925 #, c-format msgid "invalid start of line: '%c'" msgstr "comienzo inválido de línea: '%c'" -#: apply.c:3066 +#: apply.c:3046 #, c-format msgid "Hunk #%d succeeded at %d (offset %d line)." msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." msgstr[0] "Hunk #%d tuvo éxito en %d (%d línea compensada)." msgstr[1] "Hunk #%d tuvo éxito en %d (%d líneas compensadas)." -#: apply.c:3078 +#: apply.c:3058 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "Contexto reducido a (%ld/%ld) para aplicar el fragmento en %d" -#: apply.c:3084 +#: apply.c:3064 #, c-format msgid "" "while searching for:\n" @@ -302,23 +316,23 @@ msgstr "" "mientras se busca:\n" "%.*s" -#: apply.c:3106 +#: apply.c:3086 #, c-format msgid "missing binary patch data for '%s'" msgstr "data perdida en parche binario para '%s'" -#: apply.c:3114 +#: apply.c:3094 #, c-format msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'" msgstr "" "no se puede revertir-aplicar un parche binario sin el hunk revertido a '%s'" -#: apply.c:3161 +#: apply.c:3141 #, c-format msgid "cannot apply binary patch to '%s' without full index line" msgstr "no se puede aplicar el parche binario a '%s' sin un índice completo" -#: apply.c:3171 +#: apply.c:3151 #, c-format msgid "" "the patch applies to '%s' (%s), which does not match the current contents." @@ -326,289 +340,289 @@ msgstr "" "el parche aplica a '%s' (%s), lo cual no concuerda con los contenidos " "actuales." -#: apply.c:3179 +#: apply.c:3159 #, c-format msgid "the patch applies to an empty '%s' but it is not empty" msgstr "el parche aplica a un '%s' vacío, pero este no lo esta" -#: apply.c:3197 +#: apply.c:3177 #, c-format msgid "the necessary postimage %s for '%s' cannot be read" msgstr "la postimagen necesaria %s para '%s' no se puede leer" -#: apply.c:3210 +#: apply.c:3190 #, c-format msgid "binary patch does not apply to '%s'" msgstr "el parche binario no aplica para '%s'" -#: apply.c:3216 +#: apply.c:3196 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "" "el parche binario para '%s' crea un resultado incorrecto (saliendo %s, se " "obtuvo %s)" -#: apply.c:3237 +#: apply.c:3217 #, c-format msgid "patch failed: %s:%ld" msgstr "el parche falló: %s:%ld" -#: apply.c:3360 +#: apply.c:3340 #, c-format msgid "cannot checkout %s" msgstr "no se puede hacer checkout a %s" -#: apply.c:3412 apply.c:3423 apply.c:3469 midx.c:59 setup.c:279 +#: apply.c:3392 apply.c:3403 apply.c:3449 midx.c:62 setup.c:279 #, c-format msgid "failed to read %s" msgstr "no se pudo leer %s" -#: apply.c:3420 +#: apply.c:3400 #, c-format msgid "reading from '%s' beyond a symbolic link" msgstr "leyendo de '%s' tras un enlace simbólico" -#: apply.c:3449 apply.c:3692 +#: apply.c:3429 apply.c:3672 #, c-format msgid "path %s has been renamed/deleted" msgstr "la ruta %s ha sido renombrada/suprimida" -#: apply.c:3535 apply.c:3707 +#: apply.c:3515 apply.c:3687 #, c-format msgid "%s: does not exist in index" msgstr "%s: no existe en el índice" -#: apply.c:3544 apply.c:3715 +#: apply.c:3524 apply.c:3695 #, c-format msgid "%s: does not match index" msgstr "%s: no concuerda con el índice" -#: apply.c:3579 +#: apply.c:3559 msgid "repository lacks the necessary blob to fall back on 3-way merge." msgstr "" "el repositorio carece del blob necesario para regresar en un merge de tres-" "vías." -#: apply.c:3582 +#: apply.c:3562 #, c-format msgid "Falling back to three-way merge...\n" msgstr "Retrocediendo en un merge de tres-vías...\n" -#: apply.c:3598 apply.c:3602 +#: apply.c:3578 apply.c:3582 #, c-format msgid "cannot read the current contents of '%s'" msgstr "no se pueden leer los contenidos actuales de '%s'" -#: apply.c:3614 +#: apply.c:3594 #, c-format msgid "Failed to fall back on three-way merge...\n" msgstr "Falló el merge en retroceso de tres-vías...\n" -#: apply.c:3628 +#: apply.c:3608 #, c-format msgid "Applied patch to '%s' with conflicts.\n" msgstr "Parche aplicado a '%s' con conflictos.\n" -#: apply.c:3633 +#: apply.c:3613 #, c-format msgid "Applied patch to '%s' cleanly.\n" msgstr "Parche aplicado a '%s' limpiamente\n" -#: apply.c:3659 +#: apply.c:3639 msgid "removal patch leaves file contents" msgstr "parche de remoción deja contenidos en el archivo" -#: apply.c:3732 +#: apply.c:3712 #, c-format msgid "%s: wrong type" msgstr "%s: tipo incorrecto" -#: apply.c:3734 +#: apply.c:3714 #, c-format msgid "%s has type %o, expected %o" msgstr "%s tiene tipo %o, se esperaba %o" -#: apply.c:3885 apply.c:3887 read-cache.c:830 read-cache.c:856 +#: apply.c:3865 apply.c:3867 read-cache.c:830 read-cache.c:856 #: read-cache.c:1309 #, c-format msgid "invalid path '%s'" msgstr "ruta inválida '%s'" -#: apply.c:3943 +#: apply.c:3923 #, c-format msgid "%s: already exists in index" msgstr "%s: ya existe en el índice" -#: apply.c:3946 +#: apply.c:3926 #, c-format msgid "%s: already exists in working directory" msgstr "%s: ya existe en el directorio de trabajo" -#: apply.c:3966 +#: apply.c:3946 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "nuevo modo (%o) de %s no concuerda con el viejo modo (%o)" -#: apply.c:3971 +#: apply.c:3951 #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "nuevo modo (%o) de %s no concuerda con el viejo modo (%o) de %s" -#: apply.c:3991 +#: apply.c:3971 #, c-format msgid "affected file '%s' is beyond a symbolic link" msgstr "archivo afectado '%s' está tras un enlace simbólico" -#: apply.c:3995 +#: apply.c:3975 #, c-format msgid "%s: patch does not apply" msgstr "%s: el parche no aplica" -#: apply.c:4010 +#: apply.c:3990 #, c-format msgid "Checking patch %s..." msgstr "Revisando el parche %s..." -#: apply.c:4102 +#: apply.c:4082 #, c-format msgid "sha1 information is lacking or useless for submodule %s" msgstr "falta información del sha1 o es inútil para el submódulo %s" -#: apply.c:4109 +#: apply.c:4089 #, c-format msgid "mode change for %s, which is not in current HEAD" msgstr "modo cambiado para %s, el cual no se encuentra en el HEAD actual" -#: apply.c:4112 +#: apply.c:4092 #, c-format msgid "sha1 information is lacking or useless (%s)." msgstr "falta información sha1 o es inútil (%s)." -#: apply.c:4117 builtin/checkout.c:257 builtin/reset.c:143 +#: apply.c:4097 builtin/checkout.c:278 builtin/reset.c:143 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "make_cache_entry falló para la ruta '%s'" -#: apply.c:4121 +#: apply.c:4101 #, c-format msgid "could not add %s to temporary index" msgstr "no se pudo añadir %s al índice temporal" -#: apply.c:4131 +#: apply.c:4111 #, c-format msgid "could not write temporary index to %s" msgstr "no se pudo escribir un índice temporal para %s" -#: apply.c:4269 +#: apply.c:4249 #, c-format msgid "unable to remove %s from index" msgstr "no se puede eliminar %s del índice" -#: apply.c:4303 +#: apply.c:4283 #, c-format msgid "corrupt patch for submodule %s" msgstr "parche corrupto para el submódulo %s" -#: apply.c:4309 +#: apply.c:4289 #, c-format msgid "unable to stat newly created file '%s'" msgstr "no es posible establecer el archivo recién creado '%s'" -#: apply.c:4317 +#: apply.c:4297 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "" "no es posible crear una copia de seguridad para el archivo recién creado %s" -#: apply.c:4323 apply.c:4468 +#: apply.c:4303 apply.c:4448 #, c-format msgid "unable to add cache entry for %s" msgstr "no es posible agregar una entrada en el cache para %s" -#: apply.c:4366 +#: apply.c:4346 #, c-format msgid "failed to write to '%s'" msgstr "falló escribir para '%s'" -#: apply.c:4370 +#: apply.c:4350 #, c-format msgid "closing file '%s'" msgstr "cerrando archivo '%s'" -#: apply.c:4440 +#: apply.c:4420 #, c-format msgid "unable to write file '%s' mode %o" msgstr "no es posible escribir el archivo '%s' modo %o" -#: apply.c:4538 +#: apply.c:4518 #, c-format msgid "Applied patch %s cleanly." msgstr "Parche %s aplicado limpiamente." -#: apply.c:4546 +#: apply.c:4526 msgid "internal error" msgstr "error interno" -#: apply.c:4549 +#: apply.c:4529 #, c-format msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." msgstr[0] "Aplicando parche %%s con %d rechazo..." msgstr[1] "Aplicando parche %%s con %d rechazos..." -#: apply.c:4560 +#: apply.c:4540 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "truncando el nombre de archivo .rej a %.*s.rej" -#: apply.c:4568 builtin/fetch.c:837 builtin/fetch.c:1118 +#: apply.c:4548 builtin/fetch.c:878 builtin/fetch.c:1168 #, c-format msgid "cannot open %s" msgstr "no se puede abrir %s" -#: apply.c:4582 +#: apply.c:4562 #, c-format msgid "Hunk #%d applied cleanly." msgstr "Hunk #%d aplicado limpiamente." -#: apply.c:4586 +#: apply.c:4566 #, c-format msgid "Rejected hunk #%d." msgstr "Hunk #%d rechazado." -#: apply.c:4696 +#: apply.c:4676 #, c-format msgid "Skipped patch '%s'." msgstr "Parche '%s' saltado." -#: apply.c:4704 +#: apply.c:4684 msgid "unrecognized input" msgstr "input no reconocido" -#: apply.c:4724 +#: apply.c:4704 msgid "unable to read index file" msgstr "no es posible leer el archivo índice" -#: apply.c:4879 +#: apply.c:4859 #, c-format msgid "can't open patch '%s': %s" msgstr "no se puede abrir el parche '%s': %s" -#: apply.c:4906 +#: apply.c:4886 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "%d error de espacios en blanco aplastado" msgstr[1] "%d errores de espacios en blanco aplastados" -#: apply.c:4912 apply.c:4927 +#: apply.c:4892 apply.c:4907 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." msgstr[0] "%d línea agrega errores de espacios en blanco." msgstr[1] "%d líneas agregan errores de espacios en blanco." -#: apply.c:4920 +#: apply.c:4900 #, c-format msgid "%d line applied after fixing whitespace errors." msgid_plural "%d lines applied after fixing whitespace errors." @@ -617,146 +631,146 @@ msgstr[0] "" msgstr[1] "" "%d líneas aplicadas después de arreglar los errores de espacios en blanco." -#: apply.c:4936 builtin/add.c:540 builtin/mv.c:301 builtin/rm.c:390 +#: apply.c:4916 builtin/add.c:540 builtin/mv.c:301 builtin/rm.c:390 msgid "Unable to write new index file" msgstr "No es posible escribir el archivo índice" -#: apply.c:4963 apply.c:4966 builtin/am.c:2210 builtin/am.c:2213 -#: builtin/clone.c:120 builtin/fetch.c:118 builtin/merge.c:271 -#: builtin/pull.c:207 builtin/submodule--helper.c:407 -#: builtin/submodule--helper.c:1366 builtin/submodule--helper.c:1369 -#: builtin/submodule--helper.c:1849 builtin/submodule--helper.c:1852 -#: builtin/submodule--helper.c:2091 git-add--interactive.perl:197 +#: apply.c:4943 apply.c:4946 builtin/am.c:2208 builtin/am.c:2211 +#: builtin/clone.c:123 builtin/fetch.c:128 builtin/merge.c:273 +#: builtin/pull.c:208 builtin/submodule--helper.c:407 +#: builtin/submodule--helper.c:1367 builtin/submodule--helper.c:1370 +#: builtin/submodule--helper.c:1850 builtin/submodule--helper.c:1853 +#: builtin/submodule--helper.c:2092 git-add--interactive.perl:211 msgid "path" msgstr "ruta" -#: apply.c:4964 +#: apply.c:4944 msgid "don't apply changes matching the given path" msgstr "no aplicar cambios que concuerden con la ruta suministrada" -#: apply.c:4967 +#: apply.c:4947 msgid "apply changes matching the given path" msgstr "aplicar cambios que concuerden con la ruta suministrada" -#: apply.c:4969 builtin/am.c:2219 +#: apply.c:4949 builtin/am.c:2217 msgid "num" msgstr "num" -#: apply.c:4970 +#: apply.c:4950 msgid "remove <num> leading slashes from traditional diff paths" msgstr "eliminar <num> slashes iniciales de las rutas diff tradicionales" -#: apply.c:4973 +#: apply.c:4953 msgid "ignore additions made by the patch" msgstr "ignorar adiciones hechas por el parche" -#: apply.c:4975 +#: apply.c:4955 msgid "instead of applying the patch, output diffstat for the input" msgstr "en lugar de aplicar el parche, mostrar diffstat para la entrada" -#: apply.c:4979 +#: apply.c:4959 msgid "show number of added and deleted lines in decimal notation" msgstr "mostrar el numero de líneas agregadas y eliminadas en notación decimal" -#: apply.c:4981 +#: apply.c:4961 msgid "instead of applying the patch, output a summary for the input" msgstr "en lugar de aplicar el parche, mostrar un resumen para la entrada" -#: apply.c:4983 +#: apply.c:4963 msgid "instead of applying the patch, see if the patch is applicable" msgstr "en lugar de aplicar el parche, ver si el parche es aplicable" -#: apply.c:4985 +#: apply.c:4965 msgid "make sure the patch is applicable to the current index" msgstr "asegurar que el parche es aplicable al índice actual" -#: apply.c:4987 +#: apply.c:4967 msgid "mark new files with `git add --intent-to-add`" msgstr "marca los nuevos archivos con `git add --intent-to-add`" -#: apply.c:4989 +#: apply.c:4969 msgid "apply a patch without touching the working tree" msgstr "aplicar un parche sin tocar el árbol de trabajo" -#: apply.c:4991 +#: apply.c:4971 msgid "accept a patch that touches outside the working area" msgstr "aceptar un parche que toca fuera del área de trabajo" -#: apply.c:4994 +#: apply.c:4974 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "también aplicar el parche ( usar con --stat/--summary/--check" -#: apply.c:4996 +#: apply.c:4976 msgid "attempt three-way merge if a patch does not apply" msgstr "intentar merge de tres-vías si el parche no aplica" -#: apply.c:4998 +#: apply.c:4978 msgid "build a temporary index based on embedded index information" msgstr "" "construir un índice temporal basado en la información del índice incrustado" -#: apply.c:5001 builtin/checkout-index.c:173 builtin/ls-files.c:524 +#: apply.c:4981 builtin/checkout-index.c:173 builtin/ls-files.c:524 msgid "paths are separated with NUL character" msgstr "rutas están separadas con un carácter NULL" -#: apply.c:5003 +#: apply.c:4983 msgid "ensure at least <n> lines of context match" msgstr "asegure que por lo menos <n> líneas del contexto concuerden" -#: apply.c:5004 builtin/am.c:2198 builtin/interpret-trailers.c:97 -#: builtin/interpret-trailers.c:99 builtin/interpret-trailers.c:101 -#: builtin/pack-objects.c:3317 builtin/rebase.c:1415 +#: apply.c:4984 builtin/am.c:2196 builtin/interpret-trailers.c:98 +#: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102 +#: builtin/pack-objects.c:3330 builtin/rebase.c:1421 msgid "action" msgstr "acción" -#: apply.c:5005 +#: apply.c:4985 msgid "detect new or modified lines that have whitespace errors" msgstr "" "detectar líneas nuevas o modificadas que contienen errores de espacios en " "blanco" -#: apply.c:5008 apply.c:5011 +#: apply.c:4988 apply.c:4991 msgid "ignore changes in whitespace when finding context" msgstr "" "ignorar cambios en los espacios en blanco cuando se encuentra el contexto" -#: apply.c:5014 +#: apply.c:4994 msgid "apply the patch in reverse" msgstr "aplicar el parche en reversa" -#: apply.c:5016 +#: apply.c:4996 msgid "don't expect at least one line of context" msgstr "no espera al menos una línea del contexto" -#: apply.c:5018 +#: apply.c:4998 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "dejar los hunks rechazados en los archivos *.rej correspontientes" -#: apply.c:5020 +#: apply.c:5000 msgid "allow overlapping hunks" msgstr "permitir solapamiento de hunks" -#: apply.c:5021 builtin/add.c:291 builtin/check-ignore.c:22 -#: builtin/commit.c:1317 builtin/count-objects.c:98 builtin/fsck.c:786 -#: builtin/log.c:2045 builtin/mv.c:123 builtin/read-tree.c:128 +#: apply.c:5001 builtin/add.c:291 builtin/check-ignore.c:22 +#: builtin/commit.c:1337 builtin/count-objects.c:98 builtin/fsck.c:786 +#: builtin/log.c:2068 builtin/mv.c:123 builtin/read-tree.c:128 msgid "be verbose" msgstr "ser verboso" -#: apply.c:5023 +#: apply.c:5003 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "" "tolerar nuevas líneas faltantes detectadas incorrectamente al final del " "archivo" -#: apply.c:5026 +#: apply.c:5006 msgid "do not trust the line counts in the hunk headers" msgstr "no confiar en el conteo de líneas en los headers del hunk" -#: apply.c:5028 builtin/am.c:2207 +#: apply.c:5008 builtin/am.c:2205 msgid "root" msgstr "raíz" -#: apply.c:5029 +#: apply.c:5009 msgid "prepend <root> to all filenames" msgstr "anteponer <root> a todos los nombres de archivos" @@ -799,98 +813,98 @@ msgstr "nombre de objeto no válido: %s" msgid "not a tree object: %s" msgstr "no es un objeto tree: %s" -#: archive.c:424 +#: archive.c:426 msgid "current working directory is untracked" msgstr "directorio de trabajo actual no rastreado" -#: archive.c:455 +#: archive.c:457 msgid "fmt" msgstr "fmt" -#: archive.c:455 +#: archive.c:457 msgid "archive format" msgstr "formato del archivo" -#: archive.c:456 builtin/log.c:1557 +#: archive.c:458 builtin/log.c:1580 msgid "prefix" msgstr "prefijo" -#: archive.c:457 +#: archive.c:459 msgid "prepend prefix to each pathname in the archive" msgstr "anteponer prefijo a cada ruta en el archivo" -#: archive.c:458 builtin/blame.c:821 builtin/blame.c:822 -#: builtin/commit-tree.c:117 builtin/config.c:129 builtin/fast-export.c:1091 -#: builtin/fast-export.c:1093 builtin/grep.c:895 builtin/hash-object.c:105 +#: archive.c:460 builtin/blame.c:862 builtin/blame.c:874 builtin/blame.c:875 +#: builtin/commit-tree.c:117 builtin/config.c:129 builtin/fast-export.c:1134 +#: builtin/fast-export.c:1136 builtin/grep.c:897 builtin/hash-object.c:105 #: builtin/ls-files.c:560 builtin/ls-files.c:563 builtin/notes.c:412 #: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:177 msgid "file" msgstr "carpeta" -#: archive.c:459 builtin/archive.c:90 +#: archive.c:461 builtin/archive.c:90 msgid "write the archive to this file" msgstr "escribe el archivo en esta carpeta" -#: archive.c:461 +#: archive.c:463 msgid "read .gitattributes in working directory" msgstr "leer .gitattributes en el directorio de trabajo" -#: archive.c:462 +#: archive.c:464 msgid "report archived files on stderr" msgstr "reportar archivos archivados por stderr" -#: archive.c:463 +#: archive.c:465 msgid "store only" msgstr "solo guardar" -#: archive.c:464 +#: archive.c:466 msgid "compress faster" -msgstr "comprimir mas rápido" +msgstr "comprimir más rápido" -#: archive.c:472 +#: archive.c:474 msgid "compress better" msgstr "comprimir mejor" -#: archive.c:475 +#: archive.c:477 msgid "list supported archive formats" msgstr "listar los formatos de carpeta soportados" -#: archive.c:477 builtin/archive.c:91 builtin/clone.c:110 builtin/clone.c:113 -#: builtin/submodule--helper.c:1378 builtin/submodule--helper.c:1858 +#: archive.c:479 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116 +#: builtin/submodule--helper.c:1379 builtin/submodule--helper.c:1859 msgid "repo" msgstr "repo" -#: archive.c:478 builtin/archive.c:92 +#: archive.c:480 builtin/archive.c:92 msgid "retrieve the archive from remote repository <repo>" msgstr "obtener la carpeta del repositorio remoto <repo>" -#: archive.c:479 builtin/archive.c:93 builtin/difftool.c:707 +#: archive.c:481 builtin/archive.c:93 builtin/difftool.c:707 #: builtin/notes.c:498 msgid "command" msgstr "comando" -#: archive.c:480 builtin/archive.c:94 +#: archive.c:482 builtin/archive.c:94 msgid "path to the remote git-upload-archive command" msgstr "ruta para el comando git-upload-archivo remoto" -#: archive.c:487 +#: archive.c:489 msgid "Unexpected option --remote" msgstr "Opción inesperada --remote" -#: archive.c:489 +#: archive.c:491 msgid "Option --exec can only be used together with --remote" msgstr "Opción --exec solo puede ser utilizada con --remote" -#: archive.c:491 +#: archive.c:493 msgid "Unexpected option --output" msgstr "Opción inesperada --output" -#: archive.c:513 +#: archive.c:515 #, c-format msgid "Unknown archive format '%s'" msgstr "Formato de carpeta desconocido '%s'" -#: archive.c:520 +#: archive.c:522 #, c-format msgid "Argument not supported for format '%s': -%d" msgstr "Argumento no soportado para formato '%s': -%d" @@ -934,7 +948,7 @@ msgstr "ruta no válida UTF-8: %s" msgid "path too long (%d chars, SHA1: %s): %s" msgstr "ruta muy larga (%d chars, SHA1: %s): %s" -#: archive-zip.c:474 builtin/pack-objects.c:226 builtin/pack-objects.c:229 +#: archive-zip.c:474 builtin/pack-objects.c:230 builtin/pack-objects.c:233 #, c-format msgid "deflate error (%d)" msgstr "error al desinflar (%d)" @@ -947,7 +961,7 @@ msgstr "timestamp muy largo para este sistema: %<PRIuMAX>" #: attr.c:211 #, c-format msgid "%.*s is not a valid attribute name" -msgstr "%.*s no es un nombre de atributo valido" +msgstr "%.*s no es un nombre de atributo válido" #: attr.c:368 #, c-format @@ -975,7 +989,7 @@ msgstr "¡No podemos biseccionar más!\n" #: bisect.c:733 #, c-format msgid "Not a valid commit name %s" -msgstr "No es un nombre de commit valido %s" +msgstr "No es un nombre de commit válido %s" #: bisect.c:758 #, c-format @@ -1013,7 +1027,7 @@ msgid "" msgstr "" "Algunas %s revisiones no son ancestros de la revisión %s.\n" "git bisect no puede trabajar bien en este caso.\n" -"Tal vez confundió la revisión %s y %s?\n" +"Tal vez confundiste la revisión %s y %s?\n" #: bisect.c:789 #, c-format @@ -1036,12 +1050,12 @@ msgstr "Biseccionando: una base de fisión debe ser probada\n" msgid "a %s revision is needed" msgstr "una %s revisión es necesaria" -#: bisect.c:884 builtin/notes.c:177 builtin/tag.c:248 +#: bisect.c:884 builtin/notes.c:177 builtin/tag.c:254 #, c-format msgid "could not create file '%s'" msgstr "no se pudo crear el archivo '%s'" -#: bisect.c:928 builtin/merge.c:146 +#: bisect.c:928 builtin/merge.c:148 #, c-format msgid "could not read file '%s'" msgstr "no se pudo leer el archivo '%s'" @@ -1081,40 +1095,40 @@ msgid_plural "Bisecting: %d revisions left to test after this %s\n" msgstr[0] "Biseccionando: falta %d revisión por probar después de esto %s\n" msgstr[1] "Biseccionando: faltan %d revisiones por probar después de esto %s\n" -#: blame.c:1794 +#: blame.c:2697 msgid "--contents and --reverse do not blend well." msgstr "--contents y --reverse no se mezclan bien." -#: blame.c:1808 +#: blame.c:2711 msgid "cannot use --contents with final commit object name" msgstr "no se puede usar --contents con el nombre de objeto commit final" -#: blame.c:1829 +#: blame.c:2732 msgid "--reverse and --first-parent together require specified latest commit" msgstr "" "--reverse y --first-parent juntos requieren especificar el último commit" -#: blame.c:1838 bundle.c:164 ref-filter.c:2077 remote.c:1938 sequencer.c:2030 -#: sequencer.c:4224 builtin/commit.c:1017 builtin/log.c:382 builtin/log.c:940 -#: builtin/log.c:1428 builtin/log.c:1804 builtin/log.c:2094 builtin/merge.c:415 -#: builtin/pack-objects.c:3140 builtin/pack-objects.c:3155 +#: blame.c:2741 bundle.c:167 ref-filter.c:2196 remote.c:1938 sequencer.c:2033 +#: sequencer.c:4348 builtin/commit.c:1020 builtin/log.c:387 builtin/log.c:963 +#: builtin/log.c:1451 builtin/log.c:1827 builtin/log.c:2117 builtin/merge.c:411 +#: builtin/pack-objects.c:3148 builtin/pack-objects.c:3163 #: builtin/shortlog.c:192 msgid "revision walk setup failed" msgstr "falló la configuración del camino de revisión" -#: blame.c:1856 +#: blame.c:2759 msgid "" "--reverse --first-parent together require range along first-parent chain" msgstr "" "--reverse --first-parent juntos requieren un rango a lo largo de la cadena " "del primer padre" -#: blame.c:1867 +#: blame.c:2770 #, c-format msgid "no such path %s in %s" msgstr "no hay una ruta %s en %s" -#: blame.c:1878 +#: blame.c:2781 #, c-format msgid "cannot read blob %s for path %s" msgstr "no se puede leer el blob %s para la ruta %s" @@ -1199,7 +1213,7 @@ msgstr "No rastreando: información ambigua para la referencia %s" #: branch.c:189 #, c-format msgid "'%s' is not a valid branch name." -msgstr "'%s' no es un nombre valido de rama." +msgstr "'%s' no es un nombre válido de rama." #: branch.c:208 #, c-format @@ -1246,7 +1260,7 @@ msgstr "" #: branch.c:281 #, c-format msgid "Not a valid object name: '%s'." -msgstr "Nombre de objeto no valido: '%s'." +msgstr "Nombre de objeto no válido: '%s'." #: branch.c:301 #, c-format @@ -1256,14 +1270,14 @@ msgstr "Nombre de objeto ambiguo: '%s'." #: branch.c:306 #, c-format msgid "Not a valid branch point: '%s'." -msgstr "Punto de rama no valido: '%s'." +msgstr "Punto de rama no válido: '%s'." -#: branch.c:359 +#: branch.c:364 #, c-format msgid "'%s' is already checked out at '%s'" msgstr "'%s' ya ha sido marcado en '%s'" -#: branch.c:382 +#: branch.c:387 #, c-format msgid "HEAD of working tree %s is not updated" msgstr "HEAD del árbol de trabajo %s no está actualizada" @@ -1278,8 +1292,8 @@ msgstr "'%s' no se ve como un archivo bundle v2" msgid "unrecognized header: %s%s (%d)" msgstr "header no reconocido %s%s (%d)" -#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2281 sequencer.c:2916 -#: builtin/commit.c:788 +#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2283 sequencer.c:3024 +#: builtin/commit.c:791 #, c-format msgid "could not open '%s'" msgstr "no se pudo abrir '%s'" @@ -1288,60 +1302,64 @@ msgstr "no se pudo abrir '%s'" msgid "Repository lacks these prerequisite commits:" msgstr "Al repositorio le falta estos commits prerrequisito:" -#: bundle.c:194 +#: bundle.c:146 +msgid "need a repository to verify a bundle" +msgstr "se necesita un repositorio para verificar un bundle" + +#: bundle.c:197 #, c-format msgid "The bundle contains this ref:" msgid_plural "The bundle contains these %d refs:" msgstr[0] "El bundle contiene esta referencia:" msgstr[1] "El bundle contiene estas %d referencias:" -#: bundle.c:201 +#: bundle.c:204 msgid "The bundle records a complete history." msgstr "El bundle registra una historia completa." -#: bundle.c:203 +#: bundle.c:206 #, c-format msgid "The bundle requires this ref:" msgid_plural "The bundle requires these %d refs:" msgstr[0] "El bundle requiere esta referencia:" msgstr[1] "El bundle requiere estas %d referencias:" -#: bundle.c:269 +#: bundle.c:272 msgid "unable to dup bundle descriptor" msgstr "incapaz de duplicar bundle descriptor" -#: bundle.c:276 +#: bundle.c:279 msgid "Could not spawn pack-objects" msgstr "No se pudo crear los pack-objetcts" -#: bundle.c:287 +#: bundle.c:290 msgid "pack-objects died" msgstr "pack-objects murió" -#: bundle.c:329 +#: bundle.c:332 msgid "rev-list died" msgstr "rev-list murió" -#: bundle.c:378 +#: bundle.c:381 #, c-format msgid "ref '%s' is excluded by the rev-list options" msgstr "referencia '%s' es excluida por las opciones de rev-list" -#: bundle.c:457 builtin/log.c:197 builtin/log.c:1709 builtin/shortlog.c:306 +#: bundle.c:460 builtin/log.c:202 builtin/log.c:1732 builtin/shortlog.c:306 #, c-format msgid "unrecognized argument: %s" msgstr "argumento no reconocido: %s" -#: bundle.c:465 +#: bundle.c:468 msgid "Refusing to create empty bundle." msgstr "Rechazando crear un bundle vacío." -#: bundle.c:475 +#: bundle.c:478 #, c-format msgid "cannot create '%s'" msgstr "no se puede crear '%s'" -#: bundle.c:500 +#: bundle.c:503 msgid "index-pack died" msgstr "index-pack murió" @@ -1350,8 +1368,8 @@ msgstr "index-pack murió" msgid "invalid color value: %.*s" msgstr "color inválido: %.*s" -#: commit.c:50 sequencer.c:2697 builtin/am.c:355 builtin/am.c:399 -#: builtin/am.c:1377 builtin/am.c:2022 builtin/replace.c:455 +#: commit.c:50 sequencer.c:2727 builtin/am.c:355 builtin/am.c:399 +#: builtin/am.c:1378 builtin/am.c:2020 builtin/replace.c:455 #, c-format msgid "could not parse %s" msgstr "no se puede analizar %s" @@ -1361,7 +1379,7 @@ msgstr "no se puede analizar %s" msgid "%s %s is not a commit!" msgstr "%s %s no es un commit!" -#: commit.c:193 +#: commit.c:192 msgid "" "Support for <GIT_DIR>/info/grafts is deprecated\n" "and will be removed in a future Git version.\n" @@ -1381,227 +1399,282 @@ msgstr "" "Apapa este mensaje ejecutando\n" "\"git config advice.graftFileDeprecated false\"" -#: commit.c:1128 +#: commit.c:1127 #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." msgstr "Commit %s tiene una firma GPG no confiable, pretendidamente por %s." -#: commit.c:1131 +#: commit.c:1130 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." msgstr "Commit %s tiene una mala firma GPG pretendidamente por %s." -#: commit.c:1134 +#: commit.c:1133 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "Commit %s no tiene una firma GPG." -#: commit.c:1137 +#: commit.c:1136 #, c-format msgid "Commit %s has a good GPG signature by %s\n" msgstr "El Commit %s tiene una buena firma GPG por %s\n" -#: commit.c:1391 +#: commit.c:1390 msgid "" "Warning: commit message did not conform to UTF-8.\n" "You may want to amend it after fixing the message, or set the config\n" "variable i18n.commitencoding to the encoding your project uses.\n" msgstr "" "Peligro: el mensaje del commit no se ajusta a UTF-8.\n" -"Tal vez quiera enmendarlo después de arreglar el mensaje, o arreglar la\n" +"Tal vez quieras enmendarlo después de arreglar el mensaje, o arreglar la\n" "variable de configuración i18n.commitencoding para la codificación que usa " -"su proyecto.\n" +"tu proyecto.\n" -#: commit-graph.c:105 +#: commit-graph.c:127 msgid "commit-graph file is too small" msgstr "archivo commit-graph es muy pequeño" -#: commit-graph.c:170 +#: commit-graph.c:192 #, c-format msgid "commit-graph signature %X does not match signature %X" msgstr "firma %X en commit-graph no concuerda con firma %X" -#: commit-graph.c:177 +#: commit-graph.c:199 #, c-format msgid "commit-graph version %X does not match version %X" msgstr "versión de commit-graph %X no concuerda con versión %X" -#: commit-graph.c:184 +#: commit-graph.c:206 #, c-format msgid "commit-graph hash version %X does not match version %X" msgstr "versión de hash de commit-graph %X no concuerda con versión %X" -#: commit-graph.c:207 +#: commit-graph.c:229 msgid "commit-graph chunk lookup table entry missing; file may be incomplete" msgstr "" "falta tabla de lookup del chunk en commit-graph; el archivo puede estar " "incompleto" -#: commit-graph.c:218 +#: commit-graph.c:240 #, c-format msgid "commit-graph improper chunk offset %08x%08x" msgstr "offset del chunk de commit-graph inapropiado %08x%08x" -#: commit-graph.c:255 +#: commit-graph.c:283 #, c-format msgid "commit-graph chunk id %08x appears multiple times" msgstr "id de chunk de commit-graph %08x parece tener múltiples tiempos" -#: commit-graph.c:390 +#: commit-graph.c:347 +msgid "commit-graph has no base graphs chunk" +msgstr "commit-graph no tiene una chunk base de graphs" + +#: commit-graph.c:357 +msgid "commit-graph chain does not match" +msgstr "cadena commit-graph no concuerda" + +#: commit-graph.c:404 +#, c-format +msgid "invalid commit-graph chain: line '%s' not a hash" +msgstr "cadena de commit-graph inválida: línea '%s' no es un hash" + +#: commit-graph.c:430 +msgid "unable to find all commit-graph files" +msgstr "no es posible encontrar los archivos commit-graph" + +#: commit-graph.c:554 commit-graph.c:614 +msgid "invalid commit position. commit-graph is likely corrupt" +msgstr "posición de commit inválida. commit-graph está probablemente corrupto" + +#: commit-graph.c:575 #, c-format msgid "could not find commit %s" msgstr "no se pudo encontrar commit %s" -#: commit-graph.c:732 builtin/pack-objects.c:2649 +#: commit-graph.c:1002 builtin/pack-objects.c:2657 #, c-format msgid "unable to get type of object %s" msgstr "incapaz de obtener el tipo de objeto: %s" -#: commit-graph.c:765 +#: commit-graph.c:1034 msgid "Loading known commits in commit graph" msgstr "Cargando commits conocidos en commit graph" -#: commit-graph.c:781 +#: commit-graph.c:1051 msgid "Expanding reachable commits in commit graph" msgstr "Expandiendo commits alcanzables en commit graph" -#: commit-graph.c:793 +#: commit-graph.c:1070 msgid "Clearing commit marks in commit graph" msgstr "Limpiando marcas de commits en commit graph" -#: commit-graph.c:813 +#: commit-graph.c:1089 msgid "Computing commit graph generation numbers" msgstr "Calculando números de generación de commit graph" -#: commit-graph.c:930 +#: commit-graph.c:1163 #, c-format msgid "Finding commits for commit graph in %d pack" msgid_plural "Finding commits for commit graph in %d packs" msgstr[0] "Encontrando commits para commit graph en %d pack" msgstr[1] "Encontrando commits para commit graph en %d packs" -#: commit-graph.c:943 +#: commit-graph.c:1176 #, c-format msgid "error adding pack %s" msgstr "error agregando pack %s" -#: commit-graph.c:945 +#: commit-graph.c:1180 #, c-format msgid "error opening index for %s" msgstr "error abriendo index para %s" -#: commit-graph.c:959 +#: commit-graph.c:1204 #, c-format msgid "Finding commits for commit graph from %d ref" msgid_plural "Finding commits for commit graph from %d refs" msgstr[0] "Encontrando commits para commit graph de %d ref" msgstr[1] "Encontrando commits para commit graph de %d refs" -#: commit-graph.c:991 +#: commit-graph.c:1238 msgid "Finding commits for commit graph among packed objects" msgstr "Encontrando commits para commit graph entre los objetos empaquetados" -#: commit-graph.c:1004 +#: commit-graph.c:1253 msgid "Counting distinct commits in commit graph" msgstr "Contando commits distintos en commit graph" -#: commit-graph.c:1017 -#, c-format -msgid "the commit graph format cannot write %d commits" -msgstr "el formato de gráficos de commit no pudede escribir %d commits" - -#: commit-graph.c:1026 +#: commit-graph.c:1284 msgid "Finding extra edges in commit graph" msgstr "Encontrando esquinas extra en commit graph" -#: commit-graph.c:1050 -msgid "too many commits to write graph" -msgstr "demasiados commits para escribir el gráfico" +#: commit-graph.c:1332 +msgid "failed to write correct number of base graph ids" +msgstr "falló al escribir el número correcto de ids de base graph" -#: commit-graph.c:1057 midx.c:819 +#: commit-graph.c:1365 midx.c:811 #, c-format msgid "unable to create leading directories of %s" msgstr "no se pudo crear directorios principales para %s" -#: commit-graph.c:1097 +#: commit-graph.c:1377 builtin/index-pack.c:306 builtin/repack.c:240 +#, c-format +msgid "unable to create '%s'" +msgstr "no se puede crear '%s'" + +#: commit-graph.c:1437 #, c-format msgid "Writing out commit graph in %d pass" msgid_plural "Writing out commit graph in %d passes" msgstr[0] "Escribiendo commit graph en %d paso" msgstr[1] "Escribiendo commit graph en %d pasos" -#: commit-graph.c:1162 +#: commit-graph.c:1478 +msgid "unable to open commit-graph chain file" +msgstr "no se pudo abrir la cadena de archivos commit-graph" + +#: commit-graph.c:1490 +msgid "failed to rename base commit-graph file" +msgstr "no se pudo renombrar el archivo base commit-graph" + +#: commit-graph.c:1510 +msgid "failed to rename temporary commit-graph file" +msgstr "falló al renombrar el archivo temporal commit-graph" + +#: commit-graph.c:1621 +msgid "Scanning merged commits" +msgstr "Escaneando commits fusionados" + +#: commit-graph.c:1632 +#, c-format +msgid "unexpected duplicate commit id %s" +msgstr "id de commit duplicado inesperado %s" + +#: commit-graph.c:1657 +msgid "Merging commit-graph" +msgstr "Fusionando commit-graph" + +#: commit-graph.c:1844 +#, c-format +msgid "the commit graph format cannot write %d commits" +msgstr "el formato de gráficos de commit no pudede escribir %d commits" + +#: commit-graph.c:1855 +msgid "too many commits to write graph" +msgstr "demasiados commits para escribir el gráfico" + +#: commit-graph.c:1945 msgid "the commit-graph file has incorrect checksum and is likely corrupt" msgstr "" "el archivo de commit-graph tiene checksums incorrectos y probablemente está " "corrupto" -#: commit-graph.c:1172 +#: commit-graph.c:1955 #, c-format msgid "commit-graph has incorrect OID order: %s then %s" msgstr "commit-graph tiene un orden de OID incorrecto: %s luego %s" -#: commit-graph.c:1182 commit-graph.c:1197 +#: commit-graph.c:1965 commit-graph.c:1980 #, c-format msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u" msgstr "commit-graph tiene un valor fanout incorrecto: fanout[%d] = %u != %u" -#: commit-graph.c:1189 +#: commit-graph.c:1972 #, c-format msgid "failed to parse commit %s from commit-graph" msgstr "falló al analizar commit %s para commit-graph" -#: commit-graph.c:1206 +#: commit-graph.c:1989 msgid "Verifying commits in commit graph" msgstr "Verificando commits en commit graph" -#: commit-graph.c:1219 +#: commit-graph.c:2002 #, c-format msgid "failed to parse commit %s from object database for commit-graph" msgstr "" "falló al analizar el commit %s de la base de datos de objetos para commit-" "graph" -#: commit-graph.c:1226 +#: commit-graph.c:2009 #, c-format msgid "root tree OID for commit %s in commit-graph is %s != %s" msgstr "árbol raíz OID para commit %s en commit-graph es %s != %s" -#: commit-graph.c:1236 +#: commit-graph.c:2019 #, c-format msgid "commit-graph parent list for commit %s is too long" msgstr "lista padre de commit-graph para commit %s es muy larga" -#: commit-graph.c:1242 +#: commit-graph.c:2028 #, c-format msgid "commit-graph parent for %s is %s != %s" msgstr "padre de commit-graph para %s es %s != %s" -#: commit-graph.c:1255 +#: commit-graph.c:2041 #, c-format msgid "commit-graph parent list for commit %s terminates early" msgstr "lista padre de commit-graph para commit %s termina antes" -#: commit-graph.c:1260 +#: commit-graph.c:2046 #, c-format msgid "" "commit-graph has generation number zero for commit %s, but non-zero elsewhere" msgstr "" "commit-graph ha generado número cero para %s, pero no-cero para los demás" -#: commit-graph.c:1264 +#: commit-graph.c:2050 #, c-format msgid "" "commit-graph has non-zero generation number for commit %s, but zero elsewhere" msgstr "" "commit-graph tiene generación no-cero para %s, pero cero para los demás" -#: commit-graph.c:1279 +#: commit-graph.c:2065 #, c-format msgid "commit-graph generation for commit %s is %u != %u" msgstr "generación commit-graph para commit %s es %u != %u" -#: commit-graph.c:1285 +#: commit-graph.c:2071 #, c-format msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>" msgstr "" @@ -1611,7 +1684,7 @@ msgstr "" msgid "memory exhausted" msgstr "memoria agotada" -#: config.c:123 +#: config.c:124 #, c-format msgid "" "exceeded maximum include depth (%d) while including\n" @@ -1626,300 +1699,300 @@ msgstr "" "\t%s\n" "Esto puede ser causado por inclusiones circulares." -#: config.c:139 +#: config.c:140 #, c-format msgid "could not expand include path '%s'" msgstr "no se pudo expandir rutas de inclusión '%s'" -#: config.c:150 +#: config.c:151 msgid "relative config includes must come from files" msgstr "inclusiones de configuración relativas tienen que venir de archivos" -#: config.c:190 +#: config.c:197 msgid "relative config include conditionals must come from files" msgstr "" "la configuración relativa incluye condicionales que deben venir de archivos" -#: config.c:348 +#: config.c:376 #, c-format msgid "key does not contain a section: %s" msgstr "llave no contiene una sección: %s" -#: config.c:354 +#: config.c:382 #, c-format msgid "key does not contain variable name: %s" msgstr "llave no contiene el nombre de variable: %s" -#: config.c:378 sequencer.c:2459 +#: config.c:406 sequencer.c:2463 #, c-format msgid "invalid key: %s" msgstr "llave inválida: %s" -#: config.c:384 +#: config.c:412 #, c-format msgid "invalid key (newline): %s" msgstr "llave inválida (nueva línea): %s" -#: config.c:420 config.c:432 +#: config.c:448 config.c:460 #, c-format msgid "bogus config parameter: %s" msgstr "parámetro de configuración malogrado: %s" -#: config.c:467 +#: config.c:495 #, c-format msgid "bogus format in %s" msgstr "formato malogrado en %s" -#: config.c:793 +#: config.c:821 #, c-format msgid "bad config line %d in blob %s" msgstr "mala línea de config %d en el blob %s" -#: config.c:797 +#: config.c:825 #, c-format msgid "bad config line %d in file %s" msgstr "mala línea de config %d en el archivo %s" -#: config.c:801 +#: config.c:829 #, c-format msgid "bad config line %d in standard input" msgstr "mala línea de config %d en la entrada standard" -#: config.c:805 +#: config.c:833 #, c-format msgid "bad config line %d in submodule-blob %s" msgstr "mala línea de config %d en el submódulo-blob %s" -#: config.c:809 +#: config.c:837 #, c-format msgid "bad config line %d in command line %s" msgstr "mala línea de config %d en la línea de comando %s" -#: config.c:813 +#: config.c:841 #, c-format msgid "bad config line %d in %s" msgstr "mala línea de config %d en %s" -#: config.c:952 +#: config.c:978 msgid "out of range" msgstr "fuera de rango" -#: config.c:952 +#: config.c:978 msgid "invalid unit" msgstr "unidad inválida" -#: config.c:958 +#: config.c:979 #, c-format msgid "bad numeric config value '%s' for '%s': %s" msgstr "mal valor de config numérica '%s' para '%s': %s" -#: config.c:963 +#: config.c:998 #, c-format msgid "bad numeric config value '%s' for '%s' in blob %s: %s" msgstr "mal valor de config numérica '%s' para '%s' en el blob %s: %s" -#: config.c:966 +#: config.c:1001 #, c-format msgid "bad numeric config value '%s' for '%s' in file %s: %s" msgstr "mal valor de config numérica '%s' para '%s' en el archivo %s: %s" -#: config.c:969 +#: config.c:1004 #, c-format msgid "bad numeric config value '%s' for '%s' in standard input: %s" msgstr "mal valor de config numérica '%s' para '%s' en la entrada standard: %s" -#: config.c:972 +#: config.c:1007 #, c-format msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s" msgstr "" "mal valor de config numérica '%s' para '%s' en el submódulo-blob %s: %s" -#: config.c:975 +#: config.c:1010 #, c-format msgid "bad numeric config value '%s' for '%s' in command line %s: %s" msgstr "" "mal valor de config numérica '%s' para '%s' en la línea de comando %s: %s" -#: config.c:978 +#: config.c:1013 #, c-format msgid "bad numeric config value '%s' for '%s' in %s: %s" msgstr "mal valor de config numérica '%s' para '%s' en %s: %s" -#: config.c:1073 +#: config.c:1108 #, c-format msgid "failed to expand user dir in: '%s'" msgstr "falló al expandir el directorio de usuario en: '%s'" -#: config.c:1082 +#: config.c:1117 #, c-format msgid "'%s' for '%s' is not a valid timestamp" msgstr "'%s' para '%s' no es una marca de tiempo válida" -#: config.c:1173 +#: config.c:1208 #, c-format msgid "abbrev length out of range: %d" msgstr "largo de abreviatura fuera de rango: %d" -#: config.c:1187 config.c:1198 +#: config.c:1222 config.c:1233 #, c-format msgid "bad zlib compression level %d" msgstr "nivel de compresión de zlib erróneo %d" -#: config.c:1290 +#: config.c:1325 msgid "core.commentChar should only be one character" msgstr "core.commentChar debería tener solo un caracter" -#: config.c:1323 +#: config.c:1358 #, c-format msgid "invalid mode for object creation: %s" msgstr "modo inválido de creación de objetos: %s" -#: config.c:1395 +#: config.c:1430 #, c-format msgid "malformed value for %s" msgstr "valor malformado para %s" -#: config.c:1421 +#: config.c:1456 #, c-format msgid "malformed value for %s: %s" msgstr "valor malformado para %s: %s" -#: config.c:1422 +#: config.c:1457 msgid "must be one of nothing, matching, simple, upstream or current" msgstr "debe ser uno de nothing, matching, simple, upstream o current" -#: config.c:1483 builtin/pack-objects.c:3397 +#: config.c:1518 builtin/pack-objects.c:3410 #, c-format msgid "bad pack compression level %d" msgstr "nivel de compresión de pack erróneo %d" -#: config.c:1604 +#: config.c:1639 #, c-format msgid "unable to load config blob object '%s'" msgstr "incapaz de cargar configuración de objeto blob '%s'" -#: config.c:1607 +#: config.c:1642 #, c-format msgid "reference '%s' does not point to a blob" msgstr "referencia '%s' no apunta a un blob" -#: config.c:1624 +#: config.c:1659 #, c-format msgid "unable to resolve config blob '%s'" msgstr "no se posible resolver configuración de blob '%s'" -#: config.c:1654 +#: config.c:1689 #, c-format msgid "failed to parse %s" msgstr "no se pudo analizar %s" -#: config.c:1710 +#: config.c:1745 msgid "unable to parse command-line config" msgstr "no es posible analizar la configuración de la línea de comando" -#: config.c:2059 +#: config.c:2094 msgid "unknown error occurred while reading the configuration files" msgstr "" "error desconocido ocurrió mientras se leían los archivos de configuración" -#: config.c:2229 +#: config.c:2264 #, c-format msgid "Invalid %s: '%s'" -msgstr "Invalido %s: '%s'" +msgstr "Inválido %s: '%s'" -#: config.c:2272 +#: config.c:2307 #, c-format msgid "unknown core.untrackedCache value '%s'; using 'keep' default value" msgstr "" "valor core.untrackedCache '%s' desconocido; usando 'keep' como valor por " "defecto" -#: config.c:2298 +#: config.c:2333 #, c-format msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100" msgstr "valor splitIndex.maxPercentChange '%d' debe estar entre 0 y 100" -#: config.c:2344 +#: config.c:2379 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "no es posible analizar '%s' de la configuración de la línea de comando" -#: config.c:2346 +#: config.c:2381 #, c-format msgid "bad config variable '%s' in file '%s' at line %d" msgstr "mala variable de config '%s' en el archivo '%s' en la línea %d" -#: config.c:2427 +#: config.c:2462 #, c-format msgid "invalid section name '%s'" msgstr "nombre de sección inválido '%s'" -#: config.c:2459 +#: config.c:2494 #, c-format msgid "%s has multiple values" msgstr "%s tiene múltiples valores" -#: config.c:2488 +#: config.c:2523 #, c-format msgid "failed to write new configuration file %s" msgstr "falló al escribir nuevo archivo de configuración %s" -#: config.c:2740 config.c:3064 +#: config.c:2775 config.c:3099 #, c-format msgid "could not lock config file %s" msgstr "no se pudo bloquear archivo de configuración %s" -#: config.c:2751 +#: config.c:2786 #, c-format msgid "opening %s" msgstr "abriendo %s" -#: config.c:2786 builtin/config.c:328 +#: config.c:2821 builtin/config.c:328 #, c-format msgid "invalid pattern: %s" msgstr "patrón inválido: %s" -#: config.c:2811 +#: config.c:2846 #, c-format msgid "invalid config file %s" msgstr "archivo de configuración inválido: %s" -#: config.c:2824 config.c:3077 +#: config.c:2859 config.c:3112 #, c-format msgid "fstat on %s failed" msgstr "fstat en %s falló" -#: config.c:2835 +#: config.c:2870 #, c-format msgid "unable to mmap '%s'" msgstr "no es posible hacer mmap '%s'" -#: config.c:2844 config.c:3082 +#: config.c:2879 config.c:3117 #, c-format msgid "chmod on %s failed" msgstr "chmod en %s falló" -#: config.c:2929 config.c:3179 +#: config.c:2964 config.c:3214 #, c-format msgid "could not write config file %s" msgstr "no se pudo escribir el archivo de configuración %s" -#: config.c:2963 +#: config.c:2998 #, c-format msgid "could not set '%s' to '%s'" msgstr "no se pudo configurar '%s' a '%s'" -#: config.c:2965 builtin/remote.c:782 +#: config.c:3000 builtin/remote.c:782 #, c-format msgid "could not unset '%s'" msgstr "no se pudo desactivar '%s'" -#: config.c:3055 +#: config.c:3090 #, c-format msgid "invalid section name: %s" msgstr "sección de nombre inválida: %s" -#: config.c:3222 +#: config.c:3257 #, c-format msgid "missing value for '%s'" msgstr "valor faltante para '%s'" @@ -1937,7 +2010,7 @@ msgid "" msgstr "" "No se pudo leer del repositorio remoto.\n" "\n" -"Por favor asegúrese que tiene los permisos de acceso correctos\n" +"Por favor asegúrate que tienes los permisos de acceso correctos\n" "y que el repositorio existe." #: connect.c:81 @@ -2084,19 +2157,19 @@ msgstr "ruta extraña '%s' bloqueada" msgid "unable to fork" msgstr "no es posible hacer fork" -#: connected.c:85 builtin/fsck.c:221 builtin/prune.c:43 +#: connected.c:86 builtin/fsck.c:221 builtin/prune.c:43 msgid "Checking connectivity" msgstr "Verificando conectividad" -#: connected.c:97 +#: connected.c:98 msgid "Could not run 'git rev-list'" msgstr "No se pudo correr 'git rev-list'" -#: connected.c:117 +#: connected.c:118 msgid "failed write to rev-list" msgstr "falló escribir a rev-list" -#: connected.c:124 +#: connected.c:125 msgid "failed to close rev-list's stdin" msgstr "falló al cerrar la entrada standard de rev-list" @@ -2314,7 +2387,7 @@ msgstr "falló al cargar isla de regex para '%s': %s" msgid "island regex from config has too many capture groups (max=%d)" msgstr "regex isla de config tiene muchos grupos de captura (max=%d)" -#: delta-islands.c:466 +#: delta-islands.c:467 #, c-format msgid "Marked %d islands, done.\n" msgstr "%d islas marcadas, listo.\n" @@ -2391,35 +2464,35 @@ msgstr "" "Errores en la variable de config 'diff.dirstat' encontrados:\n" "%s" -#: diff.c:4210 +#: diff.c:4215 #, c-format msgid "external diff died, stopping at %s" msgstr "diff externo murió, deteniendo en %s" -#: diff.c:4555 +#: diff.c:4560 msgid "--name-only, --name-status, --check and -s are mutually exclusive" msgstr "--name-only, --name-status, --check y -s son mutuamente exclusivas" -#: diff.c:4558 +#: diff.c:4563 msgid "-G, -S and --find-object are mutually exclusive" msgstr "-G, -S y --find-object son mutuamente exclusivas" -#: diff.c:4636 +#: diff.c:4641 msgid "--follow requires exactly one pathspec" msgstr "--follow requiere exactamente un pathspec" -#: diff.c:4684 +#: diff.c:4689 #, c-format msgid "invalid --stat value: %s" msgstr "valor --stat inválido: %s" -#: diff.c:4689 diff.c:4694 diff.c:4699 diff.c:4704 diff.c:5217 +#: diff.c:4694 diff.c:4699 diff.c:4704 diff.c:4709 diff.c:5222 #: parse-options.c:199 parse-options.c:203 #, c-format msgid "%s expects a numerical value" msgstr "%s espera un valor numérico" -#: diff.c:4721 +#: diff.c:4726 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -2428,42 +2501,42 @@ msgstr "" "Falló al analizar parámetro de opción --dirstat/-X:\n" "%s" -#: diff.c:4806 +#: diff.c:4811 #, c-format msgid "unknown change class '%c' in --diff-filter=%s" msgstr "cambio de clase desconocido '%c' en --diff-filter=%s" -#: diff.c:4830 +#: diff.c:4835 #, c-format msgid "unknown value after ws-error-highlight=%.*s" msgstr "valor desconocido luego de ws-error-highlight=%.*s" -#: diff.c:4844 +#: diff.c:4849 #, c-format msgid "unable to resolve '%s'" msgstr "no se puede resolver '%s'" -#: diff.c:4894 diff.c:4900 +#: diff.c:4899 diff.c:4905 #, c-format msgid "%s expects <n>/<m> form" msgstr "%s espera forma <n>/<m>" -#: diff.c:4912 +#: diff.c:4917 #, c-format msgid "%s expects a character, got '%s'" msgstr "%s esperaba un char, se obtuvo '%s'" -#: diff.c:4933 +#: diff.c:4938 #, c-format msgid "bad --color-moved argument: %s" msgstr "mal argumento --color-moved: %s" -#: diff.c:4952 +#: diff.c:4957 #, c-format msgid "invalid mode '%s' in --color-moved-ws" msgstr "modo inválido '%s' en --color-moved-ws" -#: diff.c:4992 +#: diff.c:4997 msgid "" "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " "\"histogram\"" @@ -2471,154 +2544,154 @@ msgstr "" "opción diff-algorithm acepta \"myers\", \"minimal\", \"patience\" e " "\"histogram\"" -#: diff.c:5028 diff.c:5048 +#: diff.c:5033 diff.c:5053 #, c-format msgid "invalid argument to %s" msgstr "argumento inválido para %s" -#: diff.c:5186 +#: diff.c:5191 #, c-format msgid "failed to parse --submodule option parameter: '%s'" msgstr "falló al analizar parámetro de opción --submodule: '%s'" -#: diff.c:5242 +#: diff.c:5247 #, c-format msgid "bad --word-diff argument: %s" msgstr "mal argumento --word-diff: %s" -#: diff.c:5265 +#: diff.c:5270 msgid "Diff output format options" msgstr "Opciones de formato de salida para diff" -#: diff.c:5267 diff.c:5273 +#: diff.c:5272 diff.c:5278 msgid "generate patch" msgstr "generar parche" -#: diff.c:5270 builtin/log.c:167 +#: diff.c:5275 builtin/log.c:172 msgid "suppress diff output" msgstr "suprimir salida de diff" -#: diff.c:5275 diff.c:5389 diff.c:5396 +#: diff.c:5280 diff.c:5394 diff.c:5401 msgid "<n>" msgstr "<n>" -#: diff.c:5276 diff.c:5279 +#: diff.c:5281 diff.c:5284 msgid "generate diffs with <n> lines context" msgstr "genera diffs con <n> líneas de contexto" -#: diff.c:5281 +#: diff.c:5286 msgid "generate the diff in raw format" msgstr "genera el diff en formato raw" -#: diff.c:5284 +#: diff.c:5289 msgid "synonym for '-p --raw'" msgstr "sinónimo para '-p --stat'" -#: diff.c:5288 +#: diff.c:5293 msgid "synonym for '-p --stat'" msgstr "sinónimo para '-p --stat'" -#: diff.c:5292 +#: diff.c:5297 msgid "machine friendly --stat" msgstr "--stat amigable para máquina" -#: diff.c:5295 +#: diff.c:5300 msgid "output only the last line of --stat" msgstr "mostrar solo la última línea para --stat" -#: diff.c:5297 diff.c:5305 +#: diff.c:5302 diff.c:5310 msgid "<param1,param2>..." msgstr "<param1,param2>..." -#: diff.c:5298 +#: diff.c:5303 msgid "" "output the distribution of relative amount of changes for each sub-directory" msgstr "" "muestra la distribución de cantidades de cambios relativa para cada " "subdirectorio" -#: diff.c:5302 +#: diff.c:5307 msgid "synonym for --dirstat=cumulative" msgstr "sinónimo para --dirstat=cumulative" -#: diff.c:5306 +#: diff.c:5311 msgid "synonym for --dirstat=files,param1,param2..." msgstr "sinonimo para --dirstat=archivos,param1,param2..." -#: diff.c:5310 +#: diff.c:5315 msgid "warn if changes introduce conflict markers or whitespace errors" msgstr "" "advierte si cambios introducen conflictos de markers o errores de espacios " "en blanco" -#: diff.c:5313 +#: diff.c:5318 msgid "condensed summary such as creations, renames and mode changes" msgstr "" "resumen condensado de creaciones, cambios de nombres y cambios de modos" -#: diff.c:5316 +#: diff.c:5321 msgid "show only names of changed files" msgstr "mostrar solo nombres de archivos cambiados" -#: diff.c:5319 +#: diff.c:5324 msgid "show only names and status of changed files" msgstr "mostrar solo nombres y estados de archivos cambiados" -#: diff.c:5321 +#: diff.c:5326 msgid "<width>[,<name-width>[,<count>]]" msgstr "<ancho>[,<nombre-ancho>[,<cantidad>]]" -#: diff.c:5322 +#: diff.c:5327 msgid "generate diffstat" msgstr "generar diffstat" -#: diff.c:5324 diff.c:5327 diff.c:5330 +#: diff.c:5329 diff.c:5332 diff.c:5335 msgid "<width>" msgstr "<ancho>" -#: diff.c:5325 +#: diff.c:5330 msgid "generate diffstat with a given width" msgstr "genera diffstat con un ancho dado" -#: diff.c:5328 +#: diff.c:5333 msgid "generate diffstat with a given name width" msgstr "genera diffstat con un nombre de ancho dado" -#: diff.c:5331 +#: diff.c:5336 msgid "generate diffstat with a given graph width" msgstr "genera diffstat con un ancho de graph dado" -#: diff.c:5333 +#: diff.c:5338 msgid "<count>" msgstr "<cantidad>" -#: diff.c:5334 +#: diff.c:5339 msgid "generate diffstat with limited lines" msgstr "genera diffstat con líneas limitadas" -#: diff.c:5337 +#: diff.c:5342 msgid "generate compact summary in diffstat" msgstr "genera un resumen compacto de diffstat" -#: diff.c:5340 +#: diff.c:5345 msgid "output a binary diff that can be applied" msgstr "muestra un diff binario que puede ser aplicado" -#: diff.c:5343 +#: diff.c:5348 msgid "show full pre- and post-image object names on the \"index\" lines" msgstr "" "mostrar todo un pre- y post-image de nombres de objetos en las líneas \"index" "\"" -#: diff.c:5345 +#: diff.c:5350 msgid "show colored diff" msgstr "mostrar diff colorido" -#: diff.c:5346 +#: diff.c:5351 msgid "<kind>" msgstr "<tipo>" -#: diff.c:5347 +#: diff.c:5352 msgid "" "highlight whitespace errors in the 'context', 'old' or 'new' lines in the " "diff" @@ -2626,7 +2699,7 @@ msgstr "" "resaltar errores de espacios en blanco en las líneas 'context', 'old' o " "'new' del diff" -#: diff.c:5350 +#: diff.c:5355 msgid "" "do not munge pathnames and use NULs as output field terminators in --raw or " "--numstat" @@ -2634,89 +2707,89 @@ msgstr "" "no consolidar los pathnames y usar NULs como terminadores de campos en --raw " "o --numstat" -#: diff.c:5353 diff.c:5356 diff.c:5359 diff.c:5465 +#: diff.c:5358 diff.c:5361 diff.c:5364 diff.c:5470 msgid "<prefix>" msgstr "<prefijo>" -#: diff.c:5354 +#: diff.c:5359 msgid "show the given source prefix instead of \"a/\"" msgstr "mostrar el prefijo de fuente dado en lugar de \"a/\"" -#: diff.c:5357 +#: diff.c:5362 msgid "show the given destination prefix instead of \"b/\"" msgstr "mostrar el prefijo de destino en lugar de \"b/\"" -#: diff.c:5360 +#: diff.c:5365 msgid "prepend an additional prefix to every line of output" msgstr "anteponer un prefijo adicional a cada línea mostrada" -#: diff.c:5363 +#: diff.c:5368 msgid "do not show any source or destination prefix" msgstr "no mostrar ningún prefijo de fuente o destino" -#: diff.c:5366 +#: diff.c:5371 msgid "show context between diff hunks up to the specified number of lines" msgstr "" "muestra el contexto entre hunks de diff hasta el número especificado de " "líneas" -#: diff.c:5370 diff.c:5375 diff.c:5380 +#: diff.c:5375 diff.c:5380 diff.c:5385 msgid "<char>" msgstr "<char>" -#: diff.c:5371 +#: diff.c:5376 msgid "specify the character to indicate a new line instead of '+'" msgstr "especifica el char para indicar una nueva línea en lugar de '+'" -#: diff.c:5376 +#: diff.c:5381 msgid "specify the character to indicate an old line instead of '-'" msgstr "especifica el char para indicar una línea vieja en lugar de '-'" -#: diff.c:5381 +#: diff.c:5386 msgid "specify the character to indicate a context instead of ' '" msgstr "especifica el char para indicar un contexto en lugar de ' '" -#: diff.c:5384 +#: diff.c:5389 msgid "Diff rename options" msgstr "Opciones de diff rename" -#: diff.c:5385 +#: diff.c:5390 msgid "<n>[/<m>]" msgstr "<n>[/<m>]" -#: diff.c:5386 +#: diff.c:5391 msgid "break complete rewrite changes into pairs of delete and create" msgstr "descomponer los cambios de reescritura en pares de borrar y crear" -#: diff.c:5390 +#: diff.c:5395 msgid "detect renames" msgstr "detectar renombrados" -#: diff.c:5394 +#: diff.c:5399 msgid "omit the preimage for deletes" msgstr "omite la preimage para borrados" -#: diff.c:5397 +#: diff.c:5402 msgid "detect copies" msgstr "detectar copias" -#: diff.c:5401 +#: diff.c:5406 msgid "use unmodified files as source to find copies" msgstr "usa archivos no modificados como fuente para encontrar copias" -#: diff.c:5403 +#: diff.c:5408 msgid "disable rename detection" msgstr "deshabilita detección de renombres" -#: diff.c:5406 +#: diff.c:5411 msgid "use empty blobs as rename source" msgstr "usa blobs vacíos como fuente de renombre" -#: diff.c:5408 +#: diff.c:5413 msgid "continue listing the history of a file beyond renames" msgstr "continua listando el historial de un archivo más allá de renombres" -#: diff.c:5411 +#: diff.c:5416 msgid "" "prevent rename/copy detection if the number of rename/copy targets exceeds " "given limit" @@ -2724,155 +2797,155 @@ msgstr "" "previene detección de renombre/copias si el número de objetivos para " "renombres/copias excede el límite dado" -#: diff.c:5413 +#: diff.c:5418 msgid "Diff algorithm options" msgstr "Opciones de algoritmos de diff" -#: diff.c:5415 +#: diff.c:5420 msgid "produce the smallest possible diff" msgstr "produce el diff más pequeño posible" -#: diff.c:5418 +#: diff.c:5423 msgid "ignore whitespace when comparing lines" msgstr "ignorar espacios en blanco cuando comparando líneas" -#: diff.c:5421 +#: diff.c:5426 msgid "ignore changes in amount of whitespace" msgstr "ignorar cambios en la cantidad de líneas en blanco" -#: diff.c:5424 +#: diff.c:5429 msgid "ignore changes in whitespace at EOL" msgstr "ignorar cambios en espacios en blanco en EOL" -#: diff.c:5427 +#: diff.c:5432 msgid "ignore carrier-return at the end of line" msgstr "ignora carrier-return al final de la línea" -#: diff.c:5430 +#: diff.c:5435 msgid "ignore changes whose lines are all blank" msgstr "ignora cambios cuyas líneas son todas en blanco" -#: diff.c:5433 +#: diff.c:5438 msgid "heuristic to shift diff hunk boundaries for easy reading" msgstr "heurística para cambiar los límites de hunk para una fácil lectura" -#: diff.c:5436 +#: diff.c:5441 msgid "generate diff using the \"patience diff\" algorithm" msgstr "genera un diff usando algoritmo \"patience diff\"" -#: diff.c:5440 +#: diff.c:5445 msgid "generate diff using the \"histogram diff\" algorithm" msgstr "genera un diff usando algoritmo \"histogram diff\"" -#: diff.c:5442 +#: diff.c:5447 msgid "<algorithm>" msgstr "<algoritmo>" -#: diff.c:5443 +#: diff.c:5448 msgid "choose a diff algorithm" msgstr "escoge un algoritmo para diff" -#: diff.c:5445 +#: diff.c:5450 msgid "<text>" msgstr "<texto>" -#: diff.c:5446 +#: diff.c:5451 msgid "generate diff using the \"anchored diff\" algorithm" msgstr "genera un diff usando algoritmo \"anchored diff\"" -#: diff.c:5448 diff.c:5457 diff.c:5460 +#: diff.c:5453 diff.c:5462 diff.c:5465 msgid "<mode>" msgstr "<modo>" -#: diff.c:5449 +#: diff.c:5454 msgid "show word diff, using <mode> to delimit changed words" msgstr "" "muestra diff por palabras usando <modo> para delimitar las palabras cambiadas" -#: diff.c:5451 diff.c:5454 diff.c:5499 +#: diff.c:5456 diff.c:5459 diff.c:5504 msgid "<regex>" msgstr "<regex>" -#: diff.c:5452 +#: diff.c:5457 msgid "use <regex> to decide what a word is" msgstr "usa <regex> para decidir que palabra es" -#: diff.c:5455 +#: diff.c:5460 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>" msgstr "equivalente a --word-diff=color --word-diff-regex=<regex>" -#: diff.c:5458 +#: diff.c:5463 msgid "moved lines of code are colored differently" msgstr "líneas movidas de código están coloreadas diferente" -#: diff.c:5461 +#: diff.c:5466 msgid "how white spaces are ignored in --color-moved" msgstr "como espacios en blanco son ignorados en --color-moved" -#: diff.c:5464 +#: diff.c:5469 msgid "Other diff options" msgstr "Otras opciones de diff" -#: diff.c:5466 +#: diff.c:5471 msgid "when run from subdir, exclude changes outside and show relative paths" msgstr "" "cuando ejecutado desde un subdir, excluye cambios del exterior y muestra " "paths relativos" -#: diff.c:5470 +#: diff.c:5475 msgid "treat all files as text" msgstr "tratar todos los archivos como texto" -#: diff.c:5472 +#: diff.c:5477 msgid "swap two inputs, reverse the diff" msgstr "cambia dos inputs, invierte el diff" -#: diff.c:5474 +#: diff.c:5479 msgid "exit with 1 if there were differences, 0 otherwise" msgstr "termina con 1 si hubieron diferencias, de lo contrario con 0" -#: diff.c:5476 +#: diff.c:5481 msgid "disable all output of the program" msgstr "deshabilita todo el output del programa" -#: diff.c:5478 +#: diff.c:5483 msgid "allow an external diff helper to be executed" msgstr "permite la ejecución de un diff helper externo" -#: diff.c:5480 +#: diff.c:5485 msgid "run external text conversion filters when comparing binary files" msgstr "" "ejecuta filtros de conversión de texto externos cuando comparando binarios" -#: diff.c:5482 +#: diff.c:5487 msgid "<when>" msgstr "<cuando>" -#: diff.c:5483 +#: diff.c:5488 msgid "ignore changes to submodules in the diff generation" msgstr "ignorar cambios a submódulos en la generación de diff" -#: diff.c:5486 +#: diff.c:5491 msgid "<format>" msgstr "<formato>" -#: diff.c:5487 +#: diff.c:5492 msgid "specify how differences in submodules are shown" msgstr "especifica como son mostradas las diferencias en submódulos" -#: diff.c:5491 +#: diff.c:5496 msgid "hide 'git add -N' entries from the index" msgstr "ocultar entradas 'git add -N' del index" -#: diff.c:5494 +#: diff.c:5499 msgid "treat 'git add -N' entries as real in the index" msgstr "trata entradas 'git add -N' como reales en el index" -#: diff.c:5496 +#: diff.c:5501 msgid "<string>" msgstr "<string>" -#: diff.c:5497 +#: diff.c:5502 msgid "" "look for differences that change the number of occurrences of the specified " "string" @@ -2880,7 +2953,7 @@ msgstr "" "busca por diferencias que cambien el número de ocurrencias para el string " "especificado" -#: diff.c:5500 +#: diff.c:5505 msgid "" "look for differences that change the number of occurrences of the specified " "regex" @@ -2888,23 +2961,23 @@ msgstr "" "busca por diferencias que cambien el número de ocurrencias para el regex " "especificado" -#: diff.c:5503 +#: diff.c:5508 msgid "show all changes in the changeset with -S or -G" msgstr "mostrar todos los cambios en el changeset con -S o -G" -#: diff.c:5506 +#: diff.c:5511 msgid "treat <string> in -S as extended POSIX regular expression" msgstr "tratar <string> en -S como una expresión regular extendida de POSIX" -#: diff.c:5509 +#: diff.c:5514 msgid "control the order in which files appear in the output" msgstr "controlar el orden en el que los archivos aparecen en la salida" -#: diff.c:5510 +#: diff.c:5515 msgid "<object-id>" msgstr "<id-objeto>" -#: diff.c:5511 +#: diff.c:5516 msgid "" "look for differences that change the number of occurrences of the specified " "object" @@ -2912,38 +2985,38 @@ msgstr "" "busca por diferencias que cambien el número de ocurrencias para el objeto " "especificado" -#: diff.c:5513 +#: diff.c:5518 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]" msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]" -#: diff.c:5514 +#: diff.c:5519 msgid "select files by diff type" msgstr "selecciona archivos por tipo de diff" -#: diff.c:5516 +#: diff.c:5521 msgid "<file>" msgstr "<archivo>" -#: diff.c:5517 +#: diff.c:5522 msgid "Output to a specific file" msgstr "Output a un archivo específico" -#: diff.c:6150 +#: diff.c:6177 msgid "inexact rename detection was skipped due to too many files." msgstr "" "detección de cambio de nombre inexacta fue saltada por haber muchos archivos." -#: diff.c:6153 +#: diff.c:6180 msgid "only found copies from modified paths due to too many files." msgstr "" "solo se encontraron copias de rutas modificadas por haber muchos archivos." -#: diff.c:6156 +#: diff.c:6183 #, c-format msgid "" "you may want to set your %s variable to at least %d and retry the command." msgstr "" -"tal vez quiera configurar la variable %s para por lo menos %d y volver a " +"tal vez quieras configurar la variable %s para por lo menos %d y volver a " "intentar el comando." #: dir.c:537 @@ -3044,32 +3117,32 @@ msgstr "no se puede escribir al remoto" msgid "--stateless-rpc requires multi_ack_detailed" msgstr "--stateless-rpc requiere multi_ack_detailed" -#: fetch-pack.c:360 fetch-pack.c:1271 +#: fetch-pack.c:360 fetch-pack.c:1284 #, c-format msgid "invalid shallow line: %s" msgstr "línea poco profunda inválida: %s" -#: fetch-pack.c:366 fetch-pack.c:1277 +#: fetch-pack.c:366 fetch-pack.c:1290 #, c-format msgid "invalid unshallow line: %s" msgstr "línea superficial inválida: %s" -#: fetch-pack.c:368 fetch-pack.c:1279 +#: fetch-pack.c:368 fetch-pack.c:1292 #, c-format msgid "object not found: %s" msgstr "objeto no encontrado: %s" -#: fetch-pack.c:371 fetch-pack.c:1282 +#: fetch-pack.c:371 fetch-pack.c:1295 #, c-format msgid "error in object: %s" msgstr "error en objeto: %s" -#: fetch-pack.c:373 fetch-pack.c:1284 +#: fetch-pack.c:373 fetch-pack.c:1297 #, c-format msgid "no shallow found: %s" msgstr "superficie no encontrada: %s" -#: fetch-pack.c:376 fetch-pack.c:1288 +#: fetch-pack.c:376 fetch-pack.c:1301 #, c-format msgid "expected shallow/unshallow, got %s" msgstr "se esperaba shallow/unshallow, se obtuvo %s" @@ -3088,7 +3161,7 @@ msgstr "commit inválido %s" msgid "giving up" msgstr "rindiéndose" -#: fetch-pack.c:477 progress.c:284 +#: fetch-pack.c:477 progress.c:277 msgid "done" msgstr "listo" @@ -3129,154 +3202,130 @@ msgstr "%s falló" msgid "error in sideband demultiplexer" msgstr "error en demultiplexor de banda lateral" -#: fetch-pack.c:906 -msgid "Server does not support shallow clients" -msgstr "El servidor no soporta clientes superficiales" - -#: fetch-pack.c:910 -msgid "Server supports multi_ack_detailed" -msgstr "El servidor soporta ulti_ack_detailed" - -#: fetch-pack.c:913 -msgid "Server supports no-done" -msgstr "El servidor soporta no-done" - -#: fetch-pack.c:919 -msgid "Server supports multi_ack" -msgstr "El servidor soporta multi_ack" - -#: fetch-pack.c:923 -msgid "Server supports side-band-64k" -msgstr "El servidor soporta side-band-64k" - -#: fetch-pack.c:927 -msgid "Server supports side-band" -msgstr "El servidor soporta side-band" - -#: fetch-pack.c:931 -msgid "Server supports allow-tip-sha1-in-want" -msgstr "El servidor soporta allow-tip-sha1-in-want" - -#: fetch-pack.c:935 -msgid "Server supports allow-reachable-sha1-in-want" -msgstr "El servidor soporta allow-reachable-sha1-in-want" - -#: fetch-pack.c:945 -msgid "Server supports ofs-delta" -msgstr "El servidor soporta ofs-delta" - -#: fetch-pack.c:951 fetch-pack.c:1144 -msgid "Server supports filter" -msgstr "El servidor soporta filtro" - -#: fetch-pack.c:959 +#: fetch-pack.c:908 #, c-format msgid "Server version is %.*s" msgstr "Versión de servidor es %.*s" -#: fetch-pack.c:965 +#: fetch-pack.c:913 fetch-pack.c:919 fetch-pack.c:922 fetch-pack.c:928 +#: fetch-pack.c:932 fetch-pack.c:936 fetch-pack.c:940 fetch-pack.c:944 +#: fetch-pack.c:948 fetch-pack.c:952 fetch-pack.c:956 fetch-pack.c:960 +#: fetch-pack.c:966 fetch-pack.c:972 fetch-pack.c:977 fetch-pack.c:982 +#, c-format +msgid "Server supports %s" +msgstr "El servidor soporta %s" + +#: fetch-pack.c:915 +msgid "Server does not support shallow clients" +msgstr "El servidor no soporta clientes superficiales" + +#: fetch-pack.c:975 msgid "Server does not support --shallow-since" msgstr "El servidor no soporta --shalow-since" -#: fetch-pack.c:969 +#: fetch-pack.c:980 msgid "Server does not support --shallow-exclude" msgstr "El servidor no soporta --shalow-exclude" -#: fetch-pack.c:971 +#: fetch-pack.c:984 msgid "Server does not support --deepen" msgstr "El servidor no soporta --deepen" -#: fetch-pack.c:988 +#: fetch-pack.c:1001 msgid "no common commits" msgstr "no hay commits comunes" -#: fetch-pack.c:1000 fetch-pack.c:1449 +#: fetch-pack.c:1013 fetch-pack.c:1462 msgid "git fetch-pack: fetch failed." msgstr "git fetch-pack: fetch falló." -#: fetch-pack.c:1138 +#: fetch-pack.c:1151 msgid "Server does not support shallow requests" msgstr "El servidor no soporta peticiones superficiales" -#: fetch-pack.c:1171 +#: fetch-pack.c:1157 +msgid "Server supports filter" +msgstr "El servidor soporta filtro" + +#: fetch-pack.c:1184 msgid "unable to write request to remote" msgstr "no se puede escribir request al remoto" -#: fetch-pack.c:1189 +#: fetch-pack.c:1202 #, c-format msgid "error reading section header '%s'" msgstr "error leyendo sección header '%s'" -#: fetch-pack.c:1195 +#: fetch-pack.c:1208 #, c-format msgid "expected '%s', received '%s'" msgstr "se esperaba '%s', se recibió '%s'" -#: fetch-pack.c:1234 +#: fetch-pack.c:1247 #, c-format msgid "unexpected acknowledgment line: '%s'" -msgstr "linea de confirmación inesperada: '%s'" +msgstr "línea de confirmación inesperada: '%s'" -#: fetch-pack.c:1239 +#: fetch-pack.c:1252 #, c-format msgid "error processing acks: %d" msgstr "error procesando acks: %d" -#: fetch-pack.c:1249 +#: fetch-pack.c:1262 msgid "expected packfile to be sent after 'ready'" msgstr "espere que el packfile sea mandado luego del 'listo'" -#: fetch-pack.c:1251 +#: fetch-pack.c:1264 msgid "expected no other sections to be sent after no 'ready'" msgstr "espere que ninguna otra sección sea enviada luego del 'listo'" -#: fetch-pack.c:1293 +#: fetch-pack.c:1306 #, c-format msgid "error processing shallow info: %d" msgstr "error procesando información superficial: %d" -#: fetch-pack.c:1340 +#: fetch-pack.c:1353 #, c-format msgid "expected wanted-ref, got '%s'" msgstr "se esperaba wanted-ref, se obtuvo '%s'" -#: fetch-pack.c:1345 +#: fetch-pack.c:1358 #, c-format msgid "unexpected wanted-ref: '%s'" msgstr "wanted-ref inesperado: '%s'" -#: fetch-pack.c:1350 +#: fetch-pack.c:1363 #, c-format msgid "error processing wanted refs: %d" msgstr "error procesando refs deseadas: %d" -#: fetch-pack.c:1676 +#: fetch-pack.c:1689 msgid "no matching remote head" msgstr "no concuerda el head remoto" -#: fetch-pack.c:1699 builtin/clone.c:673 +#: fetch-pack.c:1712 builtin/clone.c:686 msgid "remote did not send all necessary objects" msgstr "remoto no mando todos los objetos necesarios" -#: fetch-pack.c:1726 +#: fetch-pack.c:1739 #, c-format msgid "no such remote ref %s" msgstr "no existe ref remota %s" -#: fetch-pack.c:1729 +#: fetch-pack.c:1742 #, c-format msgid "Server does not allow request for unadvertised object %s" msgstr "El servidor no permite solicitudes de objetos inadvertidos %s" -#: gpg-interface.c:318 +#: gpg-interface.c:321 msgid "gpg failed to sign the data" msgstr "gpg falló al firmar la data" -#: gpg-interface.c:344 +#: gpg-interface.c:347 msgid "could not create temporary file" msgstr "no se pudo crear archivo temporal" -#: gpg-interface.c:347 +#: gpg-interface.c:350 #, c-format msgid "failed writing detached signature to '%s'" msgstr "falló al escribir la firma separada para '%s'" @@ -3286,18 +3335,18 @@ msgstr "falló al escribir la firma separada para '%s'" msgid "ignore invalid color '%.*s' in log.graphColors" msgstr "ignora color inválido '%.*s' en log.graphColors" -#: grep.c:2113 +#: grep.c:2117 #, c-format msgid "'%s': unable to read %s" msgstr "'%s': no es posible leer %s" -#: grep.c:2130 setup.c:164 builtin/clone.c:411 builtin/diff.c:82 +#: grep.c:2134 setup.c:164 builtin/clone.c:409 builtin/diff.c:82 #: builtin/rm.c:135 #, c-format msgid "failed to stat '%s'" msgstr "falló al marcar '%s'" -#: grep.c:2141 +#: grep.c:2145 #, c-format msgid "'%s': short read" msgstr "'%s': lectura corta" @@ -3367,7 +3416,7 @@ msgstr "comandos disponibles de git desde otro lugar en tu $PATH" msgid "These are common Git commands used in various situations:" msgstr "Estos son comandos comunes de Git usados en varias situaciones:" -#: help.c:363 git.c:97 +#: help.c:363 git.c:98 #, c-format msgid "unsupported command listing type '%s'" msgstr "comando de listado de tipos no soportado '%s'" @@ -3430,10 +3479,10 @@ msgid_plural "" "The most similar commands are" msgstr[0] "" "\n" -"El comando mas similar es" +"El comando más similar es" msgstr[1] "" "\n" -"Los comandos mas similares son" +"Los comandos más similares son" #: help.c:714 msgid "git version [<options>]" @@ -3512,7 +3561,7 @@ msgstr "no se puede tener un nombre vacío (para <%s>)" msgid "name consists only of disallowed characters: %s" msgstr "el nombre consiste solo de caracteres no permitidos: %s" -#: ident.c:436 builtin/commit.c:608 +#: ident.c:436 builtin/commit.c:611 #, c-format msgid "invalid date format: %s" msgstr "formato de fecha inválido: %s" @@ -3544,6 +3593,11 @@ msgstr "se esperaba 'tree:<depth>'" msgid "sparse:path filters support has been dropped" msgstr "soporte para filtros sparse:path ha sido discontinuado" +#: list-objects-filter-options.c:94 +#, c-format +msgid "invalid filter-spec '%s'" +msgstr "filtro -spec inválido '%s'" + #: list-objects-filter-options.c:158 msgid "cannot change partial clone promisor remote" msgstr "no se puede cambiar un clon parcial remoto promisor" @@ -3577,8 +3631,8 @@ msgstr "No se pudo crear '%s.lock': %s" msgid "failed to read the cache" msgstr "falló al leer la cache" -#: merge.c:107 rerere.c:720 builtin/am.c:1887 builtin/am.c:1921 -#: builtin/checkout.c:461 builtin/checkout.c:811 builtin/clone.c:773 +#: merge.c:107 rerere.c:720 builtin/am.c:1885 builtin/am.c:1919 +#: builtin/checkout.c:536 builtin/checkout.c:796 builtin/clone.c:786 #: builtin/stash.c:264 msgid "unable to write new index file" msgstr "no es posible escribir el archivo índice" @@ -3601,91 +3655,91 @@ msgstr "add_cacheinfo falló para refrescar la ruta '%s'; abortando fusión." msgid "error building trees" msgstr "error construyendo árboles" -#: merge-recursive.c:861 +#: merge-recursive.c:863 #, c-format msgid "failed to create path '%s'%s" msgstr "falló al crear la ruta '%s'%s" -#: merge-recursive.c:872 +#: merge-recursive.c:874 #, c-format msgid "Removing %s to make room for subdirectory\n" msgstr "Removiendo %s para hacer espacio para un subdirectorio\n" -#: merge-recursive.c:886 merge-recursive.c:905 +#: merge-recursive.c:888 merge-recursive.c:907 msgid ": perhaps a D/F conflict?" msgstr ": tal vez un conflicto D/F?" -#: merge-recursive.c:895 +#: merge-recursive.c:897 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "rehusando perder el archivo rastreado en '%s'" -#: merge-recursive.c:936 builtin/cat-file.c:40 +#: merge-recursive.c:938 builtin/cat-file.c:40 #, c-format msgid "cannot read object %s '%s'" msgstr "no se puede leer el objeto %s '%s'" -#: merge-recursive.c:939 +#: merge-recursive.c:941 #, c-format msgid "blob expected for %s '%s'" msgstr "se esperaba blob para %s '%s'" -#: merge-recursive.c:963 +#: merge-recursive.c:965 #, c-format msgid "failed to open '%s': %s" msgstr "falló al abrir '%s': %s" -#: merge-recursive.c:974 +#: merge-recursive.c:976 #, c-format msgid "failed to symlink '%s': %s" msgstr "falló al crear el enlace simbólico '%s': %s" -#: merge-recursive.c:979 +#: merge-recursive.c:981 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "no se que hacer con %06o %s '%s'" -#: merge-recursive.c:1175 +#: merge-recursive.c:1177 #, c-format msgid "Failed to merge submodule %s (not checked out)" msgstr "Falló al fusionar el submódulo %s (no revisado)" -#: merge-recursive.c:1182 +#: merge-recursive.c:1184 #, c-format msgid "Failed to merge submodule %s (commits not present)" msgstr "Falló al fusionar el submódulo %s (commits no presentes)" -#: merge-recursive.c:1189 +#: merge-recursive.c:1191 #, c-format msgid "Failed to merge submodule %s (commits don't follow merge-base)" msgstr "Falló el fusionar submódulo %s (commits no siguen la fusión base)" -#: merge-recursive.c:1197 merge-recursive.c:1209 +#: merge-recursive.c:1199 merge-recursive.c:1211 #, c-format msgid "Fast-forwarding submodule %s to the following commit:" msgstr "Haciendo fast-forward a submódulo %s para el siguiente commit:" -#: merge-recursive.c:1200 merge-recursive.c:1212 +#: merge-recursive.c:1202 merge-recursive.c:1214 #, c-format msgid "Fast-forwarding submodule %s" msgstr "Avance rápido en submódulo %s" -#: merge-recursive.c:1235 +#: merge-recursive.c:1237 #, c-format msgid "Failed to merge submodule %s (merge following commits not found)" msgstr "" "Falló al fusionar submódulo %s (los siguentes commits no fueron encontrados)" -#: merge-recursive.c:1239 +#: merge-recursive.c:1241 #, c-format msgid "Failed to merge submodule %s (not fast-forward)" msgstr "Falló al fusionar el submódulo %s (no es posible avance rápido)" -#: merge-recursive.c:1240 +#: merge-recursive.c:1242 msgid "Found a possible merge resolution for the submodule:\n" msgstr "Se encontró una posible solución de fusión para el submódulo:\n" -#: merge-recursive.c:1243 +#: merge-recursive.c:1245 #, c-format msgid "" "If this is correct simply add it to the index for example\n" @@ -3702,33 +3756,33 @@ msgstr "" "\n" "el cual aceptará esta sugerencia.\n" -#: merge-recursive.c:1252 +#: merge-recursive.c:1254 #, c-format msgid "Failed to merge submodule %s (multiple merges found)" msgstr "Falló al fusionar el submódulo %s (fusiones múltiples encontradas)" -#: merge-recursive.c:1325 +#: merge-recursive.c:1327 msgid "Failed to execute internal merge" msgstr "Falló al ejecutar la fusión interna" -#: merge-recursive.c:1330 +#: merge-recursive.c:1332 #, c-format msgid "Unable to add %s to database" msgstr "No es posible agregar %s a la base de datos" -#: merge-recursive.c:1362 +#: merge-recursive.c:1364 #, c-format msgid "Auto-merging %s" msgstr "Auto-fusionando %s" -#: merge-recursive.c:1385 +#: merge-recursive.c:1387 #, c-format msgid "Error: Refusing to lose untracked file at %s; writing to %s instead." msgstr "" "Error: Rehusando perder el archivo no rastreado en %s; escribiéndolo a %s en " "cambio." -#: merge-recursive.c:1457 +#: merge-recursive.c:1459 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -3737,7 +3791,7 @@ msgstr "" "CONFLICTO (%s/borrar): %s borrado en %s y %s en %s. Falta versión %s de %s " "en el árbol." -#: merge-recursive.c:1462 +#: merge-recursive.c:1464 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -3746,7 +3800,7 @@ msgstr "" "CONFLICTO (%s/borrar): %s borrado en %s y %s para %s en %s. Versión %s de %s " "permanece en el árbol." -#: merge-recursive.c:1469 +#: merge-recursive.c:1471 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -3755,7 +3809,7 @@ msgstr "" "CONFLICTO (%s/eliminar): %s eliminado en %s y %s en %s. Versión %s de %s " "dejada en el árbol, en %s." -#: merge-recursive.c:1474 +#: merge-recursive.c:1476 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -3764,44 +3818,44 @@ msgstr "" "CONFLICTO (%s/borrar): %s borrado en %s y %s para %s en %s. Versión %s de %s " "permanece en el árbol en %s." -#: merge-recursive.c:1509 +#: merge-recursive.c:1511 msgid "rename" msgstr "renombrar" -#: merge-recursive.c:1509 +#: merge-recursive.c:1511 msgid "renamed" msgstr "renombrado" -#: merge-recursive.c:1589 merge-recursive.c:2445 merge-recursive.c:3085 +#: merge-recursive.c:1591 merge-recursive.c:2450 merge-recursive.c:3094 #, c-format msgid "Refusing to lose dirty file at %s" msgstr "Rehusando perder el archivo sucio en %s" -#: merge-recursive.c:1599 +#: merge-recursive.c:1601 #, c-format msgid "Refusing to lose untracked file at %s, even though it's in the way." msgstr "" "Rehusando perder el archivo no rastreado en %s, incluso aunque se está " "interponiendo." -#: merge-recursive.c:1657 +#: merge-recursive.c:1659 #, c-format msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s" msgstr "" "CONFLICTO (renombrar/agregar): Renombrar %s->%s en %s. %s agregado en %s" -#: merge-recursive.c:1687 +#: merge-recursive.c:1690 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "%s es un directorio en %s agregando como %s más bien" -#: merge-recursive.c:1692 +#: merge-recursive.c:1695 #, c-format msgid "Refusing to lose untracked file at %s; adding as %s instead" msgstr "" "Rehusando perder el archivo no rastreado en %s; agregándolo como %s en cambio" -#: merge-recursive.c:1711 +#: merge-recursive.c:1714 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" @@ -3810,18 +3864,18 @@ msgstr "" "CONFLICTO (renombrar/renombrar): Renombrar \"%s\"->\"%s\" en la rama \"%s\" " "renombrar \"%s\"->\"%s\" en \"%s\"%s" -#: merge-recursive.c:1716 +#: merge-recursive.c:1719 msgid " (left unresolved)" msgstr " (dejado sin resolver)" -#: merge-recursive.c:1825 +#: merge-recursive.c:1828 #, c-format msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" msgstr "" "CONFLICTO (renombrar/renombrar): Renombrar %s->%s en %s. Renombrar %s->%s en " "%s" -#: merge-recursive.c:2030 +#: merge-recursive.c:2035 #, c-format msgid "" "CONFLICT (directory rename split): Unclear where to place %s because " @@ -3832,7 +3886,7 @@ msgstr "" "colocar %s porque el directorio %s fue renombrado a otros múltiples " "directorios, sin ningún que contenga la mayoría de archivos." -#: merge-recursive.c:2062 +#: merge-recursive.c:2067 #, c-format msgid "" "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of " @@ -3842,7 +3896,7 @@ msgstr "" "existente en %s se interpone con el cambio de nombres implícito, poniendo " "la(s) siguiente(s) ruta(s) aquí: %s." -#: merge-recursive.c:2072 +#: merge-recursive.c:2077 #, c-format msgid "" "CONFLICT (implicit dir rename): Cannot map more than one path to %s; " @@ -3851,7 +3905,7 @@ msgstr "" "CONFLICTO (cambio de nombre implícito): No se puede mapear más de una ruta " "para %s; cambio de nombre implícito intentó poner estas rutas: %s" -#: merge-recursive.c:2164 +#: merge-recursive.c:2169 #, c-format msgid "" "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-" @@ -3860,7 +3914,7 @@ msgstr "" "CONFLICTO (renombrar/renombrar): Renombrar directorio %s->%s en %s. " "Renombrar directorio %s->%s en %s" -#: merge-recursive.c:2408 +#: merge-recursive.c:2413 #, c-format msgid "" "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was " @@ -3869,52 +3923,52 @@ msgstr "" "PELIGRO: Evitando aplicar %s -> %s renombrado a %s, porque %s mismo fue " "renombrado." -#: merge-recursive.c:2929 +#: merge-recursive.c:2938 #, c-format msgid "cannot read object %s" msgstr "no se pudo leer el objeto %s" -#: merge-recursive.c:2932 +#: merge-recursive.c:2941 #, c-format msgid "object %s is not a blob" msgstr "objeto %s no es un blob" -#: merge-recursive.c:2996 +#: merge-recursive.c:3005 msgid "modify" msgstr "modificar" -#: merge-recursive.c:2996 +#: merge-recursive.c:3005 msgid "modified" msgstr "modificado" -#: merge-recursive.c:3008 +#: merge-recursive.c:3017 msgid "content" msgstr "contenido" -#: merge-recursive.c:3012 +#: merge-recursive.c:3021 msgid "add/add" msgstr "agregar/agregar" -#: merge-recursive.c:3035 +#: merge-recursive.c:3044 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "Saltado %s (fusionado como existente)" -#: merge-recursive.c:3057 git-submodule.sh:937 +#: merge-recursive.c:3066 git-submodule.sh:937 msgid "submodule" msgstr "submódulo" -#: merge-recursive.c:3058 +#: merge-recursive.c:3067 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "CONFLICTO (%s): Conflicto de fusión en %s" -#: merge-recursive.c:3088 +#: merge-recursive.c:3097 #, c-format msgid "Adding as %s instead" msgstr "Agregando más bien como %s" -#: merge-recursive.c:3170 +#: merge-recursive.c:3179 #, c-format msgid "" "Path updated: %s added in %s inside a directory that was renamed in %s; " @@ -3923,7 +3977,7 @@ msgstr "" "Path actualizado: %s agregado en %s dentro de un directorio que fue " "renombrado en %s; moviéndolo a %s." -#: merge-recursive.c:3173 +#: merge-recursive.c:3182 #, c-format msgid "" "CONFLICT (file location): %s added in %s inside a directory that was renamed " @@ -3932,7 +3986,7 @@ msgstr "" "CONFLICTO (ubicación de archivo): %s agregado en %s dentro de un directorio " "que fue renombrado en %s, sugerimos que debería ser movido a %s." -#: merge-recursive.c:3177 +#: merge-recursive.c:3186 #, c-format msgid "" "Path updated: %s renamed to %s in %s, inside a directory that was renamed in " @@ -3941,7 +3995,7 @@ msgstr "" "Path actualizado: %s renombrado a %s en %s, dentro de un directorio que fue " "renombrado en %s; moviéndolo a %s." -#: merge-recursive.c:3180 +#: merge-recursive.c:3189 #, c-format msgid "" "CONFLICT (file location): %s renamed to %s in %s, inside a directory that " @@ -3951,37 +4005,37 @@ msgstr "" "directorio que fue renombrado en %s, sugiriendo que tal vez debería ser " "movido a %s." -#: merge-recursive.c:3294 +#: merge-recursive.c:3303 #, c-format msgid "Removing %s" msgstr "Eliminando %s" -#: merge-recursive.c:3317 +#: merge-recursive.c:3326 msgid "file/directory" msgstr "archivo/directorio" -#: merge-recursive.c:3322 +#: merge-recursive.c:3331 msgid "directory/file" msgstr "directorio/archivo" -#: merge-recursive.c:3329 +#: merge-recursive.c:3338 #, c-format msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" msgstr "" "CONFLICTO (%s): Hay un directorio con el nombre %s en %s. Agregando %s como " "%s" -#: merge-recursive.c:3338 +#: merge-recursive.c:3347 #, c-format msgid "Adding %s" msgstr "Agregando %s" -#: merge-recursive.c:3347 +#: merge-recursive.c:3356 #, c-format msgid "CONFLICT (add/add): Merge conflict in %s" msgstr "CONFLICTO (add/add): Conflicto de merge en %s" -#: merge-recursive.c:3385 +#: merge-recursive.c:3394 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -3991,177 +4045,190 @@ msgstr "" "merge:\n" " %s" -#: merge-recursive.c:3396 +#: merge-recursive.c:3405 msgid "Already up to date!" msgstr "¡Ya está actualizado!" -#: merge-recursive.c:3405 +#: merge-recursive.c:3414 #, c-format msgid "merging of trees %s and %s failed" msgstr "falló la fusión de los árboles %s y %s" -#: merge-recursive.c:3504 +#: merge-recursive.c:3513 msgid "Merging:" msgstr "Fusionando:" -#: merge-recursive.c:3517 +#: merge-recursive.c:3526 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "se encontró %u ancestro común:" msgstr[1] "se encontraron %u ancestros comunes:" -#: merge-recursive.c:3556 +#: merge-recursive.c:3565 msgid "merge returned no commit" msgstr "la fusión no devolvió ningún commit" -#: merge-recursive.c:3622 +#: merge-recursive.c:3631 #, c-format msgid "Could not parse object '%s'" msgstr "No se pudo analizar el objeto '%s'" -#: merge-recursive.c:3638 builtin/merge.c:702 builtin/merge.c:873 +#: merge-recursive.c:3647 builtin/merge.c:698 builtin/merge.c:869 msgid "Unable to write index." msgstr "Incapaz de escribir el índice." -#: midx.c:66 +#: midx.c:69 #, c-format msgid "multi-pack-index file %s is too small" msgstr "archivo multi-pack-index %s es muy pequeño" -#: midx.c:82 +#: midx.c:85 #, c-format msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x" msgstr "firma de multi-pack-index 0x%08x no concuerda con firma 0x%08x" -#: midx.c:87 +#: midx.c:90 #, c-format msgid "multi-pack-index version %d not recognized" msgstr "versión %d de multi-pack-index no reconocida" -#: midx.c:92 +#: midx.c:95 #, c-format msgid "hash version %u does not match" msgstr "versión de hash %u no concuerda" -#: midx.c:106 +#: midx.c:109 msgid "invalid chunk offset (too large)" msgstr "offset inválido del conjunto (muy grande)" -#: midx.c:130 +#: midx.c:133 msgid "terminating multi-pack-index chunk id appears earlier than expected" msgstr "" "terminando multi-pack-index porque el id del conjunto aparece antes de lo " "esperado" -#: midx.c:143 +#: midx.c:146 msgid "multi-pack-index missing required pack-name chunk" msgstr "multi-pack-index le falta el conjunto pack-name requerido" -#: midx.c:145 +#: midx.c:148 msgid "multi-pack-index missing required OID fanout chunk" msgstr "multi-pack-index le falta el conjunto OID fanout requerido" -#: midx.c:147 +#: midx.c:150 msgid "multi-pack-index missing required OID lookup chunk" msgstr "multi-pack-index le falta el conjunto OID fanout requerido" -#: midx.c:149 +#: midx.c:152 msgid "multi-pack-index missing required object offsets chunk" msgstr "multi-pack-index le falta el conjunto de offset del objeto requerido" -#: midx.c:163 +#: midx.c:166 #, c-format msgid "multi-pack-index pack names out of order: '%s' before '%s'" msgstr "multi-pack-index nombres de paquete fuera de orden:'%s' antes '%s'" -#: midx.c:208 +#: midx.c:211 #, c-format msgid "bad pack-int-id: %u (%u total packs)" msgstr "mal pack-int-id: %u (%u paquetes totales)" -#: midx.c:258 +#: midx.c:261 msgid "multi-pack-index stores a 64-bit offset, but off_t is too small" msgstr "multi-pack-index guarda un offset de 64-bit, pero off_t es muy pequeño" -#: midx.c:286 +#: midx.c:289 msgid "error preparing packfile from multi-pack-index" msgstr "error preparando packfile de multi-pack-index" -#: midx.c:457 +#: midx.c:470 #, c-format msgid "failed to add packfile '%s'" msgstr "falló al agregar packfile '%s'" -#: midx.c:463 +#: midx.c:476 #, c-format msgid "failed to open pack-index '%s'" msgstr "falló al abrir pack-index '%s'" -#: midx.c:557 +#: midx.c:536 #, c-format msgid "failed to locate object %d in packfile" msgstr "falló al ubicar objeto %d en packfile" -#: midx.c:993 +#: midx.c:865 +#, c-format +msgid "did not see pack-file %s to drop" +msgstr "no se vió pack-file %s caer" + +#: midx.c:1036 #, c-format msgid "failed to clear multi-pack-index at %s" msgstr "falló al limpiar multi-pack-index en %s" -#: midx.c:1048 +#: midx.c:1091 msgid "Looking for referenced packfiles" msgstr "Buscando por packfiles referidos" -#: midx.c:1063 +#: midx.c:1106 #, c-format msgid "" "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]" msgstr "" "oid fanout fuera de orden: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]" -#: midx.c:1067 +#: midx.c:1110 msgid "Verifying OID order in MIDX" msgstr "Verificando orden de OID en MIDX" -#: midx.c:1076 +#: midx.c:1119 #, c-format msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]" msgstr "oid lookup fuera de orden: oid[%d] = %s >= %s = oid[%d]" -#: midx.c:1095 +#: midx.c:1138 msgid "Sorting objects by packfile" msgstr "Ordenando objetos por packfile" -#: midx.c:1101 +#: midx.c:1144 msgid "Verifying object offsets" msgstr "Verificando offsets de objetos" -#: midx.c:1117 +#: midx.c:1160 #, c-format msgid "failed to load pack entry for oid[%d] = %s" msgstr "fallo al cargar entrada pack para oid[%d] = %s" -#: midx.c:1123 +#: midx.c:1166 #, c-format msgid "failed to load pack-index for packfile %s" msgstr "falló al cargar el pack-index para packfile %s" -#: midx.c:1132 +#: midx.c:1175 #, c-format msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>" msgstr "offset para objeto incorrecto oid[%d] = %s: %<PRIx64> != %<PRIx64>" -#: name-hash.c:531 +#: midx.c:1350 +msgid "could not start pack-objects" +msgstr "no se pudo empezar los pack-objetcts" + +#: midx.c:1369 +msgid "could not finish pack-objects" +msgstr "no se pudo finalizar pack-objetcts" + +#: name-hash.c:532 #, c-format msgid "unable to create lazy_dir thread: %s" msgstr "no es posible crear hilo lazy_dir: %s" -#: name-hash.c:553 +#: name-hash.c:554 #, c-format msgid "unable to create lazy_name thread: %s" msgstr "no es posible crear hilo lazy_name: %s" -#: name-hash.c:559 +#: name-hash.c:560 #, c-format msgid "unable to join lazy_name thread: %s" msgstr "no es posible unir hilo lazy_name: %s" @@ -4233,17 +4300,17 @@ msgstr "incapaz de analizar objeto: %s" msgid "hash mismatch %s" msgstr "hash no concuerda %s" -#: packfile.c:617 +#: packfile.c:648 msgid "offset before end of packfile (broken .idx?)" msgstr "offset antes del final del paquete (broken .idx?)" -#: packfile.c:1868 +#: packfile.c:1899 #, c-format msgid "offset before start of pack index for %s (corrupt index?)" msgstr "" "offset antes del comienzo del índice del paquete para %s (índice corrupto?)" -#: packfile.c:1872 +#: packfile.c:1903 #, c-format msgid "offset beyond end of pack index for %s (truncated index?)" msgstr "" @@ -4302,7 +4369,7 @@ msgstr "switch desconocido `%c'" #: parse-options.c:863 #, c-format msgid "unknown non-ascii option in string: `%s'" -msgstr "opcion desconocida en string no ascii: `%s'" +msgstr "opción desconocida en string no ascii: `%s'" #: parse-options.c:887 msgid "..." @@ -4499,24 +4566,29 @@ msgstr "no es posible crear lstat hilado: %s" msgid "unable to parse --pretty format" msgstr "incapaz de analizar el formato --pretty" -#: range-diff.c:56 +#: range-diff.c:70 msgid "could not start `log`" msgstr "no se pudo comenzar `log`" -#: range-diff.c:59 +#: range-diff.c:72 msgid "could not read `log` output" msgstr "no se pudo leer output de `log`" -#: range-diff.c:74 sequencer.c:4897 +#: range-diff.c:91 sequencer.c:5021 #, c-format msgid "could not parse commit '%s'" msgstr "no se pudo analizar commit '%s'" -#: range-diff.c:224 +#: range-diff.c:117 +#, c-format +msgid "could not parse git header '%.*s'" +msgstr "no se puede analizar git header '%.*s'" + +#: range-diff.c:274 msgid "failed to generate diff" msgstr "falló al generar diff" -#: range-diff.c:455 range-diff.c:457 +#: range-diff.c:506 range-diff.c:508 #, c-format msgid "could not parse log for '%s'" msgstr "no se pudo leer el log para '%s'" @@ -4632,11 +4704,10 @@ msgid "unordered stage entries for '%s'" msgstr "entradas de stage desordenadas para '%s'" #: read-cache.c:1946 read-cache.c:2234 rerere.c:565 rerere.c:599 rerere.c:1111 -#: builtin/add.c:460 builtin/check-ignore.c:178 builtin/checkout.c:358 -#: builtin/checkout.c:672 builtin/checkout.c:1060 builtin/clean.c:955 -#: builtin/commit.c:344 builtin/diff-tree.c:120 builtin/grep.c:498 -#: builtin/mv.c:145 builtin/reset.c:245 builtin/rm.c:271 -#: builtin/submodule--helper.c:330 +#: builtin/add.c:460 builtin/check-ignore.c:178 builtin/checkout.c:467 +#: builtin/checkout.c:651 builtin/clean.c:956 builtin/commit.c:347 +#: builtin/diff-tree.c:120 builtin/grep.c:499 builtin/mv.c:145 +#: builtin/reset.c:245 builtin/rm.c:271 builtin/submodule--helper.c:330 msgid "index file corrupt" msgstr "archivo índice corrompido" @@ -4690,12 +4761,12 @@ msgstr "no se pudo refrescar el index compartido '%s'" msgid "broken index, expect %s in %s, got %s" msgstr "index roto, se esperaba %s en %s, se obtuvo %s" -#: read-cache.c:2989 wrapper.c:658 builtin/merge.c:1117 +#: read-cache.c:2989 wrapper.c:658 builtin/merge.c:1114 #, c-format msgid "could not close '%s'" msgstr "no se pudo cerrar '%s'" -#: read-cache.c:3092 sequencer.c:2354 sequencer.c:3807 +#: read-cache.c:3092 sequencer.c:2358 sequencer.c:3928 #, c-format msgid "could not stat '%s'" msgstr "no se pudo definir '%s'" @@ -4776,7 +4847,7 @@ msgid_plural "Rebase %s onto %s (%d commands)" msgstr[0] "Rebase %s en %s (%d comando)" msgstr[1] "Rebase %s en %s (%d comandos)" -#: rebase-interactive.c:65 git-rebase--preserve-merges.sh:173 +#: rebase-interactive.c:65 git-rebase--preserve-merges.sh:228 msgid "" "\n" "Do not remove any line. Use 'drop' explicitly to remove a commit.\n" @@ -4784,7 +4855,7 @@ msgstr "" "\n" "No eliminar ninguna línea. Usa 'drop' explícitamente para borrar un commit \n" -#: rebase-interactive.c:68 git-rebase--preserve-merges.sh:177 +#: rebase-interactive.c:68 git-rebase--preserve-merges.sh:232 msgid "" "\n" "If you remove a line here THAT COMMIT WILL BE LOST.\n" @@ -4792,7 +4863,7 @@ msgstr "" "\n" "Si remueves una línea aquí EL COMMIT SE PERDERÁ.\n" -#: rebase-interactive.c:74 git-rebase--preserve-merges.sh:816 +#: rebase-interactive.c:74 git-rebase--preserve-merges.sh:871 msgid "" "\n" "You are editing the todo file of an ongoing interactive rebase.\n" @@ -4801,12 +4872,12 @@ msgid "" "\n" msgstr "" "\n" -"Esta editando el archivo TODO de un rebase interactivo.\n" -"Para continuar el rebase después de editar, ejecute:\n" +"Estás editando el archivo TODO de un rebase interactivo.\n" +"Para continuar el rebase después de editar, ejecuta:\n" " git rebase --continue\n" "\n" -#: rebase-interactive.c:79 git-rebase--preserve-merges.sh:893 +#: rebase-interactive.c:79 git-rebase--preserve-merges.sh:948 msgid "" "\n" "However, if you remove everything, the rebase will be aborted.\n" @@ -4816,12 +4887,12 @@ msgstr "" "Como sea, si quieres borrar todo, el rebase será abortado.\n" "\n" -#: rebase-interactive.c:85 git-rebase--preserve-merges.sh:900 +#: rebase-interactive.c:85 git-rebase--preserve-merges.sh:955 msgid "Note that empty commits are commented out" msgstr "Tenga en cuenta que los commits vacíos están comentados" -#: rebase-interactive.c:105 rerere.c:485 rerere.c:692 sequencer.c:3339 -#: sequencer.c:3365 sequencer.c:4996 builtin/fsck.c:356 builtin/rebase.c:235 +#: rebase-interactive.c:105 rerere.c:485 rerere.c:692 sequencer.c:3447 +#: sequencer.c:3473 sequencer.c:5120 builtin/fsck.c:356 builtin/rebase.c:235 #, c-format msgid "could not write '%s'" msgstr "no se pudo escribir '%s'" @@ -4838,7 +4909,7 @@ msgid "" "Dropped commits (newer to older):\n" msgstr "" "Peligro: algunos commits pueden haber sido botados de forma accidental.\n" -"Commits botados (empezando con el mas nuevo):\n" +"Commits botados (empezando con el más nuevo):\n" #: rebase-interactive.c:180 #, c-format @@ -4858,97 +4929,98 @@ msgstr "" "Los posibles comportamientos son: ignore,warn,error.\n" "\n" -#: refs.c:192 +#: refs.c:262 #, c-format msgid "%s does not point to a valid object!" msgstr "%s no apunta a ningún objeto válido!" -#: refs.c:597 +#: refs.c:667 #, c-format msgid "ignoring dangling symref %s" msgstr "ignorando referencia rota %s" -#: refs.c:599 ref-filter.c:1982 +#: refs.c:669 ref-filter.c:2092 #, c-format msgid "ignoring broken ref %s" msgstr "ignorando referencia rota %s" -#: refs.c:734 +#: refs.c:804 #, c-format msgid "could not open '%s' for writing: %s" msgstr "no se pudo abrir '%s' para escritura: %s" -#: refs.c:744 refs.c:795 +#: refs.c:814 refs.c:865 #, c-format msgid "could not read ref '%s'" msgstr "no se pudo leer la referencia '%s'" -#: refs.c:750 +#: refs.c:820 #, c-format msgid "ref '%s' already exists" msgstr "ref '%s' ya existe" -#: refs.c:755 +#: refs.c:825 #, c-format msgid "unexpected object ID when writing '%s'" msgstr "ID de objecto inesperado cuando se escribía '%s'" -#: refs.c:763 sequencer.c:400 sequencer.c:2679 sequencer.c:2805 -#: sequencer.c:2819 sequencer.c:3076 sequencer.c:4913 wrapper.c:656 +#: refs.c:833 sequencer.c:403 sequencer.c:2709 sequencer.c:2913 +#: sequencer.c:2927 sequencer.c:3184 sequencer.c:5037 wrapper.c:656 #, c-format msgid "could not write to '%s'" msgstr "no se pudo escribir en '%s'" -#: refs.c:790 wrapper.c:225 wrapper.c:395 builtin/am.c:715 builtin/rebase.c:993 +#: refs.c:860 wrapper.c:225 wrapper.c:395 builtin/am.c:715 +#: builtin/rebase.c:1003 #, c-format msgid "could not open '%s' for writing" msgstr "no se pudo abrir '%s' para escritura" -#: refs.c:797 +#: refs.c:867 #, c-format msgid "unexpected object ID when deleting '%s'" msgstr "ID de objecto inesperado cuando se borraba '%s'" -#: refs.c:928 +#: refs.c:998 #, c-format msgid "log for ref %s has gap after %s" msgstr "log de ref %s tiene un vacío tras %s" -#: refs.c:934 +#: refs.c:1004 #, c-format msgid "log for ref %s unexpectedly ended on %s" msgstr "log de ref %s finalizado inesperadamente en %s" -#: refs.c:993 +#: refs.c:1063 #, c-format msgid "log for %s is empty" msgstr "log de %s está vacío" -#: refs.c:1085 +#: refs.c:1155 #, c-format msgid "refusing to update ref with bad name '%s'" msgstr "rehusando actualizar ref con mal nombre '%s'" -#: refs.c:1161 +#: refs.c:1231 #, c-format msgid "update_ref failed for ref '%s': %s" msgstr "update_ref falló para ref '%s': %s" -#: refs.c:1942 +#: refs.c:2012 #, c-format msgid "multiple updates for ref '%s' not allowed" msgstr "múltiples actualizaciones para ref '%s' no permitidas" -#: refs.c:1974 +#: refs.c:2044 msgid "ref updates forbidden inside quarantine environment" msgstr "actualizaciones de ref prohibidas dentro de ambiente de cuarentena" -#: refs.c:2070 refs.c:2100 +#: refs.c:2140 refs.c:2170 #, c-format msgid "'%s' exists; cannot create '%s'" msgstr "'%s' existe; no se puede crear '%s'" -#: refs.c:2076 refs.c:2111 +#: refs.c:2146 refs.c:2181 #, c-format msgid "cannot process '%s' and '%s' at the same time" msgstr "no se puede procesar '%s' y '%s' al mismo tiempo" @@ -4974,268 +5046,252 @@ msgstr "no se pudo eliminar la referencia: %s" msgid "invalid refspec '%s'" msgstr "refspec inválido: '%s'" -#: ref-filter.c:39 wt-status.c:1909 +#: ref-filter.c:42 wt-status.c:1934 msgid "gone" msgstr "desaparecido" -#: ref-filter.c:40 +#: ref-filter.c:43 #, c-format msgid "ahead %d" msgstr "adelante %d" -#: ref-filter.c:41 +#: ref-filter.c:44 #, c-format msgid "behind %d" msgstr "detrás %d" -#: ref-filter.c:42 +#: ref-filter.c:45 #, c-format msgid "ahead %d, behind %d" msgstr "delante %d, detrás %d" -#: ref-filter.c:138 +#: ref-filter.c:162 #, c-format msgid "expected format: %%(color:<color>)" msgstr "formato esperado: %%(color:<color>)" -#: ref-filter.c:140 +#: ref-filter.c:164 #, c-format msgid "unrecognized color: %%(color:%s)" msgstr "color no reconocido: %%(color:%s)" -#: ref-filter.c:162 +#: ref-filter.c:186 #, c-format msgid "Integer value expected refname:lstrip=%s" msgstr "Valor entero esperado refname:lstrip=%s" -#: ref-filter.c:166 +#: ref-filter.c:190 #, c-format msgid "Integer value expected refname:rstrip=%s" msgstr "Valor entero esperado refname:rstrip=%s" -#: ref-filter.c:168 +#: ref-filter.c:192 #, c-format msgid "unrecognized %%(%s) argument: %s" msgstr "argumento: %s no reconocido %%(%s)" -#: ref-filter.c:223 +#: ref-filter.c:247 #, c-format msgid "%%(objecttype) does not take arguments" msgstr "%%(objecttype) no toma ningún argumento" -#: ref-filter.c:245 +#: ref-filter.c:269 #, c-format msgid "unrecognized %%(objectsize) argument: %s" msgstr "%%(objectsize) no reconocido argumento: %s" -#: ref-filter.c:253 +#: ref-filter.c:277 #, c-format msgid "%%(deltabase) does not take arguments" msgstr "%%(deltabase) no toma argumentos" -#: ref-filter.c:265 +#: ref-filter.c:289 #, c-format msgid "%%(body) does not take arguments" msgstr "%%(body) no toma ningún argumento" -#: ref-filter.c:274 +#: ref-filter.c:298 #, c-format msgid "%%(subject) does not take arguments" msgstr "%%(subject) no toma ningún argumento" -#: ref-filter.c:296 +#: ref-filter.c:320 #, c-format msgid "unknown %%(trailers) argument: %s" msgstr "%%(trailers) desconocidos, argumento: %s" -#: ref-filter.c:325 +#: ref-filter.c:349 #, c-format msgid "positive value expected contents:lines=%s" msgstr "valor positivo esperado contents:lines=%s" -#: ref-filter.c:327 +#: ref-filter.c:351 #, c-format msgid "unrecognized %%(contents) argument: %s" msgstr "argumento %s no reconocido %%(contents)" -#: ref-filter.c:342 +#: ref-filter.c:366 #, c-format msgid "positive value expected objectname:short=%s" msgstr "valor positivo esperado objectname:short=%s" -#: ref-filter.c:346 +#: ref-filter.c:370 #, c-format msgid "unrecognized %%(objectname) argument: %s" msgstr "argumento: %s no reconocido %%(objectname)" -#: ref-filter.c:376 +#: ref-filter.c:400 #, c-format msgid "expected format: %%(align:<width>,<position>)" msgstr "formato esperado: %%(align:<ancho>,<posición>)" -#: ref-filter.c:388 +#: ref-filter.c:412 #, c-format msgid "unrecognized position:%s" msgstr "posición desconocida: %s" -#: ref-filter.c:395 +#: ref-filter.c:419 #, c-format msgid "unrecognized width:%s" msgstr "ancho desconocido: %s" -#: ref-filter.c:404 +#: ref-filter.c:428 #, c-format msgid "unrecognized %%(align) argument: %s" msgstr "argumento no reconocido para %%(align): %s" -#: ref-filter.c:412 +#: ref-filter.c:436 #, c-format msgid "positive width expected with the %%(align) atom" msgstr "se esperaba un ancho positivo con el átomo %%(align)" -#: ref-filter.c:430 +#: ref-filter.c:454 #, c-format msgid "unrecognized %%(if) argument: %s" msgstr "argumento: %s no reconocido %%(if)" -#: ref-filter.c:531 +#: ref-filter.c:556 #, c-format msgid "malformed field name: %.*s" msgstr "nombre mal formado de campo: %.*s" -#: ref-filter.c:558 +#: ref-filter.c:583 #, c-format msgid "unknown field name: %.*s" msgstr "nombre de campo desconocido: %.*s" -#: ref-filter.c:562 +#: ref-filter.c:587 #, c-format msgid "" "not a git repository, but the field '%.*s' requires access to object data" msgstr "" "no es un repositorio git, pero el campo '%.*s' requiere acceso al objeto data" -#: ref-filter.c:686 +#: ref-filter.c:711 #, c-format msgid "format: %%(if) atom used without a %%(then) atom" msgstr "formato: átomo %%(if) usado sin un átomo %%(then)" -#: ref-filter.c:749 +#: ref-filter.c:774 #, c-format msgid "format: %%(then) atom used without an %%(if) atom" msgstr "formato: átomo %%(then) usado sin átomo %%(if)" -#: ref-filter.c:751 +#: ref-filter.c:776 #, c-format msgid "format: %%(then) atom used more than once" -msgstr "formato: átomo %%(then) usado mas de una vez" +msgstr "formato: átomo %%(then) usado más de una vez" -#: ref-filter.c:753 +#: ref-filter.c:778 #, c-format msgid "format: %%(then) atom used after %%(else)" msgstr "formato: átomo %%(then) usado después de %%(else)" -#: ref-filter.c:781 +#: ref-filter.c:806 #, c-format msgid "format: %%(else) atom used without an %%(if) atom" msgstr "formato: átomo %%(else) usado sin un átomo %%(if)" -#: ref-filter.c:783 +#: ref-filter.c:808 #, c-format msgid "format: %%(else) atom used without a %%(then) atom" msgstr "formato: átomo %%(else) usado sin un átomo %%(then)" -#: ref-filter.c:785 +#: ref-filter.c:810 #, c-format msgid "format: %%(else) atom used more than once" -msgstr "formato: átomo %%(else) usado mas de una vez" +msgstr "formato: átomo %%(else) usado más de una vez" -#: ref-filter.c:800 +#: ref-filter.c:825 #, c-format msgid "format: %%(end) atom used without corresponding atom" msgstr "formato: átomo %%(end) usado sin átomo correspondiente" -#: ref-filter.c:857 +#: ref-filter.c:882 #, c-format msgid "malformed format string %s" msgstr "formato de cadena mal formado %s" -#: ref-filter.c:1453 -#, c-format -msgid "(no branch, rebasing %s)" -msgstr "(no hay rama, rebasando %s)" - -#: ref-filter.c:1456 +#: ref-filter.c:1485 #, c-format -msgid "(no branch, rebasing detached HEAD %s)" -msgstr "(no hay rama, rebasando con HEAD desacoplado %s)" +msgid "no branch, rebasing %s" +msgstr "no hay rama, rebasando %s" -#: ref-filter.c:1459 +#: ref-filter.c:1488 #, c-format -msgid "(no branch, bisect started on %s)" -msgstr "(no hay rama, comenzando biseccón en %s)" +msgid "no branch, rebasing detached HEAD %s" +msgstr "(o hay rama, rebasando con HEAD desacoplado %s" -#. TRANSLATORS: make sure this matches "HEAD -#. detached at " in wt-status.c -#. -#: ref-filter.c:1467 -#, c-format -msgid "(HEAD detached at %s)" -msgstr "(HEAD desacoplado en %s)" - -#. TRANSLATORS: make sure this matches "HEAD -#. detached from " in wt-status.c -#. -#: ref-filter.c:1474 +#: ref-filter.c:1491 #, c-format -msgid "(HEAD detached from %s)" -msgstr "(HEAD desacoplado de %s)" +msgid "no branch, bisect started on %s" +msgstr "no hay rama, comenzando biseccón en %s" -#: ref-filter.c:1478 -msgid "(no branch)" -msgstr "(sin rama)" +#: ref-filter.c:1501 +msgid "no branch" +msgstr "sin rama" -#: ref-filter.c:1512 ref-filter.c:1669 +#: ref-filter.c:1537 ref-filter.c:1743 #, c-format msgid "missing object %s for %s" msgstr "falta objeto %s para %s" -#: ref-filter.c:1522 +#: ref-filter.c:1547 #, c-format msgid "parse_object_buffer failed on %s for %s" msgstr "parse_object_buffer falló en %s para %s" -#: ref-filter.c:1888 +#: ref-filter.c:1998 #, c-format msgid "malformed object at '%s'" msgstr "objeto mal formado en '%s'" -#: ref-filter.c:1977 +#: ref-filter.c:2087 #, c-format msgid "ignoring ref with broken name %s" msgstr "ignorando referencia con nombre roto %s" -#: ref-filter.c:2263 +#: ref-filter.c:2382 #, c-format msgid "format: %%(end) atom missing" msgstr "formato: falta átomo %%(end)" -#: ref-filter.c:2363 +#: ref-filter.c:2482 #, c-format msgid "option `%s' is incompatible with --merged" msgstr "opción `%s' es incompatible con --merged" -#: ref-filter.c:2366 +#: ref-filter.c:2485 #, c-format msgid "option `%s' is incompatible with --no-merged" msgstr "opción `%s' es incompatible con --no-merged" -#: ref-filter.c:2376 +#: ref-filter.c:2495 #, c-format msgid "malformed object name %s" msgstr "nombre de objeto mal formado %s" -#: ref-filter.c:2381 +#: ref-filter.c:2500 #, c-format msgid "option `%s' must point to a commit" msgstr "opción '%s' debe apuntar a un commit" @@ -5579,8 +5635,8 @@ msgstr "no se puede desvincular stray '%s'" msgid "Recorded preimage for '%s'" msgstr "Resolución precargada para '%s'" -#: rerere.c:881 submodule.c:2024 builtin/log.c:1750 -#: builtin/submodule--helper.c:1417 builtin/submodule--helper.c:1427 +#: rerere.c:881 submodule.c:2023 builtin/log.c:1773 +#: builtin/submodule--helper.c:1418 builtin/submodule--helper.c:1428 #, c-format msgid "could not create directory '%s'" msgstr "no se pudo crear el directorio '%s'" @@ -5614,20 +5670,20 @@ msgstr "Se olvidó resolución para '%s'\n" msgid "unable to open rr-cache directory" msgstr "no es posible abrir directorio rr-cache" -#: revision.c:2476 +#: revision.c:2507 msgid "your current branch appears to be broken" msgstr "tu rama actual parece estar rota" -#: revision.c:2479 +#: revision.c:2510 #, c-format msgid "your current branch '%s' does not have any commits yet" msgstr "tu rama actual '%s' no tiene ningún commit todavía" -#: revision.c:2679 +#: revision.c:2710 msgid "--first-parent is incompatible with --bisect" msgstr "--first-parent es incompatible con --bisect" -#: revision.c:2683 +#: revision.c:2714 msgid "-L does not yet support diff formats besides -p and -s" msgstr "-L no soporta todavía formatos de diff fuera de -p y -s" @@ -5699,24 +5755,29 @@ msgstr "mensaje de commit inválido, modo cleanup '%s'" msgid "could not delete '%s'" msgstr "no se pudo borrar '%s'" -#: sequencer.c:318 +#: sequencer.c:311 builtin/rebase.c:759 builtin/rebase.c:1645 builtin/rm.c:369 +#, c-format +msgid "could not remove '%s'" +msgstr "no se pudo eliminar'%s'" + +#: sequencer.c:321 msgid "revert" msgstr "revertir" -#: sequencer.c:320 +#: sequencer.c:323 msgid "cherry-pick" msgstr "cherry-pick" -#: sequencer.c:322 +#: sequencer.c:325 msgid "rebase -i" msgstr "rebase -i" -#: sequencer.c:324 +#: sequencer.c:327 #, c-format msgid "unknown action: %d" msgstr "acción desconocida: %d" -#: sequencer.c:382 +#: sequencer.c:385 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'" @@ -5724,7 +5785,7 @@ msgstr "" "después de resolver los conflictos, marca las rutas corregidas\n" "con 'git add <rutas>' o 'git rm <rutas>'" -#: sequencer.c:385 +#: sequencer.c:388 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'\n" @@ -5734,44 +5795,44 @@ msgstr "" "con 'git add <rutas>' o 'git rm <rutas>'\n" "y haz un commit del resultado con 'git commit'" -#: sequencer.c:398 sequencer.c:2801 +#: sequencer.c:401 sequencer.c:2909 #, c-format msgid "could not lock '%s'" msgstr "no se pudo bloquear '%s'" -#: sequencer.c:405 +#: sequencer.c:408 #, c-format msgid "could not write eol to '%s'" msgstr "no se pudo escribir EOL en '%s'" -#: sequencer.c:410 sequencer.c:2684 sequencer.c:2807 sequencer.c:2821 -#: sequencer.c:3084 +#: sequencer.c:413 sequencer.c:2714 sequencer.c:2915 sequencer.c:2929 +#: sequencer.c:3192 #, c-format msgid "failed to finalize '%s'" msgstr "falló al finalizar '%s'" -#: sequencer.c:433 sequencer.c:978 sequencer.c:1652 sequencer.c:2704 -#: sequencer.c:3066 sequencer.c:3175 builtin/am.c:245 builtin/commit.c:760 -#: builtin/merge.c:1115 builtin/rebase.c:567 +#: sequencer.c:436 sequencer.c:981 sequencer.c:1655 sequencer.c:2734 +#: sequencer.c:3174 sequencer.c:3283 builtin/am.c:245 builtin/commit.c:763 +#: builtin/merge.c:1112 builtin/rebase.c:567 #, c-format msgid "could not read '%s'" msgstr "no se pudo leer '%s'" -#: sequencer.c:459 +#: sequencer.c:462 #, c-format msgid "your local changes would be overwritten by %s." msgstr "tus cambios locales serán sobreescritos por %s." -#: sequencer.c:463 +#: sequencer.c:466 msgid "commit your changes or stash them to proceed." msgstr "realiza un commit con tus cambios o aplica un stash para proceder." -#: sequencer.c:495 +#: sequencer.c:498 #, c-format msgid "%s: fast-forward" msgstr "%s: avance rápido" -#: sequencer.c:534 builtin/tag.c:555 +#: sequencer.c:537 builtin/tag.c:565 #, c-format msgid "Invalid cleanup mode %s" msgstr "Modo cleanup inválido %s" @@ -5779,70 +5840,70 @@ msgstr "Modo cleanup inválido %s" #. TRANSLATORS: %s will be "revert", "cherry-pick" or #. "rebase -i". #. -#: sequencer.c:629 +#: sequencer.c:632 #, c-format msgid "%s: Unable to write new index file" msgstr "%s: Incapaz de escribir el nuevo archivo índice" -#: sequencer.c:646 +#: sequencer.c:649 msgid "unable to update cache tree" msgstr "no es posible actualizar el árbol de la caché" -#: sequencer.c:660 +#: sequencer.c:663 msgid "could not resolve HEAD commit" msgstr "no se pudo resolver el commit de HEAD" -#: sequencer.c:740 +#: sequencer.c:743 #, c-format msgid "no key present in '%.*s'" msgstr "no hay llave presente en '%.*s'" -#: sequencer.c:751 +#: sequencer.c:754 #, c-format msgid "unable to dequote value of '%s'" msgstr "no es posible dequote para '%s'" -#: sequencer.c:788 wrapper.c:227 wrapper.c:397 builtin/am.c:706 -#: builtin/am.c:798 builtin/merge.c:1112 builtin/rebase.c:1035 +#: sequencer.c:791 wrapper.c:227 wrapper.c:397 builtin/am.c:706 +#: builtin/am.c:798 builtin/merge.c:1109 builtin/rebase.c:1045 #, c-format msgid "could not open '%s' for reading" msgstr "no se pudo abrir '%s' para lectura" -#: sequencer.c:798 +#: sequencer.c:801 msgid "'GIT_AUTHOR_NAME' already given" msgstr "'GIT_AUTHOR_NAME' ya proporcionado" -#: sequencer.c:803 +#: sequencer.c:806 msgid "'GIT_AUTHOR_EMAIL' already given" msgstr "'GIT_AUTHOR_EMAIL' ya proporcionado" -#: sequencer.c:808 +#: sequencer.c:811 msgid "'GIT_AUTHOR_DATE' already given" msgstr "'GIT_AUTHOR_DATE' ya proporcionado" -#: sequencer.c:812 +#: sequencer.c:815 #, c-format msgid "unknown variable '%s'" msgstr "variable desconocida '%s'" -#: sequencer.c:817 +#: sequencer.c:820 msgid "missing 'GIT_AUTHOR_NAME'" msgstr "falta 'GIT_AUTHOR_NAME'" -#: sequencer.c:819 +#: sequencer.c:822 msgid "missing 'GIT_AUTHOR_EMAIL'" msgstr "falta 'GIT_AUTHOR_EMAIL'" -#: sequencer.c:821 +#: sequencer.c:824 msgid "missing 'GIT_AUTHOR_DATE'" msgstr "falta 'GIT_AUTHOR_DATE'" -#: sequencer.c:881 +#: sequencer.c:884 #, c-format msgid "invalid date format '%s' in '%s'" msgstr "formato de fecha inválido '%s' en '%s'" -#: sequencer.c:898 +#: sequencer.c:901 #, c-format msgid "" "you have staged changes in your working tree\n" @@ -5872,15 +5933,15 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c:992 +#: sequencer.c:995 msgid "writing root commit" msgstr "escribiendo commit raíz" -#: sequencer.c:1213 +#: sequencer.c:1216 msgid "'prepare-commit-msg' hook failed" msgstr "hook 'prepare-commit-msg' falló" -#: sequencer.c:1220 +#: sequencer.c:1223 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -5907,7 +5968,7 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: sequencer.c:1233 +#: sequencer.c:1236 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -5931,305 +5992,348 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: sequencer.c:1275 +#: sequencer.c:1278 msgid "couldn't look up newly created commit" msgstr "no se pudo revisar el commit recién creado" -#: sequencer.c:1277 +#: sequencer.c:1280 msgid "could not parse newly created commit" msgstr "no se pudo analizar el commit recién creado" -#: sequencer.c:1323 +#: sequencer.c:1326 msgid "unable to resolve HEAD after creating commit" msgstr "no se pudo resolver HEAD tras crear el commit" -#: sequencer.c:1325 +#: sequencer.c:1328 msgid "detached HEAD" msgstr "HEAD desacoplado" -#: sequencer.c:1329 +#: sequencer.c:1332 msgid " (root-commit)" msgstr " (commit-raíz)" -#: sequencer.c:1350 +#: sequencer.c:1353 msgid "could not parse HEAD" msgstr "no se pudo analizar HEAD" -#: sequencer.c:1352 +#: sequencer.c:1355 #, c-format msgid "HEAD %s is not a commit!" msgstr "HEAD %s no es un commit!" -#: sequencer.c:1356 builtin/commit.c:1551 +#: sequencer.c:1359 builtin/commit.c:1571 msgid "could not parse HEAD commit" msgstr "no se pudo analizar el commit de HEAD" -#: sequencer.c:1408 sequencer.c:2001 +#: sequencer.c:1411 sequencer.c:2004 msgid "unable to parse commit author" msgstr "no es posible analizar el autor del commit" -#: sequencer.c:1418 builtin/am.c:1572 builtin/merge.c:688 +#: sequencer.c:1421 builtin/am.c:1573 builtin/merge.c:684 msgid "git write-tree failed to write a tree" msgstr "git write-tree falló al escribir el árbol" -#: sequencer.c:1435 sequencer.c:1496 +#: sequencer.c:1438 sequencer.c:1499 #, c-format msgid "unable to read commit message from '%s'" msgstr "no se puede leer el mensaje del commit de '%s'" -#: sequencer.c:1462 builtin/am.c:1594 builtin/commit.c:1650 builtin/merge.c:882 -#: builtin/merge.c:906 +#: sequencer.c:1465 builtin/am.c:1595 builtin/commit.c:1670 builtin/merge.c:878 +#: builtin/merge.c:903 msgid "failed to write commit object" msgstr "falló al escribir el objeto commit" -#: sequencer.c:1523 +#: sequencer.c:1526 #, c-format msgid "could not parse commit %s" msgstr "no se pudo analizar commit %s" -#: sequencer.c:1528 +#: sequencer.c:1531 #, c-format msgid "could not parse parent commit %s" msgstr "no se pudo analizar el commit padre %s" -#: sequencer.c:1602 sequencer.c:1712 +#: sequencer.c:1605 sequencer.c:1715 #, c-format msgid "unknown command: %d" msgstr "comando desconocido: %d" -#: sequencer.c:1659 sequencer.c:1684 +#: sequencer.c:1662 sequencer.c:1687 #, c-format msgid "This is a combination of %d commits." msgstr "Esta es una combinación de %d commits." -#: sequencer.c:1669 +#: sequencer.c:1672 msgid "need a HEAD to fixup" msgstr "se necesita un HEAD para arreglar" -#: sequencer.c:1671 sequencer.c:3111 +#: sequencer.c:1674 sequencer.c:3219 msgid "could not read HEAD" msgstr "no se pudo leer HEAD" -#: sequencer.c:1673 +#: sequencer.c:1676 msgid "could not read HEAD's commit message" msgstr "no se pudo leer el mensaje de commit de HEAD" -#: sequencer.c:1679 +#: sequencer.c:1682 #, c-format msgid "cannot write '%s'" msgstr "no se puede escribir '%s'" -#: sequencer.c:1686 git-rebase--preserve-merges.sh:441 +#: sequencer.c:1689 git-rebase--preserve-merges.sh:496 msgid "This is the 1st commit message:" msgstr "Este es el mensaje del 1er commit:" -#: sequencer.c:1694 +#: sequencer.c:1697 #, c-format msgid "could not read commit message of %s" msgstr "no se puede leer el mensaje del commit de %s" -#: sequencer.c:1701 +#: sequencer.c:1704 #, c-format msgid "This is the commit message #%d:" msgstr "Este es el mensaje del commit #%d:" -#: sequencer.c:1707 +#: sequencer.c:1710 #, c-format msgid "The commit message #%d will be skipped:" msgstr "El mensaje del commit #%d será saltado:" -#: sequencer.c:1795 +#: sequencer.c:1798 msgid "your index file is unmerged." msgstr "tu archivo índice no está fusionado." -#: sequencer.c:1802 +#: sequencer.c:1805 msgid "cannot fixup root commit" msgstr "no se puede arreglar el commit raíz" -#: sequencer.c:1821 +#: sequencer.c:1824 #, c-format msgid "commit %s is a merge but no -m option was given." msgstr "el commit %s es una fusión pero no se proporcionó la opción -m." -#: sequencer.c:1829 sequencer.c:1837 +#: sequencer.c:1832 sequencer.c:1840 #, c-format msgid "commit %s does not have parent %d" msgstr "el commit %s no tiene un padre %d" -#: sequencer.c:1843 +#: sequencer.c:1846 #, c-format msgid "cannot get commit message for %s" msgstr "no se puede obtener el mensaje de commit para %s" #. TRANSLATORS: The first %s will be a "todo" command like #. "revert" or "pick", the second %s a SHA1. -#: sequencer.c:1862 +#: sequencer.c:1865 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s: no se puede analizar el commit padre %s" -#: sequencer.c:1927 +#: sequencer.c:1930 #, c-format msgid "could not rename '%s' to '%s'" msgstr "no se puede renombrar '%s' a '%s'" -#: sequencer.c:1982 +#: sequencer.c:1985 #, c-format msgid "could not revert %s... %s" msgstr "no se pudo revertir %s... %s" -#: sequencer.c:1983 +#: sequencer.c:1986 #, c-format msgid "could not apply %s... %s" msgstr "no se pudo aplicar %s... %s" -#: sequencer.c:2042 +#: sequencer.c:2045 #, c-format msgid "git %s: failed to read the index" msgstr "git %s: falló al leer el índice" -#: sequencer.c:2049 +#: sequencer.c:2052 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s: falló al refrescar el índice" -#: sequencer.c:2118 +#: sequencer.c:2128 #, c-format msgid "%s does not accept arguments: '%s'" msgstr "%s no acepta los argumentos: '%s'" -#: sequencer.c:2127 +#: sequencer.c:2137 #, c-format msgid "missing arguments for %s" msgstr "faltan argumentos para para %s" -#: sequencer.c:2164 +#: sequencer.c:2174 #, c-format msgid "could not parse '%.*s'" msgstr "no se puede analizar '%.*s'" -#: sequencer.c:2226 +#: sequencer.c:2228 #, c-format msgid "invalid line %d: %.*s" msgstr "línea inválida %d: %.*s" -#: sequencer.c:2237 +#: sequencer.c:2239 #, c-format msgid "cannot '%s' without a previous commit" msgstr "no se puede '%s' sin un commit previo" -#: sequencer.c:2285 builtin/rebase.c:153 builtin/rebase.c:178 +#: sequencer.c:2287 builtin/rebase.c:153 builtin/rebase.c:178 #: builtin/rebase.c:204 builtin/rebase.c:229 #, c-format msgid "could not read '%s'." msgstr "no se puede leer '%s'." -#: sequencer.c:2360 +#: sequencer.c:2323 +msgid "cancelling a cherry picking in progress" +msgstr "cancelando cherry-pick en progreso" + +#: sequencer.c:2330 +msgid "cancelling a revert in progress" +msgstr "cancelando revert en progreso" + +#: sequencer.c:2364 msgid "please fix this using 'git rebase --edit-todo'." msgstr "por favor arregle esto usando 'git rebase --edit-todo'." -#: sequencer.c:2362 +#: sequencer.c:2366 #, c-format msgid "unusable instruction sheet: '%s'" msgstr "hoja de instrucciones inutilizable: '%s'" -#: sequencer.c:2367 +#: sequencer.c:2371 msgid "no commits parsed." msgstr "ningún commit analizado." -#: sequencer.c:2378 +#: sequencer.c:2382 msgid "cannot cherry-pick during a revert." msgstr "no se puede realizar cherry-pick durante un revert." -#: sequencer.c:2380 +#: sequencer.c:2384 msgid "cannot revert during a cherry-pick." msgstr "no se puede realizar un revert durante un cherry-pick." -#: sequencer.c:2462 +#: sequencer.c:2466 #, c-format msgid "invalid value for %s: %s" msgstr "valor inválido para %s: %s" -#: sequencer.c:2549 +#: sequencer.c:2553 msgid "unusable squash-onto" msgstr "squash-onto inservible" -#: sequencer.c:2565 +#: sequencer.c:2569 #, c-format msgid "malformed options sheet: '%s'" msgstr "hoja de opciones mal formada: '%s'" -#: sequencer.c:2648 sequencer.c:4227 +#: sequencer.c:2652 sequencer.c:4351 msgid "empty commit set passed" msgstr "conjunto de commits vacío entregado" -#: sequencer.c:2656 -msgid "a cherry-pick or revert is already in progress" -msgstr "un cherry-pick o revert ya está en progreso" +#: sequencer.c:2668 +msgid "revert is already in progress" +msgstr "revert ya está en progreso" + +#: sequencer.c:2670 +#, c-format +msgid "try \"git revert (--continue | %s--abort | --quit)\"" +msgstr "intenta \"git revert (--continue | --quit | %s --abort)\"" + +#: sequencer.c:2673 +msgid "cherry-pick is already in progress" +msgstr "cherry-pick ya está en progreso" -#: sequencer.c:2657 -msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" -msgstr "intenta \"git cherry-pick (--continue | --quit | --abort)\"" +#: sequencer.c:2675 +#, c-format +msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\"" +msgstr "intenta \"git cherry-pick (--continue | --quit | %s --abort)\"" -#: sequencer.c:2660 +#: sequencer.c:2689 #, c-format msgid "could not create sequencer directory '%s'" msgstr "no se pudo crear un directorio secuenciador '%s'" -#: sequencer.c:2674 +#: sequencer.c:2704 msgid "could not lock HEAD" msgstr "no se pudo bloquear HEAD" -#: sequencer.c:2729 sequencer.c:3979 +#: sequencer.c:2764 sequencer.c:4103 msgid "no cherry-pick or revert in progress" msgstr "ningún cherry-pick o revert en progreso" -#: sequencer.c:2731 +#: sequencer.c:2766 sequencer.c:2777 msgid "cannot resolve HEAD" msgstr "no se puede resolver HEAD" -#: sequencer.c:2733 sequencer.c:2768 +#: sequencer.c:2768 sequencer.c:2812 msgid "cannot abort from a branch yet to be born" msgstr "no se puede abortar de una rama por nacer" -#: sequencer.c:2754 builtin/grep.c:732 +#: sequencer.c:2798 builtin/grep.c:734 #, c-format msgid "cannot open '%s'" msgstr "no se puede abrir '%s'" -#: sequencer.c:2756 +#: sequencer.c:2800 #, c-format msgid "cannot read '%s': %s" msgstr "no se puede leer '%s': %s" -#: sequencer.c:2757 +#: sequencer.c:2801 msgid "unexpected end of file" msgstr "final de archivo inesperado" -#: sequencer.c:2763 +#: sequencer.c:2807 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "archivo HEAD de pre-cherry-pick guardado '%s' está corrupto" -#: sequencer.c:2774 +#: sequencer.c:2818 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!" -msgstr "Parece que se ha movido HEAD. No se hace rebobinado, revise su HEAD!" +msgstr "Parece que se ha movido HEAD. No se hace rebobinado, revisa tu HEAD!" + +#: sequencer.c:2859 +msgid "no revert in progress" +msgstr "no hay revert en progreso" + +#: sequencer.c:2867 +msgid "no cherry-pick in progress" +msgstr "ningún cherry-pick en progreso" + +#: sequencer.c:2877 +msgid "failed to skip the commit" +msgstr "falló al escribir el commit" -#: sequencer.c:2903 sequencer.c:3894 +#: sequencer.c:2884 +msgid "there is nothing to skip" +msgstr "no hay nada que saltar" + +#: sequencer.c:2887 +#, c-format +msgid "" +"have you committed already?\n" +"try \"git %s --continue\"" +msgstr "" +"¿ya has hecho el commit?\n" +"intenta \"git %s --continue\"" + +#: sequencer.c:3011 sequencer.c:4015 #, c-format msgid "could not update %s" msgstr "no se puede actualizar %s" -#: sequencer.c:2941 sequencer.c:3874 +#: sequencer.c:3049 sequencer.c:3995 msgid "cannot read HEAD" msgstr "no se puede leer HEAD" -#: sequencer.c:2958 +#: sequencer.c:3066 #, c-format msgid "unable to copy '%s' to '%s'" msgstr "no se pudo copiar '%s' a '%s'" -#: sequencer.c:2966 +#: sequencer.c:3074 #, c-format msgid "" "You can amend the commit now, with\n" @@ -6240,35 +6344,35 @@ msgid "" "\n" " git rebase --continue\n" msgstr "" -"Puede enmendar el commit ahora, con\n" +"Puedes enmendar el commit ahora, con\n" "\n" "\tgit commit --amend %s\n" "\n" -"Una vez que esté satisfecho con los cambios, ejecute\n" +"Una vez que estés satisfecho con los cambios, ejecuta\n" "\n" "\tgit rebase --continue\n" -#: sequencer.c:2976 +#: sequencer.c:3084 #, c-format msgid "Could not apply %s... %.*s" msgstr "No se pudo aplicar %s... %.*s" -#: sequencer.c:2983 +#: sequencer.c:3091 #, c-format msgid "Could not merge %.*s" msgstr "No se pudo fusionar %.*s" -#: sequencer.c:2997 sequencer.c:3001 builtin/difftool.c:633 +#: sequencer.c:3105 sequencer.c:3109 builtin/difftool.c:633 #, c-format msgid "could not copy '%s' to '%s'" msgstr "no se pudo copiar '%s' a '%s'" -#: sequencer.c:3023 sequencer.c:3446 builtin/rebase.c:839 builtin/rebase.c:1580 -#: builtin/rebase.c:1940 builtin/rebase.c:1995 +#: sequencer.c:3131 sequencer.c:3558 builtin/rebase.c:849 builtin/rebase.c:1582 +#: builtin/rebase.c:1953 builtin/rebase.c:2008 msgid "could not read index" msgstr "no se pudo leer índice" -#: sequencer.c:3028 +#: sequencer.c:3136 #, c-format msgid "" "execution failed: %s\n" @@ -6283,11 +6387,11 @@ msgstr "" " git rebase --continue\n" "\n" -#: sequencer.c:3034 +#: sequencer.c:3142 msgid "and made changes to the index and/or the working tree\n" msgstr "y se hicieron cambios al índice y/o árbol de trabajo\n" -#: sequencer.c:3040 +#: sequencer.c:3148 #, c-format msgid "" "execution succeeded: %s\n" @@ -6304,76 +6408,76 @@ msgstr "" " git rebase --continue\n" "\n" -#: sequencer.c:3101 +#: sequencer.c:3209 #, c-format msgid "illegal label name: '%.*s'" msgstr "nombre de label ilegal: '%.*s'" -#: sequencer.c:3155 +#: sequencer.c:3263 msgid "writing fake root commit" msgstr "escribiendo commit raíz falso" -#: sequencer.c:3160 +#: sequencer.c:3268 msgid "writing squash-onto" msgstr "escribiendo squash-onto" -#: sequencer.c:3198 builtin/rebase.c:844 builtin/rebase.c:850 +#: sequencer.c:3306 builtin/rebase.c:854 builtin/rebase.c:860 #, c-format msgid "failed to find tree of %s" msgstr "falló al encontrar árbol de %s" -#: sequencer.c:3216 builtin/rebase.c:863 +#: sequencer.c:3324 builtin/rebase.c:873 msgid "could not write index" msgstr "no se pudo escribir índice" -#: sequencer.c:3243 +#: sequencer.c:3351 #, c-format msgid "could not resolve '%s'" msgstr "no se pudo resolver '%s'" -#: sequencer.c:3271 +#: sequencer.c:3379 msgid "cannot merge without a current revision" msgstr "no se puede fusionar sin una versión actual" -#: sequencer.c:3293 +#: sequencer.c:3401 #, c-format msgid "unable to parse '%.*s'" msgstr "no se puede analizar '%.*s'" -#: sequencer.c:3302 +#: sequencer.c:3410 #, c-format msgid "nothing to merge: '%.*s'" msgstr "nada para fusionar: '%.*s'" -#: sequencer.c:3314 +#: sequencer.c:3422 msgid "octopus merge cannot be executed on top of a [new root]" msgstr "fusión octopus no puede ser ejecutada en la punta de un [nuevo root]" -#: sequencer.c:3329 +#: sequencer.c:3437 #, c-format msgid "could not get commit message of '%s'" msgstr "no se puede leer el mensaje del commit '%s'" -#: sequencer.c:3478 +#: sequencer.c:3590 #, c-format msgid "could not even attempt to merge '%.*s'" msgstr "no se pudo intentar fusionar '%.*s'" -#: sequencer.c:3494 +#: sequencer.c:3606 msgid "merge: Unable to write new index file" msgstr "fusión: No se puede escribir el nuevo archivo índice" -#: sequencer.c:3562 builtin/rebase.c:711 +#: sequencer.c:3675 builtin/rebase.c:711 #, c-format msgid "Applied autostash.\n" msgstr "Autostash aplicado.\n" -#: sequencer.c:3574 +#: sequencer.c:3687 #, c-format msgid "cannot store %s" msgstr "no se puede guardar %s" -#: sequencer.c:3577 builtin/rebase.c:727 +#: sequencer.c:3690 builtin/rebase.c:727 git-rebase--preserve-merges.sh:113 #, c-format msgid "" "Applying autostash resulted in conflicts.\n" @@ -6385,31 +6489,31 @@ msgstr "" "Puedes ejecutar \"git stash pop\" o \"git stash drop\" en cualquier " "momento.\n" -#: sequencer.c:3638 +#: sequencer.c:3751 #, c-format msgid "could not checkout %s" msgstr "no se puede hacer checkout a %s" -#: sequencer.c:3652 +#: sequencer.c:3765 #, c-format msgid "%s: not a valid OID" msgstr "%s no es OID válido" -#: sequencer.c:3657 git-rebase--preserve-merges.sh:724 +#: sequencer.c:3770 git-rebase--preserve-merges.sh:779 msgid "could not detach HEAD" msgstr "no se puede desacoplar HEAD" -#: sequencer.c:3672 +#: sequencer.c:3785 #, c-format msgid "Stopped at HEAD\n" msgstr "Detenido en HEAD\n" -#: sequencer.c:3674 +#: sequencer.c:3787 #, c-format msgid "Stopped at %s\n" msgstr "Detenido en %s\n" -#: sequencer.c:3682 +#: sequencer.c:3795 #, c-format msgid "" "Could not execute the todo command\n" @@ -6430,48 +6534,48 @@ msgstr "" " git rebase --edit-todo\n" " git rebase --continue\n" -#: sequencer.c:3759 +#: sequencer.c:3877 #, c-format msgid "Stopped at %s... %.*s\n" msgstr "Detenido en %s... %.*s\n" -#: sequencer.c:3837 +#: sequencer.c:3958 #, c-format msgid "unknown command %d" msgstr "comando desconocido %d" -#: sequencer.c:3882 +#: sequencer.c:4003 msgid "could not read orig-head" msgstr "no se puede leer orig-head" -#: sequencer.c:3887 +#: sequencer.c:4008 msgid "could not read 'onto'" msgstr "no se puede leer 'onto'" -#: sequencer.c:3901 +#: sequencer.c:4022 #, c-format msgid "could not update HEAD to %s" msgstr "no se puede actualizar HEAD a %s" -#: sequencer.c:3991 +#: sequencer.c:4115 msgid "cannot rebase: You have unstaged changes." msgstr "no se puede realizar rebase: Tienes cambios fuera del área de stage." -#: sequencer.c:4000 +#: sequencer.c:4124 msgid "cannot amend non-existing commit" msgstr "no se puede arreglar un commit no existente" -#: sequencer.c:4002 +#: sequencer.c:4126 #, c-format msgid "invalid file: '%s'" msgstr "archivo inválido: '%s'" -#: sequencer.c:4004 +#: sequencer.c:4128 #, c-format msgid "invalid contents: '%s'" msgstr "contenido inválido: '%s'" -#: sequencer.c:4007 +#: sequencer.c:4131 msgid "" "\n" "You have uncommitted changes in your working tree. Please, commit them\n" @@ -6482,60 +6586,60 @@ msgstr "" "un commit con estos\n" "primero y luego ejecuta 'git rebase --continue' de nuevo." -#: sequencer.c:4043 sequencer.c:4081 +#: sequencer.c:4167 sequencer.c:4205 #, c-format msgid "could not write file: '%s'" msgstr "no se pudo escribir el archivo: '%s'" -#: sequencer.c:4096 +#: sequencer.c:4220 msgid "could not remove CHERRY_PICK_HEAD" msgstr "no se puede eliminar CHERRY_PICK_HEAD" -#: sequencer.c:4103 +#: sequencer.c:4227 msgid "could not commit staged changes." msgstr "no se pudo realizar el commit con los cambios en el área de stage." -#: sequencer.c:4204 +#: sequencer.c:4328 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s: no se puede aplicar cherry-pick a un %s" -#: sequencer.c:4208 +#: sequencer.c:4332 #, c-format msgid "%s: bad revision" msgstr "%s: revisión errónea" -#: sequencer.c:4243 +#: sequencer.c:4367 msgid "can't revert as initial commit" msgstr "no se puede revertir como commit inicial" -#: sequencer.c:4686 +#: sequencer.c:4810 msgid "make_script: unhandled options" msgstr "make_script: opciones desconocidas" -#: sequencer.c:4689 +#: sequencer.c:4813 msgid "make_script: error preparing revisions" msgstr "make_script: error preparando revisiones" -#: sequencer.c:4847 +#: sequencer.c:4971 msgid "" "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --" "continue'.\n" "Or you can abort the rebase with 'git rebase --abort'.\n" msgstr "" -"Se puede arreglar esto con 'git rebase --edit-todo' y después ejecutar 'git " +"Se puede arreglar esto con 'git rebase --edit-todo' y después ejecuta 'git " "rebase --continue'.\n" "O se puede abortar el rebase con 'git rebase --abort'.\n" -#: sequencer.c:4959 sequencer.c:4976 +#: sequencer.c:5083 sequencer.c:5100 msgid "nothing to do" msgstr "nada que hacer" -#: sequencer.c:4990 +#: sequencer.c:5114 msgid "could not skip unnecessary pick commands" msgstr "no se pudo saltar los comandos pick innecesarios" -#: sequencer.c:5073 +#: sequencer.c:5197 msgid "the script was already rearranged." msgstr "este script ya fue reorganizado." @@ -6760,196 +6864,201 @@ msgstr "repositorio de referencia '%s' es superficial (shallow)" msgid "reference repository '%s' is grafted" msgstr "repositorio de referencia '% s' está injertado" -#: sha1-file.c:846 +#: sha1-file.c:792 +#, c-format +msgid "invalid line while parsing alternate refs: %s" +msgstr "línea inválida mientras se analizaban refs alternas: %s" + +#: sha1-file.c:944 #, c-format msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>" msgstr "intentando usar mmap %<PRIuMAX> sobre límite %<PRIuMAX>" -#: sha1-file.c:871 +#: sha1-file.c:969 msgid "mmap failed" msgstr "mmap falló" -#: sha1-file.c:1035 +#: sha1-file.c:1133 #, c-format msgid "object file %s is empty" msgstr "archivo de objeto %s está vacío" -#: sha1-file.c:1159 sha1-file.c:2297 +#: sha1-file.c:1257 sha1-file.c:2396 #, c-format msgid "corrupt loose object '%s'" msgstr "objeto perdido corrupto '%s'" -#: sha1-file.c:1161 sha1-file.c:2301 +#: sha1-file.c:1259 sha1-file.c:2400 #, c-format msgid "garbage at end of loose object '%s'" msgstr "basura al final del objeto perdido '%s'" -#: sha1-file.c:1203 +#: sha1-file.c:1301 msgid "invalid object type" msgstr "tipo de objeto inválido" -#: sha1-file.c:1287 +#: sha1-file.c:1385 #, c-format msgid "unable to unpack %s header with --allow-unknown-type" msgstr "no es posible desempacar header %s con --allow-unknown-type" -#: sha1-file.c:1290 +#: sha1-file.c:1388 #, c-format msgid "unable to unpack %s header" msgstr "incapaz de desempaquetar header %s" -#: sha1-file.c:1296 +#: sha1-file.c:1394 #, c-format msgid "unable to parse %s header with --allow-unknown-type" msgstr "no es posible analizar header %s con --allow-unknown-type" -#: sha1-file.c:1299 +#: sha1-file.c:1397 #, c-format msgid "unable to parse %s header" msgstr "incapaz de analizar header %s" -#: sha1-file.c:1490 +#: sha1-file.c:1588 #, c-format msgid "failed to read object %s" msgstr "falló al leer objeto %s" -#: sha1-file.c:1494 +#: sha1-file.c:1592 #, c-format msgid "replacement %s not found for %s" msgstr "reemplazo %s no encontrado para %s" -#: sha1-file.c:1498 +#: sha1-file.c:1596 #, c-format msgid "loose object %s (stored in %s) is corrupt" msgstr "objeto perdido %s (guardado en %s) está corrompido" -#: sha1-file.c:1502 +#: sha1-file.c:1600 #, c-format msgid "packed object %s (stored in %s) is corrupt" msgstr "paquete de objeto %s (guardado en %s) está corrompido" -#: sha1-file.c:1604 +#: sha1-file.c:1703 #, c-format msgid "unable to write file %s" msgstr "no es posible escribir archivo %s" -#: sha1-file.c:1611 +#: sha1-file.c:1710 #, c-format msgid "unable to set permission to '%s'" msgstr "no se pudo poner permisos a '%s'" -#: sha1-file.c:1618 +#: sha1-file.c:1717 msgid "file write error" msgstr "falló de escritura" -#: sha1-file.c:1637 +#: sha1-file.c:1736 msgid "error when closing loose object file" msgstr "error cerrando el archivo de objeto suelto" -#: sha1-file.c:1702 +#: sha1-file.c:1801 #, c-format msgid "insufficient permission for adding an object to repository database %s" msgstr "" "permisos insuficientes para agregar un objeto a la base de datos del " "repositorio %s" -#: sha1-file.c:1704 +#: sha1-file.c:1803 msgid "unable to create temporary file" msgstr "no es posible crear un archivo temporal" -#: sha1-file.c:1728 +#: sha1-file.c:1827 msgid "unable to write loose object file" msgstr "no es posible escribir el archivo de objeto suelto" -#: sha1-file.c:1734 +#: sha1-file.c:1833 #, c-format msgid "unable to deflate new object %s (%d)" msgstr "no es posible desinflar el objeto nuevo %s (%d)" -#: sha1-file.c:1738 +#: sha1-file.c:1837 #, c-format msgid "deflateEnd on object %s failed (%d)" msgstr "deflateEnd en objeto %s falló (%d)" -#: sha1-file.c:1742 +#: sha1-file.c:1841 #, c-format msgid "confused by unstable object source data for %s" msgstr "confundido por fuente de data de objetos inestable para %s" -#: sha1-file.c:1752 builtin/pack-objects.c:920 +#: sha1-file.c:1851 builtin/pack-objects.c:925 #, c-format msgid "failed utime() on %s" msgstr "falló utime() en %s" -#: sha1-file.c:1827 +#: sha1-file.c:1926 #, c-format msgid "cannot read object for %s" msgstr "no se pudo leer el objeto para %s" -#: sha1-file.c:1867 +#: sha1-file.c:1966 msgid "corrupt commit" msgstr "commit corrupto" -#: sha1-file.c:1875 +#: sha1-file.c:1974 msgid "corrupt tag" msgstr "tag corrupto" -#: sha1-file.c:1974 +#: sha1-file.c:2073 #, c-format msgid "read error while indexing %s" msgstr "error leyendo al indexar %s" -#: sha1-file.c:1977 +#: sha1-file.c:2076 #, c-format msgid "short read while indexing %s" msgstr "lectura corta al indexar %s" -#: sha1-file.c:2050 sha1-file.c:2059 +#: sha1-file.c:2149 sha1-file.c:2158 #, c-format msgid "%s: failed to insert into database" msgstr "%s: falló al insertar en la base de datos" -#: sha1-file.c:2065 +#: sha1-file.c:2164 #, c-format msgid "%s: unsupported file type" msgstr "%s: tipo de archivo no soportado" -#: sha1-file.c:2089 +#: sha1-file.c:2188 #, c-format msgid "%s is not a valid object" msgstr "%s no es objeto válido" -#: sha1-file.c:2091 +#: sha1-file.c:2190 #, c-format msgid "%s is not a valid '%s' object" msgstr "%s no es un objeto '%s' válido" -#: sha1-file.c:2118 builtin/index-pack.c:154 +#: sha1-file.c:2217 builtin/index-pack.c:155 #, c-format msgid "unable to open %s" msgstr "no es posible abrir %s" -#: sha1-file.c:2308 sha1-file.c:2360 +#: sha1-file.c:2407 sha1-file.c:2459 #, c-format msgid "hash mismatch for %s (expected %s)" msgstr "hash no concuerda para %s (se esperaba %s)" -#: sha1-file.c:2332 +#: sha1-file.c:2431 #, c-format msgid "unable to mmap %s" msgstr "no es posible hacer mmap a %s" -#: sha1-file.c:2337 +#: sha1-file.c:2436 #, c-format msgid "unable to unpack header of %s" msgstr "incapaz de desempaquetar header de %s" -#: sha1-file.c:2343 +#: sha1-file.c:2442 #, c-format msgid "unable to parse header of %s" msgstr "incapaz de analizar header de %s" -#: sha1-file.c:2354 +#: sha1-file.c:2453 #, c-format msgid "unable to unpack contents of %s" msgstr "no es posible desempaquetar contenidos de %s" @@ -6969,7 +7078,7 @@ msgid "" "because it will be ignored when you just specify 40-hex. These refs\n" "may be created by mistake. For example,\n" "\n" -" git checkout -b $br $(git rev-parse ...)\n" +" git switch -c $br $(git rev-parse ...)\n" "\n" "where \"$br\" is somehow empty and a 40-hex ref is created. Please\n" "examine these refs and maybe delete them. Turn this message off by\n" @@ -6979,13 +7088,65 @@ msgstr "" "porque esto sería ignorado cuando solo se especifiquen 40-hex. Estas refs\n" "tal vez sean creadas por error. Por ejemplo,\n" "\n" -" git checkout -b $br $(git rev-parse ...)\n" +" git switch -c $br $(git rev-parse ...)\n" "\n" "donde \"$br\" está de alguna manera vacía y una ref de 40-hex es creada. Por " "favor\n" -"examine estas refs y tal vez bórrelas. Silencie este mensaje \n" +"examina estas refs y tal vez bórralas. Silencia este mensaje \n" "ejecutando \"git config advice.objectNameWarning false\"" +#. TRANSLATORS: IEC 80000-13:2008 gibibyte +#: strbuf.c:821 +#, c-format +msgid "%u.%2.2u GiB" +msgstr "%u.%2.2u GiB" + +#. TRANSLATORS: IEC 80000-13:2008 gibibyte/second +#: strbuf.c:823 +#, c-format +msgid "%u.%2.2u GiB/s" +msgstr "%u.%2.2u GiB/s" + +#. TRANSLATORS: IEC 80000-13:2008 mebibyte +#: strbuf.c:831 +#, c-format +msgid "%u.%2.2u MiB" +msgstr "%u.%2.2u MiB" + +#. TRANSLATORS: IEC 80000-13:2008 mebibyte/second +#: strbuf.c:833 +#, c-format +msgid "%u.%2.2u MiB/s" +msgstr "%u.%2.2u MiB/s" + +#. TRANSLATORS: IEC 80000-13:2008 kibibyte +#: strbuf.c:840 +#, c-format +msgid "%u.%2.2u KiB" +msgstr "%u.%2.2u KiB" + +#. TRANSLATORS: IEC 80000-13:2008 kibibyte/second +#: strbuf.c:842 +#, c-format +msgid "%u.%2.2u KiB/s" +msgstr "%u.%2.2u KiB/s" + +#. TRANSLATORS: IEC 80000-13:2008 byte +#: strbuf.c:848 +#, c-format +msgid "%u byte" +msgid_plural "%u bytes" +msgstr[0] "%u byte" +msgstr[1] "%u bytes" + +#. TRANSLATORS: IEC 80000-13:2008 byte/second +#: strbuf.c:850 +#, c-format +msgid "%u byte/s" +msgid_plural "%u bytes/s" +msgstr[0] "%u bytes/s" +msgstr[1] "%u bytes/s" + #: submodule.c:114 submodule.c:143 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" msgstr "" @@ -7020,9 +7181,9 @@ msgstr "El patrón de ruta '%s' está en el submódulo '%.*s'" msgid "submodule entry '%s' (%s) is a %s, not a commit" msgstr "entrada de submódulo '%s' (%s) es un %s, no un commit" -#: submodule.c:1147 builtin/branch.c:672 builtin/submodule--helper.c:1988 +#: submodule.c:1147 builtin/branch.c:680 builtin/submodule--helper.c:1989 msgid "Failed to resolve HEAD as a valid ref." -msgstr "Falló al resolver HEAD como un ref valido." +msgstr "Falló al resolver HEAD como un ref válido." #: submodule.c:1481 #, c-format @@ -7059,7 +7220,7 @@ msgstr "submódulo '%s' tiene un índice corrupto" msgid "Submodule '%s' could not be updated." msgstr "Submódulo '%s' no pudo ser actualizado." -#: submodule.c:2008 +#: submodule.c:2007 #, c-format msgid "" "relocate_gitdir for submodule '%s' with more than one worktree not supported" @@ -7067,12 +7228,12 @@ msgstr "" "relocate_gitdir para el submódulo '%s' con más de un árbol de trabajo no " "soportado" -#: submodule.c:2020 submodule.c:2076 +#: submodule.c:2019 submodule.c:2074 #, c-format msgid "could not lookup name for submodule '%s'" msgstr "no se pudo resolver el nombre para el submódulo '%s'" -#: submodule.c:2027 +#: submodule.c:2026 #, c-format msgid "" "Migrating git directory of '%s%s' from\n" @@ -7083,16 +7244,16 @@ msgstr "" "'%s' hacia\n" "'%s'\n" -#: submodule.c:2111 +#: submodule.c:2109 #, c-format msgid "could not recurse into submodule '%s'" msgstr "no pudo recursar en el submódulo '%s'" -#: submodule.c:2155 +#: submodule.c:2153 msgid "could not start ls-files in .." msgstr "no se pudo comenzar ls-files en .." -#: submodule.c:2194 +#: submodule.c:2192 #, c-format msgid "ls-tree returned unexpected return code %d" msgstr "ls-tree devolvió un código %d inesperado" @@ -7266,15 +7427,10 @@ msgstr "Abortando." msgid "failed to push all needed submodules" msgstr "falló al hacer push a todos los submódulos necesarios" -#: transport.c:1326 transport-helper.c:645 +#: transport.c:1340 transport-helper.c:645 msgid "operation not supported by protocol" msgstr "operación no soportada por protocolo" -#: transport.c:1430 -#, c-format -msgid "invalid line while parsing alternate refs: %s" -msgstr "línea inválida mientras se analizaban refs alternas: %s" - #: transport-helper.c:51 transport-helper.c:80 msgid "full write to remote helper failed" msgstr "escritura total al helper remoto falló" @@ -7319,7 +7475,7 @@ msgstr "no se pudo ejecutar fast-import" msgid "error while running fast-import" msgstr "error al ejecutar fast-import" -#: transport-helper.c:533 transport-helper.c:1099 +#: transport-helper.c:533 transport-helper.c:1105 #, c-format msgid "could not read ref %s" msgstr "no se pudo leer la referencia %s" @@ -7372,24 +7528,24 @@ msgstr "helper %s no soporta --signed=if-asked" msgid "helper %s does not support 'push-option'" msgstr "helper %s no soporta 'push-option'" -#: transport-helper.c:939 +#: transport-helper.c:945 msgid "remote-helper doesn't support push; refspec needed" msgstr "remote-helper no soporta push; se necesita refspec" -#: transport-helper.c:944 +#: transport-helper.c:950 #, c-format msgid "helper %s does not support 'force'" msgstr "helper %s no soporta 'force'" -#: transport-helper.c:991 +#: transport-helper.c:997 msgid "couldn't run fast-export" msgstr "no se pudo ejecutar fast-export" -#: transport-helper.c:996 +#: transport-helper.c:1002 msgid "error while running fast-export" msgstr "error al ejecutar fast-export" -#: transport-helper.c:1021 +#: transport-helper.c:1027 #, c-format msgid "" "No refs in common and none specified; doing nothing.\n" @@ -7398,47 +7554,47 @@ msgstr "" "No hay refs comunes y ninguno especificado; no se hace nada.\n" "Tal vez deberías especificar un branch como 'master'.\n" -#: transport-helper.c:1085 +#: transport-helper.c:1091 #, c-format msgid "malformed response in ref list: %s" msgstr "respuesta malformada en lista de refs: %s" -#: transport-helper.c:1238 +#: transport-helper.c:1244 #, c-format msgid "read(%s) failed" msgstr "leer(%s) falló" -#: transport-helper.c:1265 +#: transport-helper.c:1271 #, c-format msgid "write(%s) failed" msgstr "escribir(%s) falló" -#: transport-helper.c:1314 +#: transport-helper.c:1320 #, c-format msgid "%s thread failed" msgstr "hilo %s falló" -#: transport-helper.c:1318 +#: transport-helper.c:1324 #, c-format msgid "%s thread failed to join: %s" msgstr "hilo %s falló al unirse: %s" -#: transport-helper.c:1337 transport-helper.c:1341 +#: transport-helper.c:1343 transport-helper.c:1347 #, c-format msgid "can't start thread for copying data: %s" msgstr "no se puede iniciar el hilo para copiar data: %s" -#: transport-helper.c:1378 +#: transport-helper.c:1384 #, c-format msgid "%s process failed to wait" msgstr "proceso %s falló al esperar" -#: transport-helper.c:1382 +#: transport-helper.c:1388 #, c-format msgid "%s process failed" msgstr "proceso %s falló" -#: transport-helper.c:1400 transport-helper.c:1409 +#: transport-helper.c:1406 transport-helper.c:1415 msgid "can't start thread for copying data" msgstr "no se puede iniciar hilo para copiar data" @@ -7454,7 +7610,7 @@ msgstr "modo mal formado en la entrada de árbol" msgid "empty filename in tree entry" msgstr "nombre de archivo vacío en la entrada de árbol" -#: tree-walk.c:116 +#: tree-walk.c:118 msgid "too-short tree file" msgstr "archivo de árbol muy corto" @@ -7701,8 +7857,8 @@ msgid "Aborting\n" msgstr "Abortando\n" #: unpack-trees.c:318 -msgid "Checking out files" -msgstr "Revisando archivos" +msgid "Updating files" +msgstr "Actualizando archivos" #: unpack-trees.c:350 msgid "" @@ -7743,35 +7899,35 @@ msgstr "numero de puerto inválido" msgid "invalid '..' path segment" msgstr "segmento de ruta '..' inválido" -#: worktree.c:255 builtin/am.c:2097 +#: worktree.c:258 builtin/am.c:2095 #, c-format msgid "failed to read '%s'" msgstr "falló al leer '%s'" -#: worktree.c:301 +#: worktree.c:304 #, c-format msgid "'%s' at main working tree is not the repository directory" msgstr "" "'%s' en el árbol de trabajo principal no es el directorio del repositorio" -#: worktree.c:312 +#: worktree.c:315 #, c-format msgid "'%s' file does not contain absolute path to the working tree location" msgstr "" "archivo '%s' no contiene una ruta absoluta a la ubicación del árbol de " "trabajo" -#: worktree.c:324 +#: worktree.c:327 #, c-format msgid "'%s' does not exist" msgstr "'%s' no existe" -#: worktree.c:330 +#: worktree.c:333 #, c-format msgid "'%s' is not a .git file, error code %d" msgstr "'%s' no es un archivo .git, código de error %d" -#: worktree.c:338 +#: worktree.c:341 #, c-format msgid "'%s' does not point back to '%s'" msgstr "'%s' no apunta de vuelta a '%s'" @@ -7790,159 +7946,166 @@ msgstr "no es posible acceder '%s'" msgid "unable to get current working directory" msgstr "no es posible obtener el directorio de trabajo actual" -#: wt-status.c:156 +#: wt-status.c:158 msgid "Unmerged paths:" msgstr "Rutas no fusionadas:" -#: wt-status.c:183 wt-status.c:210 +#: wt-status.c:187 wt-status.c:219 +msgid " (use \"git restore --staged <file>...\" to unstage)" +msgstr "" +" (usa \"git restore --staged <archivo>...\" para sacar del área de stage)" + +#: wt-status.c:190 wt-status.c:222 #, c-format -msgid " (use \"git reset %s <file>...\" to unstage)" -msgstr " (usa \"git reset %s <archivo>...\" para sacar del área de stage)" +msgid " (use \"git restore --source=%s --staged <file>...\" to unstage)" +msgstr "" +" (usa \"git restore --source=%s --staged <archivo>...\" para sacar del área " +"de stage)" -#: wt-status.c:185 wt-status.c:212 +#: wt-status.c:193 wt-status.c:225 msgid " (use \"git rm --cached <file>...\" to unstage)" msgstr " (usa \"git rm --cached <archivo>...\" para sacar del área de stage)" -#: wt-status.c:189 +#: wt-status.c:197 msgid " (use \"git add <file>...\" to mark resolution)" msgstr " (usa \"git add <archivo>...\" para marcar una resolución)" -#: wt-status.c:191 wt-status.c:195 +#: wt-status.c:199 wt-status.c:203 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)" msgstr "" " (usa \"git add/rm <archivo>...\" como una forma apropiada de marcar la " "resolución)" -#: wt-status.c:193 +#: wt-status.c:201 msgid " (use \"git rm <file>...\" to mark resolution)" msgstr " (usa \"git rm <file>...\" para marcar la resolución)" -#: wt-status.c:204 wt-status.c:1064 +#: wt-status.c:211 wt-status.c:1074 msgid "Changes to be committed:" msgstr "Cambios a ser confirmados:" -#: wt-status.c:222 wt-status.c:1073 +#: wt-status.c:234 wt-status.c:1083 msgid "Changes not staged for commit:" msgstr "Cambios no rastreados para el commit:" -#: wt-status.c:226 +#: wt-status.c:238 msgid " (use \"git add <file>...\" to update what will be committed)" msgstr "" " (usa \"git add <archivo>...\" para actualizar lo que será confirmado)" -#: wt-status.c:228 +#: wt-status.c:240 msgid " (use \"git add/rm <file>...\" to update what will be committed)" msgstr "" " (usa \"git add/rm <archivo>...\" para actualizar a lo que se le va a hacer " "commit)" -#: wt-status.c:229 +#: wt-status.c:241 msgid "" -" (use \"git checkout -- <file>...\" to discard changes in working directory)" +" (use \"git restore <file>...\" to discard changes in working directory)" msgstr "" -" (usa \"git checkout -- <archivo>...\" para descartar los cambios en el " +" (usa \"git restore <archivo>...\" para descartar los cambios en el " "directorio de trabajo)" -#: wt-status.c:231 +#: wt-status.c:243 msgid " (commit or discard the untracked or modified content in submodules)" msgstr "" " (confirmar o descartar el contenido sin seguimiento o modificado en los " "sub-módulos)" -#: wt-status.c:243 +#: wt-status.c:254 #, c-format msgid " (use \"git %s <file>...\" to include in what will be committed)" msgstr "" " (usa \"git %s <archivo>...\" para incluirlo a lo que se será confirmado)" -#: wt-status.c:258 +#: wt-status.c:268 msgid "both deleted:" msgstr "ambos borrados:" -#: wt-status.c:260 +#: wt-status.c:270 msgid "added by us:" msgstr "agregado por nosotros:" -#: wt-status.c:262 +#: wt-status.c:272 msgid "deleted by them:" msgstr "borrados por ellos:" -#: wt-status.c:264 +#: wt-status.c:274 msgid "added by them:" msgstr "agregado por ellos:" -#: wt-status.c:266 +#: wt-status.c:276 msgid "deleted by us:" msgstr "borrado por nosotros:" -#: wt-status.c:268 +#: wt-status.c:278 msgid "both added:" msgstr "ambos agregados:" -#: wt-status.c:270 +#: wt-status.c:280 msgid "both modified:" msgstr "ambos modificados:" -#: wt-status.c:280 +#: wt-status.c:290 msgid "new file:" msgstr "nuevo archivo:" -#: wt-status.c:282 +#: wt-status.c:292 msgid "copied:" msgstr "copiado:" -#: wt-status.c:284 +#: wt-status.c:294 msgid "deleted:" msgstr "borrado:" -#: wt-status.c:286 +#: wt-status.c:296 msgid "modified:" msgstr "modificado:" -#: wt-status.c:288 +#: wt-status.c:298 msgid "renamed:" msgstr "renombrado:" -#: wt-status.c:290 +#: wt-status.c:300 msgid "typechange:" msgstr "cambio de tipo:" -#: wt-status.c:292 +#: wt-status.c:302 msgid "unknown:" msgstr "desconocido:" -#: wt-status.c:294 +#: wt-status.c:304 msgid "unmerged:" msgstr "des-fusionado:" -#: wt-status.c:374 +#: wt-status.c:384 msgid "new commits, " msgstr "nuevos commits, " -#: wt-status.c:376 +#: wt-status.c:386 msgid "modified content, " msgstr "contenido modificado, " -#: wt-status.c:378 +#: wt-status.c:388 msgid "untracked content, " msgstr "contenido no rastreado, " -#: wt-status.c:896 +#: wt-status.c:906 #, c-format msgid "Your stash currently has %d entry" msgid_plural "Your stash currently has %d entries" msgstr[0] "Tu stash actualmente tiene %d entrada" msgstr[1] "Tu stash actualmente tiene %d entradas" -#: wt-status.c:928 +#: wt-status.c:938 msgid "Submodules changed but not updated:" -msgstr "Submodulos cambiados pero no actualizados:" +msgstr "Submódulos cambiados pero no actualizados:" -#: wt-status.c:930 +#: wt-status.c:940 msgid "Submodule changes to be committed:" -msgstr "Submodulos cambiados listos para realizar commit:" +msgstr "Submódulos cambiados listos para realizar commit:" -#: wt-status.c:1012 +#: wt-status.c:1022 msgid "" "Do not modify or remove the line above.\n" "Everything below it will be ignored." @@ -7950,107 +8113,118 @@ msgstr "" "No modifique o borre la línea de encima.\n" "Todo lo que este por abajo será eliminado." -#: wt-status.c:1119 +#: wt-status.c:1114 +#, c-format +msgid "" +"\n" +"It took %.2f seconds to compute the branch ahead/behind values.\n" +"You can use '--no-ahead-behind' to avoid this.\n" +msgstr "" +"\n" +"Tomó %.2f segundos para calcular los valores anterior/posterior del branch.\n" +"Puedes usar '--no-ahead-behind' para evitar esto.\n" + +#: wt-status.c:1144 msgid "You have unmerged paths." msgstr "Tienes rutas no fusionadas." -#: wt-status.c:1122 +#: wt-status.c:1147 msgid " (fix conflicts and run \"git commit\")" msgstr " (arregla los conflictos y corre \"git commit\"" -#: wt-status.c:1124 +#: wt-status.c:1149 msgid " (use \"git merge --abort\" to abort the merge)" msgstr " (usa \"git merge --abort\" para abortar la fusion)" -#: wt-status.c:1128 +#: wt-status.c:1153 msgid "All conflicts fixed but you are still merging." msgstr "Todos los conflictos resueltos pero sigues fusionando." -#: wt-status.c:1131 +#: wt-status.c:1156 msgid " (use \"git commit\" to conclude merge)" msgstr " (usa \"git commit\" para concluir la fusión)" -#: wt-status.c:1140 +#: wt-status.c:1165 msgid "You are in the middle of an am session." msgstr "Estás en medio de una sesión am." -#: wt-status.c:1143 +#: wt-status.c:1168 msgid "The current patch is empty." msgstr "El parche actual está vacío." -#: wt-status.c:1147 +#: wt-status.c:1172 msgid " (fix conflicts and then run \"git am --continue\")" msgstr " (arregla los conflictos y luego corre \"git am --continue\"" -#: wt-status.c:1149 +#: wt-status.c:1174 msgid " (use \"git am --skip\" to skip this patch)" msgstr " (usa \"git am --skip\" para saltar este parche)" -#: wt-status.c:1151 +#: wt-status.c:1176 msgid " (use \"git am --abort\" to restore the original branch)" msgstr " (usa \"git am --abort\" para restaurar la rama original)" -#: wt-status.c:1284 +#: wt-status.c:1309 msgid "git-rebase-todo is missing." msgstr "git-rebase-todo no está presente." -#: wt-status.c:1286 +#: wt-status.c:1311 msgid "No commands done." msgstr "No se realizaron los comandos." -#: wt-status.c:1289 +#: wt-status.c:1314 #, c-format msgid "Last command done (%d command done):" msgid_plural "Last commands done (%d commands done):" msgstr[0] "El último comando realizado (%d comando realizado):" msgstr[1] "Los últimos comandos realizados (%d comandos realizados):" -#: wt-status.c:1300 +#: wt-status.c:1325 #, c-format msgid " (see more in file %s)" -msgstr " (ver mas en el archivo %s)" +msgstr " (ver más en el archivo %s)" -#: wt-status.c:1305 +#: wt-status.c:1330 msgid "No commands remaining." -msgstr "No quedan mas comandos." +msgstr "No quedan más comandos." -#: wt-status.c:1308 +#: wt-status.c:1333 #, c-format msgid "Next command to do (%d remaining command):" msgid_plural "Next commands to do (%d remaining commands):" msgstr[0] "Siguiente comando a realizar (%d comando restante):" msgstr[1] "Siguiente comandos a realizar (%d comandos faltantes):" -#: wt-status.c:1316 +#: wt-status.c:1341 msgid " (use \"git rebase --edit-todo\" to view and edit)" msgstr " (usa \"git rebase --edit-todo\" para ver y editar)" -#: wt-status.c:1328 +#: wt-status.c:1353 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." msgstr "Estás aplicando un rebase de la rama '%s' en '%s." -#: wt-status.c:1333 +#: wt-status.c:1358 msgid "You are currently rebasing." msgstr "Estás aplicando un rebase." -#: wt-status.c:1346 +#: wt-status.c:1371 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr " (corrige los conflictos y ejecuta \"git rebase --continue\")" -#: wt-status.c:1348 +#: wt-status.c:1373 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr " (usa \"git rebase --skip\" para omitir este parche)" -#: wt-status.c:1350 +#: wt-status.c:1375 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr " (usa \"git rebase --abort\" para volver a tu rama original)" -#: wt-status.c:1357 +#: wt-status.c:1382 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr " (todos los conflictos corregidos: ejecuta \"git rebase --continue\")" -#: wt-status.c:1361 +#: wt-status.c:1386 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." @@ -8058,144 +8232,136 @@ msgstr "" "Estás dividiendo un commit mientras aplicas un rebase de la rama '%s' en " "'%s'." -#: wt-status.c:1366 +#: wt-status.c:1391 msgid "You are currently splitting a commit during a rebase." msgstr "Estás dividiendo un commit durante un rebase." -#: wt-status.c:1369 +#: wt-status.c:1394 msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr "" " (Una vez que tu directorio de trabajo esté limpio, ejecuta \"git rebase --" "continue\")" -#: wt-status.c:1373 +#: wt-status.c:1398 #, c-format msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." msgstr "" "Estás editando un commit mientras se aplica un rebase de la rama '%s' en " "'%s'." -#: wt-status.c:1378 +#: wt-status.c:1403 msgid "You are currently editing a commit during a rebase." msgstr "Estás editando un commit durante un rebase." -#: wt-status.c:1381 +#: wt-status.c:1406 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr " (usa \"git commit --amend\" para enmendar el commit actual)" -#: wt-status.c:1383 +#: wt-status.c:1408 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr "" " (usa \"git rebase --continue\" una vez que estés satisfecho con tus " "cambios)" -#: wt-status.c:1394 +#: wt-status.c:1419 msgid "Cherry-pick currently in progress." -msgstr "Cherry-pick en progreso actualmente" +msgstr "Cherry-pick en progreso actualmente." -#: wt-status.c:1397 +#: wt-status.c:1422 #, c-format msgid "You are currently cherry-picking commit %s." msgstr "Estás realizando un cherry-picking en el commit %s." -#: wt-status.c:1404 +#: wt-status.c:1429 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr " (corrige los conflictos y ejecuta \"git cherry-pick --continue\")" -#: wt-status.c:1407 +#: wt-status.c:1432 msgid " (run \"git cherry-pick --continue\" to continue)" msgstr " (ejecuta \"git cherry-pick --continue\" para continuar)" -#: wt-status.c:1410 +#: wt-status.c:1435 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr "" " (todos los conflictos corregidos: ejecuta \"git cherry-pick --continue\")" -#: wt-status.c:1412 +#: wt-status.c:1437 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr "" " (use \"git cherry-pick --abort\" para cancelar la operación cherry-pick)" -#: wt-status.c:1422 +#: wt-status.c:1447 msgid "Revert currently in progress." -msgstr "Revierte el estado en progreso actual" +msgstr "Revierte el estado en progreso actual." -#: wt-status.c:1425 +#: wt-status.c:1450 #, c-format msgid "You are currently reverting commit %s." msgstr "Estás revirtiendo el commit %s." -#: wt-status.c:1431 +#: wt-status.c:1456 msgid " (fix conflicts and run \"git revert --continue\")" msgstr " (corrige los conflictos y ejecuta \"git revert --continue\")" -#: wt-status.c:1434 +#: wt-status.c:1459 msgid " (run \"git revert --continue\" to continue)" msgstr " (ejecuta \"git revert --continue\" para continuar)" -#: wt-status.c:1437 +#: wt-status.c:1462 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr " (todos los conflictos corregidos: ejecuta \"git revert --continue\")" -#: wt-status.c:1439 +#: wt-status.c:1464 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr " (usa \"git revert --abort\" para cancelar la operación de revertir)" -#: wt-status.c:1449 +#: wt-status.c:1474 #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "Estás aplicando un bisect, comenzando en la rama '%s'." -#: wt-status.c:1453 +#: wt-status.c:1478 msgid "You are currently bisecting." msgstr "Estás aplicando un bisect." -#: wt-status.c:1456 +#: wt-status.c:1481 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr " (usa \"git bisect reset\" para volver a la rama original)" -#: wt-status.c:1665 +#: wt-status.c:1690 msgid "On branch " msgstr "En la rama " -#: wt-status.c:1672 +#: wt-status.c:1697 msgid "interactive rebase in progress; onto " msgstr "rebase interactivo en progreso; en " -#: wt-status.c:1674 +#: wt-status.c:1699 msgid "rebase in progress; onto " msgstr "rebase en progreso; en " -#: wt-status.c:1679 -msgid "HEAD detached at " -msgstr "HEAD desacoplada en " - -#: wt-status.c:1681 -msgid "HEAD detached from " -msgstr "HEAD desacoplada de " - -#: wt-status.c:1684 +#: wt-status.c:1709 msgid "Not currently on any branch." msgstr "Actualmente no estás en ninguna rama." -#: wt-status.c:1701 +#: wt-status.c:1726 msgid "Initial commit" msgstr "Confirmación inicial" -#: wt-status.c:1702 +#: wt-status.c:1727 msgid "No commits yet" msgstr "No hay commits todavía" -#: wt-status.c:1716 +#: wt-status.c:1741 msgid "Untracked files" msgstr "Archivos sin seguimiento" -#: wt-status.c:1718 +#: wt-status.c:1743 msgid "Ignored files" msgstr "Archivos ignorados" -#: wt-status.c:1722 +#: wt-status.c:1747 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -8203,34 +8369,34 @@ msgid "" "new files yourself (see 'git help status')." msgstr "" "Tomó %.2f segundos enumerar los archivos no rastreados. 'status -uno'\n" -"puede acelerarlo, pero tiene que ser cuidadoso de no olvidar agregar\n" -"nuevos archivos usted mismo (vea 'git help status')." +"puede acelerarlo, pero tienes que ser cuidadoso de no olvidar agregar\n" +"nuevos archivos tú mismo (vea 'git help status')." -#: wt-status.c:1728 +#: wt-status.c:1753 #, c-format msgid "Untracked files not listed%s" msgstr "Archivos no rastreados no son mostrados %s" -#: wt-status.c:1730 +#: wt-status.c:1755 msgid " (use -u option to show untracked files)" msgstr " (usa la opción -u para mostrar los archivos sin seguimiento)" -#: wt-status.c:1736 +#: wt-status.c:1761 msgid "No changes" msgstr "Sin cambios" -#: wt-status.c:1741 +#: wt-status.c:1766 #, c-format msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" msgstr "" "sin cambios agregados al commit (usa \"git add\" y/o \"git commit -a\")\n" -#: wt-status.c:1744 +#: wt-status.c:1769 #, c-format msgid "no changes added to commit\n" msgstr "no se agregaron cambios al commit\n" -#: wt-status.c:1747 +#: wt-status.c:1772 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " @@ -8239,67 +8405,67 @@ msgstr "" "no hay nada agregado al commit pero hay archivos sin seguimiento presentes " "(usa \"git add\" para hacerles seguimiento)\n" -#: wt-status.c:1750 +#: wt-status.c:1775 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "" "no hay nada agregado para confirmar, pero hay archivos sin seguimiento " "presentes\n" -#: wt-status.c:1753 +#: wt-status.c:1778 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "" "no hay nada para confirmar (crea/copia archivos y usa \"git add\" para " "hacerles seguimiento)\n" -#: wt-status.c:1756 wt-status.c:1761 +#: wt-status.c:1781 wt-status.c:1786 #, c-format msgid "nothing to commit\n" msgstr "nada para hacer commit\n" -#: wt-status.c:1759 +#: wt-status.c:1784 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "" "nada para hacer commit (usa -u para mostrar los archivos no rastreados)\n" -#: wt-status.c:1763 +#: wt-status.c:1788 #, c-format msgid "nothing to commit, working tree clean\n" msgstr "nada para hacer commit, el árbol de trabajo está limpio\n" -#: wt-status.c:1876 +#: wt-status.c:1901 msgid "No commits yet on " msgstr "No hay commits todavía en " -#: wt-status.c:1880 +#: wt-status.c:1905 msgid "HEAD (no branch)" msgstr "HEAD (sin rama)" -#: wt-status.c:1911 +#: wt-status.c:1936 msgid "different" msgstr "diferente" -#: wt-status.c:1913 wt-status.c:1921 +#: wt-status.c:1938 wt-status.c:1946 msgid "behind " msgstr "detrás " -#: wt-status.c:1916 wt-status.c:1919 +#: wt-status.c:1941 wt-status.c:1944 msgid "ahead " msgstr "adelante " #. TRANSLATORS: the action is e.g. "pull with rebase" -#: wt-status.c:2443 +#: wt-status.c:2466 #, c-format msgid "cannot %s: You have unstaged changes." msgstr "no se puede %s: Tienes cambios sin marcar." -#: wt-status.c:2449 +#: wt-status.c:2472 msgid "additionally, your index contains uncommitted changes." msgstr "adicionalmente, tu índice contiene cambios que no están en un commit." -#: wt-status.c:2451 +#: wt-status.c:2474 #, c-format msgid "cannot %s: Your index contains uncommitted changes." msgstr "no se puede %s: Tu índice contiene cambios que no están en un commit." @@ -8313,7 +8479,7 @@ msgstr "git add [<opción>] [--] <especificación-de-ruta>..." msgid "unexpected diff status %c" msgstr "diff status inesperado %c" -#: builtin/add.c:89 builtin/commit.c:285 +#: builtin/add.c:89 builtin/commit.c:288 msgid "updating files failed" msgstr "falló la actualización de carpetas" @@ -8362,8 +8528,8 @@ msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "" "Las siguientes rutas son ignoradas por uno de tus archivos .gitignore:\n" -#: builtin/add.c:290 builtin/clean.c:908 builtin/fetch.c:137 builtin/mv.c:124 -#: builtin/prune-packed.c:56 builtin/pull.c:221 builtin/push.c:560 +#: builtin/add.c:290 builtin/clean.c:909 builtin/fetch.c:147 builtin/mv.c:124 +#: builtin/prune-packed.c:56 builtin/pull.c:222 builtin/push.c:560 #: builtin/remote.c:1345 builtin/rm.c:241 builtin/send-pack.c:165 msgid "dry run" msgstr "dry run ( ejecución en seco)" @@ -8372,7 +8538,7 @@ msgstr "dry run ( ejecución en seco)" msgid "interactive picking" msgstr "selección interactiva" -#: builtin/add.c:294 builtin/checkout.c:1379 builtin/reset.c:306 +#: builtin/add.c:294 builtin/checkout.c:1480 builtin/reset.c:306 msgid "select hunks interactively" msgstr "elegir hunks de forma interactiva" @@ -8444,16 +8610,16 @@ msgstr "" "Se ha agregado otro repositorio de git dentro del repositorio actual.\n" "Clones del repositorio exterior no tendrán el contenido del \n" "repositorio embebido y no sabrán como obtenerla.\n" -"Si quería agregar un submódulo, use:\n" +"Si querías agregar un submódulo, usa:\n" "\n" "\tgit submodule add <url> %s\n" "\n" -"Si se agrego esta ruta por error, puede eliminar desde el índice \n" +"Si se agrego esta ruta por error, puedes eliminar desde el índice \n" "usando:\n" "\n" "\tgit rm --cached %s\n" "\n" -"Vea \"git help submodule\" para mas información." +"Vea \"git help submodule\" para más información." #: builtin/add.c:354 #, c-format @@ -8463,7 +8629,7 @@ msgstr "agregando repositorio embebido: %s" #: builtin/add.c:372 #, c-format msgid "Use -f if you really want to add them.\n" -msgstr "Use -f si realmente quiere agregarlos.\n" +msgstr "Usa -f si realmente quieres agregarlos.\n" #: builtin/add.c:379 msgid "adding files failed" @@ -8540,7 +8706,7 @@ msgstr "offset de zona horaria inválido" msgid "Patch format detection failed." msgstr "Falló al detectar el formato del parche." -#: builtin/am.c:949 builtin/clone.c:409 +#: builtin/am.c:949 builtin/clone.c:407 #, c-format msgid "failed to create directory '%s'" msgstr "falló al crear el directorio '%s'" @@ -8549,14 +8715,14 @@ msgstr "falló al crear el directorio '%s'" msgid "Failed to split patches." msgstr "Falló al dividir parches." -#: builtin/am.c:1084 builtin/commit.c:371 +#: builtin/am.c:1084 builtin/commit.c:374 msgid "unable to write index file" msgstr "no es posible escribir en el archivo índice" #: builtin/am.c:1098 #, c-format msgid "When you have resolved this problem, run \"%s --continue\"." -msgstr "Cuando haya resuelto este problema, ejecute \"%s --continue\"." +msgstr "Cuando hayas resuelto este problema, ejecuta \"%s --continue\"." #: builtin/am.c:1099 #, c-format @@ -8590,17 +8756,17 @@ msgstr "sangría no válida: %.*s" msgid "unable to parse commit %s" msgstr "no es posible analizar el commit %s" -#: builtin/am.c:1495 +#: builtin/am.c:1496 msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "" "Repositorio carece de los blobs necesarios para retroceder en una fusión de " "3-vías." -#: builtin/am.c:1497 +#: builtin/am.c:1498 msgid "Using index info to reconstruct a base tree..." msgstr "Usando la información del índice para reconstruir un árbol base..." -#: builtin/am.c:1516 +#: builtin/am.c:1517 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." @@ -8608,28 +8774,24 @@ msgstr "" "Editaste el parche a mano?\n" "No aplica a blobs guardados en su índice." -#: builtin/am.c:1522 +#: builtin/am.c:1523 msgid "Falling back to patching base and 3-way merge..." msgstr "Retrocediendo para parchar base y fusión de 3-vías..." -#: builtin/am.c:1548 +#: builtin/am.c:1549 msgid "Failed to merge in the changes." msgstr "Falló al fusionar en los cambios." -#: builtin/am.c:1580 +#: builtin/am.c:1581 msgid "applying to an empty history" msgstr "aplicando a un historial vacío" -#: builtin/am.c:1627 builtin/am.c:1631 +#: builtin/am.c:1628 builtin/am.c:1632 #, c-format msgid "cannot resume: %s does not exist." msgstr "no se puede continuar: %s no existe." -#: builtin/am.c:1647 -msgid "cannot be interactive without stdin connected to a terminal." -msgstr "no se puede ser interactivo sin stdin conectado a un terminal." - -#: builtin/am.c:1652 +#: builtin/am.c:1650 msgid "Commit Body is:" msgstr "Cuerpo de commit es:" @@ -8637,34 +8799,35 @@ msgstr "Cuerpo de commit es:" #. in your translation. The program will only accept English #. input at this point. #. -#: builtin/am.c:1662 +#: builtin/am.c:1660 +#, c-format msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " msgstr "Aplicar? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " -#: builtin/am.c:1712 +#: builtin/am.c:1710 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "Índice sucio: no se puede aplicar parches (sucio: %s)" -#: builtin/am.c:1752 builtin/am.c:1820 +#: builtin/am.c:1750 builtin/am.c:1818 #, c-format msgid "Applying: %.*s" msgstr "Aplicando: %.*s" -#: builtin/am.c:1769 +#: builtin/am.c:1767 msgid "No changes -- Patch already applied." msgstr "Sin cambios -- parche ya aplicado." -#: builtin/am.c:1775 +#: builtin/am.c:1773 #, c-format msgid "Patch failed at %s %.*s" msgstr "El parche falló en %s %.*s" -#: builtin/am.c:1779 +#: builtin/am.c:1777 msgid "Use 'git am --show-current-patch' to see the failed patch" msgstr "Use 'git am --show-current-patch' para ver el parche fallido" -#: builtin/am.c:1823 +#: builtin/am.c:1821 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" @@ -8674,30 +8837,30 @@ msgstr "" "Si no hay nada en el área de stage, las posibilidad es que algo mas\n" "ya haya introducido el mismo cambio; tal vez quieras omitir este parche." -#: builtin/am.c:1830 +#: builtin/am.c:1828 msgid "" "You still have unmerged paths in your index.\n" "You should 'git add' each file with resolved conflicts to mark them as " "such.\n" "You might run `git rm` on a file to accept \"deleted by them\" for it." msgstr "" -"Todavía tiene rutas sin fusionar en su índice.\n" -"Debe realizar 'git add' cada archivo con conflictos resueltos y marcarlos " +"Todavía tienes rutas sin fusionar en tu índice.\n" +"Debes realizar 'git add' cada archivo con conflictos resueltos y marcarlos " "como tal.\n" -"Tal vez ejecute `git rm` en el archivo para aceptar \"borrado por ellos\" en " -"él." +"Se puede ejecutar `git rm` en el archivo para aceptar \"borrado por ellos\" " +"en él." -#: builtin/am.c:1937 builtin/am.c:1941 builtin/am.c:1953 builtin/reset.c:329 +#: builtin/am.c:1935 builtin/am.c:1939 builtin/am.c:1951 builtin/reset.c:329 #: builtin/reset.c:337 #, c-format msgid "Could not parse object '%s'." msgstr "No se pudo analizar el objeto '%s'." -#: builtin/am.c:1989 +#: builtin/am.c:1987 msgid "failed to clean index" msgstr "falló al limpiar el índice" -#: builtin/am.c:2033 +#: builtin/am.c:2031 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" @@ -8705,144 +8868,144 @@ msgstr "" "Parece haber movido HEAD desde el último falló 'am'.\n" "No rebobinando a ORIG_HEAD" -#: builtin/am.c:2130 +#: builtin/am.c:2128 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "Valor inválido para --patch-format: %s" -#: builtin/am.c:2166 +#: builtin/am.c:2164 msgid "git am [<options>] [(<mbox> | <Maildir>)...]" msgstr "git am [<opciones>] [(<mbox> | <Directorio-de-correo>)...]" -#: builtin/am.c:2167 +#: builtin/am.c:2165 msgid "git am [<options>] (--continue | --skip | --abort)" msgstr "git am [<opciones>] (--continue | --skip | --abort)" -#: builtin/am.c:2173 +#: builtin/am.c:2171 msgid "run interactively" msgstr "ejecutar de manera interactiva" -#: builtin/am.c:2175 +#: builtin/am.c:2173 msgid "historical option -- no-op" msgstr "opción histórica -- no-op" -#: builtin/am.c:2177 +#: builtin/am.c:2175 msgid "allow fall back on 3way merging if needed" msgstr "permitir retroceso en fusión de 3-vías si es necesario" -#: builtin/am.c:2178 builtin/init-db.c:494 builtin/prune-packed.c:58 -#: builtin/repack.c:306 builtin/stash.c:805 +#: builtin/am.c:2176 builtin/init-db.c:494 builtin/prune-packed.c:58 +#: builtin/repack.c:296 builtin/stash.c:806 msgid "be quiet" msgstr "ser silencioso" -#: builtin/am.c:2180 +#: builtin/am.c:2178 msgid "add a Signed-off-by line to the commit message" msgstr "agregar una línea \"Firmado-por\" al mensaje del commit" -#: builtin/am.c:2183 +#: builtin/am.c:2181 msgid "recode into utf8 (default)" msgstr "recodificar en utf8 (default)" -#: builtin/am.c:2185 +#: builtin/am.c:2183 msgid "pass -k flag to git-mailinfo" msgstr "pasar flag -k a git-mailinfo" -#: builtin/am.c:2187 +#: builtin/am.c:2185 msgid "pass -b flag to git-mailinfo" msgstr "pasar flag -b a git-mailinfo" -#: builtin/am.c:2189 +#: builtin/am.c:2187 msgid "pass -m flag to git-mailinfo" msgstr "pasar flag -m a git-mailinfo" -#: builtin/am.c:2191 +#: builtin/am.c:2189 msgid "pass --keep-cr flag to git-mailsplit for mbox format" msgstr "pasar flag --keep-cr a git-mailsplit para formato mbox" -#: builtin/am.c:2194 +#: builtin/am.c:2192 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" msgstr "" "no pasar flag --keep-cr a git-mailsplit independientemente de am.keepcr" -#: builtin/am.c:2197 +#: builtin/am.c:2195 msgid "strip everything before a scissors line" msgstr "descubrir todo antes de una línea de tijeras" -#: builtin/am.c:2199 builtin/am.c:2202 builtin/am.c:2205 builtin/am.c:2208 -#: builtin/am.c:2211 builtin/am.c:2214 builtin/am.c:2217 builtin/am.c:2220 -#: builtin/am.c:2226 +#: builtin/am.c:2197 builtin/am.c:2200 builtin/am.c:2203 builtin/am.c:2206 +#: builtin/am.c:2209 builtin/am.c:2212 builtin/am.c:2215 builtin/am.c:2218 +#: builtin/am.c:2224 msgid "pass it through git-apply" msgstr "pasarlo a través de git-apply" -#: builtin/am.c:2216 builtin/commit.c:1348 builtin/fmt-merge-msg.c:671 -#: builtin/fmt-merge-msg.c:674 builtin/grep.c:879 builtin/merge.c:247 -#: builtin/pull.c:158 builtin/pull.c:217 builtin/rebase.c:1412 -#: builtin/repack.c:317 builtin/repack.c:321 builtin/repack.c:323 -#: builtin/show-branch.c:651 builtin/show-ref.c:172 builtin/tag.c:397 -#: parse-options.h:141 parse-options.h:162 parse-options.h:311 +#: builtin/am.c:2214 builtin/commit.c:1368 builtin/fmt-merge-msg.c:671 +#: builtin/fmt-merge-msg.c:674 builtin/grep.c:881 builtin/merge.c:249 +#: builtin/pull.c:159 builtin/pull.c:218 builtin/rebase.c:1418 +#: builtin/repack.c:307 builtin/repack.c:311 builtin/repack.c:313 +#: builtin/show-branch.c:650 builtin/show-ref.c:172 builtin/tag.c:403 +#: parse-options.h:141 parse-options.h:162 parse-options.h:312 msgid "n" msgstr "n" -#: builtin/am.c:2222 builtin/branch.c:653 builtin/for-each-ref.c:38 -#: builtin/replace.c:554 builtin/tag.c:431 builtin/verify-tag.c:39 +#: builtin/am.c:2220 builtin/branch.c:661 builtin/for-each-ref.c:38 +#: builtin/replace.c:554 builtin/tag.c:437 builtin/verify-tag.c:38 msgid "format" msgstr "formato" -#: builtin/am.c:2223 +#: builtin/am.c:2221 msgid "format the patch(es) are in" msgstr "formatear el parche(s)" -#: builtin/am.c:2229 +#: builtin/am.c:2227 msgid "override error message when patch failure occurs" msgstr "sobrescribir mensajes de error cuando fallos de parchado ocurran" -#: builtin/am.c:2231 +#: builtin/am.c:2229 msgid "continue applying patches after resolving a conflict" msgstr "continuar aplicando los parches tras resolver conflictos" -#: builtin/am.c:2234 +#: builtin/am.c:2232 msgid "synonyms for --continue" msgstr "sinónimos para --continue" -#: builtin/am.c:2237 +#: builtin/am.c:2235 msgid "skip the current patch" msgstr "saltar el parche actual" -#: builtin/am.c:2240 +#: builtin/am.c:2238 msgid "restore the original branch and abort the patching operation." msgstr "restaurar la rama original y abortar la operación de parchado." -#: builtin/am.c:2243 +#: builtin/am.c:2241 msgid "abort the patching operation but keep HEAD where it is." msgstr "abortar la operación de parchado pero mantener HEAD donde está." -#: builtin/am.c:2246 +#: builtin/am.c:2244 msgid "show the patch being applied." msgstr "muestra el parche siendo aplicado." -#: builtin/am.c:2250 +#: builtin/am.c:2248 msgid "lie about committer date" msgstr "mentir sobre la fecha del committer" -#: builtin/am.c:2252 +#: builtin/am.c:2250 msgid "use current timestamp for author date" msgstr "usar el timestamp actual para la fecha del autor" -#: builtin/am.c:2254 builtin/commit-tree.c:120 builtin/commit.c:1491 -#: builtin/merge.c:282 builtin/pull.c:192 builtin/rebase.c:489 -#: builtin/rebase.c:1453 builtin/revert.c:116 builtin/tag.c:412 +#: builtin/am.c:2252 builtin/commit-tree.c:120 builtin/commit.c:1511 +#: builtin/merge.c:286 builtin/pull.c:193 builtin/rebase.c:489 +#: builtin/rebase.c:1459 builtin/revert.c:117 builtin/tag.c:418 msgid "key-id" msgstr "key-id" -#: builtin/am.c:2255 builtin/rebase.c:490 builtin/rebase.c:1454 +#: builtin/am.c:2253 builtin/rebase.c:490 builtin/rebase.c:1460 msgid "GPG-sign commits" msgstr "Commits con firma GPG" -#: builtin/am.c:2258 +#: builtin/am.c:2256 msgid "(internal use for git-rebase)" msgstr "(uso interno para git-rebase)" -#: builtin/am.c:2276 +#: builtin/am.c:2274 msgid "" "The -b/--binary option has been a no-op for long time, and\n" "it will be removed. Please do not use it anymore." @@ -8850,16 +9013,16 @@ msgstr "" "La opción -b/--binary ha estado deshabilitada por mucho tiempo, y\n" "será removida. Por favor no la use más." -#: builtin/am.c:2283 +#: builtin/am.c:2281 msgid "failed to read the index" msgstr "falló al leer el índice" -#: builtin/am.c:2298 +#: builtin/am.c:2296 #, c-format msgid "previous rebase directory %s still exists but mbox given." msgstr "directorio de rebase previo %s todavía existe en el mbox dado." -#: builtin/am.c:2322 +#: builtin/am.c:2320 #, c-format msgid "" "Stray %s directory found.\n" @@ -8868,10 +9031,14 @@ msgstr "" "Directorio extraviado %s encontrado.\n" "Use \"git am --abort\" para borrarlo." -#: builtin/am.c:2328 +#: builtin/am.c:2326 msgid "Resolve operation not in progress, we are not resuming." msgstr "Operación de resolución no está en progreso, no vamos a continuar." +#: builtin/am.c:2336 +msgid "interactive mode requires patches on the command line" +msgstr "modo interactivo requiere parches en la línea de comando" + #: builtin/apply.c:8 msgid "git apply [<options>] [<patch>...]" msgstr "git apply [<opciones>] [<parche>...]" @@ -9025,8 +9192,8 @@ msgid "" "You need to give me at least one %s and %s revision.\n" "You can use \"git bisect %s\" and \"git bisect %s\" for that." msgstr "" -"Tiene que dar al menos un %s y un %s revision.\n" -"Puede ver \"git bisect %s\" y \"git bisect %s\" para eso." +"Tienes que dar al menos un %s y un %s revision.\n" +"Se puede ver \"git bisect %s\" y \"git bisect %s\" para eso." #: builtin/bisect--helper.c:289 #, c-format @@ -9035,9 +9202,9 @@ msgid "" "You then need to give me at least one %s and %s revision.\n" "You can use \"git bisect %s\" and \"git bisect %s\" for that." msgstr "" -"Tiene que comenzar por \"git bisect start\".\n" -"Después tiene que entregar al menos un %s y una revision %s.\n" -"Puede usar \"git bisect %s\" y \"git bisect %s\" para eso." +"Tienes que comenzar por \"git bisect start\".\n" +"Después tienes que entregar al menos un %s y una revision %s.\n" +"Puedes usar \"git bisect %s\" y \"git bisect %s\" para eso." #: builtin/bisect--helper.c:321 #, c-format @@ -9092,7 +9259,7 @@ msgstr "mal HEAD - Necesito un HEAD" #, c-format msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'." msgstr "" -"Error al hacer checkout '%s'. Intente 'git bisect start <rama-válida>'." +"error al hacer checkout '%s'. Intente 'git bisect start <rama-válida>'." #: builtin/bisect--helper.c:547 msgid "won't bisect on cg-seek'ed tree" @@ -9102,79 +9269,84 @@ msgstr "no se bisecará en un árbol con cg-seek" msgid "bad HEAD - strange symbolic ref" msgstr "mal HEAD - ref simbólico extraño" -#: builtin/bisect--helper.c:627 +#: builtin/bisect--helper.c:574 +#, c-format +msgid "invalid ref: '%s'" +msgstr "ref inválido: '%s'" + +#: builtin/bisect--helper.c:630 msgid "perform 'git bisect next'" msgstr "realiza 'git bisect next'" -#: builtin/bisect--helper.c:629 +#: builtin/bisect--helper.c:632 msgid "write the terms to .git/BISECT_TERMS" msgstr "escribe los términos a .git/BISECT_TERMS" -#: builtin/bisect--helper.c:631 +#: builtin/bisect--helper.c:634 msgid "cleanup the bisection state" msgstr "limpiar el estado de bisección" -#: builtin/bisect--helper.c:633 +#: builtin/bisect--helper.c:636 msgid "check for expected revs" msgstr "revisar por revs esperados" -#: builtin/bisect--helper.c:635 +#: builtin/bisect--helper.c:638 msgid "reset the bisection state" msgstr "reiniciar el estado de bisect" -#: builtin/bisect--helper.c:637 +#: builtin/bisect--helper.c:640 msgid "write out the bisection state in BISECT_LOG" msgstr "escribir el estado de bisect en BISECT_LOG" -#: builtin/bisect--helper.c:639 +#: builtin/bisect--helper.c:642 msgid "check and set terms in a bisection state" msgstr "revisar y configurar los terms en el estado de bisect" -#: builtin/bisect--helper.c:641 +#: builtin/bisect--helper.c:644 msgid "check whether bad or good terms exist" msgstr "revisar si existen términos malos o buenos" -#: builtin/bisect--helper.c:643 +#: builtin/bisect--helper.c:646 msgid "print out the bisect terms" msgstr "imprimir los terms del bisect" -#: builtin/bisect--helper.c:645 +#: builtin/bisect--helper.c:648 msgid "start the bisect session" msgstr "comenzar la sesión de bisect" -#: builtin/bisect--helper.c:647 +#: builtin/bisect--helper.c:650 msgid "update BISECT_HEAD instead of checking out the current commit" msgstr "actualiza BISECT_HEAD en lugar de revisar el commit actual" -#: builtin/bisect--helper.c:649 +#: builtin/bisect--helper.c:652 msgid "no log for BISECT_WRITE" msgstr "no hay log para BISECT_WRITE" -#: builtin/bisect--helper.c:666 +#: builtin/bisect--helper.c:669 msgid "--write-terms requires two arguments" msgstr "--write-terms requiere dos argumentos" -#: builtin/bisect--helper.c:670 +#: builtin/bisect--helper.c:673 msgid "--bisect-clean-state requires no arguments" msgstr "--bisect-clean-state no requiere argumentos" -#: builtin/bisect--helper.c:677 +#: builtin/bisect--helper.c:680 msgid "--bisect-reset requires either no argument or a commit" msgstr "--bisect-reset requiere un commit o ningún argumento" -#: builtin/bisect--helper.c:681 +#: builtin/bisect--helper.c:684 msgid "--bisect-write requires either 4 or 5 arguments" msgstr "--bisect-write requiere entre 4 o 5 argumentos" -#: builtin/bisect--helper.c:687 +#: builtin/bisect--helper.c:690 msgid "--check-and-set-terms requires 3 arguments" msgstr "--bisect-clean-state no requiere argumentos" -#: builtin/bisect--helper.c:693 +#: builtin/bisect--helper.c:696 msgid "--bisect-next-check requires 2 or 3 arguments" msgstr "--bisect-next-check requiere 2 o 3 argumentos" -#: builtin/bisect--helper.c:699 +#: builtin/bisect--helper.c:702 msgid "--bisect-terms requires 0 or 1 argument" msgstr "--bisect-terms requiere 0 o 1 argumentos" @@ -9186,133 +9358,150 @@ msgstr "git blame [<opciones>] [<opciones-rev>] [<revision>] [--] <archivo>" msgid "<rev-opts> are documented in git-rev-list(1)" msgstr "<rev-opts> están documentadas en git-rev-list(1)" -#: builtin/blame.c:407 +#: builtin/blame.c:410 #, c-format msgid "expecting a color: %s" msgstr "esperando un color: %s" -#: builtin/blame.c:414 +#: builtin/blame.c:417 msgid "must end with a color" msgstr "tiene que terminar con un color" -#: builtin/blame.c:701 +#: builtin/blame.c:730 #, c-format msgid "invalid color '%s' in color.blame.repeatedLines" msgstr "color inválido '%s' en color.blame.repeatedLines" -#: builtin/blame.c:719 +#: builtin/blame.c:748 msgid "invalid value for blame.coloring" msgstr "valor inválido para blame.coloring" -#: builtin/blame.c:794 +#: builtin/blame.c:823 +#, c-format +msgid "cannot find revision %s to ignore" +msgstr "no se pudo encontrar revision %s para ignorar" + +#: builtin/blame.c:845 msgid "Show blame entries as we find them, incrementally" msgstr "Mostrar las entradas blame como las encontramos, incrementalmente" -#: builtin/blame.c:795 +#: builtin/blame.c:846 msgid "Show blank SHA-1 for boundary commits (Default: off)" msgstr "Mostrar SHA-1 en blanco para commits extremos (Default: off)" -#: builtin/blame.c:796 +#: builtin/blame.c:847 msgid "Do not treat root commits as boundaries (Default: off)" msgstr "No tratar commits raíces como extremos (Default: off)" -#: builtin/blame.c:797 +#: builtin/blame.c:848 msgid "Show work cost statistics" msgstr "Mostrar estadísticas de costo de trabajo" -#: builtin/blame.c:798 +#: builtin/blame.c:849 msgid "Force progress reporting" msgstr "Forzar el reporte de progreso" -#: builtin/blame.c:799 +#: builtin/blame.c:850 msgid "Show output score for blame entries" msgstr "Mostrar la puntuación de salida de las entradas de blame" -#: builtin/blame.c:800 +#: builtin/blame.c:851 msgid "Show original filename (Default: auto)" msgstr "Mostrar nombre original del archivo (Default: auto)" -#: builtin/blame.c:801 +#: builtin/blame.c:852 msgid "Show original linenumber (Default: off)" msgstr "Mostrar número de línea original (Default: off)" -#: builtin/blame.c:802 +#: builtin/blame.c:853 msgid "Show in a format designed for machine consumption" msgstr "Mostrar en un formato diseñado para consumo de máquina" -#: builtin/blame.c:803 +#: builtin/blame.c:854 msgid "Show porcelain format with per-line commit information" msgstr "Mostrar en formato porcelana con información de commit por línea" -#: builtin/blame.c:804 +#: builtin/blame.c:855 msgid "Use the same output mode as git-annotate (Default: off)" msgstr "Usar el mismo modo salida como git-annotate (Default: off)" -#: builtin/blame.c:805 +#: builtin/blame.c:856 msgid "Show raw timestamp (Default: off)" msgstr "Mostrar timestamp en formato raw (Default: off)" -#: builtin/blame.c:806 +#: builtin/blame.c:857 msgid "Show long commit SHA1 (Default: off)" msgstr "Mostrar SHA1 del commit en formato largo (Default: off)" -#: builtin/blame.c:807 +#: builtin/blame.c:858 msgid "Suppress author name and timestamp (Default: off)" msgstr "Suprimir nombre del autor y timestamp (Default: off)" -#: builtin/blame.c:808 +#: builtin/blame.c:859 msgid "Show author email instead of name (Default: off)" msgstr "Mostrar en cambio el email del autor (Default: off)" -#: builtin/blame.c:809 +#: builtin/blame.c:860 msgid "Ignore whitespace differences" msgstr "Ignorar diferencias de espacios en blanco" -#: builtin/blame.c:810 +#: builtin/blame.c:861 builtin/log.c:1629 +msgid "rev" +msgstr "rev" + +#: builtin/blame.c:861 +msgid "Ignore <rev> when blaming" +msgstr "ignorar <rev> durante el blame" + +#: builtin/blame.c:862 +msgid "Ignore revisions from <file>" +msgstr "ignorar revisiones de <archivo>" + +#: builtin/blame.c:863 msgid "color redundant metadata from previous line differently" -msgstr "colorear metadata redundante de lineas previas de manera diferente" +msgstr "colorear metadata redundante de líneas previas de manera diferente" -#: builtin/blame.c:811 +#: builtin/blame.c:864 msgid "color lines by age" -msgstr "colorear lineas por edad" +msgstr "colorear líneas por edad" -#: builtin/blame.c:818 +#: builtin/blame.c:871 msgid "Use an experimental heuristic to improve diffs" msgstr "Usar un heurístico experimental para mejorar los diffs" -#: builtin/blame.c:820 +#: builtin/blame.c:873 msgid "Spend extra cycles to find better match" msgstr "Ocupo más ciclos para encontrar mejoras resultados" -#: builtin/blame.c:821 +#: builtin/blame.c:874 msgid "Use revisions from <file> instead of calling git-rev-list" msgstr "Use revisiones desde <archivo> en lugar de llamar git-rev-list" -#: builtin/blame.c:822 +#: builtin/blame.c:875 msgid "Use <file>'s contents as the final image" msgstr "Usar contenido de <archivo> como imagen final" -#: builtin/blame.c:823 builtin/blame.c:824 +#: builtin/blame.c:876 builtin/blame.c:877 msgid "score" msgstr "puntaje" -#: builtin/blame.c:823 +#: builtin/blame.c:876 msgid "Find line copies within and across files" msgstr "Encontrar copias de líneas entre y a través de archivos" -#: builtin/blame.c:824 +#: builtin/blame.c:877 msgid "Find line movements within and across files" msgstr "Encontrar movimientos de líneas entre y a través de archivos" -#: builtin/blame.c:825 +#: builtin/blame.c:878 msgid "n,m" msgstr "n,m" -#: builtin/blame.c:825 +#: builtin/blame.c:878 msgid "Process only line range n,m, counting from 1" msgstr "Procesar solo el rango de líneas n,m, contando desde 1" -#: builtin/blame.c:876 +#: builtin/blame.c:929 msgid "--progress can't be used with --incremental or porcelain formats" msgstr "--progress no puede ser usado con --incremental o formatos porcelana" @@ -9324,18 +9513,18 @@ msgstr "--progress no puede ser usado con --incremental o formatos porcelana" #. your language may need more or fewer display #. columns. #. -#: builtin/blame.c:927 +#: builtin/blame.c:980 msgid "4 years, 11 months ago" msgstr "hace 4 años, 11 meses" -#: builtin/blame.c:1031 +#: builtin/blame.c:1087 #, c-format msgid "file %s has only %lu line" msgid_plural "file %s has only %lu lines" msgstr[0] "archivo %s tiene solo %lu línea" msgstr[1] "archivo %s tiene solo %lu líneas" -#: builtin/blame.c:1077 +#: builtin/blame.c:1133 msgid "Blaming lines" msgstr "Blaming a líneas" @@ -9367,7 +9556,7 @@ msgstr "git branch [<opciones>] [-r | -a] [--points-at]" msgid "git branch [<options>] [-r | -a] [--format]" msgstr "git branch [<opciones>] [-r | -a] [--formato]" -#: builtin/branch.c:151 +#: builtin/branch.c:154 #, c-format msgid "" "deleting branch '%s' that has been merged to\n" @@ -9376,7 +9565,7 @@ msgstr "" "borrando la rama '%s' que ha sido fusionada en\n" " '%s', pero aún no ha sido fusionada a HEAD." -#: builtin/branch.c:155 +#: builtin/branch.c:158 #, c-format msgid "" "not deleting branch '%s' that is not yet merged to\n" @@ -9385,139 +9574,139 @@ msgstr "" "no borrando rama '%s' que todavía no ha sido fusionada \n" "\ta '%s', aunque se fusione con HEAD." -#: builtin/branch.c:169 +#: builtin/branch.c:172 #, c-format msgid "Couldn't look up commit object for '%s'" msgstr "No se pudo encontrar el objeto commit para '%s'" -#: builtin/branch.c:173 +#: builtin/branch.c:176 #, c-format msgid "" "The branch '%s' is not fully merged.\n" "If you are sure you want to delete it, run 'git branch -D %s'." msgstr "" "La rama '%s' no ha sido fusionada completamente.\n" -"Si está seguro de querer borrarla, ejecute 'git branch -D %s'." +"Si estás seguro de querer borrarla, ejecuta 'git branch -D %s'." -#: builtin/branch.c:186 +#: builtin/branch.c:189 msgid "Update of config-file failed" msgstr "Falló de actualización de config-file" -#: builtin/branch.c:217 +#: builtin/branch.c:220 msgid "cannot use -a with -d" msgstr "no se puede usar-a con -d" -#: builtin/branch.c:223 +#: builtin/branch.c:226 msgid "Couldn't look up commit object for HEAD" msgstr "No se pudo revisar el objeto commit para HEAD" -#: builtin/branch.c:237 +#: builtin/branch.c:240 #, c-format msgid "Cannot delete branch '%s' checked out at '%s'" msgstr "No se puede borrar rama '%s' que cuenta con checkout en '%s'" -#: builtin/branch.c:252 +#: builtin/branch.c:255 #, c-format msgid "remote-tracking branch '%s' not found." msgstr "rama de rastreo remoto '%s' no encontrada." -#: builtin/branch.c:253 +#: builtin/branch.c:256 #, c-format msgid "branch '%s' not found." msgstr "rama '%s' no encontrada." -#: builtin/branch.c:268 +#: builtin/branch.c:271 #, c-format msgid "Error deleting remote-tracking branch '%s'" msgstr "Error al eliminar la rama de rastreo remota '%s'" -#: builtin/branch.c:269 +#: builtin/branch.c:272 #, c-format msgid "Error deleting branch '%s'" msgstr "Error al eliminar la rama '%s'" -#: builtin/branch.c:276 +#: builtin/branch.c:279 #, c-format msgid "Deleted remote-tracking branch %s (was %s).\n" msgstr "Eliminada la rama de rastreo remota %s (era %s).\n" -#: builtin/branch.c:277 +#: builtin/branch.c:280 #, c-format msgid "Deleted branch %s (was %s).\n" msgstr "Eliminada la rama %s (era %s)..\n" -#: builtin/branch.c:421 builtin/tag.c:60 +#: builtin/branch.c:429 builtin/tag.c:61 msgid "unable to parse format string" msgstr "no es posible analizar el string de formato" -#: builtin/branch.c:452 +#: builtin/branch.c:460 msgid "could not resolve HEAD" msgstr "no se pudo resolver HEAD" -#: builtin/branch.c:458 +#: builtin/branch.c:466 #, c-format msgid "HEAD (%s) points outside of refs/heads/" msgstr "HEAD (%s) apunta fuera de refs/heads/" -#: builtin/branch.c:473 +#: builtin/branch.c:481 #, c-format msgid "Branch %s is being rebased at %s" msgstr "Rama %s está siendo rebasada en %s" -#: builtin/branch.c:477 +#: builtin/branch.c:485 #, c-format msgid "Branch %s is being bisected at %s" msgstr "Rama %s está siendo bisecada en %s" -#: builtin/branch.c:494 +#: builtin/branch.c:502 msgid "cannot copy the current branch while not on any." msgstr "no se puede copiar la rama actual mientras no se está en ninguna." -#: builtin/branch.c:496 +#: builtin/branch.c:504 msgid "cannot rename the current branch while not on any." msgstr "no se puede renombrar la rama actual mientras no se está en ninguna." -#: builtin/branch.c:507 +#: builtin/branch.c:515 #, c-format msgid "Invalid branch name: '%s'" msgstr "Nombre de rama inválido: '%s'" -#: builtin/branch.c:534 +#: builtin/branch.c:542 msgid "Branch rename failed" msgstr "Cambio de nombre de rama fallido" -#: builtin/branch.c:536 +#: builtin/branch.c:544 msgid "Branch copy failed" msgstr "Copiado de rama fallido" -#: builtin/branch.c:540 +#: builtin/branch.c:548 #, c-format msgid "Created a copy of a misnamed branch '%s'" msgstr "Copia creada de la rama malnombrada '%s'" -#: builtin/branch.c:543 +#: builtin/branch.c:551 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "Rama mal llamada '%s' renombrada" -#: builtin/branch.c:549 +#: builtin/branch.c:557 #, c-format msgid "Branch renamed to %s, but HEAD is not updated!" msgstr "¡Rama renombrada a %s, pero HEAD no está actualizado!" -#: builtin/branch.c:558 +#: builtin/branch.c:566 msgid "Branch is renamed, but update of config-file failed" msgstr "" "La rama está renombrada, pero falló la actualización del archivo de " "configuración" -#: builtin/branch.c:560 +#: builtin/branch.c:568 msgid "Branch is copied, but update of config-file failed" msgstr "" "La rama está copiada, pero falló la actualización del archivo de " "configuración" -#: builtin/branch.c:576 +#: builtin/branch.c:584 #, c-format msgid "" "Please edit the description for the branch\n" @@ -9528,180 +9717,180 @@ msgstr "" "%s\n" "Las líneas que comiencen con '%c' serán removidas.\n" -#: builtin/branch.c:610 +#: builtin/branch.c:618 msgid "Generic options" msgstr "Opciones genéricas" -#: builtin/branch.c:612 +#: builtin/branch.c:620 msgid "show hash and subject, give twice for upstream branch" msgstr "mostrar hash y tema, dar dos veces para rama upstream" -#: builtin/branch.c:613 +#: builtin/branch.c:621 msgid "suppress informational messages" msgstr "suprimir mensajes informativos" -#: builtin/branch.c:614 +#: builtin/branch.c:622 msgid "set up tracking mode (see git-pull(1))" msgstr "configurando modo tracking (mirar git-pull(1))" -#: builtin/branch.c:616 +#: builtin/branch.c:624 msgid "do not use" msgstr "no usar" -#: builtin/branch.c:618 builtin/rebase.c:485 +#: builtin/branch.c:626 builtin/rebase.c:485 msgid "upstream" msgstr "upstream" -#: builtin/branch.c:618 +#: builtin/branch.c:626 msgid "change the upstream info" msgstr "cambiar info de upstream" -#: builtin/branch.c:619 +#: builtin/branch.c:627 msgid "Unset the upstream info" msgstr "Desconfigurando la info de upstream" -#: builtin/branch.c:620 +#: builtin/branch.c:628 msgid "use colored output" msgstr "usar salida con colores" -#: builtin/branch.c:621 +#: builtin/branch.c:629 msgid "act on remote-tracking branches" msgstr "actuar en ramas de traqueo remoto" -#: builtin/branch.c:623 builtin/branch.c:625 +#: builtin/branch.c:631 builtin/branch.c:633 msgid "print only branches that contain the commit" msgstr "mostrar solo ramas que contienen el commit" -#: builtin/branch.c:624 builtin/branch.c:626 +#: builtin/branch.c:632 builtin/branch.c:634 msgid "print only branches that don't contain the commit" msgstr "mostrar solo ramas que no contienen el commit" -#: builtin/branch.c:629 +#: builtin/branch.c:637 msgid "Specific git-branch actions:" msgstr "Acciones específicas de git-branch:" -#: builtin/branch.c:630 +#: builtin/branch.c:638 msgid "list both remote-tracking and local branches" msgstr "listar ramas de remote-tracking y locales" -#: builtin/branch.c:632 +#: builtin/branch.c:640 msgid "delete fully merged branch" msgstr "borrar ramas totalmente fusionadas" -#: builtin/branch.c:633 +#: builtin/branch.c:641 msgid "delete branch (even if not merged)" msgstr "borrar rama (incluso si no está fusionada)" -#: builtin/branch.c:634 +#: builtin/branch.c:642 msgid "move/rename a branch and its reflog" msgstr "mover/renombrar una rama y su reflog" -#: builtin/branch.c:635 +#: builtin/branch.c:643 msgid "move/rename a branch, even if target exists" msgstr "mover/renombrar una rama, incluso si el destino existe" -#: builtin/branch.c:636 +#: builtin/branch.c:644 msgid "copy a branch and its reflog" msgstr "copiar una rama y su reflog" -#: builtin/branch.c:637 +#: builtin/branch.c:645 msgid "copy a branch, even if target exists" msgstr "copiar una rama, incluso si el objetivo existe" -#: builtin/branch.c:638 +#: builtin/branch.c:646 msgid "list branch names" msgstr "listar nombres de ramas" -#: builtin/branch.c:639 +#: builtin/branch.c:647 msgid "show current branch name" msgstr "muestra el nombre de branch actual" -#: builtin/branch.c:640 +#: builtin/branch.c:648 msgid "create the branch's reflog" msgstr "crea el reflog de la rama" -#: builtin/branch.c:642 +#: builtin/branch.c:650 msgid "edit the description for the branch" msgstr "edita la descripción de la rama" -#: builtin/branch.c:643 +#: builtin/branch.c:651 msgid "force creation, move/rename, deletion" msgstr "fuerza la creación,movimiento/renombrado,borrado" -#: builtin/branch.c:644 +#: builtin/branch.c:652 msgid "print only branches that are merged" msgstr "muestra solo ramas que han sido fusionadas" -#: builtin/branch.c:645 +#: builtin/branch.c:653 msgid "print only branches that are not merged" msgstr "muestra solo ramas que no han sido fusionadas" -#: builtin/branch.c:646 +#: builtin/branch.c:654 msgid "list branches in columns" msgstr "muestra las ramas en columnas" -#: builtin/branch.c:649 builtin/for-each-ref.c:42 builtin/notes.c:415 +#: builtin/branch.c:657 builtin/for-each-ref.c:42 builtin/notes.c:415 #: builtin/notes.c:418 builtin/notes.c:581 builtin/notes.c:584 -#: builtin/tag.c:427 +#: builtin/tag.c:433 msgid "object" msgstr "objeto" -#: builtin/branch.c:650 +#: builtin/branch.c:658 msgid "print only branches of the object" msgstr "imprimir sólo las ramas del objeto" -#: builtin/branch.c:652 builtin/for-each-ref.c:48 builtin/tag.c:434 +#: builtin/branch.c:660 builtin/for-each-ref.c:48 builtin/tag.c:440 msgid "sorting and filtering are case insensitive" msgstr "ordenamiento y filtrado son case-insensitive" -#: builtin/branch.c:653 builtin/for-each-ref.c:38 builtin/tag.c:432 -#: builtin/verify-tag.c:39 +#: builtin/branch.c:661 builtin/for-each-ref.c:38 builtin/tag.c:438 +#: builtin/verify-tag.c:38 msgid "format to use for the output" msgstr "formato para usar para el output" -#: builtin/branch.c:676 builtin/clone.c:748 +#: builtin/branch.c:684 builtin/clone.c:761 msgid "HEAD not found below refs/heads!" msgstr "HEAD no encontrado abajo de refs/heads!" -#: builtin/branch.c:700 +#: builtin/branch.c:708 msgid "--column and --verbose are incompatible" msgstr "--column y --verbose son incompatibles" -#: builtin/branch.c:715 builtin/branch.c:769 builtin/branch.c:778 +#: builtin/branch.c:723 builtin/branch.c:777 builtin/branch.c:786 msgid "branch name required" msgstr "se necesita el nombre de la rama" -#: builtin/branch.c:745 +#: builtin/branch.c:753 msgid "Cannot give description to detached HEAD" msgstr "No se puede dar descripción al HEAD desacoplado" -#: builtin/branch.c:750 +#: builtin/branch.c:758 msgid "cannot edit description of more than one branch" msgstr "no se puede editar la descripción de más de una rama" -#: builtin/branch.c:757 +#: builtin/branch.c:765 #, c-format msgid "No commit on branch '%s' yet." msgstr "Aún no hay commits en la rama '%s'." -#: builtin/branch.c:760 +#: builtin/branch.c:768 #, c-format msgid "No branch named '%s'." msgstr "No hay ninguna rama llamada '%s'." -#: builtin/branch.c:775 +#: builtin/branch.c:783 msgid "too many branches for a copy operation" msgstr "demasiadas ramas para una operación de copiado" -#: builtin/branch.c:784 +#: builtin/branch.c:792 msgid "too many arguments for a rename operation" msgstr "demasiados argumentos para una operación de renombrado" -#: builtin/branch.c:789 +#: builtin/branch.c:797 msgid "too many arguments to set new upstream" msgstr "demasiados argumentos para configurar un nuevo upstream" -#: builtin/branch.c:793 +#: builtin/branch.c:801 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." @@ -9709,37 +9898,40 @@ msgstr "" "no se pudo configurar upstream de HEAD a %s cuando este no apunta a ninguna " "rama." -#: builtin/branch.c:796 builtin/branch.c:819 +#: builtin/branch.c:804 builtin/branch.c:827 #, c-format msgid "no such branch '%s'" msgstr "no hay tal rama '%s'" -#: builtin/branch.c:800 +#: builtin/branch.c:808 #, c-format msgid "branch '%s' does not exist" msgstr "la rama '%s' no existe" -#: builtin/branch.c:813 +#: builtin/branch.c:821 msgid "too many arguments to unset upstream" msgstr "demasiados argumentos para desconfigurar upstream" -#: builtin/branch.c:817 +#: builtin/branch.c:825 msgid "could not unset upstream of HEAD when it does not point to any branch." msgstr "" "no se puede desconfigurar upstream de HEAD cuando este no apunta a ninguna " "rama." -#: builtin/branch.c:823 +#: builtin/branch.c:831 #, c-format msgid "Branch '%s' has no upstream information" msgstr "Rama '%s' no tiene información de upstream" -#: builtin/branch.c:833 -msgid "-a and -r options to 'git branch' do not make sense with a branch name" +#: builtin/branch.c:841 +msgid "" +"The -a, and -r, options to 'git branch' do not take a branch name.\n" +"Did you mean to use: -a|-r --list <pattern>?" msgstr "" -"opciones -a y -r para 'git branch' no tienen sentido con un nombre de rama" +"Las opciones -a, y -r, de 'git branch' no toman un nombre de rama.\n" +"¿Quisiste usar: -a|-r --list <patrón>?" -#: builtin/branch.c:836 +#: builtin/branch.c:845 msgid "" "the '--set-upstream' option is no longer supported. Please use '--track' or " "'--set-upstream-to' instead." @@ -9760,7 +9952,7 @@ msgstr "Se necesita un repositorio para agrupar." msgid "Need a repository to unbundle." msgstr "Se necesita un repositorio para desagrupar." -#: builtin/cat-file.c:593 +#: builtin/cat-file.c:594 msgid "" "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" "p | <type> | --textconv | --filters) [--path=<path>] <object>" @@ -9768,7 +9960,7 @@ msgstr "" "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" "p | <tipo> | --textconv | --filters) [--path=<ruta>] <objeto>" -#: builtin/cat-file.c:594 +#: builtin/cat-file.c:595 msgid "" "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" "filters]" @@ -9776,72 +9968,72 @@ msgstr "" "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" "filters]" -#: builtin/cat-file.c:615 +#: builtin/cat-file.c:616 msgid "only one batch option may be specified" msgstr "solo se puede especificar una opción batch" -#: builtin/cat-file.c:633 +#: builtin/cat-file.c:634 msgid "<type> can be one of: blob, tree, commit, tag" msgstr "<tipo> puede ser: blob, tree, commit, tag" -#: builtin/cat-file.c:634 +#: builtin/cat-file.c:635 msgid "show object type" msgstr "mostrar el tipo del objeto" -#: builtin/cat-file.c:635 +#: builtin/cat-file.c:636 msgid "show object size" msgstr "mostrar el tamaño del objeto" -#: builtin/cat-file.c:637 +#: builtin/cat-file.c:638 msgid "exit with zero when there's no error" msgstr "salir con cero cuando no haya error" -#: builtin/cat-file.c:638 +#: builtin/cat-file.c:639 msgid "pretty-print object's content" msgstr "realizar pretty-print del contenido del objeto" -#: builtin/cat-file.c:640 +#: builtin/cat-file.c:641 msgid "for blob objects, run textconv on object's content" msgstr "para objetos blob, ejecuta textconv en el contenido del objeto" -#: builtin/cat-file.c:642 +#: builtin/cat-file.c:643 msgid "for blob objects, run filters on object's content" msgstr "para objetos blob, ejecuta filters en el contenido del objeto" -#: builtin/cat-file.c:643 git-submodule.sh:936 +#: builtin/cat-file.c:644 git-submodule.sh:936 msgid "blob" msgstr "blob" -#: builtin/cat-file.c:644 +#: builtin/cat-file.c:645 msgid "use a specific path for --textconv/--filters" msgstr "use una ruta específica para --textconv/--filters" -#: builtin/cat-file.c:646 +#: builtin/cat-file.c:647 msgid "allow -s and -t to work with broken/corrupt objects" msgstr "permita -s y -t para trabajar con objetos rotos o corruptos" -#: builtin/cat-file.c:647 +#: builtin/cat-file.c:648 msgid "buffer --batch output" msgstr "salida buffer --batch" -#: builtin/cat-file.c:649 +#: builtin/cat-file.c:650 msgid "show info and content of objects fed from the standard input" msgstr "mostrar info y content de los objetos alimentados por standard input" -#: builtin/cat-file.c:653 +#: builtin/cat-file.c:654 msgid "show info about objects fed from the standard input" msgstr "mostrar info de los objetos alimentados por standard input" -#: builtin/cat-file.c:657 +#: builtin/cat-file.c:658 msgid "follow in-tree symlinks (used with --batch or --batch-check)" msgstr "" "seguir los enlaces simbólicos en el árbol (usado con --batch o --batch-check)" -#: builtin/cat-file.c:659 +#: builtin/cat-file.c:660 msgid "show all objects with --batch or --batch-check" msgstr "mostrar todos los objetos con --batch o --batch-check" -#: builtin/cat-file.c:661 +#: builtin/cat-file.c:662 msgid "do not order --batch-all-objects output" msgstr "no ordenar el output de --batch-all-objects" @@ -9869,8 +10061,8 @@ msgstr "leer nombres de archivos de stdin" msgid "terminate input and output records by a NUL character" msgstr "terminar registros de entrada y salida con un carácter NUL" -#: builtin/check-ignore.c:21 builtin/checkout.c:1355 builtin/gc.c:538 -#: builtin/worktree.c:499 +#: builtin/check-ignore.c:21 builtin/checkout.c:1433 builtin/gc.c:538 +#: builtin/worktree.c:507 msgid "suppress progress reporting" msgstr "suprimir el reporte de progreso" @@ -9962,9 +10154,9 @@ msgid "write the content to temporary files" msgstr "escribir el contenido en un archivo temporal" #: builtin/checkout-index.c:178 builtin/column.c:31 -#: builtin/submodule--helper.c:1372 builtin/submodule--helper.c:1375 -#: builtin/submodule--helper.c:1383 builtin/submodule--helper.c:1856 -#: builtin/worktree.c:672 +#: builtin/submodule--helper.c:1373 builtin/submodule--helper.c:1376 +#: builtin/submodule--helper.c:1384 builtin/submodule--helper.c:1857 +#: builtin/worktree.c:680 msgid "string" msgstr "string" @@ -9976,91 +10168,114 @@ msgstr "cuando cree archivos, anteponer <string>" msgid "copy out the files from named stage" msgstr "copiar los archivos del stage nombrado" -#: builtin/checkout.c:32 +#: builtin/checkout.c:31 msgid "git checkout [<options>] <branch>" msgstr "git checkout [<opciones>] <rama>" -#: builtin/checkout.c:33 +#: builtin/checkout.c:32 msgid "git checkout [<options>] [<branch>] -- <file>..." msgstr "git checkout [<opciones>] [<rama>] -- <archivo>..." -#: builtin/checkout.c:151 builtin/checkout.c:190 +#: builtin/checkout.c:37 +msgid "git switch [<options>] [<branch>]" +msgstr "git switch [<opciones>] [<rama>]" + +#: builtin/checkout.c:42 +msgid "git restore [<options>] [--source=<branch>] <file>..." +msgstr "git restore [<opciones>] [--source=<rama>] -- <archivo>..." + +#: builtin/checkout.c:172 builtin/checkout.c:211 #, c-format msgid "path '%s' does not have our version" msgstr "ruta '%s' no tiene nuestra versión" -#: builtin/checkout.c:153 builtin/checkout.c:192 +#: builtin/checkout.c:174 builtin/checkout.c:213 #, c-format msgid "path '%s' does not have their version" msgstr "ruta '%s' no tiene su versión" -#: builtin/checkout.c:169 +#: builtin/checkout.c:190 #, c-format msgid "path '%s' does not have all necessary versions" msgstr "ruta '%s' no tiene todas las versiones necesarias" -#: builtin/checkout.c:219 +#: builtin/checkout.c:240 #, c-format msgid "path '%s' does not have necessary versions" msgstr "ruta '%s' no tiene versiones necesarias" -#: builtin/checkout.c:237 +#: builtin/checkout.c:258 #, c-format msgid "path '%s': cannot merge" msgstr "ruta '%s': no se puede fusionar" -#: builtin/checkout.c:253 +#: builtin/checkout.c:274 #, c-format msgid "Unable to add merge result for '%s'" msgstr "Incapaz de agregar resultados de fusión a '%s'" -#: builtin/checkout.c:331 builtin/checkout.c:334 builtin/checkout.c:337 -#: builtin/checkout.c:340 +#: builtin/checkout.c:374 +#, c-format +msgid "Recreated %d merge conflict" +msgid_plural "Recreated %d merge conflicts" +msgstr[0] "Recreado %d conflicto de merge" +msgstr[1] "Recreados %d conflictos de merge" + +#: builtin/checkout.c:379 +#, c-format +msgid "Updated %d path from %s" +msgid_plural "Updated %d paths from %s" +msgstr[0] "Actualizada %d ruta para %s" +msgstr[1] "Actualizadas %d rutas para %s" + +#: builtin/checkout.c:386 +#, c-format +msgid "Updated %d path from the index" +msgid_plural "Updated %d paths from the index" +msgstr[0] "Actualizada %d ruta desde el index" +msgstr[1] "Actualizadas %d rutas desde el index" + +#: builtin/checkout.c:409 builtin/checkout.c:412 builtin/checkout.c:415 +#: builtin/checkout.c:419 #, c-format msgid "'%s' cannot be used with updating paths" msgstr "'%s' no puede ser usada con rutas actualizadas" -#: builtin/checkout.c:343 builtin/checkout.c:346 +#: builtin/checkout.c:422 builtin/checkout.c:425 #, c-format msgid "'%s' cannot be used with %s" msgstr "'%s' no puede ser usado con %s" -#: builtin/checkout.c:349 +#: builtin/checkout.c:429 #, c-format msgid "Cannot update paths and switch to branch '%s' at the same time." msgstr "No se puede actualizar rutas y cambiar a la rama '%s' al mismo tiempo." -#: builtin/checkout.c:396 builtin/checkout.c:403 +#: builtin/checkout.c:433 #, c-format -msgid "path '%s' is unmerged" -msgstr "ruta '%s' no esta fusionada" +msgid "neither '%s' or '%s' is specified" +msgstr "ni '%s' o '%s' están especificados" -#: builtin/checkout.c:442 +#: builtin/checkout.c:437 #, c-format -msgid "Recreated %d merge conflict" -msgid_plural "Recreated %d merge conflicts" -msgstr[0] "Recreado %d conflicto de merge" -msgstr[1] "Recreados %d conflictos de merge" +msgid "'%s' must be used when '%s' is not specified" +msgstr "'%s' tiene que ser usado cuando '%s' no es especificado" -#: builtin/checkout.c:447 +#: builtin/checkout.c:442 builtin/checkout.c:447 #, c-format -msgid "Updated %d path from %s" -msgid_plural "Updated %d paths from %s" -msgstr[0] "Actualizada %d ruta para %s" -msgstr[1] "Actualizadas %d rutas para %s" +msgid "'%s' or '%s' cannot be used with %s" +msgstr "'%s' o '%s' no puede ser usado con %s" -#: builtin/checkout.c:454 +#: builtin/checkout.c:506 builtin/checkout.c:513 #, c-format -msgid "Updated %d path from the index" -msgid_plural "Updated %d paths from the index" -msgstr[0] "Actualizada %d ruta desde el index" -msgstr[1] "Actualizadas %d rutas desde el index" +msgid "path '%s' is unmerged" +msgstr "ruta '%s' no esta fusionada" -#: builtin/checkout.c:695 +#: builtin/checkout.c:679 msgid "you need to resolve your current index first" -msgstr "necesita resolver su índice actual primero" +msgstr "necesitas resolver tu índice actual primero" -#: builtin/checkout.c:744 +#: builtin/checkout.c:729 #, c-format msgid "" "cannot continue with staged changes in the following files:\n" @@ -10069,56 +10284,56 @@ msgstr "" "no se puede continuar con los cambios en stage en los siguientes archivos:\n" "%s" -#: builtin/checkout.c:751 +#: builtin/checkout.c:736 #, c-format msgid "staged changes in the following files may be lost: %s" msgstr "" "cambios en el área de stage en el siguiente archivo pueden ser perdidos: %s" -#: builtin/checkout.c:848 +#: builtin/checkout.c:833 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "No se puede hacer reflog para '%s': %s\n" -#: builtin/checkout.c:890 +#: builtin/checkout.c:875 msgid "HEAD is now at" msgstr "HEAD está ahora en" -#: builtin/checkout.c:894 builtin/clone.c:701 +#: builtin/checkout.c:879 builtin/clone.c:714 msgid "unable to update HEAD" msgstr "no es posible actualizar HEAD" -#: builtin/checkout.c:898 +#: builtin/checkout.c:883 #, c-format msgid "Reset branch '%s'\n" msgstr "Reiniciar rama '%s'\n" -#: builtin/checkout.c:901 +#: builtin/checkout.c:886 #, c-format msgid "Already on '%s'\n" msgstr "Ya en '%s'\n" -#: builtin/checkout.c:905 +#: builtin/checkout.c:890 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "Rama reiniciada y cambiada a '%s'\n" -#: builtin/checkout.c:907 builtin/checkout.c:1283 +#: builtin/checkout.c:892 builtin/checkout.c:1289 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "Cambiado a nueva rama '%s'\n" -#: builtin/checkout.c:909 +#: builtin/checkout.c:894 #, c-format msgid "Switched to branch '%s'\n" msgstr "Cambiado a rama '%s'\n" -#: builtin/checkout.c:960 +#: builtin/checkout.c:945 #, c-format msgid " ... and %d more.\n" msgstr " ... y %d más.\n" -#: builtin/checkout.c:966 +#: builtin/checkout.c:951 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -10131,17 +10346,17 @@ msgid_plural "" "\n" "%s\n" msgstr[0] "" -"Peligro: está saliendo %d commit atrás, no está conectado\n" +"Peligro: estás saliendo %d commit atrás, no está conectado\n" "a ninguna rama:\n" "\n" "%s\n" msgstr[1] "" -"Peligro: está saliendo %d commits atrás, no está conectado\n" +"Peligro: estás saliendo %d commits atrás, no está conectado\n" "a ninguna rama:\n" "\n" "%s\n" -#: builtin/checkout.c:985 +#: builtin/checkout.c:970 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -10156,36 +10371,40 @@ msgid_plural "" " git branch <new-branch-name> %s\n" "\n" msgstr[0] "" -"Si quiere conservarlo creando una nueva rama, este es un buen momento\n" +"Si quieres conservarlo creando una nueva rama, este es un buen momento\n" "para hacerlo:\n" "\n" " git branch <nuevo-nombre-de-rama> %s\n" "\n" msgstr[1] "" -"Si quiere conservarlos creando una nueva rama, este es un buen momento\n" +"Si quieres conservarlos creando una nueva rama, este es un buen momento\n" "para hacerlo:\n" "\n" " git branch <nombre-de-rama> %s\n" "\n" -#: builtin/checkout.c:1017 +#: builtin/checkout.c:1005 msgid "internal error in revision walk" msgstr "error interno en camino de revisión" -#: builtin/checkout.c:1021 +#: builtin/checkout.c:1009 msgid "Previous HEAD position was" msgstr "La posición previa de HEAD era" -#: builtin/checkout.c:1052 builtin/checkout.c:1278 +#: builtin/checkout.c:1049 builtin/checkout.c:1284 msgid "You are on a branch yet to be born" msgstr "Estás en una rama por nacer" -#: builtin/checkout.c:1173 +#: builtin/checkout.c:1176 +msgid "only one reference expected" +msgstr "solo una referencia esperada" + +#: builtin/checkout.c:1193 #, c-format msgid "only one reference expected, %d given." msgstr "solo una referencia esperada, %d entregadas." -#: builtin/checkout.c:1209 +#: builtin/checkout.c:1230 #, c-format msgid "" "'%s' could be both a local file and a tracking branch.\n" @@ -10194,151 +10413,207 @@ msgstr "" "'%s' puede ser tanto un archivo local como una rama de rastreo.\n" "Por favor use -- (y opcionalmente --no-guess) para desambiguar" -#: builtin/checkout.c:1222 builtin/worktree.c:290 builtin/worktree.c:448 +#: builtin/checkout.c:1243 builtin/worktree.c:291 builtin/worktree.c:456 #, c-format msgid "invalid reference: %s" msgstr "referencia inválida: %s" -#: builtin/checkout.c:1251 +#: builtin/checkout.c:1256 builtin/checkout.c:1618 #, c-format msgid "reference is not a tree: %s" msgstr "la referencia no es n árbol: %s" -#: builtin/checkout.c:1292 +#: builtin/checkout.c:1303 +#, c-format +msgid "a branch is expected, got tag '%s'" +msgstr "se esperaba un branch, se obtuvo tag '%s'" + +#: builtin/checkout.c:1305 +#, c-format +msgid "a branch is expected, got remote branch '%s'" +msgstr "se espera una rama, se obtuvo una rama remota '%s'" + +#: builtin/checkout.c:1306 builtin/checkout.c:1314 +#, c-format +msgid "a branch is expected, got '%s'" +msgstr "se esperaba branch, se obuto '%s'" + +#: builtin/checkout.c:1309 +#, c-format +msgid "a branch is expected, got commit '%s'" +msgstr "se espera una rama, se obtuvo commit '%s'" + +#: builtin/checkout.c:1325 +msgid "" +"cannot switch branch while merging\n" +"Consider \"git merge --quit\" or \"git worktree add\"." +msgstr "" +"no se puede cambiar de branch durante un merge\n" +"Considera \"git merge --quit\" o \"git worktree add\"." + +#: builtin/checkout.c:1329 +msgid "" +"cannot switch branch in the middle of an am session\n" +"Consider \"git am --quit\" or \"git worktree add\"." +msgstr "" +"no se puede cambiar de branch en medio de una sesión de am\n" +"Considera \"git am --quit\" o \"git worktree add\"." + +#: builtin/checkout.c:1333 +msgid "" +"cannot switch branch while rebasing\n" +"Consider \"git rebase --quit\" or \"git worktree add\"." +msgstr "" +"no se puede cambiar de branch durante un rebase\n" +"Considera \"git rebase --quit\" o \"git worktree add\"." + +#: builtin/checkout.c:1337 +msgid "" +"cannot switch branch while cherry-picking\n" +"Consider \"git cherry-pick --quit\" or \"git worktree add\"." +msgstr "" +"no se puede cambiar de branch durante un cherry-pick\n" +"Considera \"git cherry-pick --quit\" o \"git worktree add\"." + +#: builtin/checkout.c:1341 +msgid "" +"cannot switch branch while reverting\n" +"Consider \"git revert --quit\" or \"git worktree add\"." +msgstr "" +"no se puede cambiar de branch durante un revert\n" +"Considera \"git revert --quit\" o \"git worktree add\"." + +#: builtin/checkout.c:1345 +msgid "you are switching branch while bisecting" +msgstr "estás cambiando ramas durante un bisect" + +#: builtin/checkout.c:1352 msgid "paths cannot be used with switching branches" msgstr "rutas no pueden ser usadas con cambios de rama" -#: builtin/checkout.c:1295 builtin/checkout.c:1299 builtin/checkout.c:1303 +#: builtin/checkout.c:1355 builtin/checkout.c:1359 builtin/checkout.c:1363 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "'%s' no puede ser usado con cambios de ramas" -#: builtin/checkout.c:1307 builtin/checkout.c:1310 builtin/checkout.c:1315 -#: builtin/checkout.c:1318 +#: builtin/checkout.c:1367 builtin/checkout.c:1370 builtin/checkout.c:1373 +#: builtin/checkout.c:1378 builtin/checkout.c:1383 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "'%s' no puede ser usado con '%s'" -#: builtin/checkout.c:1323 +#: builtin/checkout.c:1380 +#, c-format +msgid "'%s' cannot take <start-point>" +msgstr "'%s' no puede tomar <punto de partida>" + +#: builtin/checkout.c:1388 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "No se puede cambiar rama a un '%s' sin commits" -#: builtin/checkout.c:1356 builtin/checkout.c:1358 builtin/clone.c:118 -#: builtin/remote.c:169 builtin/remote.c:171 builtin/worktree.c:492 -#: builtin/worktree.c:494 -msgid "branch" -msgstr "rama" +#: builtin/checkout.c:1395 +msgid "missing branch or commit argument" +msgstr "falta branch o commit como argumento" -#: builtin/checkout.c:1357 -msgid "create and checkout a new branch" -msgstr "crear y hacer checkout a una nueva rama" +#: builtin/checkout.c:1437 builtin/clone.c:91 builtin/fetch.c:151 +#: builtin/merge.c:285 builtin/pull.c:137 builtin/push.c:575 +#: builtin/send-pack.c:174 +msgid "force progress reporting" +msgstr "forzar el reporte de progreso" -#: builtin/checkout.c:1359 -msgid "create/reset and checkout a branch" -msgstr "crear/reiniciar y hacer checkout a una rama" +#: builtin/checkout.c:1438 +msgid "perform a 3-way merge with the new branch" +msgstr "realizar una fusión de tres vías con la rama nueva" -#: builtin/checkout.c:1360 -msgid "create reflog for new branch" -msgstr "crear un reflog para una nueva rama" +#: builtin/checkout.c:1439 builtin/log.c:1617 parse-options.h:318 +msgid "style" +msgstr "estilo" -#: builtin/checkout.c:1361 builtin/worktree.c:496 +#: builtin/checkout.c:1440 +msgid "conflict style (merge or diff3)" +msgstr "conflicto de estilos (merge o diff3)" + +#: builtin/checkout.c:1452 builtin/worktree.c:504 msgid "detach HEAD at named commit" msgstr "desacoplar HEAD en el commit nombrado" -#: builtin/checkout.c:1362 +#: builtin/checkout.c:1453 msgid "set upstream info for new branch" msgstr "configurar info de upstream para una rama nueva" -#: builtin/checkout.c:1364 +#: builtin/checkout.c:1455 +msgid "force checkout (throw away local modifications)" +msgstr "forzar el checkout (descartar modificaciones locales)" + +#: builtin/checkout.c:1457 msgid "new-branch" msgstr "nueva-rama" -#: builtin/checkout.c:1364 +#: builtin/checkout.c:1457 msgid "new unparented branch" msgstr "nueva rama no emparentada" -#: builtin/checkout.c:1366 +#: builtin/checkout.c:1459 builtin/merge.c:288 +msgid "update ignored files (default)" +msgstr "actualizar archivos ignorados (default)" + +#: builtin/checkout.c:1462 +msgid "do not check if another worktree is holding the given ref" +msgstr "no revise si otro árbol de trabajo contiene la ref entregada" + +#: builtin/checkout.c:1475 msgid "checkout our version for unmerged files" msgstr "hacer checkout a nuestra versión para archivos sin fusionar" -#: builtin/checkout.c:1369 +#: builtin/checkout.c:1478 msgid "checkout their version for unmerged files" msgstr "hacer checkout a su versión para los archivos sin fusionar" -#: builtin/checkout.c:1371 -msgid "force checkout (throw away local modifications)" -msgstr "forzar el checkout (descartar modificaciones locales)" - -#: builtin/checkout.c:1373 -msgid "perform a 3-way merge with the new branch" -msgstr "realizar una fusión de tres vías con la rama nueva" - -#: builtin/checkout.c:1375 builtin/merge.c:284 -msgid "update ignored files (default)" -msgstr "actualizar archivos ignorados (default)" - -#: builtin/checkout.c:1377 builtin/log.c:1594 parse-options.h:317 -msgid "style" -msgstr "estilo" - -#: builtin/checkout.c:1378 -msgid "conflict style (merge or diff3)" -msgstr "conflicto de estilos (merge o diff3)" - -#: builtin/checkout.c:1381 +#: builtin/checkout.c:1482 msgid "do not limit pathspecs to sparse entries only" msgstr "no limitar pathspecs a dispersar entradas solamente" -#: builtin/checkout.c:1383 -msgid "do not second guess 'git checkout <no-such-branch>'" -msgstr "no adivinar segunda opción 'git checkout <no-hay-tal-rama>'" - -#: builtin/checkout.c:1385 -msgid "do not check if another worktree is holding the given ref" -msgstr "no revise si otro árbol de trabajo contiene la ref entregada" - -#: builtin/checkout.c:1389 builtin/clone.c:88 builtin/fetch.c:141 -#: builtin/merge.c:281 builtin/pull.c:136 builtin/push.c:575 -#: builtin/send-pack.c:174 -msgid "force progress reporting" -msgstr "forzar el reporte de progreso" - -#: builtin/checkout.c:1390 -msgid "use overlay mode (default)" -msgstr "usar modo overlay (default)" - -#: builtin/checkout.c:1422 +#: builtin/checkout.c:1533 msgid "-b, -B and --orphan are mutually exclusive" msgstr "-b, -B y --orphan son mutuamente exclusivas" -#: builtin/checkout.c:1425 +#: builtin/checkout.c:1536 msgid "-p and --overlay are mutually exclusive" msgstr "-p y --overlay son mutuamente exclusivas" -#: builtin/checkout.c:1442 +#: builtin/checkout.c:1573 msgid "--track needs a branch name" msgstr "--track necesita el nombre de una rama" -#: builtin/checkout.c:1447 +#: builtin/checkout.c:1578 msgid "missing branch name; try -b" msgstr "falta nombre de rama; prueba -b" -#: builtin/checkout.c:1484 +#: builtin/checkout.c:1611 +#, c-format +msgid "could not resolve %s" +msgstr "no se pudo resolver %s" + +#: builtin/checkout.c:1623 +msgid "you must specify path(s) to restore" +msgstr "debes especificar path(s) para restaurar" + +#: builtin/checkout.c:1631 msgid "invalid path specification" msgstr "especificación de ruta inválida" -#: builtin/checkout.c:1491 +#: builtin/checkout.c:1638 #, c-format msgid "'%s' is not a commit and a branch '%s' cannot be created from it" msgstr "'%s' no es un commit y una rama '%s' no puede ser creada desde este" -#: builtin/checkout.c:1495 +#: builtin/checkout.c:1642 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "git checkout: --detach no toma un argumento de ruta '%s'" -#: builtin/checkout.c:1499 +#: builtin/checkout.c:1646 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -10346,7 +10621,7 @@ msgstr "" "git checkout: --ours/--theirs, --force y --merge son incompatibles cuando\n" "se revisa fuera del índice." -#: builtin/checkout.c:1519 +#: builtin/checkout.c:1666 #, c-format msgid "" "'%s' matched more than one remote tracking branch.\n" @@ -10376,6 +10651,68 @@ msgstr "" "de nombre <nombre> remota, como 'origin', considera configurar\n" "checkout.defaultRemote=origin en tu configuración." +#: builtin/checkout.c:1691 builtin/checkout.c:1693 builtin/checkout.c:1733 +#: builtin/checkout.c:1735 builtin/clone.c:121 builtin/remote.c:169 +#: builtin/remote.c:171 builtin/worktree.c:500 builtin/worktree.c:502 +msgid "branch" +msgstr "rama" + +#: builtin/checkout.c:1692 +msgid "create and checkout a new branch" +msgstr "crear y hacer checkout a una nueva rama" + +#: builtin/checkout.c:1694 +msgid "create/reset and checkout a branch" +msgstr "crear/reiniciar y hacer checkout a una rama" + +#: builtin/checkout.c:1695 +msgid "create reflog for new branch" +msgstr "crear un reflog para una nueva rama" + +#: builtin/checkout.c:1697 +msgid "second guess 'git checkout <no-such-branch>' (default)" +msgstr "adivinar segunda opción 'git checkout <no-hay-tal-rama>' (default)" + +#: builtin/checkout.c:1698 +msgid "use overlay mode (default)" +msgstr "usar modo overlay (default)" + +#: builtin/checkout.c:1734 +msgid "create and switch to a new branch" +msgstr "crear y hacer switch a una nueva rama" + +#: builtin/checkout.c:1736 +msgid "create/reset and switch to a branch" +msgstr "crear/reiniciar y hacer switch a una rama" + +#: builtin/checkout.c:1738 +msgid "second guess 'git switch <no-such-branch>'" +msgstr "adivinar segunda opción 'git checkout <no-hay-tal-rama>'" + +#: builtin/checkout.c:1740 +msgid "throw away local modifications" +msgstr "descartar modificaciones locales" + +#: builtin/checkout.c:1772 +msgid "which tree-ish to checkout from" +msgstr "de qué árbol hacer el checkout" + +#: builtin/checkout.c:1774 +msgid "restore the index" +msgstr "restaurar el index" + +#: builtin/checkout.c:1776 +msgid "restore the working tree (default)" +msgstr "restaurar el árbol de trabajo (default)" + +#: builtin/checkout.c:1778 +msgid "ignore unmerged entries" +msgstr "ignorar entradas no fusionadas" + +#: builtin/checkout.c:1779 +msgid "use overlay mode" +msgstr "usar modo overlay" + #: builtin/clean.c:28 msgid "" "git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..." @@ -10407,7 +10744,12 @@ msgstr "Se saltara repositorio %s\n" msgid "failed to remove %s" msgstr "falló al borrar %s" -#: builtin/clean.c:299 git-add--interactive.perl:579 +#: builtin/clean.c:37 +#, c-format +msgid "could not lstat %s\n" +msgstr "no se pudo lstat %s\n" + +#: builtin/clean.c:300 git-add--interactive.perl:593 #, c-format msgid "" "Prompt help:\n" @@ -10420,7 +10762,7 @@ msgstr "" "foo - selecciona un objeto basado en un prefijo único\n" " - (vacío) no elegir nada\n" -#: builtin/clean.c:303 git-add--interactive.perl:588 +#: builtin/clean.c:304 git-add--interactive.perl:602 #, c-format msgid "" "Prompt help:\n" @@ -10441,38 +10783,38 @@ msgstr "" "* - escoger todos los objetos\n" " - (vacío) terminar selección\n" -#: builtin/clean.c:519 git-add--interactive.perl:554 -#: git-add--interactive.perl:559 +#: builtin/clean.c:520 git-add--interactive.perl:568 +#: git-add--interactive.perl:573 #, c-format, perl-format msgid "Huh (%s)?\n" msgstr "Ahh (%s)?\n" -#: builtin/clean.c:661 +#: builtin/clean.c:662 #, c-format msgid "Input ignore patterns>> " msgstr "Input ignora los patrones >> " -#: builtin/clean.c:698 +#: builtin/clean.c:699 #, c-format msgid "WARNING: Cannot find items matched by: %s" msgstr "PELIGRO: No se puede encontrar objetos que concuerden con: %s" -#: builtin/clean.c:719 +#: builtin/clean.c:720 msgid "Select items to delete" msgstr "Seleccionar objetos para borrar" #. TRANSLATORS: Make sure to keep [y/N] as is -#: builtin/clean.c:760 +#: builtin/clean.c:761 #, c-format msgid "Remove %s [y/N]? " msgstr "Borrar %s [y/N]? " -#: builtin/clean.c:785 git-add--interactive.perl:1717 +#: builtin/clean.c:786 git-add--interactive.perl:1763 #, c-format msgid "Bye.\n" msgstr "Adiós.\n" -#: builtin/clean.c:793 +#: builtin/clean.c:794 msgid "" "clean - start cleaning\n" "filter by pattern - exclude items from deletion\n" @@ -10490,64 +10832,64 @@ msgstr "" "help - esta ventana\n" "? - ayuda para selección de opciones" -#: builtin/clean.c:820 git-add--interactive.perl:1793 +#: builtin/clean.c:821 git-add--interactive.perl:1849 msgid "*** Commands ***" msgstr "*** Comandos ***" -#: builtin/clean.c:821 git-add--interactive.perl:1790 +#: builtin/clean.c:822 git-add--interactive.perl:1846 msgid "What now" msgstr "Ahora que" -#: builtin/clean.c:829 +#: builtin/clean.c:830 msgid "Would remove the following item:" msgid_plural "Would remove the following items:" msgstr[0] "Se eliminará el siguiente objeto:" msgstr[1] "Se eliminarán los siguientes objetos:" -#: builtin/clean.c:845 +#: builtin/clean.c:846 msgid "No more files to clean, exiting." -msgstr "No hay mas archivos para limpiar, saliendo." +msgstr "No hay más archivos para limpiar, saliendo." -#: builtin/clean.c:907 +#: builtin/clean.c:908 msgid "do not print names of files removed" msgstr "no imprimir nombres de archivos borrados" -#: builtin/clean.c:909 +#: builtin/clean.c:910 msgid "force" msgstr "forzar" -#: builtin/clean.c:910 +#: builtin/clean.c:911 msgid "interactive cleaning" msgstr "limpieza interactiva" -#: builtin/clean.c:912 +#: builtin/clean.c:913 msgid "remove whole directories" msgstr "borrar directorios completos" -#: builtin/clean.c:913 builtin/describe.c:546 builtin/describe.c:548 -#: builtin/grep.c:897 builtin/log.c:171 builtin/log.c:173 -#: builtin/ls-files.c:557 builtin/name-rev.c:417 builtin/name-rev.c:419 +#: builtin/clean.c:914 builtin/describe.c:546 builtin/describe.c:548 +#: builtin/grep.c:899 builtin/log.c:176 builtin/log.c:178 +#: builtin/ls-files.c:557 builtin/name-rev.c:413 builtin/name-rev.c:415 #: builtin/show-ref.c:179 msgid "pattern" msgstr "patrón" -#: builtin/clean.c:914 +#: builtin/clean.c:915 msgid "add <pattern> to ignore rules" msgstr "agregar <patrón> para ignorar reglas" -#: builtin/clean.c:915 +#: builtin/clean.c:916 msgid "remove ignored files, too" msgstr "borrar archivos ignorados, también" -#: builtin/clean.c:917 +#: builtin/clean.c:918 msgid "remove only ignored files" msgstr "borrar solo archivos ignorados" -#: builtin/clean.c:935 +#: builtin/clean.c:936 msgid "-x and -X cannot be used together" msgstr "-x y -X no pueden ser usadas juntas" -#: builtin/clean.c:939 +#: builtin/clean.c:940 msgid "" "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " "clean" @@ -10555,7 +10897,7 @@ msgstr "" "clean.requireForce configurado como true y ninguno -i, -n, ni -f entregados; " "rehusando el clean" -#: builtin/clean.c:942 +#: builtin/clean.c:943 msgid "" "clean.requireForce defaults to true and neither -i, -n, nor -f given; " "refusing to clean" @@ -10563,156 +10905,160 @@ msgstr "" "clean.requireForce default en true y ninguno -i, -n, ni -f entregados; " "rehusando el clean" -#: builtin/clone.c:44 +#: builtin/clone.c:46 msgid "git clone [<options>] [--] <repo> [<dir>]" msgstr "git clone [<opciones>] [--] <repo> [<directorio>]" -#: builtin/clone.c:90 +#: builtin/clone.c:93 msgid "don't create a checkout" msgstr "no crear checkout" -#: builtin/clone.c:91 builtin/clone.c:93 builtin/init-db.c:489 +#: builtin/clone.c:94 builtin/clone.c:96 builtin/init-db.c:489 msgid "create a bare repository" msgstr "crear un repositorio vacío" -#: builtin/clone.c:95 +#: builtin/clone.c:98 msgid "create a mirror repository (implies bare)" msgstr "crear un repositorio espejo (implica vacío)" -#: builtin/clone.c:97 +#: builtin/clone.c:100 msgid "to clone from a local repository" msgstr "clonar de un repositorio local" -#: builtin/clone.c:99 +#: builtin/clone.c:102 msgid "don't use local hardlinks, always copy" msgstr "no usar hardlinks, siempre copiar" -#: builtin/clone.c:101 +#: builtin/clone.c:104 msgid "setup as shared repository" msgstr "configurar como repositorio compartido" -#: builtin/clone.c:104 +#: builtin/clone.c:107 msgid "pathspec" msgstr "pathspec" -#: builtin/clone.c:104 +#: builtin/clone.c:107 msgid "initialize submodules in the clone" msgstr "inicializar submódulos en el clonado" -#: builtin/clone.c:107 +#: builtin/clone.c:110 msgid "number of submodules cloned in parallel" msgstr "numero de submódulos clonados en paralelo" -#: builtin/clone.c:108 builtin/init-db.c:486 +#: builtin/clone.c:111 builtin/init-db.c:486 msgid "template-directory" msgstr "directorio-template" -#: builtin/clone.c:109 builtin/init-db.c:487 +#: builtin/clone.c:112 builtin/init-db.c:487 msgid "directory from which templates will be used" msgstr "directorio del cual los templates serán usados" -#: builtin/clone.c:111 builtin/clone.c:113 builtin/submodule--helper.c:1379 -#: builtin/submodule--helper.c:1859 +#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1380 +#: builtin/submodule--helper.c:1860 msgid "reference repository" msgstr "repositorio de referencia" -#: builtin/clone.c:115 builtin/submodule--helper.c:1381 -#: builtin/submodule--helper.c:1861 +#: builtin/clone.c:118 builtin/submodule--helper.c:1382 +#: builtin/submodule--helper.c:1862 msgid "use --reference only while cloning" msgstr "usa--reference solamente si estás clonado" -#: builtin/clone.c:116 builtin/column.c:27 builtin/merge-file.c:46 -#: builtin/pack-objects.c:3306 builtin/repack.c:329 +#: builtin/clone.c:119 builtin/column.c:27 builtin/merge-file.c:46 +#: builtin/pack-objects.c:3314 builtin/repack.c:319 msgid "name" msgstr "nombre" -#: builtin/clone.c:117 +#: builtin/clone.c:120 msgid "use <name> instead of 'origin' to track upstream" msgstr "use <nombre> en lugar de 'origin' para rastrear upstream" -#: builtin/clone.c:119 +#: builtin/clone.c:122 msgid "checkout <branch> instead of the remote's HEAD" msgstr "checkout <rama> en lugar de HEAD remota" -#: builtin/clone.c:121 +#: builtin/clone.c:124 msgid "path to git-upload-pack on the remote" msgstr "ruta para git-upload-pack en el remoto" -#: builtin/clone.c:122 builtin/fetch.c:142 builtin/grep.c:836 -#: builtin/pull.c:225 +#: builtin/clone.c:125 builtin/fetch.c:152 builtin/grep.c:838 +#: builtin/pull.c:226 msgid "depth" msgstr "profundidad" -#: builtin/clone.c:123 +#: builtin/clone.c:126 msgid "create a shallow clone of that depth" msgstr "crear un clon superficial para esa profundidad" -#: builtin/clone.c:124 builtin/fetch.c:144 builtin/pack-objects.c:3295 +#: builtin/clone.c:127 builtin/fetch.c:154 builtin/pack-objects.c:3303 msgid "time" msgstr "tiempo" -#: builtin/clone.c:125 +#: builtin/clone.c:128 msgid "create a shallow clone since a specific time" msgstr "crear un clon superficial desde el tiempo específico" -#: builtin/clone.c:126 builtin/fetch.c:146 builtin/fetch.c:169 -#: builtin/rebase.c:1389 +#: builtin/clone.c:129 builtin/fetch.c:156 builtin/fetch.c:179 +#: builtin/rebase.c:1395 msgid "revision" msgstr "revision" -#: builtin/clone.c:127 builtin/fetch.c:147 +#: builtin/clone.c:130 builtin/fetch.c:157 msgid "deepen history of shallow clone, excluding rev" msgstr "ahondando historia de clon superficial, excluyendo rev" -#: builtin/clone.c:129 +#: builtin/clone.c:132 msgid "clone only one branch, HEAD or --branch" msgstr "clonar solo una rama,HEAD o --branch" -#: builtin/clone.c:131 +#: builtin/clone.c:134 msgid "don't clone any tags, and make later fetches not to follow them" msgstr "no clonar ningún tag, y hacer que los subsiguientes fetch no los sigan" -#: builtin/clone.c:133 +#: builtin/clone.c:136 msgid "any cloned submodules will be shallow" msgstr "cualquier submódulo clonado será superficial" -#: builtin/clone.c:134 builtin/init-db.c:495 +#: builtin/clone.c:137 builtin/init-db.c:495 msgid "gitdir" msgstr "gitdir" -#: builtin/clone.c:135 builtin/init-db.c:496 +#: builtin/clone.c:138 builtin/init-db.c:496 msgid "separate git dir from working tree" msgstr "separa git dir del árbol de trabajo" -#: builtin/clone.c:136 +#: builtin/clone.c:139 msgid "key=value" msgstr "llave=valor" -#: builtin/clone.c:137 +#: builtin/clone.c:140 msgid "set config inside the new repository" msgstr "configurar config dentro del nuevo repositorio" -#: builtin/clone.c:139 builtin/fetch.c:164 builtin/ls-remote.c:76 +#: builtin/clone.c:142 builtin/fetch.c:174 builtin/ls-remote.c:76 #: builtin/push.c:585 builtin/send-pack.c:172 msgid "server-specific" msgstr "especifico-de-servidor" -#: builtin/clone.c:139 builtin/fetch.c:164 builtin/ls-remote.c:76 +#: builtin/clone.c:142 builtin/fetch.c:174 builtin/ls-remote.c:76 #: builtin/push.c:585 builtin/send-pack.c:173 msgid "option to transmit" msgstr "opción para trasmitir" -#: builtin/clone.c:140 builtin/fetch.c:165 builtin/pull.c:238 +#: builtin/clone.c:143 builtin/fetch.c:175 builtin/pull.c:239 #: builtin/push.c:586 msgid "use IPv4 addresses only" msgstr "solo usar direcciones IPv4" -#: builtin/clone.c:142 builtin/fetch.c:167 builtin/pull.c:241 +#: builtin/clone.c:145 builtin/fetch.c:177 builtin/pull.c:242 #: builtin/push.c:588 msgid "use IPv6 addresses only" msgstr "solo usar direcciones IPv6" -#: builtin/clone.c:280 +#: builtin/clone.c:149 +msgid "any cloned submodules will use their remote-tracking branch" +msgstr "cualquier submódulo clonado usará su branch de rastreo remoto" + +#: builtin/clone.c:285 msgid "" "No directory name could be guessed.\n" "Please specify a directory on the command line" @@ -10720,146 +11066,146 @@ msgstr "" "No se pudo adivinar ningún nombre de directorio.\n" "Por favor especifique un directorio en la línea de comando" -#: builtin/clone.c:333 +#: builtin/clone.c:338 #, c-format msgid "info: Could not add alternate for '%s': %s\n" msgstr "info: No se pudo agregar un alterno para '%s': %s\n" -#: builtin/clone.c:405 -#, c-format -msgid "failed to open '%s'" -msgstr "falló al abrir '%s'" - -#: builtin/clone.c:413 +#: builtin/clone.c:411 #, c-format msgid "%s exists and is not a directory" msgstr "%s existe pero no es un directorio" -#: builtin/clone.c:427 +#: builtin/clone.c:428 #, c-format -msgid "failed to stat %s\n" -msgstr "falló al analizar %s\n" +msgid "failed to start iterator over '%s'" +msgstr "falló al iniciar el iterador sobre '%s'" -#: builtin/clone.c:444 +#: builtin/clone.c:453 #, c-format msgid "failed to unlink '%s'" msgstr "falló al desvincular '%s'" -#: builtin/clone.c:449 +#: builtin/clone.c:458 #, c-format msgid "failed to create link '%s'" msgstr "falló al crear link '%s'" -#: builtin/clone.c:453 +#: builtin/clone.c:462 #, c-format msgid "failed to copy file to '%s'" msgstr "falló al copiar archivo a '%s'" -#: builtin/clone.c:479 +#: builtin/clone.c:467 +#, c-format +msgid "failed to iterate over '%s'" +msgstr "falló al iterar sobre '%s'" + +#: builtin/clone.c:492 #, c-format msgid "done.\n" msgstr "hecho.\n" -#: builtin/clone.c:493 +#: builtin/clone.c:506 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" -"and retry the checkout with 'git checkout -f HEAD'\n" +"and retry with 'git restore --source=HEAD :/'\n" msgstr "" "Clonado exitoso, pero falló el checkout.\n" -"Puede inspeccionar a qué se hizo checkout con 'git status'\n" -"y volver a intentarlo con 'git checkout -f HEAD'\n" +"Puedes inspeccionar a qué se hizo checkout con 'git status'\n" +"y volver a intentarlo con 'git restore --source=HEAD :/'\n" -#: builtin/clone.c:570 +#: builtin/clone.c:583 #, c-format msgid "Could not find remote branch %s to clone." msgstr "No se pudo encontrar la rama remota %s para clonar." -#: builtin/clone.c:689 +#: builtin/clone.c:702 #, c-format msgid "unable to update %s" msgstr "incapaz de actualizar %s" -#: builtin/clone.c:739 +#: builtin/clone.c:752 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "" "remoto HEAD refiere a un ref inexistente, no se puede hacer checkout.\n" -#: builtin/clone.c:770 +#: builtin/clone.c:783 msgid "unable to checkout working tree" msgstr "no es posible realizar checkout en el árbol de trabajo" -#: builtin/clone.c:815 +#: builtin/clone.c:833 msgid "unable to write parameters to config file" msgstr "no es posible escribir parámetros al archivo config" -#: builtin/clone.c:878 +#: builtin/clone.c:896 msgid "cannot repack to clean up" msgstr "no se puede reempaquetar para limpiar" -#: builtin/clone.c:880 +#: builtin/clone.c:898 msgid "cannot unlink temporary alternates file" msgstr "no se puede desvincular archivos alternos temporales" -#: builtin/clone.c:920 builtin/receive-pack.c:1952 +#: builtin/clone.c:938 builtin/receive-pack.c:1950 msgid "Too many arguments." msgstr "Muchos argumentos." -#: builtin/clone.c:924 +#: builtin/clone.c:942 msgid "You must specify a repository to clone." msgstr "Tienes que especificar un repositorio para clonar." -#: builtin/clone.c:937 +#: builtin/clone.c:955 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "Las opciones --bare y --origin %s son incompatibles." -#: builtin/clone.c:940 +#: builtin/clone.c:958 msgid "--bare and --separate-git-dir are incompatible." msgstr "--bare y --separate-git-dir son incompatibles." -#: builtin/clone.c:953 +#: builtin/clone.c:971 #, c-format msgid "repository '%s' does not exist" msgstr "repositorio '%s' no existe" -#: builtin/clone.c:959 builtin/fetch.c:1610 +#: builtin/clone.c:977 builtin/fetch.c:1660 #, c-format msgid "depth %s is not a positive number" msgstr "profundidad %s no es un numero positivo" -#: builtin/clone.c:969 +#: builtin/clone.c:987 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "la ruta de destino '%s' ya existe y no es un directorio vacío." -#: builtin/clone.c:979 +#: builtin/clone.c:997 #, c-format msgid "working tree '%s' already exists." msgstr "directorio de trabajo '%s' ya existe." -#: builtin/clone.c:994 builtin/clone.c:1015 builtin/difftool.c:264 -#: builtin/worktree.c:296 builtin/worktree.c:328 +#: builtin/clone.c:1012 builtin/clone.c:1033 builtin/difftool.c:264 +#: builtin/worktree.c:303 builtin/worktree.c:335 #, c-format msgid "could not create leading directories of '%s'" msgstr "no se pudo crear directorios principales de '%s'" -#: builtin/clone.c:999 +#: builtin/clone.c:1017 #, c-format msgid "could not create work tree dir '%s'" msgstr "no se pudo crear un árbol de trabajo '%s'" -#: builtin/clone.c:1019 +#: builtin/clone.c:1037 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "Clonando en un repositorio vacío '%s'...\n" -#: builtin/clone.c:1021 +#: builtin/clone.c:1039 #, c-format msgid "Cloning into '%s'...\n" msgstr "Clonando en '%s'...\n" -#: builtin/clone.c:1045 +#: builtin/clone.c:1063 msgid "" "clone --recursive is not compatible with both --reference and --reference-if-" "able" @@ -10867,36 +11213,36 @@ msgstr "" "clone --recursive no es compatible con --reference y --reference-if-able al " "mismo tiempo" -#: builtin/clone.c:1106 +#: builtin/clone.c:1124 msgid "--depth is ignored in local clones; use file:// instead." msgstr "--depth es ignorada en clonaciones locales; usa file:// más bien." -#: builtin/clone.c:1108 +#: builtin/clone.c:1126 msgid "--shallow-since is ignored in local clones; use file:// instead." msgstr "--shallow-since es ignorado en el clon local; use file:// ." -#: builtin/clone.c:1110 +#: builtin/clone.c:1128 msgid "--shallow-exclude is ignored in local clones; use file:// instead." msgstr "--shallow-exclude es ignorado en clones locales; use file://." -#: builtin/clone.c:1112 +#: builtin/clone.c:1130 msgid "--filter is ignored in local clones; use file:// instead." msgstr "--filter es ignorado en clones locales; usa file:// en su lugar." -#: builtin/clone.c:1115 +#: builtin/clone.c:1133 msgid "source repository is shallow, ignoring --local" msgstr "repositorio fuente es superficial, ignorando --local" -#: builtin/clone.c:1120 +#: builtin/clone.c:1138 msgid "--local is ignored" msgstr "--local es ignorado" -#: builtin/clone.c:1197 builtin/clone.c:1205 +#: builtin/clone.c:1215 builtin/clone.c:1223 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "Rama remota %s no encontrada en upstream %s" -#: builtin/clone.c:1208 +#: builtin/clone.c:1226 msgid "You appear to have cloned an empty repository." msgstr "Pareces haber clonado un repositorio sin contenido." @@ -10945,7 +11291,7 @@ msgstr "" msgid "duplicate parent %s ignored" msgstr "padre duplicado %s ignorado" -#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:520 +#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:525 #, c-format msgid "not a valid object name %s" msgstr "no es un nombre de objeto válido %s" @@ -10973,13 +11319,13 @@ msgstr "padre" msgid "id of a parent commit object" msgstr "id del objeto commit padre" -#: builtin/commit-tree.c:114 builtin/commit.c:1480 builtin/merge.c:268 -#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1473 -#: builtin/tag.c:406 +#: builtin/commit-tree.c:114 builtin/commit.c:1500 builtin/merge.c:270 +#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1460 +#: builtin/tag.c:412 msgid "message" msgstr "mensaje" -#: builtin/commit-tree.c:115 builtin/commit.c:1480 +#: builtin/commit-tree.c:115 builtin/commit.c:1500 msgid "commit message" msgstr "mensaje del commit" @@ -10987,8 +11333,8 @@ msgstr "mensaje del commit" msgid "read commit log message from file" msgstr "leer mensaje de commit desde un archivo" -#: builtin/commit-tree.c:121 builtin/commit.c:1492 builtin/merge.c:283 -#: builtin/pull.c:193 builtin/revert.c:117 +#: builtin/commit-tree.c:121 builtin/commit.c:1512 builtin/merge.c:287 +#: builtin/pull.c:194 builtin/revert.c:118 msgid "GPG sign commit" msgstr "Firmar commit con GPG" @@ -11014,7 +11360,7 @@ msgid "" "it empty. You can repeat your command with --allow-empty, or you can\n" "remove the commit entirely with \"git reset HEAD^\".\n" msgstr "" -"Has solicitado un amend en tu commit mas reciente, pero hacerlo lo \n" +"Has solicitado un amend en tu commit más reciente, pero hacerlo lo \n" "vaciaría. Puedes repetir el comando con --alow-empty, o puedes eliminar\n" "el commit completamente con \"git reset HEAD^\".\n" @@ -11028,86 +11374,92 @@ msgid "" msgstr "" "El cherry-pick anterior ahora está vacío, posiblemente por un conflicto de " "resolución.\n" -"Si desea realizar un commit de todas maneras, use:\n" +"Si deseas realizar un commit de todas maneras, usa:\n" "\n" " git commit --allow-empty\n" "\n" #: builtin/commit.c:63 -msgid "Otherwise, please use 'git reset'\n" -msgstr "Caso contrario, por favor usa 'git reset'\n" +msgid "Otherwise, please use 'git cherry-pick --skip'\n" +msgstr "Caso contrario, por favor usa 'git cherry-pick --skip'\n" #: builtin/commit.c:66 msgid "" +"and then use:\n" +"\n" +" git cherry-pick --continue\n" +"\n" +"to resume cherry-picking the remaining commits.\n" "If you wish to skip this commit, use:\n" "\n" -" git reset\n" +" git cherry-pick --skip\n" "\n" -"Then \"git cherry-pick --continue\" will resume cherry-picking\n" -"the remaining commits.\n" msgstr "" -"Si quiere saltar este commit, use:\n" +"y luego usa:\n" +"\n" +" git cherry-pick --continue\n" +"\n" +"para resumir el cherry-pick con los commits faltantes.\n" +"Si deseas saltar el commit, usa:\n" "\n" -" git reset\n" +" git cherry-pick --skip\n" "\n" -"Luego \"git cherry-pick --continue\" continuara el cherry-picking\n" -"para los commits restantes.\n" -#: builtin/commit.c:312 +#: builtin/commit.c:315 msgid "failed to unpack HEAD tree object" msgstr "falló al desempaquetar objeto del árbol HEAD" -#: builtin/commit.c:353 +#: builtin/commit.c:356 msgid "unable to create temporary index" msgstr "no es posible crear un índice temporal" -#: builtin/commit.c:359 +#: builtin/commit.c:362 msgid "interactive add failed" msgstr "adición interactiva fallida" -#: builtin/commit.c:373 +#: builtin/commit.c:376 msgid "unable to update temporary index" msgstr "no es posible actualizar el índice temporal" -#: builtin/commit.c:375 +#: builtin/commit.c:378 msgid "Failed to update main cache tree" msgstr "Falló al actualizar el cache principal del árbol" -#: builtin/commit.c:400 builtin/commit.c:423 builtin/commit.c:469 +#: builtin/commit.c:403 builtin/commit.c:426 builtin/commit.c:472 msgid "unable to write new_index file" msgstr "no es posible escribir archivo new_index" -#: builtin/commit.c:452 +#: builtin/commit.c:455 msgid "cannot do a partial commit during a merge." msgstr "no se puede realizar un commit parcial durante una fusión." -#: builtin/commit.c:454 +#: builtin/commit.c:457 msgid "cannot do a partial commit during a cherry-pick." msgstr "no se puede realizar un commit parcial durante un cherry-pick." -#: builtin/commit.c:462 +#: builtin/commit.c:465 msgid "cannot read the index" msgstr "no se puede leer el índice" -#: builtin/commit.c:481 +#: builtin/commit.c:484 msgid "unable to write temporary index file" msgstr "no es posible escribir el índice temporal" -#: builtin/commit.c:579 +#: builtin/commit.c:582 #, c-format msgid "commit '%s' lacks author header" msgstr "commit '%s' requiere cabecera de autor" -#: builtin/commit.c:581 +#: builtin/commit.c:584 #, c-format msgid "commit '%s' has malformed author line" msgstr "el commit '%s' tiene una línea de autor mal formada" -#: builtin/commit.c:600 +#: builtin/commit.c:603 msgid "malformed --author parameter" msgstr "parámetro --author mal formado" -#: builtin/commit.c:653 +#: builtin/commit.c:656 msgid "" "unable to select a comment character that is not used\n" "in the current commit message" @@ -11115,38 +11467,38 @@ msgstr "" "no es posible seleccionar un carácter de comentario que no es usado\n" "en el mensaje de commit actual" -#: builtin/commit.c:691 builtin/commit.c:724 builtin/commit.c:1069 +#: builtin/commit.c:694 builtin/commit.c:727 builtin/commit.c:1072 #, c-format msgid "could not lookup commit %s" msgstr "no se pudo revisar el commit %s" -#: builtin/commit.c:703 builtin/shortlog.c:319 +#: builtin/commit.c:706 builtin/shortlog.c:319 #, c-format msgid "(reading log message from standard input)\n" msgstr "(leyendo mensajes de logs desde standard input)\n" -#: builtin/commit.c:705 +#: builtin/commit.c:708 msgid "could not read log from standard input" msgstr "no se pudo leer log desde standard input" -#: builtin/commit.c:709 +#: builtin/commit.c:712 #, c-format msgid "could not read log file '%s'" msgstr "no se pudo leer el log '%s'" -#: builtin/commit.c:740 builtin/commit.c:756 +#: builtin/commit.c:743 builtin/commit.c:759 msgid "could not read SQUASH_MSG" msgstr "no se pudo leer SQUASH_MSG" -#: builtin/commit.c:747 +#: builtin/commit.c:750 msgid "could not read MERGE_MSG" msgstr "no se pudo leer MERGE_MSG" -#: builtin/commit.c:807 +#: builtin/commit.c:810 msgid "could not write commit template" msgstr "no se pudo escribir el template del commit" -#: builtin/commit.c:826 +#: builtin/commit.c:829 #, c-format msgid "" "\n" @@ -11161,7 +11513,7 @@ msgstr "" "\t%s\n" "y vuelve a intentar.\n" -#: builtin/commit.c:831 +#: builtin/commit.c:834 #, c-format msgid "" "\n" @@ -11171,174 +11523,174 @@ msgid "" "and try again.\n" msgstr "" "\n" -"Parece que puede estar haciendo un commit a un cherry-pick.\n" -"Si esto no es correcto, por favor elimine el archivo\n" +"Parece que puedes estar haciendo un commit a un cherry-pick.\n" +"Si esto no es correcto, por favor elimina el archivo\n" "\t%s\n" -"y vuelva a intentar.\n" +"y vuelve a intentar.\n" -#: builtin/commit.c:844 +#: builtin/commit.c:847 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" "with '%c' will be ignored, and an empty message aborts the commit.\n" msgstr "" -"Por favor ingrese el mensaje del commit para sus cambios. Las líneas que " +"Por favor ingresa el mensaje del commit para tus cambios. Las líneas que " "comiencen\n" "con '%c' serán ignoradas, y un mensaje vacío aborta el commit.\n" -#: builtin/commit.c:852 +#: builtin/commit.c:855 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" "with '%c' will be kept; you may remove them yourself if you want to.\n" "An empty message aborts the commit.\n" msgstr "" -"Por favor ingrese el mensaje del commit para sus cambios. Las líneas que " +"Por favor ingresa el mensaje del commit para tus cambios. Las líneas que " "comiencen\n" "con '%c' serán guardadas; puede eliminarlas usted mismo si desea.\n" "Un mensaje vacío aborta el commit.\n" -#: builtin/commit.c:869 +#: builtin/commit.c:872 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "%sAutor: %.*s <%.*s>" -#: builtin/commit.c:877 +#: builtin/commit.c:880 #, c-format msgid "%sDate: %s" msgstr "%sFecha: %s" -#: builtin/commit.c:884 +#: builtin/commit.c:887 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "%sCommitter: %.*s <%.*s>" -#: builtin/commit.c:902 +#: builtin/commit.c:905 msgid "Cannot read index" msgstr "No se puede leer el índice" -#: builtin/commit.c:969 +#: builtin/commit.c:972 msgid "Error building trees" msgstr "Error al construir los árboles" -#: builtin/commit.c:983 builtin/tag.c:269 +#: builtin/commit.c:986 builtin/tag.c:275 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "Por favor suministra el mensaje usando las opciones -m o -F.\n" -#: builtin/commit.c:1027 +#: builtin/commit.c:1030 #, c-format msgid "--author '%s' is not 'Name <email>' and matches no existing author" msgstr "" "--author '%s' no está en el formato 'Name <email>' y no concuerda con ningún " "autor existente" -#: builtin/commit.c:1041 +#: builtin/commit.c:1044 #, c-format msgid "Invalid ignored mode '%s'" msgstr "Modo ignorado inválido '%s'" -#: builtin/commit.c:1059 builtin/commit.c:1284 +#: builtin/commit.c:1062 builtin/commit.c:1304 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "Modo inválido de los archivos no rastreados '%s'" -#: builtin/commit.c:1097 +#: builtin/commit.c:1102 msgid "--long and -z are incompatible" msgstr "--long y -z son incompatibles" -#: builtin/commit.c:1130 +#: builtin/commit.c:1146 msgid "Using both --reset-author and --author does not make sense" msgstr "Usar ambos --reset-author y --author no tiene sentido" -#: builtin/commit.c:1139 +#: builtin/commit.c:1155 msgid "You have nothing to amend." msgstr "No tienes nada que enmendar." -#: builtin/commit.c:1142 +#: builtin/commit.c:1158 msgid "You are in the middle of a merge -- cannot amend." msgstr "Estás en medio de una fusión -- no puedes enmendar." -#: builtin/commit.c:1144 +#: builtin/commit.c:1160 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "Está en medio de un cherry-pick -- no se puede enmendar." -#: builtin/commit.c:1147 +#: builtin/commit.c:1163 msgid "Options --squash and --fixup cannot be used together" msgstr "Opciones --squash y --fixup no pueden ser usadas juntas" -#: builtin/commit.c:1157 +#: builtin/commit.c:1173 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "Solo uno de -c/-C/-F/--fixup puede ser usado." -#: builtin/commit.c:1159 +#: builtin/commit.c:1175 msgid "Option -m cannot be combined with -c/-C/-F." msgstr "La opción -m no puede ser combinada con -c/-C/-F." -#: builtin/commit.c:1167 +#: builtin/commit.c:1183 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "--reset-author sólo puede ser usada con -C, -c o --amend." -#: builtin/commit.c:1184 +#: builtin/commit.c:1200 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "" "Solo uno de --include/--only/--all/--interactive/--patch puede ser usado." -#: builtin/commit.c:1186 +#: builtin/commit.c:1202 msgid "No paths with --include/--only does not make sense." msgstr "No hay rutas con --include/--only no tiene sentido." -#: builtin/commit.c:1192 +#: builtin/commit.c:1208 #, c-format msgid "paths '%s ...' with -a does not make sense" msgstr "paths '%s ...' con -a no tiene sentido" -#: builtin/commit.c:1319 builtin/commit.c:1503 +#: builtin/commit.c:1339 builtin/commit.c:1523 msgid "show status concisely" msgstr "mostrar status de manera concisa" -#: builtin/commit.c:1321 builtin/commit.c:1505 +#: builtin/commit.c:1341 builtin/commit.c:1525 msgid "show branch information" msgstr "mostrar información de la rama" -#: builtin/commit.c:1323 +#: builtin/commit.c:1343 msgid "show stash information" msgstr "mostrar información del stash" -#: builtin/commit.c:1325 builtin/commit.c:1507 +#: builtin/commit.c:1345 builtin/commit.c:1527 msgid "compute full ahead/behind values" msgstr "calcular todos los valores delante/atrás" -#: builtin/commit.c:1327 +#: builtin/commit.c:1347 msgid "version" msgstr "version" -#: builtin/commit.c:1327 builtin/commit.c:1509 builtin/push.c:561 -#: builtin/worktree.c:643 +#: builtin/commit.c:1347 builtin/commit.c:1529 builtin/push.c:561 +#: builtin/worktree.c:651 msgid "machine-readable output" msgstr "output formato-maquina" -#: builtin/commit.c:1330 builtin/commit.c:1511 +#: builtin/commit.c:1350 builtin/commit.c:1531 msgid "show status in long format (default)" msgstr "mostrar status en formato largo (default)" -#: builtin/commit.c:1333 builtin/commit.c:1514 +#: builtin/commit.c:1353 builtin/commit.c:1534 msgid "terminate entries with NUL" msgstr "terminar entradas con NUL" -#: builtin/commit.c:1335 builtin/commit.c:1339 builtin/commit.c:1517 -#: builtin/fast-export.c:1085 builtin/fast-export.c:1088 builtin/rebase.c:1465 -#: parse-options.h:331 +#: builtin/commit.c:1355 builtin/commit.c:1359 builtin/commit.c:1537 +#: builtin/fast-export.c:1125 builtin/fast-export.c:1128 +#: builtin/fast-export.c:1131 builtin/rebase.c:1471 parse-options.h:332 msgid "mode" msgstr "modo" -#: builtin/commit.c:1336 builtin/commit.c:1517 +#: builtin/commit.c:1356 builtin/commit.c:1537 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "" "mostrar archivos sin seguimiento, modos opcionales: all, normal, no. " "(Predeterminado: all)" -#: builtin/commit.c:1340 +#: builtin/commit.c:1360 msgid "" "show ignored files, optional modes: traditional, matching, no. (Default: " "traditional)" @@ -11346,11 +11698,11 @@ msgstr "" "mostrar archivos ignorados, modos opcionales: traditional, matching, no. " "(Predeterminado: traditional)" -#: builtin/commit.c:1342 parse-options.h:179 +#: builtin/commit.c:1362 parse-options.h:179 msgid "when" msgstr "cuando" -#: builtin/commit.c:1343 +#: builtin/commit.c:1363 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" @@ -11358,235 +11710,251 @@ msgstr "" "ignorar cambios en submódulos, opcional cuando: all,dirty,untracked. " "(Default: all)" -#: builtin/commit.c:1345 +#: builtin/commit.c:1365 msgid "list untracked files in columns" msgstr "listar en columnas los archivos sin seguimiento" -#: builtin/commit.c:1346 +#: builtin/commit.c:1366 msgid "do not detect renames" msgstr "no detectar renombrados" -#: builtin/commit.c:1348 +#: builtin/commit.c:1368 msgid "detect renames, optionally set similarity index" msgstr "detectar renombres, opcionalmente configurar similaridad de índice" -#: builtin/commit.c:1368 +#: builtin/commit.c:1388 msgid "Unsupported combination of ignored and untracked-files arguments" msgstr "" "Combinación de argumentos de archivos ignorados y no rastreados no soportada" -#: builtin/commit.c:1473 +#: builtin/commit.c:1493 msgid "suppress summary after successful commit" msgstr "suprime summary tras un commit exitoso" -#: builtin/commit.c:1474 +#: builtin/commit.c:1494 msgid "show diff in commit message template" msgstr "mostrar diff en el template del mensaje de commit" -#: builtin/commit.c:1476 +#: builtin/commit.c:1496 msgid "Commit message options" msgstr "Opciones para el mensaje del commit" -#: builtin/commit.c:1477 builtin/merge.c:272 builtin/tag.c:408 +#: builtin/commit.c:1497 builtin/merge.c:274 builtin/tag.c:414 msgid "read message from file" msgstr "leer mensaje desde un archivo" -#: builtin/commit.c:1478 +#: builtin/commit.c:1498 msgid "author" msgstr "autor" -#: builtin/commit.c:1478 +#: builtin/commit.c:1498 msgid "override author for commit" msgstr "sobrescribe el autor del commit" -#: builtin/commit.c:1479 builtin/gc.c:539 +#: builtin/commit.c:1499 builtin/gc.c:539 msgid "date" msgstr "fecha" -#: builtin/commit.c:1479 +#: builtin/commit.c:1499 msgid "override date for commit" msgstr "sobrescribe la fecha del commit" -#: builtin/commit.c:1481 builtin/commit.c:1482 builtin/commit.c:1483 -#: builtin/commit.c:1484 parse-options.h:323 ref-filter.h:92 +#: builtin/commit.c:1501 builtin/commit.c:1502 builtin/commit.c:1503 +#: builtin/commit.c:1504 parse-options.h:324 ref-filter.h:92 msgid "commit" msgstr "confirmar" -#: builtin/commit.c:1481 +#: builtin/commit.c:1501 msgid "reuse and edit message from specified commit" msgstr "reusar y editar el mensaje de un commit especifico" -#: builtin/commit.c:1482 +#: builtin/commit.c:1502 msgid "reuse message from specified commit" msgstr "reusar el mensaje de un commit especifico" -#: builtin/commit.c:1483 +#: builtin/commit.c:1503 msgid "use autosquash formatted message to fixup specified commit" msgstr "" "usar mensaje de formato autosquash para arreglar el commit especificado" -#: builtin/commit.c:1484 +#: builtin/commit.c:1504 msgid "use autosquash formatted message to squash specified commit" msgstr "" "usar el mensaje de formato autosquash para realizar squash al commit " "especificado" -#: builtin/commit.c:1485 +#: builtin/commit.c:1505 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "el autor del commit soy yo ahora (usado con -C/-c/--amend)" -#: builtin/commit.c:1486 builtin/log.c:1541 builtin/merge.c:285 -#: builtin/pull.c:162 builtin/revert.c:109 +#: builtin/commit.c:1506 builtin/log.c:1564 builtin/merge.c:289 +#: builtin/pull.c:163 builtin/revert.c:110 msgid "add Signed-off-by:" msgstr "agregar Signed-off-by: (firmado por)" -#: builtin/commit.c:1487 +#: builtin/commit.c:1507 msgid "use specified template file" msgstr "usar archivo de template especificado" -#: builtin/commit.c:1488 +#: builtin/commit.c:1508 msgid "force edit of commit" msgstr "forzar la edición del commit" -#: builtin/commit.c:1490 +#: builtin/commit.c:1510 msgid "include status in commit message template" msgstr "incluir status en el template del mensaje de commit" -#: builtin/commit.c:1495 +#: builtin/commit.c:1515 msgid "Commit contents options" msgstr "Opciones para el contenido del commit" -#: builtin/commit.c:1496 +#: builtin/commit.c:1516 msgid "commit all changed files" msgstr "confirmar todos los archivos cambiados" -#: builtin/commit.c:1497 +#: builtin/commit.c:1517 msgid "add specified files to index for commit" msgstr "agregar archivos específicos al índice para confirmar" -#: builtin/commit.c:1498 +#: builtin/commit.c:1518 msgid "interactively add files" msgstr "agregar archivos interactivamente" -#: builtin/commit.c:1499 +#: builtin/commit.c:1519 msgid "interactively add changes" msgstr "agregar cambios interactivamente" -#: builtin/commit.c:1500 +#: builtin/commit.c:1520 msgid "commit only specified files" msgstr "sólo confirmar archivos específicos" -#: builtin/commit.c:1501 +#: builtin/commit.c:1521 msgid "bypass pre-commit and commit-msg hooks" msgstr "evitar los capturadores (hooks) de pre-commit y commit-msg" -#: builtin/commit.c:1502 +#: builtin/commit.c:1522 msgid "show what would be committed" msgstr "mostrar lo que sería incluido en el commit" -#: builtin/commit.c:1515 +#: builtin/commit.c:1535 msgid "amend previous commit" msgstr "enmendar commit previo" -#: builtin/commit.c:1516 +#: builtin/commit.c:1536 msgid "bypass post-rewrite hook" msgstr "gancho bypass post reescritura" -#: builtin/commit.c:1521 +#: builtin/commit.c:1541 msgid "ok to record an empty change" msgstr "ok al grabar un cambio vacío" -#: builtin/commit.c:1523 +#: builtin/commit.c:1543 msgid "ok to record a change with an empty message" msgstr "ok al grabar un cambio con un mensaje vacío" -#: builtin/commit.c:1596 +#: builtin/commit.c:1616 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "Archivo MERGE_HEAD (%s) corrupto" -#: builtin/commit.c:1603 +#: builtin/commit.c:1623 msgid "could not read MERGE_MODE" msgstr "no se pudo leer MERGE_MODE" -#: builtin/commit.c:1622 +#: builtin/commit.c:1642 #, c-format msgid "could not read commit message: %s" msgstr "no se pudo leer el mensaje de commit: %s" -#: builtin/commit.c:1629 +#: builtin/commit.c:1649 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "Abortando commit debido que el mensaje está en blanco.\n" -#: builtin/commit.c:1634 +#: builtin/commit.c:1654 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "Abortando commit; no se ha editado el mensaje\n" -#: builtin/commit.c:1668 +#: builtin/commit.c:1688 msgid "" "repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" -"not exceeded, and then \"git reset HEAD\" to recover." +"not exceeded, and then \"git restore --staged :/\" to recover." msgstr "" "el repositorio ha sido actualizado, pero no se pudo escribir el archivo\n" "new_index. Verifique que el disco no este lleno y la quota no ha\n" -"sido superada, y luego \"git reset HEAD\" para recuperar." +"sido superada, y luego \"git restore --sateged :/\" para recuperar." -#: builtin/commit-graph.c:10 +#: builtin/commit-graph.c:11 msgid "git commit-graph [--object-dir <objdir>]" msgstr "git commit-graph [--object-dir <objdir>]" -#: builtin/commit-graph.c:11 builtin/commit-graph.c:23 +#: builtin/commit-graph.c:12 builtin/commit-graph.c:24 msgid "git commit-graph read [--object-dir <objdir>]" msgstr "git commit-graph read [--object-dir <objdir>]" -#: builtin/commit-graph.c:12 builtin/commit-graph.c:18 -msgid "git commit-graph verify [--object-dir <objdir>]" -msgstr "git commit-graph verify [--object-dir <objdir>]" +#: builtin/commit-graph.c:13 builtin/commit-graph.c:19 +msgid "git commit-graph verify [--object-dir <objdir>] [--shallow]" +msgstr "git commit-graph verify [--object-dir <objdir>] [--shallow]" -#: builtin/commit-graph.c:13 builtin/commit-graph.c:28 +#: builtin/commit-graph.c:14 builtin/commit-graph.c:29 msgid "" -"git commit-graph write [--object-dir <objdir>] [--append] [--reachable|--" -"stdin-packs|--stdin-commits]" +"git commit-graph write [--object-dir <objdir>] [--append|--split] [--" +"reachable|--stdin-packs|--stdin-commits] <split options>" msgstr "" -"git commit-graph write [--object-dir <objdir>] [--append][--reachable|--" -"stdin-packs|--stdin-commits]" +"git commit-graph write [--object-dir <objdir>] [--append|--split] [--" +"reachable|--stdin-packs|--stdin-commits] <split options>" -#: builtin/commit-graph.c:51 builtin/commit-graph.c:89 -#: builtin/commit-graph.c:147 builtin/commit-graph.c:205 builtin/fetch.c:153 -#: builtin/log.c:1561 +#: builtin/commit-graph.c:54 builtin/commit-graph.c:100 +#: builtin/commit-graph.c:161 builtin/commit-graph.c:237 builtin/fetch.c:163 +#: builtin/log.c:1584 msgid "dir" msgstr "dir" -#: builtin/commit-graph.c:52 builtin/commit-graph.c:90 -#: builtin/commit-graph.c:148 builtin/commit-graph.c:206 +#: builtin/commit-graph.c:55 builtin/commit-graph.c:101 +#: builtin/commit-graph.c:162 builtin/commit-graph.c:238 msgid "The object directory to store the graph" msgstr "El directorio de objetos para guardar el gráfico" -#: builtin/commit-graph.c:68 builtin/commit-graph.c:105 +#: builtin/commit-graph.c:57 +msgid "if the commit-graph is split, only verify the tip file" +msgstr "si el commit-graph está cortado, solo verifica la punta del archivo" + +#: builtin/commit-graph.c:73 builtin/commit-graph.c:116 #, c-format msgid "Could not open commit-graph '%s'" msgstr "No se pudo abrir commit-graph '%s'" -#: builtin/commit-graph.c:150 +#: builtin/commit-graph.c:164 msgid "start walk at all refs" msgstr "comenzar caminata en todas las refs" -#: builtin/commit-graph.c:152 +#: builtin/commit-graph.c:166 msgid "scan pack-indexes listed by stdin for commits" msgstr "escanear paquete de índices por stdin por commits" -#: builtin/commit-graph.c:154 +#: builtin/commit-graph.c:168 msgid "start walk at commits listed by stdin" msgstr "comenzar a caminar a los commits listados por stdin" -#: builtin/commit-graph.c:156 +#: builtin/commit-graph.c:170 msgid "include all commits already in the commit-graph file" msgstr "inclye todos los commits que ya están en el archivo commit-graph" -#: builtin/commit-graph.c:165 +#: builtin/commit-graph.c:172 +msgid "allow writing an incremental commit-graph file" +msgstr "permitir escribir un archivo commit-graph incremental" + +#: builtin/commit-graph.c:174 builtin/commit-graph.c:178 +msgid "maximum number of commits in a non-base split commit-graph" +msgstr "máximo número de commits en un commit-graph sin base cortada" + +#: builtin/commit-graph.c:176 +msgid "maximum ratio between two levels of a split commit-graph" +msgstr "radio máximo entre dos niveles de corte de commit-graph" + +#: builtin/commit-graph.c:191 msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs" msgstr "use como máximo uno de --reachable, --stdin-commits, o --stdin-packs" @@ -11594,7 +11962,7 @@ msgstr "use como máximo uno de --reachable, --stdin-commits, o --stdin-packs" msgid "git config [<options>]" msgstr "git config [<opciones>]" -#: builtin/config.c:103 +#: builtin/config.c:103 builtin/env--helper.c:23 #, c-format msgid "unrecognized --type argument, %s" msgstr "argumento --type no reconocido, %s" @@ -11700,7 +12068,7 @@ msgstr "encontrar las opciones del color: slot [stdout-es-tty]" msgid "Type" msgstr "Tipo" -#: builtin/config.c:147 +#: builtin/config.c:147 builtin/env--helper.c:38 msgid "value is given this type" msgstr "al valor se ha dado este tipo" @@ -11744,7 +12112,7 @@ msgstr "respetar directivas include en la búsqueda" msgid "show origin of config (file, standard input, blob, command line)" msgstr "mostrar el origen de configuración (archivo, stdin, blob, comando)" -#: builtin/config.c:158 +#: builtin/config.c:158 builtin/env--helper.c:40 msgid "value" msgstr "valor" @@ -12040,7 +12408,7 @@ msgstr "solo considerar tags que concuerden con <patrón>" msgid "do not consider tags matching <pattern>" msgstr "no considerar tags que concuerden con <patrón>" -#: builtin/describe.c:551 builtin/name-rev.c:426 +#: builtin/describe.c:551 builtin/name-rev.c:422 msgid "show abbreviated commit object as fallback" msgstr "mostrar el objeto commit abreviado como fallback" @@ -12149,7 +12517,7 @@ msgstr "archivo temporal existe en '%s'." #: builtin/difftool.c:640 msgid "you may want to cleanup or recover these." -msgstr "tal vez desee limpiar o recuperar estos." +msgstr "tal vez desees limpiar o recuperar estos." #: builtin/difftool.c:689 msgid "use `diff.guitool` instead of `diff.tool`" @@ -12216,158 +12584,191 @@ msgstr "no se ha proporcionado <herramienta> para --tool=<herramienta>" msgid "no <cmd> given for --extcmd=<cmd>" msgstr "no se ha entregado <comando> para --extcmd=<comando>" +#: builtin/env--helper.c:6 +msgid "git env--helper --type=[bool|ulong] <options> <env-var>" +msgstr "git env--helper --type=[bool|ulong] <opciones> <env-var>" + +#: builtin/env--helper.c:37 builtin/hash-object.c:98 +msgid "type" +msgstr "tipo" + +#: builtin/env--helper.c:41 +msgid "default for git_env_*(...) to fall back on" +msgstr "default para git_env_*(...) es hacer fallback en" + +#: builtin/env--helper.c:43 +msgid "be quiet only use git_env_*() value as exit code" +msgstr "ser silencioso solo usar valor git_env_*() como código de salida" + +#: builtin/env--helper.c:62 +#, c-format +msgid "option `--default' expects a boolean value with `--type=bool`, not `%s`" +msgstr "opción `--default' espera un valor boolean con `--type=bool`, no `%s`" + +#: builtin/env--helper.c:77 +#, c-format +msgid "" +"option `--default' expects an unsigned long value with `--type=ulong`, not `" +"%s`" +msgstr "" +"opción `--default' espera un valor unsigned long con `--type=ulong`, no `%s`" + #: builtin/fast-export.c:29 msgid "git fast-export [rev-list-opts]" msgstr "git fast-export [rev-list-opts]" -#: builtin/fast-export.c:1084 +#: builtin/fast-export.c:1124 msgid "show progress after <n> objects" msgstr "mostrar progreso después de <n> objetos" -#: builtin/fast-export.c:1086 +#: builtin/fast-export.c:1126 msgid "select handling of signed tags" msgstr "seleccionar el manejo de tags firmados" -#: builtin/fast-export.c:1089 +#: builtin/fast-export.c:1129 msgid "select handling of tags that tag filtered objects" msgstr "seleccionar el manejo de tags que son tags de objetos filtrados" -#: builtin/fast-export.c:1092 +#: builtin/fast-export.c:1132 +msgid "select handling of commit messages in an alternate encoding" +msgstr "seleccionar el manejo de mensajes de commit en un encoding diferente" + +#: builtin/fast-export.c:1135 msgid "Dump marks to this file" msgstr "Volcar marcas a este archivo" -#: builtin/fast-export.c:1094 +#: builtin/fast-export.c:1137 msgid "Import marks from this file" msgstr "Importar marcas de este archivo" -#: builtin/fast-export.c:1096 +#: builtin/fast-export.c:1139 msgid "Fake a tagger when tags lack one" msgstr "Falsificar un tagger cuando les falta uno" -#: builtin/fast-export.c:1098 +#: builtin/fast-export.c:1141 msgid "Output full tree for each commit" msgstr "Mostrar todo el árbol para cada commit" -#: builtin/fast-export.c:1100 +#: builtin/fast-export.c:1143 msgid "Use the done feature to terminate the stream" msgstr "Use el feature done para terminar el stream" -#: builtin/fast-export.c:1101 +#: builtin/fast-export.c:1144 msgid "Skip output of blob data" msgstr "Saltar el output de data blob" -#: builtin/fast-export.c:1102 builtin/log.c:1609 +#: builtin/fast-export.c:1145 builtin/log.c:1632 msgid "refspec" msgstr "refspec" -#: builtin/fast-export.c:1103 +#: builtin/fast-export.c:1146 msgid "Apply refspec to exported refs" msgstr "Aplicar refspec para los refs exportados" -#: builtin/fast-export.c:1104 +#: builtin/fast-export.c:1147 msgid "anonymize output" msgstr "anonimizar la salida" -#: builtin/fast-export.c:1106 +#: builtin/fast-export.c:1149 msgid "Reference parents which are not in fast-export stream by object id" msgstr "" "Padres de la referencia que no estan en fast-export stream por id de objeto" -#: builtin/fast-export.c:1108 +#: builtin/fast-export.c:1151 msgid "Show original object ids of blobs/commits" msgstr "Mostrar ids de objetos originales para blobs/commits" -#: builtin/fetch.c:28 +#: builtin/fetch.c:30 msgid "git fetch [<options>] [<repository> [<refspec>...]]" msgstr "git fetch [<opciones>] [<repositorio> [<refspec>...]]" -#: builtin/fetch.c:29 +#: builtin/fetch.c:31 msgid "git fetch [<options>] <group>" msgstr "git fetch [<opciones>] <grupo>" -#: builtin/fetch.c:30 +#: builtin/fetch.c:32 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" msgstr "git fetch --multiple [<opciones>] [(<repositorio> | <grupo>)...]" -#: builtin/fetch.c:31 +#: builtin/fetch.c:33 msgid "git fetch --all [<options>]" msgstr "git fetch --all [<opciones>]" -#: builtin/fetch.c:115 builtin/pull.c:202 +#: builtin/fetch.c:125 builtin/pull.c:203 msgid "fetch from all remotes" msgstr "extraer de todos los remotos" -#: builtin/fetch.c:117 builtin/pull.c:205 +#: builtin/fetch.c:127 builtin/pull.c:206 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "adjuntar a .git/FETCH_HEAD en lugar de sobrescribir" -#: builtin/fetch.c:119 builtin/pull.c:208 +#: builtin/fetch.c:129 builtin/pull.c:209 msgid "path to upload pack on remote end" msgstr "ruta para cargar el paquete al final del remoto" -#: builtin/fetch.c:120 +#: builtin/fetch.c:130 msgid "force overwrite of local reference" msgstr "forzar sobrescritura de referencia local" -#: builtin/fetch.c:122 +#: builtin/fetch.c:132 msgid "fetch from multiple remotes" msgstr "extraer de múltiples remotos" -#: builtin/fetch.c:124 builtin/pull.c:212 +#: builtin/fetch.c:134 builtin/pull.c:213 msgid "fetch all tags and associated objects" msgstr "extraer todos los tags y objetos asociados" -#: builtin/fetch.c:126 +#: builtin/fetch.c:136 msgid "do not fetch all tags (--no-tags)" msgstr "no extraer todos los tags (--no-tags)" -#: builtin/fetch.c:128 +#: builtin/fetch.c:138 msgid "number of submodules fetched in parallel" msgstr "número de submódulos extraídos en paralelo" -#: builtin/fetch.c:130 builtin/pull.c:215 +#: builtin/fetch.c:140 builtin/pull.c:216 msgid "prune remote-tracking branches no longer on remote" msgstr "limpiar ramas remotas rastreadas que ya no están en el remoto" -#: builtin/fetch.c:132 +#: builtin/fetch.c:142 msgid "prune local tags no longer on remote and clobber changed tags" msgstr "" "limpiar tags locales que no se encuentran en el remoto y eliminar tags " "cambiados" -#: builtin/fetch.c:133 builtin/fetch.c:156 builtin/pull.c:139 +#: builtin/fetch.c:143 builtin/fetch.c:166 builtin/pull.c:140 msgid "on-demand" msgstr "en demanda" -#: builtin/fetch.c:134 +#: builtin/fetch.c:144 msgid "control recursive fetching of submodules" msgstr "controlar extracción recursiva de submódulos" -#: builtin/fetch.c:138 builtin/pull.c:223 +#: builtin/fetch.c:148 builtin/pull.c:224 msgid "keep downloaded pack" msgstr "mantener el paquete descargado" -#: builtin/fetch.c:140 +#: builtin/fetch.c:150 msgid "allow updating of HEAD ref" msgstr "permitir actualizar la ref HEAD" -#: builtin/fetch.c:143 builtin/fetch.c:149 builtin/pull.c:226 +#: builtin/fetch.c:153 builtin/fetch.c:159 builtin/pull.c:227 msgid "deepen history of shallow clone" msgstr "historia profunda de un clon superficial" -#: builtin/fetch.c:145 +#: builtin/fetch.c:155 msgid "deepen history of shallow repository based on time" msgstr "historia profunda de un repositorio superficial basado en tiempo" -#: builtin/fetch.c:151 builtin/pull.c:229 +#: builtin/fetch.c:161 builtin/pull.c:230 msgid "convert to a complete repository" msgstr "convertir a un repositorio completo" -#: builtin/fetch.c:154 +#: builtin/fetch.c:164 msgid "prepend this to submodule path output" msgstr "anteponer esto a salida de la ruta del submódulo" -#: builtin/fetch.c:157 +#: builtin/fetch.c:167 msgid "" "default for recursive fetching of submodules (lower priority than config " "files)" @@ -12375,97 +12776,129 @@ msgstr "" "default para extracción recursiva de submódulos (menor prioridad que " "archivos de configuración)" -#: builtin/fetch.c:161 builtin/pull.c:232 +#: builtin/fetch.c:171 builtin/pull.c:233 msgid "accept refs that update .git/shallow" msgstr "aceptar refs que actualicen .git/shallow" -#: builtin/fetch.c:162 builtin/pull.c:234 +#: builtin/fetch.c:172 builtin/pull.c:235 msgid "refmap" msgstr "refmap" -#: builtin/fetch.c:163 builtin/pull.c:235 +#: builtin/fetch.c:173 builtin/pull.c:236 msgid "specify fetch refmap" msgstr "especificar extracción de refmap" -#: builtin/fetch.c:170 +#: builtin/fetch.c:180 msgid "report that we have only objects reachable from this object" msgstr "reporta que solo tenemos objetos alcanzables de este objeto" -#: builtin/fetch.c:469 +#: builtin/fetch.c:183 +msgid "run 'gc --auto' after fetching" +msgstr "ejecutar 'gc --auto' tras el fetch" + +#: builtin/fetch.c:185 builtin/pull.c:245 +msgid "check for forced-updates on all updated branches" +msgstr "verificar updates forzados en todos los branch actualizados" + +#: builtin/fetch.c:491 msgid "Couldn't find remote ref HEAD" msgstr "No se puedo encontrar ref remota HEAD" -#: builtin/fetch.c:608 +#: builtin/fetch.c:630 #, c-format msgid "configuration fetch.output contains invalid value %s" msgstr "la configuración fetch.output contiene el valor inválido %s" -#: builtin/fetch.c:705 +#: builtin/fetch.c:728 #, c-format msgid "object %s not found" msgstr "objeto %s no encontrado" -#: builtin/fetch.c:709 +#: builtin/fetch.c:732 msgid "[up to date]" msgstr "[actualizado]" -#: builtin/fetch.c:722 builtin/fetch.c:738 builtin/fetch.c:801 +#: builtin/fetch.c:745 builtin/fetch.c:761 builtin/fetch.c:833 msgid "[rejected]" msgstr "[rechazado]" -#: builtin/fetch.c:723 +#: builtin/fetch.c:746 msgid "can't fetch in current branch" msgstr "no se puede traer en la rama actual" -#: builtin/fetch.c:733 +#: builtin/fetch.c:756 msgid "[tag update]" msgstr "[actualización de tag]" -#: builtin/fetch.c:734 builtin/fetch.c:771 builtin/fetch.c:784 -#: builtin/fetch.c:796 +#: builtin/fetch.c:757 builtin/fetch.c:794 builtin/fetch.c:816 +#: builtin/fetch.c:828 msgid "unable to update local ref" msgstr "no se posible actualizar el ref local" -#: builtin/fetch.c:738 +#: builtin/fetch.c:761 msgid "would clobber existing tag" msgstr "podría golpear tag existente" -#: builtin/fetch.c:760 +#: builtin/fetch.c:783 msgid "[new tag]" msgstr "[nuevo tag]" -#: builtin/fetch.c:763 +#: builtin/fetch.c:786 msgid "[new branch]" msgstr "[nueva rama]" -#: builtin/fetch.c:766 +#: builtin/fetch.c:789 msgid "[new ref]" msgstr "[nueva referencia]" -#: builtin/fetch.c:796 +#: builtin/fetch.c:828 msgid "forced update" msgstr "actualización forzada" -#: builtin/fetch.c:801 +#: builtin/fetch.c:833 msgid "non-fast-forward" msgstr "avance lento" -#: builtin/fetch.c:847 +#: builtin/fetch.c:854 +msgid "" +"Fetch normally indicates which branches had a forced update,\n" +"but that check has been disabled. To re-enable, use '--show-forced-updates'\n" +"flag or run 'git config fetch.showForcedUpdates true'." +msgstr "" +"Fetch normalmente incida qué branches han tenido un update forzado,\n" +"pero esa validación ha sido deshabilitada. Para activarla de nuevo use '--" +"show-forced-updates'\n" +"o ejecute 'git config fetch.showForcedUpdates true'." + +#: builtin/fetch.c:858 +#, c-format +msgid "" +"It took %.2f seconds to check forced updates. You can use\n" +"'--no-show-forced-updates' or run 'git config fetch.showForcedUpdates " +"false'\n" +" to avoid this check.\n" +msgstr "" +"Tomó %.2f segundos validar los updates forzados. Puedes usar\n" +"'--no-show-forced-updates' o ejecutar 'git config fetch.showForcedUpdates " +"false'\n" +"para evitar esta validación.\n" + +#: builtin/fetch.c:888 #, c-format msgid "%s did not send all necessary objects\n" msgstr "%s no envió todos los objetos necesarios\n" -#: builtin/fetch.c:868 +#: builtin/fetch.c:909 #, c-format msgid "reject %s because shallow roots are not allowed to be updated" msgstr "rechazado %s porque raíces superficiales no pueden ser actualizadas" -#: builtin/fetch.c:959 builtin/fetch.c:1081 +#: builtin/fetch.c:1000 builtin/fetch.c:1131 #, c-format msgid "From %.*s\n" msgstr "Desde %.*s\n" -#: builtin/fetch.c:970 +#: builtin/fetch.c:1011 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -12474,50 +12907,50 @@ msgstr "" "algunos refs locales no pudieron ser actualizados; intente ejecutar\n" " 'git remote prune %s' para eliminar cualquier rama vieja o conflictiva" -#: builtin/fetch.c:1051 +#: builtin/fetch.c:1101 #, c-format msgid " (%s will become dangling)" msgstr " (%s se pondrá colgado)" -#: builtin/fetch.c:1052 +#: builtin/fetch.c:1102 #, c-format msgid " (%s has become dangling)" msgstr " (%s se ha colgado)" -#: builtin/fetch.c:1084 +#: builtin/fetch.c:1134 msgid "[deleted]" msgstr "[eliminado]" -#: builtin/fetch.c:1085 builtin/remote.c:1036 +#: builtin/fetch.c:1135 builtin/remote.c:1036 msgid "(none)" msgstr "(nada)" -#: builtin/fetch.c:1108 +#: builtin/fetch.c:1158 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "Rehusando extraer en la rama actual %s de un repositorio no vacío" -#: builtin/fetch.c:1127 +#: builtin/fetch.c:1177 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "Opción \"%s\" valor \"%s\" no es válido para %s" -#: builtin/fetch.c:1130 +#: builtin/fetch.c:1180 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "Opción \"%s\" es ignorada por %s\n" -#: builtin/fetch.c:1434 +#: builtin/fetch.c:1484 #, c-format msgid "Fetching %s\n" msgstr "Extrayendo %s\n" -#: builtin/fetch.c:1436 builtin/remote.c:100 +#: builtin/fetch.c:1486 builtin/remote.c:100 #, c-format msgid "Could not fetch %s" msgstr "No se pudo extraer %s" -#: builtin/fetch.c:1482 +#: builtin/fetch.c:1532 msgid "" "--filter can only be used with the remote configured in extensions." "partialClone" @@ -12525,7 +12958,7 @@ msgstr "" "--filter solo puede ser usado con el remoto configurado en extensions." "partialClone" -#: builtin/fetch.c:1506 +#: builtin/fetch.c:1556 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." @@ -12533,44 +12966,44 @@ msgstr "" "No hay repositorio remoto especificado. Por favor, especifique un URL o un\n" "nombre remoto del cual las nuevas revisiones deben ser extraídas." -#: builtin/fetch.c:1543 +#: builtin/fetch.c:1593 msgid "You need to specify a tag name." -msgstr "Tiene que especificar un nombre de tag." +msgstr "Tienes que especificar un nombre de tag." -#: builtin/fetch.c:1594 +#: builtin/fetch.c:1644 msgid "Negative depth in --deepen is not supported" msgstr "Profundidad negativa en --deepen no soportada" -#: builtin/fetch.c:1596 +#: builtin/fetch.c:1646 msgid "--deepen and --depth are mutually exclusive" msgstr "--deepen y --depth son mutuamente exclusivas" -#: builtin/fetch.c:1601 +#: builtin/fetch.c:1651 msgid "--depth and --unshallow cannot be used together" msgstr "--depth y --unshallow no pueden ser usadas juntas" -#: builtin/fetch.c:1603 +#: builtin/fetch.c:1653 msgid "--unshallow on a complete repository does not make sense" msgstr "--unshallow no tiene sentido en un repositorio completo" -#: builtin/fetch.c:1619 +#: builtin/fetch.c:1669 msgid "fetch --all does not take a repository argument" msgstr "fetch --all no toma un argumento de repositorio" -#: builtin/fetch.c:1621 +#: builtin/fetch.c:1671 msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all no tiene sentido con refspecs" -#: builtin/fetch.c:1630 +#: builtin/fetch.c:1680 #, c-format msgid "No such remote or remote group: %s" msgstr "No existe el remoto o grupo remoto: %s" -#: builtin/fetch.c:1637 +#: builtin/fetch.c:1687 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "Extraer un grupo y especificar un refspecs no tiene sentido" -#: builtin/fetch.c:1653 +#: builtin/fetch.c:1703 msgid "" "--filter can only be used with the remote configured in extensions." "partialclone" @@ -12640,7 +13073,7 @@ msgstr "cite los marcadores de posición adecuadamente para Tcl" msgid "show only <n> matched refs" msgstr "mostrar solo <n> refs encontradas" -#: builtin/for-each-ref.c:39 builtin/tag.c:433 +#: builtin/for-each-ref.c:39 builtin/tag.c:439 msgid "respect format colors" msgstr "respetar el formato de colores" @@ -12808,7 +13241,7 @@ msgstr "Revisando objetos directorios" msgid "Checking %s link" msgstr "Revisando link %s" -#: builtin/fsck.c:705 builtin/index-pack.c:841 +#: builtin/fsck.c:705 builtin/index-pack.c:842 #, c-format msgid "invalid %s" msgstr "%s inválido" @@ -12893,7 +13326,7 @@ msgstr "mostrar progreso" msgid "show verbose names for reachable objects" msgstr "mostrar nombres verboso para objetos alcanzables" -#: builtin/fsck.c:859 builtin/index-pack.c:224 +#: builtin/fsck.c:859 builtin/index-pack.c:225 msgid "Checking objects" msgstr "Revisando objetos" @@ -12926,7 +13359,7 @@ msgstr "falló al analizar '%s' valor '%s'" msgid "cannot stat '%s'" msgstr "no se pudo definir '%s'" -#: builtin/gc.c:485 builtin/notes.c:240 builtin/tag.c:519 +#: builtin/gc.c:485 builtin/notes.c:240 builtin/tag.c:529 #, c-format msgid "cannot read '%s'" msgstr "no se puede leer '%s'" @@ -13001,7 +13434,7 @@ msgstr "" "gc ya está ejecutándose en la máquina '%s' pid %<PRIuMAX> (use --force so no " "es así)" -#: builtin/gc.c:693 +#: builtin/gc.c:695 msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "" @@ -13026,262 +13459,262 @@ msgstr "número inválido de hilos especificado (%d) para %s" #. variable for tweaking threads, currently #. grep.threads #. -#: builtin/grep.c:287 builtin/index-pack.c:1514 builtin/index-pack.c:1705 -#: builtin/pack-objects.c:2720 +#: builtin/grep.c:287 builtin/index-pack.c:1534 builtin/index-pack.c:1727 +#: builtin/pack-objects.c:2728 #, c-format msgid "no threads support, ignoring %s" msgstr "no hay soporte para hilos, ignorando %s" -#: builtin/grep.c:466 builtin/grep.c:590 builtin/grep.c:631 +#: builtin/grep.c:467 builtin/grep.c:591 builtin/grep.c:633 #, c-format msgid "unable to read tree (%s)" msgstr "no es posible leer el árbol (%s)" -#: builtin/grep.c:646 +#: builtin/grep.c:648 #, c-format msgid "unable to grep from object of type %s" msgstr "no es posible realizar grep del objeto de tipo %s" -#: builtin/grep.c:712 +#: builtin/grep.c:714 #, c-format msgid "switch `%c' expects a numerical value" msgstr "switch `%c' espera un valor numérico" -#: builtin/grep.c:811 +#: builtin/grep.c:813 msgid "search in index instead of in the work tree" msgstr "buscar en el índice en lugar del árbol de trabajo" -#: builtin/grep.c:813 +#: builtin/grep.c:815 msgid "find in contents not managed by git" msgstr "encontrar en contenidos no manejados por git" -#: builtin/grep.c:815 +#: builtin/grep.c:817 msgid "search in both tracked and untracked files" msgstr "buscar en archivos rastreados y no rastreados" -#: builtin/grep.c:817 +#: builtin/grep.c:819 msgid "ignore files specified via '.gitignore'" msgstr "ignorar archivos especificados via '.gitignore'" -#: builtin/grep.c:819 +#: builtin/grep.c:821 msgid "recursively search in each submodule" msgstr "búsqueda recursiva en cada submódulo" -#: builtin/grep.c:822 +#: builtin/grep.c:824 msgid "show non-matching lines" msgstr "mostrar líneas que no concuerdan" -#: builtin/grep.c:824 +#: builtin/grep.c:826 msgid "case insensitive matching" msgstr "búsqueda insensible a mayúsculas" -#: builtin/grep.c:826 +#: builtin/grep.c:828 msgid "match patterns only at word boundaries" msgstr "concordar patrón solo a los límites de las palabras" -#: builtin/grep.c:828 +#: builtin/grep.c:830 msgid "process binary files as text" msgstr "procesar archivos binarios como texto" -#: builtin/grep.c:830 +#: builtin/grep.c:832 msgid "don't match patterns in binary files" msgstr "no concordar patrones en archivos binarios" -#: builtin/grep.c:833 +#: builtin/grep.c:835 msgid "process binary files with textconv filters" msgstr "procesar archivos binarios con filtros textconv" -#: builtin/grep.c:835 +#: builtin/grep.c:837 msgid "search in subdirectories (default)" msgstr "buscar en subdirectorios (default)" -#: builtin/grep.c:837 +#: builtin/grep.c:839 msgid "descend at most <depth> levels" msgstr "descender como máximo <valor-de-profundiad> niveles" -#: builtin/grep.c:841 +#: builtin/grep.c:843 msgid "use extended POSIX regular expressions" msgstr "usar expresiones regulares POSIX extendidas" -#: builtin/grep.c:844 +#: builtin/grep.c:846 msgid "use basic POSIX regular expressions (default)" msgstr "usar expresiones regulares POSIX (default)" -#: builtin/grep.c:847 +#: builtin/grep.c:849 msgid "interpret patterns as fixed strings" msgstr "interpretar patrones como strings arreglados" -#: builtin/grep.c:850 +#: builtin/grep.c:852 msgid "use Perl-compatible regular expressions" msgstr "usar expresiones regulares compatibles con Perl" -#: builtin/grep.c:853 +#: builtin/grep.c:855 msgid "show line numbers" msgstr "mostrar números de línea" -#: builtin/grep.c:854 +#: builtin/grep.c:856 msgid "show column number of first match" msgstr "mostrar el número de columna de la primer coincidencia" -#: builtin/grep.c:855 +#: builtin/grep.c:857 msgid "don't show filenames" msgstr "no mostrar nombres de archivo" -#: builtin/grep.c:856 +#: builtin/grep.c:858 msgid "show filenames" msgstr "mostrar nombres de archivo" -#: builtin/grep.c:858 +#: builtin/grep.c:860 msgid "show filenames relative to top directory" msgstr "mostrar nombres de archivo relativos al directorio superior" -#: builtin/grep.c:860 +#: builtin/grep.c:862 msgid "show only filenames instead of matching lines" msgstr "mostrar solo nombres de archivos en lugar de líneas encontradas" -#: builtin/grep.c:862 +#: builtin/grep.c:864 msgid "synonym for --files-with-matches" msgstr "sinónimo para --files-with-matches" -#: builtin/grep.c:865 +#: builtin/grep.c:867 msgid "show only the names of files without match" msgstr "mostrar solo los nombres de archivos sin coincidencias" -#: builtin/grep.c:867 +#: builtin/grep.c:869 msgid "print NUL after filenames" msgstr "imprimir NUL después del nombre de archivo" -#: builtin/grep.c:870 +#: builtin/grep.c:872 msgid "show only matching parts of a line" msgstr "mostrar solo partes que concuerdan de una línea" -#: builtin/grep.c:872 +#: builtin/grep.c:874 msgid "show the number of matches instead of matching lines" msgstr "mostrar el número de concordancias en lugar de las líneas concordantes" -#: builtin/grep.c:873 +#: builtin/grep.c:875 msgid "highlight matches" msgstr "resaltar concordancias" -#: builtin/grep.c:875 +#: builtin/grep.c:877 msgid "print empty line between matches from different files" msgstr "imprimir una línea vacía entre coincidencias de diferentes archivos" -#: builtin/grep.c:877 +#: builtin/grep.c:879 msgid "show filename only once above matches from same file" msgstr "" "mostrar el nombre de archivo solo una vez para concordancias en el mismo " "archivo" -#: builtin/grep.c:880 +#: builtin/grep.c:882 msgid "show <n> context lines before and after matches" msgstr "mostrar <n> líneas de contexto antes y después de la concordancia" -#: builtin/grep.c:883 +#: builtin/grep.c:885 msgid "show <n> context lines before matches" msgstr "mostrar <n> líneas de contexto antes de las concordancias" -#: builtin/grep.c:885 +#: builtin/grep.c:887 msgid "show <n> context lines after matches" msgstr "mostrar <n> líneas de context después de las concordancias" -#: builtin/grep.c:887 +#: builtin/grep.c:889 msgid "use <n> worker threads" msgstr "usar <n> hilos de trabajo" -#: builtin/grep.c:888 +#: builtin/grep.c:890 msgid "shortcut for -C NUM" msgstr "atajo para -C NUM" -#: builtin/grep.c:891 +#: builtin/grep.c:893 msgid "show a line with the function name before matches" msgstr "" "mostrar una línea con el nombre de la función antes de las concordancias" -#: builtin/grep.c:893 +#: builtin/grep.c:895 msgid "show the surrounding function" msgstr "mostrar la función circundante" -#: builtin/grep.c:896 +#: builtin/grep.c:898 msgid "read patterns from file" msgstr "leer patrones del archivo" -#: builtin/grep.c:898 +#: builtin/grep.c:900 msgid "match <pattern>" msgstr "concordar <patrón>" -#: builtin/grep.c:900 +#: builtin/grep.c:902 msgid "combine patterns specified with -e" msgstr "combinar patrones especificados con -e" -#: builtin/grep.c:912 +#: builtin/grep.c:914 msgid "indicate hit with exit status without output" msgstr "indicar concordancia con exit status sin output" -#: builtin/grep.c:914 +#: builtin/grep.c:916 msgid "show only matches from files that match all patterns" msgstr "" "mostrar solo concordancias con archivos que concuerdan todos los patrones" -#: builtin/grep.c:916 +#: builtin/grep.c:918 msgid "show parse tree for grep expression" msgstr "mostrar árbol analizado para la expresión grep" -#: builtin/grep.c:920 +#: builtin/grep.c:922 msgid "pager" msgstr "paginador" -#: builtin/grep.c:920 +#: builtin/grep.c:922 msgid "show matching files in the pager" msgstr "mostrar archivos concordantes en el paginador" -#: builtin/grep.c:924 +#: builtin/grep.c:926 msgid "allow calling of grep(1) (ignored by this build)" msgstr "permitir el llamado de grep(1) (ignorado por esta build)" -#: builtin/grep.c:988 +#: builtin/grep.c:990 msgid "no pattern given" msgstr "no se ha entregado patrón" -#: builtin/grep.c:1024 +#: builtin/grep.c:1026 msgid "--no-index or --untracked cannot be used with revs" msgstr "--no-index o --untracked no se puede usar con revs" -#: builtin/grep.c:1032 +#: builtin/grep.c:1034 #, c-format msgid "unable to resolve revision: %s" msgstr "no se posible resolver revisión: %s" -#: builtin/grep.c:1063 +#: builtin/grep.c:1065 msgid "invalid option combination, ignoring --threads" msgstr "combinación de opciones inválida, ignorando --threads" -#: builtin/grep.c:1066 builtin/pack-objects.c:3403 +#: builtin/grep.c:1068 builtin/pack-objects.c:3416 msgid "no threads support, ignoring --threads" msgstr "no se soportan hilos, ignorando --threads" -#: builtin/grep.c:1069 builtin/index-pack.c:1511 builtin/pack-objects.c:2717 +#: builtin/grep.c:1071 builtin/index-pack.c:1531 builtin/pack-objects.c:2725 #, c-format msgid "invalid number of threads specified (%d)" msgstr "número inválido de hilos especificado (%d)" -#: builtin/grep.c:1092 +#: builtin/grep.c:1094 msgid "--open-files-in-pager only works on the worktree" msgstr "--open-files-in-pager solo funciona en el árbol de trabajo" -#: builtin/grep.c:1115 +#: builtin/grep.c:1117 msgid "option not supported with --recurse-submodules" msgstr "opción no soportada con --recurse-submodules" -#: builtin/grep.c:1121 +#: builtin/grep.c:1123 msgid "--cached or --untracked cannot be used with --no-index" msgstr "--cached o --untracked no pueden ser usadas con --no-index" -#: builtin/grep.c:1127 +#: builtin/grep.c:1129 msgid "--[no-]exclude-standard cannot be used for tracked contents" msgstr "--[no-]exclude-standard no puede ser usada para contenido rastreado" -#: builtin/grep.c:1135 +#: builtin/grep.c:1137 msgid "both --cached and trees are given" msgstr "--cached y árboles han sido entregados" @@ -13298,10 +13731,6 @@ msgid "git hash-object --stdin-paths" msgstr "git hash-object --stdin-paths" #: builtin/hash-object.c:98 -msgid "type" -msgstr "tipo" - -#: builtin/hash-object.c:98 msgid "object type" msgstr "tipo de objeto" @@ -13418,12 +13847,12 @@ msgstr "ningún visualizador de manual proceso la petición" msgid "no info viewer handled the request" msgstr "ningún visor de info manejo la petición" -#: builtin/help.c:434 builtin/help.c:445 git.c:335 +#: builtin/help.c:434 builtin/help.c:445 git.c:336 #, c-format msgid "'%s' is aliased to '%s'" msgstr "'%s' tiene el alias '%s'" -#: builtin/help.c:448 git.c:364 +#: builtin/help.c:448 git.c:365 #, c-format msgid "bad alias.%s string: %s" msgstr "mal alias.%s string: %s" @@ -13437,290 +13866,285 @@ msgstr "uso: %s%s" msgid "'git help config' for more information" msgstr "'git help config' para más información" -#: builtin/index-pack.c:184 +#: builtin/index-pack.c:185 #, c-format msgid "object type mismatch at %s" msgstr "el tipo del objeto no concuerda en %s" -#: builtin/index-pack.c:204 +#: builtin/index-pack.c:205 #, c-format msgid "did not receive expected object %s" msgstr "no se recibió el objeto esperado %s" -#: builtin/index-pack.c:207 +#: builtin/index-pack.c:208 #, c-format msgid "object %s: expected type %s, found %s" msgstr "objeto %s: tipo esperado %s, encontrado %s" -#: builtin/index-pack.c:257 +#: builtin/index-pack.c:258 #, c-format msgid "cannot fill %d byte" msgid_plural "cannot fill %d bytes" msgstr[0] "no se puede llenar %d byte" msgstr[1] "no se pueden llenar %d bytes" -#: builtin/index-pack.c:267 +#: builtin/index-pack.c:268 msgid "early EOF" msgstr "EOF temprano" -#: builtin/index-pack.c:268 +#: builtin/index-pack.c:269 msgid "read error on input" msgstr "leer error en input" -#: builtin/index-pack.c:280 +#: builtin/index-pack.c:281 msgid "used more bytes than were available" msgstr "se usaron más bytes de los disponibles" -#: builtin/index-pack.c:287 builtin/pack-objects.c:600 +#: builtin/index-pack.c:288 builtin/pack-objects.c:604 msgid "pack too large for current definition of off_t" msgstr "paquete muy grande para la definición actual de off_t" -#: builtin/index-pack.c:290 builtin/unpack-objects.c:94 +#: builtin/index-pack.c:291 builtin/unpack-objects.c:94 msgid "pack exceeds maximum allowed size" msgstr "paquete excede el máximo tamaño permitido" -#: builtin/index-pack.c:305 builtin/repack.c:250 -#, c-format -msgid "unable to create '%s'" -msgstr "no se puede crear '%s'" - -#: builtin/index-pack.c:311 +#: builtin/index-pack.c:312 #, c-format msgid "cannot open packfile '%s'" msgstr "no se puede abrir el archivo de paquete '%s'" -#: builtin/index-pack.c:325 +#: builtin/index-pack.c:326 msgid "pack signature mismatch" msgstr "firma del paquete no concuerda" -#: builtin/index-pack.c:327 +#: builtin/index-pack.c:328 #, c-format msgid "pack version %<PRIu32> unsupported" msgstr "versión de paquete %<PRIu32> no soportada" -#: builtin/index-pack.c:345 +#: builtin/index-pack.c:346 #, c-format msgid "pack has bad object at offset %<PRIuMAX>: %s" msgstr "paquete tiene un mal objeto en el offset %<PRIuMAX>: %s" -#: builtin/index-pack.c:465 +#: builtin/index-pack.c:466 #, c-format msgid "inflate returned %d" msgstr "inflate devolvió %d" -#: builtin/index-pack.c:514 +#: builtin/index-pack.c:515 msgid "offset value overflow for delta base object" msgstr "valor de offset desbordado para el objeto base delta" -#: builtin/index-pack.c:522 +#: builtin/index-pack.c:523 msgid "delta base offset is out of bound" msgstr "offset de base delta está fuera de límites" -#: builtin/index-pack.c:530 +#: builtin/index-pack.c:531 #, c-format msgid "unknown object type %d" msgstr "tipo de objeto %d desconocido" -#: builtin/index-pack.c:561 +#: builtin/index-pack.c:562 msgid "cannot pread pack file" msgstr "no se puede propagar el paquete" -#: builtin/index-pack.c:563 +#: builtin/index-pack.c:564 #, c-format msgid "premature end of pack file, %<PRIuMAX> byte missing" msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing" msgstr[0] "final prematuro de archivo de paquete, %<PRIuMAX> byte faltante" msgstr[1] "final prematuro de archivo de paquete, %<PRIuMAX> bytes faltantes" -#: builtin/index-pack.c:589 +#: builtin/index-pack.c:590 msgid "serious inflate inconsistency" msgstr "inconsistencia seria en inflate" -#: builtin/index-pack.c:734 builtin/index-pack.c:740 builtin/index-pack.c:763 -#: builtin/index-pack.c:802 builtin/index-pack.c:811 +#: builtin/index-pack.c:735 builtin/index-pack.c:741 builtin/index-pack.c:764 +#: builtin/index-pack.c:803 builtin/index-pack.c:812 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "COLISIÓN DE TIPO SHA1 ENCONTRADA CON %s !" -#: builtin/index-pack.c:737 builtin/pack-objects.c:153 -#: builtin/pack-objects.c:213 builtin/pack-objects.c:307 +#: builtin/index-pack.c:738 builtin/pack-objects.c:157 +#: builtin/pack-objects.c:217 builtin/pack-objects.c:311 #, c-format msgid "unable to read %s" msgstr "no se posible leer %s" -#: builtin/index-pack.c:800 +#: builtin/index-pack.c:801 #, c-format msgid "cannot read existing object info %s" msgstr "no se puede leer la información existente del objeto %s" -#: builtin/index-pack.c:808 +#: builtin/index-pack.c:809 #, c-format msgid "cannot read existing object %s" msgstr "no se puede leer el objeto existente %s" -#: builtin/index-pack.c:822 +#: builtin/index-pack.c:823 #, c-format msgid "invalid blob object %s" msgstr "objeto blob %s inválido" -#: builtin/index-pack.c:825 builtin/index-pack.c:844 +#: builtin/index-pack.c:826 builtin/index-pack.c:845 msgid "fsck error in packed object" msgstr "error de fsck en el objeto empaquetado" -#: builtin/index-pack.c:846 +#: builtin/index-pack.c:847 #, c-format msgid "Not all child objects of %s are reachable" msgstr "No todos los objetos hijos de %s son alcanzables" -#: builtin/index-pack.c:918 builtin/index-pack.c:949 +#: builtin/index-pack.c:919 builtin/index-pack.c:950 msgid "failed to apply delta" msgstr "falló al aplicar delta" -#: builtin/index-pack.c:1117 +#: builtin/index-pack.c:1118 msgid "Receiving objects" msgstr "Recibiendo objetos" -#: builtin/index-pack.c:1117 +#: builtin/index-pack.c:1118 msgid "Indexing objects" msgstr "Indexando objetos" -#: builtin/index-pack.c:1151 +#: builtin/index-pack.c:1152 msgid "pack is corrupted (SHA1 mismatch)" msgstr "paquete está corrompido (SHA1 no concuerda)" -#: builtin/index-pack.c:1156 +#: builtin/index-pack.c:1157 msgid "cannot fstat packfile" msgstr "no se puede fstat al archivo de paquete" -#: builtin/index-pack.c:1159 +#: builtin/index-pack.c:1160 msgid "pack has junk at the end" msgstr "el paquete tiene basura al final" -#: builtin/index-pack.c:1171 +#: builtin/index-pack.c:1172 msgid "confusion beyond insanity in parse_pack_objects()" msgstr "confusión más allá de la locura en parse_pack_objects()" -#: builtin/index-pack.c:1194 +#: builtin/index-pack.c:1195 msgid "Resolving deltas" msgstr "Resolviendo deltas" -#: builtin/index-pack.c:1204 builtin/pack-objects.c:2489 +#: builtin/index-pack.c:1205 builtin/pack-objects.c:2497 #, c-format msgid "unable to create thread: %s" msgstr "no es posible crear hilo: %s" -#: builtin/index-pack.c:1245 +#: builtin/index-pack.c:1246 msgid "confusion beyond insanity" msgstr "confusión más allá de la locura" -#: builtin/index-pack.c:1251 +#: builtin/index-pack.c:1252 #, c-format msgid "completed with %d local object" msgid_plural "completed with %d local objects" msgstr[0] "completado con %d objeto local" msgstr[1] "completado con %d objetos locales" -#: builtin/index-pack.c:1263 +#: builtin/index-pack.c:1264 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "Tail checksum para %s inesperada (corrupción de disco?)" -#: builtin/index-pack.c:1267 +#: builtin/index-pack.c:1268 #, c-format msgid "pack has %d unresolved delta" msgid_plural "pack has %d unresolved deltas" msgstr[0] "paquete tiene %d delta sin resolver" msgstr[1] "paquete tiene %d deltas sin resolver" -#: builtin/index-pack.c:1291 +#: builtin/index-pack.c:1292 #, c-format msgid "unable to deflate appended object (%d)" msgstr "no es posible desinflar el objeto adjunto (%d)" -#: builtin/index-pack.c:1368 +#: builtin/index-pack.c:1388 #, c-format msgid "local object %s is corrupt" msgstr "objeto local %s está corrompido" -#: builtin/index-pack.c:1382 +#: builtin/index-pack.c:1402 #, c-format msgid "packfile name '%s' does not end with '.pack'" msgstr "nombre '%s' de archivo de paquete no termina con '.pack'" -#: builtin/index-pack.c:1407 +#: builtin/index-pack.c:1427 #, c-format msgid "cannot write %s file '%s'" msgstr "no se puede escribir %s en el archivo '%s'" -#: builtin/index-pack.c:1415 +#: builtin/index-pack.c:1435 #, c-format msgid "cannot close written %s file '%s'" msgstr "no se puede cerrar escrito %s en archivo '%s'" -#: builtin/index-pack.c:1439 +#: builtin/index-pack.c:1459 msgid "error while closing pack file" msgstr "error mientras se cierra el archivo paquete" -#: builtin/index-pack.c:1453 +#: builtin/index-pack.c:1473 msgid "cannot store pack file" msgstr "no se puede guardar el archivo paquete" -#: builtin/index-pack.c:1461 +#: builtin/index-pack.c:1481 msgid "cannot store index file" msgstr "no se puede guardar el archivo índice" -#: builtin/index-pack.c:1505 builtin/pack-objects.c:2728 +#: builtin/index-pack.c:1525 builtin/pack-objects.c:2736 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "mal pack.indexversion=%<PRIu32>" -#: builtin/index-pack.c:1573 +#: builtin/index-pack.c:1593 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "No se puede abrir el archivo paquete existente '%s'" -#: builtin/index-pack.c:1575 +#: builtin/index-pack.c:1595 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "No se puede abrir el índice del archivo paquete para '%s'" -#: builtin/index-pack.c:1623 +#: builtin/index-pack.c:1643 #, c-format msgid "non delta: %d object" msgid_plural "non delta: %d objects" msgstr[0] "no delta: %d objeto" msgstr[1] "no delta: %d objetos" -#: builtin/index-pack.c:1630 +#: builtin/index-pack.c:1650 #, c-format msgid "chain length = %d: %lu object" msgid_plural "chain length = %d: %lu objects" msgstr[0] "largo de cadena = %d: %lu objeto" msgstr[1] "largo de cadena = %d: %lu objetos" -#: builtin/index-pack.c:1667 +#: builtin/index-pack.c:1689 msgid "Cannot come back to cwd" msgstr "No se puede regresar a cwd" -#: builtin/index-pack.c:1716 builtin/index-pack.c:1719 -#: builtin/index-pack.c:1735 builtin/index-pack.c:1739 +#: builtin/index-pack.c:1738 builtin/index-pack.c:1741 +#: builtin/index-pack.c:1757 builtin/index-pack.c:1761 #, c-format msgid "bad %s" msgstr "mal %s" -#: builtin/index-pack.c:1755 +#: builtin/index-pack.c:1777 msgid "--fix-thin cannot be used without --stdin" msgstr "--fix-thin no puede ser usada sin --stdin" -#: builtin/index-pack.c:1757 +#: builtin/index-pack.c:1779 msgid "--stdin requires a git repository" msgstr "--stdin requiere un repositorio git" -#: builtin/index-pack.c:1763 +#: builtin/index-pack.c:1785 msgid "--verify with no packfile name given" msgstr "--verify no recibió ningún nombre de archivo de paquete" -#: builtin/index-pack.c:1811 builtin/unpack-objects.c:580 +#: builtin/index-pack.c:1833 builtin/unpack-objects.c:580 msgid "fsck error in pack objects" msgstr "error de fsck en objetos paquete" @@ -13816,17 +14240,17 @@ msgid "specify that the git repository is to be shared amongst several users" msgstr "" "especifica que el repositorio de git será compartido entre varios usuarios" -#: builtin/init-db.c:526 builtin/init-db.c:531 +#: builtin/init-db.c:529 builtin/init-db.c:534 #, c-format msgid "cannot mkdir %s" msgstr "no se pude crear directorio %s" -#: builtin/init-db.c:535 +#: builtin/init-db.c:538 #, c-format msgid "cannot chdir to %s" msgstr "no se puede aplicar chdir a %s" -#: builtin/init-db.c:556 +#: builtin/init-db.c:559 #, c-format msgid "" "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" @@ -13835,12 +14259,12 @@ msgstr "" "%s (o --work-tree=<directorio>) no se permite sin especificar %s (o --git-" "dir=<directorio>)" -#: builtin/init-db.c:584 +#: builtin/init-db.c:587 #, c-format msgid "Cannot access work tree '%s'" msgstr "No se puede acceder al árbol de trabajo '%s'" -#: builtin/interpret-trailers.c:15 +#: builtin/interpret-trailers.c:16 msgid "" "git interpret-trailers [--in-place] [--trim-empty] [(--trailer " "<token>[(=|:)<value>])...] [<file>...]" @@ -13848,59 +14272,59 @@ msgstr "" "git interpret-trailers [--in-place] [--trim-empty] [(--trailer " "<token>[(=|:)<valor>])...] [<archivo>...]" -#: builtin/interpret-trailers.c:94 +#: builtin/interpret-trailers.c:95 msgid "edit files in place" msgstr "editar archivos en el lugar" -#: builtin/interpret-trailers.c:95 +#: builtin/interpret-trailers.c:96 msgid "trim empty trailers" msgstr "cortar trailers vacíos" -#: builtin/interpret-trailers.c:98 +#: builtin/interpret-trailers.c:99 msgid "where to place the new trailer" msgstr "donde colocar el nuevo trailer" -#: builtin/interpret-trailers.c:100 +#: builtin/interpret-trailers.c:101 msgid "action if trailer already exists" msgstr "acción if trailer ya existe" -#: builtin/interpret-trailers.c:102 +#: builtin/interpret-trailers.c:103 msgid "action if trailer is missing" msgstr "acción si falta el trailer" -#: builtin/interpret-trailers.c:104 +#: builtin/interpret-trailers.c:105 msgid "output only the trailers" msgstr "mostrar solo los trailers" -#: builtin/interpret-trailers.c:105 +#: builtin/interpret-trailers.c:106 msgid "do not apply config rules" msgstr "no aplicar reglas de configuración" -#: builtin/interpret-trailers.c:106 +#: builtin/interpret-trailers.c:107 msgid "join whitespace-continued values" msgstr "juntar valores con espacios en blanco contiguos" -#: builtin/interpret-trailers.c:107 +#: builtin/interpret-trailers.c:108 msgid "set parsing options" msgstr "configurar opciones de análisis" -#: builtin/interpret-trailers.c:109 +#: builtin/interpret-trailers.c:110 msgid "do not treat --- specially" msgstr "no tratar --- especialmente" -#: builtin/interpret-trailers.c:110 +#: builtin/interpret-trailers.c:111 msgid "trailer" msgstr "trailer" -#: builtin/interpret-trailers.c:111 +#: builtin/interpret-trailers.c:112 msgid "trailer(s) to add" msgstr "trailer(s) para agregar" -#: builtin/interpret-trailers.c:120 +#: builtin/interpret-trailers.c:123 msgid "--trailer with --only-input does not make sense" msgstr "--trailer con --only-input no tiene sentido" -#: builtin/interpret-trailers.c:130 +#: builtin/interpret-trailers.c:133 msgid "no input file given for in-place editing" msgstr "no se entregó archivo de entrada para edición en lugar" @@ -13912,393 +14336,389 @@ msgstr "git log [<opciones>] [<rango-de-revisión>] [[--] <ruta>...]" msgid "git show [<options>] <object>..." msgstr "git show [<opciones>] <objeto>..." -#: builtin/log.c:104 +#: builtin/log.c:109 #, c-format msgid "invalid --decorate option: %s" msgstr "opción --decorate inválida: %s" -#: builtin/log.c:168 +#: builtin/log.c:173 msgid "show source" msgstr "mostrar fuente" -#: builtin/log.c:169 +#: builtin/log.c:174 msgid "Use mail map file" msgstr "Usar archivo de mapa de mail" -#: builtin/log.c:171 +#: builtin/log.c:176 msgid "only decorate refs that match <pattern>" msgstr "solo decorar refs que concuerden con <patrón>" -#: builtin/log.c:173 +#: builtin/log.c:178 msgid "do not decorate refs that match <pattern>" msgstr "no decorar refs que concuerden con <patrón>" -#: builtin/log.c:174 +#: builtin/log.c:179 msgid "decorate options" msgstr "opciones de decorado" -#: builtin/log.c:177 +#: builtin/log.c:182 msgid "Process line range n,m in file, counting from 1" msgstr "Procesar rango de líneas n,m en archivo, contando desde 1" -#: builtin/log.c:275 +#: builtin/log.c:280 #, c-format msgid "Final output: %d %s\n" msgstr "Salida final: %d %s\n" -#: builtin/log.c:529 +#: builtin/log.c:534 #, c-format msgid "git show %s: bad file" msgstr "git show %s: mal archivo" -#: builtin/log.c:544 builtin/log.c:638 +#: builtin/log.c:549 builtin/log.c:643 #, c-format msgid "could not read object %s" msgstr "no se pudo leer objeto %s" -#: builtin/log.c:663 +#: builtin/log.c:668 #, c-format msgid "unknown type: %d" msgstr "tipo desconocido: %d" -#: builtin/log.c:784 +#: builtin/log.c:791 msgid "format.headers without value" msgstr "formate.headers. sin valor" -#: builtin/log.c:885 +#: builtin/log.c:908 msgid "name of output directory is too long" msgstr "nombre del directorio de salida es muy largo" -#: builtin/log.c:901 +#: builtin/log.c:924 #, c-format msgid "cannot open patch file %s" msgstr "no se puede abrir archivo patch %s" -#: builtin/log.c:918 +#: builtin/log.c:941 msgid "need exactly one range" msgstr "necesita exactamente un rango" -#: builtin/log.c:928 +#: builtin/log.c:951 msgid "not a range" msgstr "no es un rango" -#: builtin/log.c:1051 +#: builtin/log.c:1074 msgid "cover letter needs email format" msgstr "letras de portada necesita formato email" -#: builtin/log.c:1057 +#: builtin/log.c:1080 msgid "failed to create cover-letter file" msgstr "falló al crear los archivos cover-letter" -#: builtin/log.c:1136 +#: builtin/log.c:1159 #, c-format msgid "insane in-reply-to: %s" msgstr "insano in-reply-to: %s" -#: builtin/log.c:1163 +#: builtin/log.c:1186 msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "git format-patch [<opciones>] [<desde> | <rango-de-revisiones>]" -#: builtin/log.c:1221 +#: builtin/log.c:1244 msgid "two output directories?" msgstr "dos directorios de salida?" -#: builtin/log.c:1332 builtin/log.c:2076 builtin/log.c:2078 builtin/log.c:2090 +#: builtin/log.c:1355 builtin/log.c:2099 builtin/log.c:2101 builtin/log.c:2113 #, c-format msgid "unknown commit %s" msgstr "commit desconocido %s" -#: builtin/log.c:1342 builtin/replace.c:58 builtin/replace.c:207 +#: builtin/log.c:1365 builtin/replace.c:58 builtin/replace.c:207 #: builtin/replace.c:210 #, c-format msgid "failed to resolve '%s' as a valid ref" msgstr "falló al resolver '%s' como ref válida" -#: builtin/log.c:1347 +#: builtin/log.c:1370 msgid "could not find exact merge base" msgstr "no se pudo encontrar una base de fusión exacta" -#: builtin/log.c:1351 +#: builtin/log.c:1374 msgid "" "failed to get upstream, if you want to record base commit automatically,\n" "please use git branch --set-upstream-to to track a remote branch.\n" "Or you could specify base commit by --base=<base-commit-id> manually" msgstr "" -"falló al conseguir upstream, si quiere grabar un commit base de manera " +"falló al conseguir upstream, si quieres grabar un commit base de manera " "automática,\n" -"por favor use git branch --set-upstream-to para rastrear una rama remota.\n" -"O puede especificar un commit base mediante --base=<id-commit-base> " +"por favor usa git branch --set-upstream-to para rastrear una rama remota.\n" +"O puedes especificar un commit base mediante --base=<id-commit-base> " "manualmente" -#: builtin/log.c:1371 +#: builtin/log.c:1394 msgid "failed to find exact merge base" msgstr "falló al encontrar una base de fusión exacta" -#: builtin/log.c:1382 +#: builtin/log.c:1405 msgid "base commit should be the ancestor of revision list" msgstr "el commit base debe ser el ancestro de la lista de revisión" -#: builtin/log.c:1386 +#: builtin/log.c:1409 msgid "base commit shouldn't be in revision list" msgstr "el commit base no debe estar en la lista de revisión" -#: builtin/log.c:1439 +#: builtin/log.c:1462 msgid "cannot get patch id" msgstr "no se puede obtener id de patch" -#: builtin/log.c:1491 +#: builtin/log.c:1514 msgid "failed to infer range-diff ranges" msgstr "falló al inferir rangos range-diff" -#: builtin/log.c:1536 +#: builtin/log.c:1559 msgid "use [PATCH n/m] even with a single patch" msgstr "use [PATCH n/m] incluso con un único parche" -#: builtin/log.c:1539 +#: builtin/log.c:1562 msgid "use [PATCH] even with multiple patches" msgstr "use [PATCH] incluso con múltiples parches" -#: builtin/log.c:1543 +#: builtin/log.c:1566 msgid "print patches to standard out" msgstr "mostrar parches en standard out" -#: builtin/log.c:1545 +#: builtin/log.c:1568 msgid "generate a cover letter" msgstr "generar letra de cover" -#: builtin/log.c:1547 +#: builtin/log.c:1570 msgid "use simple number sequence for output file names" msgstr "" "usar una secuencia simple de números para salida de nombres de archivos" -#: builtin/log.c:1548 +#: builtin/log.c:1571 msgid "sfx" msgstr "sfx" -#: builtin/log.c:1549 +#: builtin/log.c:1572 msgid "use <sfx> instead of '.patch'" msgstr "use <sfx> en lugar de '.patch'" -#: builtin/log.c:1551 +#: builtin/log.c:1574 msgid "start numbering patches at <n> instead of 1" msgstr "comenzar a numerar los parches desde <n> en lugar de 1" -#: builtin/log.c:1553 +#: builtin/log.c:1576 msgid "mark the series as Nth re-roll" msgstr "marcar las series como Nth re-roll" -#: builtin/log.c:1555 +#: builtin/log.c:1578 msgid "Use [RFC PATCH] instead of [PATCH]" msgstr "Use [RFC PATCH] en lugar de [PATCH]" -#: builtin/log.c:1558 +#: builtin/log.c:1581 msgid "Use [<prefix>] instead of [PATCH]" msgstr "Use [<prefijo>] en lugar de [PATCH]" -#: builtin/log.c:1561 +#: builtin/log.c:1584 msgid "store resulting files in <dir>" msgstr "guardar archivos resultantes en <dir>" -#: builtin/log.c:1564 +#: builtin/log.c:1587 msgid "don't strip/add [PATCH]" msgstr "no cortar/agregar [PATCH]" -#: builtin/log.c:1567 +#: builtin/log.c:1590 msgid "don't output binary diffs" msgstr "no mostrar diffs binarios" -#: builtin/log.c:1569 +#: builtin/log.c:1592 msgid "output all-zero hash in From header" msgstr "salida como hash de todos-ceros en la cabecera From" -#: builtin/log.c:1571 +#: builtin/log.c:1594 msgid "don't include a patch matching a commit upstream" msgstr "no incluya un parche que coincida con un commit en upstream" -#: builtin/log.c:1573 +#: builtin/log.c:1596 msgid "show patch format instead of default (patch + stat)" msgstr "mostrar formato de parche en lugar del default (parche + stat)" -#: builtin/log.c:1575 +#: builtin/log.c:1598 msgid "Messaging" msgstr "Mensajeando" -#: builtin/log.c:1576 +#: builtin/log.c:1599 msgid "header" msgstr "cabezal" -#: builtin/log.c:1577 +#: builtin/log.c:1600 msgid "add email header" msgstr "agregar cabecera email" -#: builtin/log.c:1578 builtin/log.c:1580 +#: builtin/log.c:1601 builtin/log.c:1603 msgid "email" msgstr "email" -#: builtin/log.c:1578 +#: builtin/log.c:1601 msgid "add To: header" msgstr "agregar cabecera To:" -#: builtin/log.c:1580 +#: builtin/log.c:1603 msgid "add Cc: header" msgstr "agregar cabecera Cc:" -#: builtin/log.c:1582 +#: builtin/log.c:1605 msgid "ident" msgstr "ident" -#: builtin/log.c:1583 +#: builtin/log.c:1606 msgid "set From address to <ident> (or committer ident if absent)" msgstr "" "configurar dirección From a <ident> ( o identidad de committer si está " "ausente)" -#: builtin/log.c:1585 +#: builtin/log.c:1608 msgid "message-id" msgstr "id de mensaje" -#: builtin/log.c:1586 +#: builtin/log.c:1609 msgid "make first mail a reply to <message-id>" msgstr "hacer primer mail una respuesta a <id de mensaje>" -#: builtin/log.c:1587 builtin/log.c:1590 +#: builtin/log.c:1610 builtin/log.c:1613 msgid "boundary" msgstr "límite" -#: builtin/log.c:1588 +#: builtin/log.c:1611 msgid "attach the patch" msgstr "adjuntar el parche" -#: builtin/log.c:1591 +#: builtin/log.c:1614 msgid "inline the patch" msgstr "poner el parche en línea" -#: builtin/log.c:1595 +#: builtin/log.c:1618 msgid "enable message threading, styles: shallow, deep" msgstr "habilitar hilos de mensajes, estilos: superficial, profundo" -#: builtin/log.c:1597 +#: builtin/log.c:1620 msgid "signature" msgstr "firma" -#: builtin/log.c:1598 +#: builtin/log.c:1621 msgid "add a signature" msgstr "agregar una firma" -#: builtin/log.c:1599 +#: builtin/log.c:1622 msgid "base-commit" msgstr "commit-base" -#: builtin/log.c:1600 +#: builtin/log.c:1623 msgid "add prerequisite tree info to the patch series" msgstr "" "agregar información de árbol de requisitos previos a la serie de parches" -#: builtin/log.c:1602 +#: builtin/log.c:1625 msgid "add a signature from a file" msgstr "agregar una firma de un archivo" -#: builtin/log.c:1603 +#: builtin/log.c:1626 msgid "don't print the patch filenames" msgstr "no mostrar los nombres de archivos de los parches" -#: builtin/log.c:1605 +#: builtin/log.c:1628 msgid "show progress while generating patches" msgstr "mostrar medidor de progreso mientras se generan los parches" -#: builtin/log.c:1606 -msgid "rev" -msgstr "rev" - -#: builtin/log.c:1607 +#: builtin/log.c:1630 msgid "show changes against <rev> in cover letter or single patch" msgstr "muestra cambios contra <rev> en cover letter o en un solo parche" -#: builtin/log.c:1610 +#: builtin/log.c:1633 msgid "show changes against <refspec> in cover letter or single patch" msgstr "muestra cambios contra <refspec> en cover letter o en un solo parche" -#: builtin/log.c:1612 +#: builtin/log.c:1635 msgid "percentage by which creation is weighted" msgstr "porcentaje por el cual la creación es pesada" -#: builtin/log.c:1687 +#: builtin/log.c:1710 #, c-format msgid "invalid ident line: %s" msgstr "línea de identificación inválida: %s" -#: builtin/log.c:1702 +#: builtin/log.c:1725 msgid "-n and -k are mutually exclusive" msgstr "-n y -k son mutuamente exclusivas" -#: builtin/log.c:1704 +#: builtin/log.c:1727 msgid "--subject-prefix/--rfc and -k are mutually exclusive" msgstr "--subject-prefix/--rfc y -k son mutuamente exclusivos" -#: builtin/log.c:1712 +#: builtin/log.c:1735 msgid "--name-only does not make sense" msgstr "--name-only no tiene sentido" -#: builtin/log.c:1714 +#: builtin/log.c:1737 msgid "--name-status does not make sense" msgstr "--name-status no tiene sentido" -#: builtin/log.c:1716 +#: builtin/log.c:1739 msgid "--check does not make sense" msgstr "--check no tiene sentido" -#: builtin/log.c:1748 +#: builtin/log.c:1771 msgid "standard output, or directory, which one?" msgstr "salida standard, o directorio, cual?" -#: builtin/log.c:1837 +#: builtin/log.c:1860 msgid "--interdiff requires --cover-letter or single patch" msgstr "--interdiff requiere --cover-letter o un parche único" -#: builtin/log.c:1841 +#: builtin/log.c:1864 msgid "Interdiff:" msgstr "Interdiff:" -#: builtin/log.c:1842 +#: builtin/log.c:1865 #, c-format msgid "Interdiff against v%d:" msgstr "Interdiff contra v%d:" -#: builtin/log.c:1848 +#: builtin/log.c:1871 msgid "--creation-factor requires --range-diff" msgstr "--creation-factor requiere --range-diff" -#: builtin/log.c:1852 +#: builtin/log.c:1875 msgid "--range-diff requires --cover-letter or single patch" msgstr "--range-diff requiere --cover-letter o parche único" -#: builtin/log.c:1860 +#: builtin/log.c:1883 msgid "Range-diff:" msgstr "Range-diff:" -#: builtin/log.c:1861 +#: builtin/log.c:1884 #, c-format msgid "Range-diff against v%d:" msgstr "Range-diff contra v%d:" -#: builtin/log.c:1872 +#: builtin/log.c:1895 #, c-format msgid "unable to read signature file '%s'" msgstr "no se puede leer la firma del archivo '%s'" -#: builtin/log.c:1908 +#: builtin/log.c:1931 msgid "Generating patches" msgstr "Generando parches" -#: builtin/log.c:1952 +#: builtin/log.c:1975 msgid "failed to create output files" msgstr "falló al crear los archivos de salida" -#: builtin/log.c:2011 +#: builtin/log.c:2034 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [<upstream> [<head> [<límite>]]]" -#: builtin/log.c:2065 +#: builtin/log.c:2088 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" @@ -14428,7 +14848,7 @@ msgstr "" msgid "do not print remote URL" msgstr "no mostrar el URL remoto" -#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1458 +#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1464 msgid "exec" msgstr "ejecutar" @@ -14502,189 +14922,193 @@ msgstr "" msgid "empty mbox: '%s'" msgstr "mbox vacío: '%s'" -#: builtin/merge.c:54 +#: builtin/merge.c:55 msgid "git merge [<options>] [<commit>...]" msgstr "git merge [<opciones>] [<commit>...]" -#: builtin/merge.c:55 +#: builtin/merge.c:56 msgid "git merge --abort" msgstr "git merge --abort" -#: builtin/merge.c:56 +#: builtin/merge.c:57 msgid "git merge --continue" msgstr "git merge --continue" -#: builtin/merge.c:116 +#: builtin/merge.c:118 msgid "switch `m' requires a value" msgstr "cambiar `m' requiere un valor" -#: builtin/merge.c:139 +#: builtin/merge.c:141 #, c-format msgid "option `%s' requires a value" msgstr "opción `%s' requiere un valor" -#: builtin/merge.c:185 +#: builtin/merge.c:187 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "No se pudo encontrar estrategia de fusión '%s'.\n" -#: builtin/merge.c:186 +#: builtin/merge.c:188 #, c-format msgid "Available strategies are:" msgstr "Estrategias disponibles son:" -#: builtin/merge.c:191 +#: builtin/merge.c:193 #, c-format msgid "Available custom strategies are:" msgstr "Estrategias personalizadas disponibles son:" -#: builtin/merge.c:242 builtin/pull.c:150 +#: builtin/merge.c:244 builtin/pull.c:151 msgid "do not show a diffstat at the end of the merge" msgstr "no mostrar un diffstat al final de la fusión" -#: builtin/merge.c:245 builtin/pull.c:153 +#: builtin/merge.c:247 builtin/pull.c:154 msgid "show a diffstat at the end of the merge" msgstr "mostrar un diffstat al final de la fusión" -#: builtin/merge.c:246 builtin/pull.c:156 +#: builtin/merge.c:248 builtin/pull.c:157 msgid "(synonym to --stat)" msgstr "(sinónimo para --stat)" -#: builtin/merge.c:248 builtin/pull.c:159 +#: builtin/merge.c:250 builtin/pull.c:160 msgid "add (at most <n>) entries from shortlog to merge commit message" msgstr "" "agregar (como máximo <n>) entradas del shortlog al mensaje del commit de " "fusión" -#: builtin/merge.c:251 builtin/pull.c:165 +#: builtin/merge.c:253 builtin/pull.c:166 msgid "create a single commit instead of doing a merge" msgstr "crear un commit único en lugar de hacer una fusión" -#: builtin/merge.c:253 builtin/pull.c:168 +#: builtin/merge.c:255 builtin/pull.c:169 msgid "perform a commit if the merge succeeds (default)" msgstr "realizar un commit si la fusión es exitosa (default)" -#: builtin/merge.c:255 builtin/pull.c:171 +#: builtin/merge.c:257 builtin/pull.c:172 msgid "edit message before committing" msgstr "editar mensaje antes de realizar commit" -#: builtin/merge.c:257 +#: builtin/merge.c:259 msgid "allow fast-forward (default)" msgstr "permitir fast-forwars (default)" -#: builtin/merge.c:259 builtin/pull.c:178 +#: builtin/merge.c:261 builtin/pull.c:179 msgid "abort if fast-forward is not possible" msgstr "abortar si fast-forward no es posible" -#: builtin/merge.c:263 builtin/pull.c:181 +#: builtin/merge.c:265 builtin/pull.c:182 msgid "verify that the named commit has a valid GPG signature" msgstr "verificar que el commit nombrado tiene una firma GPG válida" -#: builtin/merge.c:264 builtin/notes.c:787 builtin/pull.c:185 -#: builtin/rebase.c:492 builtin/rebase.c:1471 builtin/revert.c:113 +#: builtin/merge.c:266 builtin/notes.c:787 builtin/pull.c:186 +#: builtin/rebase.c:492 builtin/rebase.c:1477 builtin/revert.c:114 msgid "strategy" msgstr "estrategia" -#: builtin/merge.c:265 builtin/pull.c:186 +#: builtin/merge.c:267 builtin/pull.c:187 msgid "merge strategy to use" msgstr "estrategia de fusión para usar" -#: builtin/merge.c:266 builtin/pull.c:189 +#: builtin/merge.c:268 builtin/pull.c:190 msgid "option=value" msgstr "opción=valor" -#: builtin/merge.c:267 builtin/pull.c:190 +#: builtin/merge.c:269 builtin/pull.c:191 msgid "option for selected merge strategy" msgstr "opción para la estrategia de fusión seleccionada" -#: builtin/merge.c:269 +#: builtin/merge.c:271 msgid "merge commit message (for a non-fast-forward merge)" msgstr "fusionar mensaje de commit (para una fusión no fast-forward)" -#: builtin/merge.c:276 +#: builtin/merge.c:278 msgid "abort the current in-progress merge" msgstr "abortar la fusión en progreso actual" -#: builtin/merge.c:278 +#: builtin/merge.c:280 +msgid "--abort but leave index and working tree alone" +msgstr "--abort pero deja el índice y el árbol de trabajo solos" + +#: builtin/merge.c:282 msgid "continue the current in-progress merge" msgstr "continuar la fusión en progreso actual" -#: builtin/merge.c:280 builtin/pull.c:197 +#: builtin/merge.c:284 builtin/pull.c:198 msgid "allow merging unrelated histories" msgstr "permitir fusionar historias no relacionadas" -#: builtin/merge.c:286 +#: builtin/merge.c:290 msgid "verify commit-msg hook" msgstr "verificar el hook commit-msg" -#: builtin/merge.c:311 +#: builtin/merge.c:307 msgid "could not run stash." msgstr "no se pudo ejecutar stash." -#: builtin/merge.c:316 +#: builtin/merge.c:312 msgid "stash failed" msgstr "stash falló" -#: builtin/merge.c:321 +#: builtin/merge.c:317 #, c-format msgid "not a valid object: %s" msgstr "no es un objeto válido: %s" -#: builtin/merge.c:343 builtin/merge.c:360 +#: builtin/merge.c:339 builtin/merge.c:356 msgid "read-tree failed" msgstr "lectura de árbol falló" -#: builtin/merge.c:390 +#: builtin/merge.c:386 msgid " (nothing to squash)" msgstr " (nada para hacer squash)" -#: builtin/merge.c:401 +#: builtin/merge.c:397 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "Commit de squash -- no actualizando HEAD\n" -#: builtin/merge.c:451 +#: builtin/merge.c:447 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "No hay mensaje de fusión -- no actualizando HEAD\n" -#: builtin/merge.c:502 +#: builtin/merge.c:498 #, c-format msgid "'%s' does not point to a commit" msgstr "'%s' no apunta a ningún commit" -#: builtin/merge.c:589 +#: builtin/merge.c:585 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "Mal string branch.%s.mergeoptions: %s" -#: builtin/merge.c:712 +#: builtin/merge.c:708 msgid "Not handling anything other than two heads merge." msgstr "No manejando nada más que fusión de dos heads." -#: builtin/merge.c:726 +#: builtin/merge.c:722 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "Opción desconocida para merge-recursive: -X%s" -#: builtin/merge.c:741 +#: builtin/merge.c:737 #, c-format msgid "unable to write %s" msgstr "no es posible escribir %s" -#: builtin/merge.c:793 +#: builtin/merge.c:789 #, c-format msgid "Could not read from '%s'" msgstr "No se puedo leer de '%s'" -#: builtin/merge.c:802 +#: builtin/merge.c:798 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "" "No se realiza commit de la fusión; use 'git commit' para completar la " "fusión.\n" -#: builtin/merge.c:808 +#: builtin/merge.c:804 msgid "" "Please enter a commit message to explain why this merge is necessary,\n" "especially if it merges an updated upstream into a topic branch.\n" @@ -14696,11 +15120,11 @@ msgstr "" "tópico.\n" "\n" -#: builtin/merge.c:813 +#: builtin/merge.c:809 msgid "An empty message aborts the commit.\n" msgstr "Un mensaje vacío aborta el commit.\n" -#: builtin/merge.c:816 +#: builtin/merge.c:812 #, c-format msgid "" "Lines starting with '%c' will be ignored, and an empty message aborts\n" @@ -14709,172 +15133,180 @@ msgstr "" "Líneas comenzando con '%c' serán ignoradas, y un mensaje vacío aborta\n" " el commit.\n" -#: builtin/merge.c:857 +#: builtin/merge.c:853 msgid "Empty commit message." msgstr "Mensaje de commit vacío." -#: builtin/merge.c:876 +#: builtin/merge.c:872 #, c-format msgid "Wonderful.\n" msgstr "Maravilloso.\n" -#: builtin/merge.c:936 +#: builtin/merge.c:933 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "" "Fusión automática falló; arregle los conflictos y luego realice un commit " "con el resultado.\n" -#: builtin/merge.c:975 +#: builtin/merge.c:972 msgid "No current branch." msgstr "No rama actual." -#: builtin/merge.c:977 +#: builtin/merge.c:974 msgid "No remote for the current branch." msgstr "No hay remoto para la rama actual." -#: builtin/merge.c:979 +#: builtin/merge.c:976 msgid "No default upstream defined for the current branch." msgstr "Por defecto, no hay un upstream definido para la rama actual." -#: builtin/merge.c:984 +#: builtin/merge.c:981 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "No hay rama de rastreo remoto para %s de %s" -#: builtin/merge.c:1041 +#: builtin/merge.c:1038 #, c-format msgid "Bad value '%s' in environment '%s'" msgstr "Valor erróneo '%s' en el entorno '%s'" -#: builtin/merge.c:1144 +#: builtin/merge.c:1141 #, c-format msgid "not something we can merge in %s: %s" msgstr "nada que podamos fusionar en %s: %s" -#: builtin/merge.c:1178 +#: builtin/merge.c:1175 msgid "not something we can merge" msgstr "nada que podamos fusionar" -#: builtin/merge.c:1281 +#: builtin/merge.c:1278 msgid "--abort expects no arguments" msgstr "--abort no espera argumentos" -#: builtin/merge.c:1285 +#: builtin/merge.c:1282 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "No hay una fusión para abortar (falta MERGE_HEAD)" -#: builtin/merge.c:1297 +#: builtin/merge.c:1291 +msgid "--quit expects no arguments" +msgstr "--quit no espera argumentos" + +#: builtin/merge.c:1304 msgid "--continue expects no arguments" msgstr "--continue no espera argumentos" -#: builtin/merge.c:1301 +#: builtin/merge.c:1308 msgid "There is no merge in progress (MERGE_HEAD missing)." msgstr "No hay fusión en progreso (falta MERGE_HEAD)." -#: builtin/merge.c:1317 +#: builtin/merge.c:1324 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." msgstr "" -"No ha concluido la fusión (existe MERGE_HEAD).\n" -"Por favor, realice un commit con los cambios antes de fusionar." +"No has concluido la fusión (existe MERGE_HEAD).\n" +"Por favor, realiza un commit con los cambios antes de fusionar." -#: builtin/merge.c:1324 +#: builtin/merge.c:1331 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." msgstr "" -"No ha concluido el cherry-pick (existe CHERRY_PICK_HEAD).\n" -"Por favor, realice un commit con los cambios antes de fusionar." +"No has concluido el cherry-pick (existe CHERRY_PICK_HEAD).\n" +"Por favor, realiza un commit con los cambios antes de fusionar." -#: builtin/merge.c:1327 +#: builtin/merge.c:1334 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." -msgstr "No ha concluido el cherry-pick (existe CHERRY_PICK_HEAD)." +msgstr "No has concluido el cherry-pick (existe CHERRY_PICK_HEAD)." -#: builtin/merge.c:1341 +#: builtin/merge.c:1348 msgid "You cannot combine --squash with --no-ff." msgstr "No se puede combinar --squash con --no-ff." -#: builtin/merge.c:1349 +#: builtin/merge.c:1350 +msgid "You cannot combine --squash with --commit." +msgstr "No se puede combinar --squash con --commit." + +#: builtin/merge.c:1366 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "" "No hay commit especificado y merge.defaultToUpstream no está configurado." -#: builtin/merge.c:1366 +#: builtin/merge.c:1383 msgid "Squash commit into empty head not supported yet" msgstr "Commit aplastado dentro de un head vacío no es soportado todavía" -#: builtin/merge.c:1368 +#: builtin/merge.c:1385 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "Commit no fast-forward no tiene sentido dentro de un head vacío" -#: builtin/merge.c:1373 +#: builtin/merge.c:1390 #, c-format msgid "%s - not something we can merge" msgstr "%s - nada que podamos fusionar" -#: builtin/merge.c:1375 +#: builtin/merge.c:1392 msgid "Can merge only exactly one commit into empty head" msgstr "Solo se puede fusionar exactamente un commit en un head vacío" -#: builtin/merge.c:1454 +#: builtin/merge.c:1471 msgid "refusing to merge unrelated histories" msgstr "rehusando fusionar historias no relacionadas" -#: builtin/merge.c:1463 +#: builtin/merge.c:1480 msgid "Already up to date." msgstr "Ya está actualizado." -#: builtin/merge.c:1473 +#: builtin/merge.c:1490 #, c-format msgid "Updating %s..%s\n" msgstr "Actualizando %s..%s\n" -#: builtin/merge.c:1515 +#: builtin/merge.c:1532 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "Intentando fusión en índice realmente trivial...\n" -#: builtin/merge.c:1522 +#: builtin/merge.c:1539 #, c-format msgid "Nope.\n" msgstr "Nop.\n" -#: builtin/merge.c:1547 +#: builtin/merge.c:1564 msgid "Already up to date. Yeeah!" msgstr "Ya está actualizado. ¡Oh, yeaahh!" -#: builtin/merge.c:1553 +#: builtin/merge.c:1570 msgid "Not possible to fast-forward, aborting." msgstr "No es posible hacer fast-forward, abortando." -#: builtin/merge.c:1576 builtin/merge.c:1655 +#: builtin/merge.c:1593 builtin/merge.c:1658 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "Rebobinando el árbol a original...\n" -#: builtin/merge.c:1580 +#: builtin/merge.c:1597 #, c-format msgid "Trying merge strategy %s...\n" msgstr "Intentando estrategia de fusión %s...\n" -#: builtin/merge.c:1646 +#: builtin/merge.c:1649 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "Ninguna estrategia de fusión manejó la fusión.\n" -#: builtin/merge.c:1648 +#: builtin/merge.c:1651 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "Fusionar con estrategia %s falló.\n" -#: builtin/merge.c:1657 +#: builtin/merge.c:1660 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "Usando el %s para preparar resolución a mano.\n" -#: builtin/merge.c:1669 +#: builtin/merge.c:1672 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" @@ -15008,21 +15440,37 @@ msgid "allow creation of more than one tree" msgstr "permitir la creación de más de un árbol" #: builtin/multi-pack-index.c:9 -msgid "git multi-pack-index [--object-dir=<dir>] (write|verify)" -msgstr "git multi-pack-index [--object-dir=<dir>] (write|verify)" +msgid "" +"git multi-pack-index [--object-dir=<dir>] (write|verify|expire|repack --" +"batch-size=<size>)" +msgstr "" +"git multi-pack-index [--object-dir=<dir>] (write|verify|expire|repack --" +"batch-size=<tamaño>)" -#: builtin/multi-pack-index.c:22 +#: builtin/multi-pack-index.c:23 msgid "object directory containing set of packfile and pack-index pairs" msgstr "objeto directorio conteniendo conjuntos de pares packfile y pack-index" -#: builtin/multi-pack-index.c:40 builtin/prune-packed.c:67 +#: builtin/multi-pack-index.c:25 +msgid "" +"during repack, collect pack-files of smaller size into a batch that is " +"larger than this size" +msgstr "" +"durante el repack, recolectar los pack-files de tamaño menor en un batch que " +"es más grande que este tamaño" + +#: builtin/multi-pack-index.c:43 builtin/prune-packed.c:67 msgid "too many arguments" msgstr "muchos argumentos" -#: builtin/multi-pack-index.c:51 +#: builtin/multi-pack-index.c:52 +msgid "--batch-size option is only for 'repack' subcommand" +msgstr "opción --batch-size es solo para el subcomando 'repack'" + +#: builtin/multi-pack-index.c:61 #, c-format -msgid "unrecognized verb: %s" -msgstr "verbo no reconocido: %s" +msgid "unrecognized subcommand: %s" +msgstr "subcomando desconocido: %s" #: builtin/mv.c:18 msgid "git mv [<options>] <source>... <destination>" @@ -15113,52 +15561,52 @@ msgstr "%s, fuente=%s, destino=%s" msgid "Renaming %s to %s\n" msgstr "Renombrando %s a %s\n" -#: builtin/mv.c:277 builtin/remote.c:717 builtin/repack.c:516 +#: builtin/mv.c:277 builtin/remote.c:717 builtin/repack.c:510 #, c-format msgid "renaming '%s' failed" msgstr "renombrando '%s' falló" -#: builtin/name-rev.c:355 +#: builtin/name-rev.c:352 msgid "git name-rev [<options>] <commit>..." msgstr "git name-rev [<opciones>] <commit>..." -#: builtin/name-rev.c:356 +#: builtin/name-rev.c:353 msgid "git name-rev [<options>] --all" msgstr "git name-rev [<opciones>] --all" -#: builtin/name-rev.c:357 +#: builtin/name-rev.c:354 msgid "git name-rev [<options>] --stdin" msgstr "git name-rev [<opciones>] --stdin" -#: builtin/name-rev.c:415 +#: builtin/name-rev.c:411 msgid "print only names (no SHA-1)" msgstr "imprimir sólo nombres (sin SHA-1)" -#: builtin/name-rev.c:416 +#: builtin/name-rev.c:412 msgid "only use tags to name the commits" msgstr "sólo usar tags para nombrar commits" -#: builtin/name-rev.c:418 +#: builtin/name-rev.c:414 msgid "only use refs matching <pattern>" msgstr "solo usar refs que concuerden con <patrón>" -#: builtin/name-rev.c:420 +#: builtin/name-rev.c:416 msgid "ignore refs matching <pattern>" msgstr "ignorar refs que concuerden con <patrón>" -#: builtin/name-rev.c:422 +#: builtin/name-rev.c:418 msgid "list all commits reachable from all refs" msgstr "listar todos los commits alcanzables desde todas las referencias" -#: builtin/name-rev.c:423 +#: builtin/name-rev.c:419 msgid "read from stdin" msgstr "leer desde stdin" -#: builtin/name-rev.c:424 +#: builtin/name-rev.c:420 msgid "allow to print `undefined` names (default)" msgstr "permitir imprimir nombres `undefined` (predeterminado)" -#: builtin/name-rev.c:430 +#: builtin/name-rev.c:426 msgid "dereference tags in the input (internal use)" msgstr "desreferenciar tags en la entrada (uso interno)" @@ -15307,7 +15755,7 @@ msgstr "incapaz de escribir el objeto de nota" msgid "the note contents have been left in %s" msgstr "los contenidos de nota han sido dejados en %s" -#: builtin/notes.c:242 builtin/tag.c:522 +#: builtin/notes.c:242 builtin/tag.c:532 #, c-format msgid "could not open or read '%s'" msgstr "no se pudo abrir o leer '%s'" @@ -15540,7 +15988,7 @@ msgstr "" "commit con el resultado 'git notes merge --commit', o aborte la fusión con " "'git notes merge --abort'.\n" -#: builtin/notes.c:897 builtin/tag.c:535 +#: builtin/notes.c:897 builtin/tag.c:545 #, c-format msgid "Failed to resolve '%s' as a valid ref." msgstr "Falló al resolver '%s' como una ref válida." @@ -15574,7 +16022,7 @@ msgstr "referencia-de-notas" msgid "use notes from <notes-ref>" msgstr "usar notas desde <referencia-de-notas>" -#: builtin/notes.c:1034 builtin/stash.c:1611 +#: builtin/notes.c:1034 builtin/stash.c:1598 #, c-format msgid "unknown subcommand: %s" msgstr "subcomando desconocido: %s" @@ -15593,129 +16041,129 @@ msgstr "" "git pack-objects [<opciones>...] <nombre-base> [< <lista-de-refs> | < <lista-" "de-objetos>]" -#: builtin/pack-objects.c:424 +#: builtin/pack-objects.c:428 #, c-format msgid "bad packed object CRC for %s" msgstr "mal paquete de objeto CRC para %s" -#: builtin/pack-objects.c:435 +#: builtin/pack-objects.c:439 #, c-format msgid "corrupt packed object for %s" msgstr "objeto empaquetado corrupto para %s" -#: builtin/pack-objects.c:566 +#: builtin/pack-objects.c:570 #, c-format msgid "recursive delta detected for object %s" msgstr "delta recursivo encontrado para objeto %s" -#: builtin/pack-objects.c:777 +#: builtin/pack-objects.c:781 #, c-format msgid "ordered %u objects, expected %<PRIu32>" msgstr "%u objetos ordenados, esperados %<PRIu32>" -#: builtin/pack-objects.c:790 +#: builtin/pack-objects.c:794 #, c-format msgid "packfile is invalid: %s" msgstr "packfile es inválido: %s" -#: builtin/pack-objects.c:794 +#: builtin/pack-objects.c:798 #, c-format msgid "unable to open packfile for reuse: %s" msgstr "no es posible abrir packfile para reusar: %s" -#: builtin/pack-objects.c:798 +#: builtin/pack-objects.c:802 msgid "unable to seek in reused packfile" msgstr "no es posible buscar en los packfile reusados" -#: builtin/pack-objects.c:809 +#: builtin/pack-objects.c:813 msgid "unable to read from reused packfile" msgstr "no es posible leer de packfile reusado" -#: builtin/pack-objects.c:837 +#: builtin/pack-objects.c:841 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit" msgstr "" "deshabilitando escritura bitmap, paquetes son divididos debido a pack." "packSizeLimit" -#: builtin/pack-objects.c:850 +#: builtin/pack-objects.c:854 msgid "Writing objects" msgstr "Escribiendo objetos" -#: builtin/pack-objects.c:912 builtin/update-index.c:89 +#: builtin/pack-objects.c:917 builtin/update-index.c:89 #, c-format msgid "failed to stat %s" msgstr "falló al iniciar %s" -#: builtin/pack-objects.c:965 +#: builtin/pack-objects.c:970 #, c-format msgid "wrote %<PRIu32> objects while expecting %<PRIu32>" msgstr "%<PRIu32> objetos escritos mientras se esperaban %<PRIu32>" -#: builtin/pack-objects.c:1161 +#: builtin/pack-objects.c:1166 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "" "deshabilitando escritura bitmap, ya que algunos objetos no están siendo " "empaquetados" -#: builtin/pack-objects.c:1589 +#: builtin/pack-objects.c:1597 #, c-format msgid "delta base offset overflow in pack for %s" msgstr "overflow de offset en la base de delta en paquete para %s" -#: builtin/pack-objects.c:1598 +#: builtin/pack-objects.c:1606 #, c-format msgid "delta base offset out of bound for %s" msgstr "outbound de offset en la base de delta para %s" -#: builtin/pack-objects.c:1867 +#: builtin/pack-objects.c:1875 msgid "Counting objects" msgstr "Contando objetos" -#: builtin/pack-objects.c:1997 +#: builtin/pack-objects.c:2005 #, c-format msgid "unable to get size of %s" msgstr "no se pudo obtener el tamaño de %s" -#: builtin/pack-objects.c:2012 +#: builtin/pack-objects.c:2020 #, c-format msgid "unable to parse object header of %s" msgstr "incapaz de analizar header del objeto %s" -#: builtin/pack-objects.c:2082 builtin/pack-objects.c:2098 -#: builtin/pack-objects.c:2108 +#: builtin/pack-objects.c:2090 builtin/pack-objects.c:2106 +#: builtin/pack-objects.c:2116 #, c-format msgid "object %s cannot be read" msgstr "objeto %s no puede ser leído" -#: builtin/pack-objects.c:2085 builtin/pack-objects.c:2112 +#: builtin/pack-objects.c:2093 builtin/pack-objects.c:2120 #, c-format msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)" msgstr "" "objeto %s inconsistente con el largo del objeto (%<PRIuMAX> vs %<PRIuMAX>)" -#: builtin/pack-objects.c:2122 +#: builtin/pack-objects.c:2130 msgid "suboptimal pack - out of memory" msgstr "suboptimal pack - fuera de memoria" -#: builtin/pack-objects.c:2448 +#: builtin/pack-objects.c:2456 #, c-format msgid "Delta compression using up to %d threads" msgstr "Compresión delta usando hasta %d hilos" -#: builtin/pack-objects.c:2580 +#: builtin/pack-objects.c:2588 #, c-format msgid "unable to pack objects reachable from tag %s" msgstr "no es posible empaquetar objetos alcanzables desde tag %s" -#: builtin/pack-objects.c:2667 +#: builtin/pack-objects.c:2675 msgid "Compressing objects" msgstr "Comprimiendo objetos" -#: builtin/pack-objects.c:2673 +#: builtin/pack-objects.c:2681 msgid "inconsistency with delta count" msgstr "inconsistencia con la cuenta de delta" -#: builtin/pack-objects.c:2754 +#: builtin/pack-objects.c:2762 #, c-format msgid "" "expected edge object ID, got garbage:\n" @@ -15724,7 +16172,7 @@ msgstr "" "se espseraba ID de objeto al borde, se obtuvo basura:\n" "%s" -#: builtin/pack-objects.c:2760 +#: builtin/pack-objects.c:2768 #, c-format msgid "" "expected object ID, got garbage:\n" @@ -15733,242 +16181,246 @@ msgstr "" "se esperaba ID de objeto, se obtuvo basuta:\n" "%s" -#: builtin/pack-objects.c:2858 +#: builtin/pack-objects.c:2866 msgid "invalid value for --missing" msgstr "valor inválido para --missing" -#: builtin/pack-objects.c:2917 builtin/pack-objects.c:3025 +#: builtin/pack-objects.c:2925 builtin/pack-objects.c:3033 msgid "cannot open pack index" msgstr "no se puede abrir índice de paquetes" -#: builtin/pack-objects.c:2948 +#: builtin/pack-objects.c:2956 #, c-format msgid "loose object at %s could not be examined" msgstr "objeto perdido en %s no pudo ser examinado" -#: builtin/pack-objects.c:3033 +#: builtin/pack-objects.c:3041 msgid "unable to force loose object" msgstr "incapaz de forzar un objeto perdido" -#: builtin/pack-objects.c:3125 +#: builtin/pack-objects.c:3133 #, c-format msgid "not a rev '%s'" msgstr "no es una rev '%s'" -#: builtin/pack-objects.c:3128 +#: builtin/pack-objects.c:3136 #, c-format msgid "bad revision '%s'" msgstr "mala revisión '%s'" -#: builtin/pack-objects.c:3153 +#: builtin/pack-objects.c:3161 msgid "unable to add recent objects" msgstr "incapaz de añadir objetos recientes" -#: builtin/pack-objects.c:3206 +#: builtin/pack-objects.c:3214 #, c-format msgid "unsupported index version %s" msgstr "versión de índice no soportada %s" -#: builtin/pack-objects.c:3210 +#: builtin/pack-objects.c:3218 #, c-format msgid "bad index version '%s'" msgstr "mala versión del índice '%s'" -#: builtin/pack-objects.c:3240 +#: builtin/pack-objects.c:3248 msgid "do not show progress meter" msgstr "no mostrar medidor de progreso" -#: builtin/pack-objects.c:3242 +#: builtin/pack-objects.c:3250 msgid "show progress meter" msgstr "mostrar medidor de progreso" -#: builtin/pack-objects.c:3244 +#: builtin/pack-objects.c:3252 msgid "show progress meter during object writing phase" msgstr "mostrar medidor de progreso durante la fase de escritura de objeto" -#: builtin/pack-objects.c:3247 +#: builtin/pack-objects.c:3255 msgid "similar to --all-progress when progress meter is shown" msgstr "similar a --all-progress cuando medidor de progreso es mostrado" -#: builtin/pack-objects.c:3248 +#: builtin/pack-objects.c:3256 msgid "<version>[,<offset>]" msgstr "<versión>[,<offset>]" -#: builtin/pack-objects.c:3249 +#: builtin/pack-objects.c:3257 msgid "write the pack index file in the specified idx format version" msgstr "" "escribir el índice de paquete en la versión de formato idx especificado" -#: builtin/pack-objects.c:3252 +#: builtin/pack-objects.c:3260 msgid "maximum size of each output pack file" msgstr "tamaño máximo de cada paquete resultante" -#: builtin/pack-objects.c:3254 +#: builtin/pack-objects.c:3262 msgid "ignore borrowed objects from alternate object store" msgstr "ignorar objetos prestados de otros almacenes de objetos" -#: builtin/pack-objects.c:3256 +#: builtin/pack-objects.c:3264 msgid "ignore packed objects" msgstr "ignorar objetos paquete" -#: builtin/pack-objects.c:3258 +#: builtin/pack-objects.c:3266 msgid "limit pack window by objects" msgstr "limitar ventana de paquete por objetos" -#: builtin/pack-objects.c:3260 +#: builtin/pack-objects.c:3268 msgid "limit pack window by memory in addition to object limit" msgstr "limitar ventana de paquete por memoria en adición a límite de objetos" -#: builtin/pack-objects.c:3262 +#: builtin/pack-objects.c:3270 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "longitud máxima de cadena delta permitida en el paquete resultante" -#: builtin/pack-objects.c:3264 +#: builtin/pack-objects.c:3272 msgid "reuse existing deltas" msgstr "reusar deltas existentes" -#: builtin/pack-objects.c:3266 +#: builtin/pack-objects.c:3274 msgid "reuse existing objects" msgstr "reutilizar objetos existentes" -#: builtin/pack-objects.c:3268 +#: builtin/pack-objects.c:3276 msgid "use OFS_DELTA objects" msgstr "usar objetos OFS_DELTA" -#: builtin/pack-objects.c:3270 +#: builtin/pack-objects.c:3278 msgid "use threads when searching for best delta matches" msgstr "usar hilos cuando se busque para mejores concordancias de delta" -#: builtin/pack-objects.c:3272 +#: builtin/pack-objects.c:3280 msgid "do not create an empty pack output" msgstr "no crear un paquete resultante vacío" -#: builtin/pack-objects.c:3274 +#: builtin/pack-objects.c:3282 msgid "read revision arguments from standard input" msgstr "leer argumentos de revisión de standard input" -#: builtin/pack-objects.c:3276 +#: builtin/pack-objects.c:3284 msgid "limit the objects to those that are not yet packed" msgstr "limitar los objetos a aquellos que no han sido empaquetados todavía" -#: builtin/pack-objects.c:3279 +#: builtin/pack-objects.c:3287 msgid "include objects reachable from any reference" msgstr "incluir objetos alcanzables por cualquier referencia" -#: builtin/pack-objects.c:3282 +#: builtin/pack-objects.c:3290 msgid "include objects referred by reflog entries" msgstr "incluir objetos referidos por entradas de reflog" -#: builtin/pack-objects.c:3285 +#: builtin/pack-objects.c:3293 msgid "include objects referred to by the index" msgstr "incluir objetos referidos por el índice" -#: builtin/pack-objects.c:3288 +#: builtin/pack-objects.c:3296 msgid "output pack to stdout" msgstr "mostrar paquete en stdout" -#: builtin/pack-objects.c:3290 +#: builtin/pack-objects.c:3298 msgid "include tag objects that refer to objects to be packed" msgstr "incluir objetos tag que refieren a objetos a ser empaquetados" -#: builtin/pack-objects.c:3292 +#: builtin/pack-objects.c:3300 msgid "keep unreachable objects" msgstr "mantener objetos inalcanzables" -#: builtin/pack-objects.c:3294 +#: builtin/pack-objects.c:3302 msgid "pack loose unreachable objects" msgstr "empaquetar objetos sueltos inalcanzables" -#: builtin/pack-objects.c:3296 +#: builtin/pack-objects.c:3304 msgid "unpack unreachable objects newer than <time>" msgstr "desempaquetar objetos inalcanzables más nuevos que <tiempo>" -#: builtin/pack-objects.c:3299 +#: builtin/pack-objects.c:3307 msgid "use the sparse reachability algorithm" msgstr "usar el algoritmo sparse reachability" -#: builtin/pack-objects.c:3301 +#: builtin/pack-objects.c:3309 msgid "create thin packs" msgstr "crear paquetes delgados" -#: builtin/pack-objects.c:3303 +#: builtin/pack-objects.c:3311 msgid "create packs suitable for shallow fetches" msgstr "crear paquetes adecuados para fetches superficiales" -#: builtin/pack-objects.c:3305 +#: builtin/pack-objects.c:3313 msgid "ignore packs that have companion .keep file" msgstr "ignorar paquetes que tienen un archivo .keep acompañante" -#: builtin/pack-objects.c:3307 +#: builtin/pack-objects.c:3315 msgid "ignore this pack" msgstr "ignorar este paquete" -#: builtin/pack-objects.c:3309 +#: builtin/pack-objects.c:3317 msgid "pack compression level" msgstr "nivel de compresión del paquete" -#: builtin/pack-objects.c:3311 +#: builtin/pack-objects.c:3319 msgid "do not hide commits by grafts" msgstr "no ocultar commits por injertos" -#: builtin/pack-objects.c:3313 +#: builtin/pack-objects.c:3321 msgid "use a bitmap index if available to speed up counting objects" msgstr "" "usar un índice bitmap si está disponible para acelerar la cuenta de objetos" -#: builtin/pack-objects.c:3315 +#: builtin/pack-objects.c:3323 msgid "write a bitmap index together with the pack index" msgstr "escribir un índice de bitmap junto al índice de paquete" -#: builtin/pack-objects.c:3318 +#: builtin/pack-objects.c:3327 +msgid "write a bitmap index if possible" +msgstr "escribir un índice de bitmap si es posible" + +#: builtin/pack-objects.c:3331 msgid "handling for missing objects" msgstr "manejo de objetos perdidos" -#: builtin/pack-objects.c:3321 +#: builtin/pack-objects.c:3334 msgid "do not pack objects in promisor packfiles" msgstr "no se puede empaquetar objetos en packfiles promisores" -#: builtin/pack-objects.c:3323 +#: builtin/pack-objects.c:3336 msgid "respect islands during delta compression" msgstr "respetar islas durante la compresión delta" -#: builtin/pack-objects.c:3348 +#: builtin/pack-objects.c:3361 #, c-format msgid "delta chain depth %d is too deep, forcing %d" msgstr "profundidad de cadena de delta %d es muy profunda, forzando %d" -#: builtin/pack-objects.c:3353 +#: builtin/pack-objects.c:3366 #, c-format msgid "pack.deltaCacheLimit is too high, forcing %d" msgstr "pack.deltaCacheLimit es muy grande, forzando %d" -#: builtin/pack-objects.c:3407 +#: builtin/pack-objects.c:3420 msgid "--max-pack-size cannot be used to build a pack for transfer" msgstr "" "--max-pack-size no puede ser usado para construir un paquete para " "transferencia" -#: builtin/pack-objects.c:3409 +#: builtin/pack-objects.c:3422 msgid "minimum pack size limit is 1 MiB" msgstr "tamaño mínimo del paquete es 1 MiB" -#: builtin/pack-objects.c:3414 +#: builtin/pack-objects.c:3427 msgid "--thin cannot be used to build an indexable pack" msgstr "--thin no puede ser usado para construir un paquete indexable" -#: builtin/pack-objects.c:3417 +#: builtin/pack-objects.c:3430 msgid "--keep-unreachable and --unpack-unreachable are incompatible" msgstr "--keep-unreachable y --unpack-unreachable son incompatibles" -#: builtin/pack-objects.c:3423 +#: builtin/pack-objects.c:3436 msgid "cannot use --filter without --stdout" msgstr "no se puede usar--filter sin --stdout" -#: builtin/pack-objects.c:3484 +#: builtin/pack-objects.c:3497 msgid "Enumerating objects" msgstr "Enumerando objetos" -#: builtin/pack-objects.c:3514 +#: builtin/pack-objects.c:3527 #, c-format msgid "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>)" msgstr "Total %<PRIu32> (delta %<PRIu32>), reusado %<PRIu32> (delta %<PRIu32>)" @@ -16023,56 +16475,56 @@ msgid "git pull [<options>] [<repository> [<refspec>...]]" msgstr "" "git pull [<opciones>] [<repositorio> [<especificación-de-referencia>...]]" -#: builtin/pull.c:140 +#: builtin/pull.c:141 msgid "control for recursive fetching of submodules" msgstr "control de fetch recursivo en submódulos" -#: builtin/pull.c:144 +#: builtin/pull.c:145 msgid "Options related to merging" msgstr "Opciones relacionadas a fusión" -#: builtin/pull.c:147 +#: builtin/pull.c:148 msgid "incorporate changes by rebasing rather than merging" msgstr "incorporar cambios por rebase en lugar de fusión" -#: builtin/pull.c:175 builtin/rebase.c:447 builtin/revert.c:125 +#: builtin/pull.c:176 builtin/rebase.c:447 builtin/revert.c:126 msgid "allow fast-forward" msgstr "permitir fast-forward" -#: builtin/pull.c:184 +#: builtin/pull.c:185 msgid "automatically stash/stash pop before and after rebase" msgstr "ejecutar automáticamente stash/stash pop antes y después de rebase" -#: builtin/pull.c:200 +#: builtin/pull.c:201 msgid "Options related to fetching" msgstr "Opciones relacionadas a fetch" -#: builtin/pull.c:210 +#: builtin/pull.c:211 msgid "force overwrite of local branch" msgstr "forzar sobrescritura de la rama local" -#: builtin/pull.c:218 +#: builtin/pull.c:219 msgid "number of submodules pulled in parallel" msgstr "número de submódulos que realizan pull en paralelo" -#: builtin/pull.c:313 +#: builtin/pull.c:316 #, c-format msgid "Invalid value for pull.ff: %s" msgstr "Valor inválido para pull.ff: %s" -#: builtin/pull.c:430 +#: builtin/pull.c:433 msgid "" "There is no candidate for rebasing against among the refs that you just " "fetched." msgstr "No hay candidato para rebasar entre las refs que has bajado con fetch." -#: builtin/pull.c:432 +#: builtin/pull.c:435 msgid "" "There are no candidates for merging among the refs that you just fetched." msgstr "" "No hay candidatos para fusionar entre las refs que has bajado con fetch." -#: builtin/pull.c:433 +#: builtin/pull.c:436 msgid "" "Generally this means that you provided a wildcard refspec which had no\n" "matches on the remote end." @@ -16081,7 +16533,7 @@ msgstr "" "tiene\n" "concordancia en el final remoto." -#: builtin/pull.c:436 +#: builtin/pull.c:439 #, c-format msgid "" "You asked to pull from the remote '%s', but did not specify\n" @@ -16092,44 +16544,44 @@ msgstr "" "una rama. Porque este no es el remoto configurado por default\n" "para tu rama actual, tienes que especificar una rama en la línea de comando." -#: builtin/pull.c:441 builtin/rebase.c:1321 git-parse-remote.sh:73 +#: builtin/pull.c:444 builtin/rebase.c:1326 git-parse-remote.sh:73 msgid "You are not currently on a branch." msgstr "No te encuentras actualmente en la rama." -#: builtin/pull.c:443 builtin/pull.c:458 git-parse-remote.sh:79 +#: builtin/pull.c:446 builtin/pull.c:461 git-parse-remote.sh:79 msgid "Please specify which branch you want to rebase against." msgstr "Por favor especifica a qué rama quieres rebasar." -#: builtin/pull.c:445 builtin/pull.c:460 git-parse-remote.sh:82 +#: builtin/pull.c:448 builtin/pull.c:463 git-parse-remote.sh:82 msgid "Please specify which branch you want to merge with." msgstr "Por favor especifica a qué rama quieres fusionar." -#: builtin/pull.c:446 builtin/pull.c:461 +#: builtin/pull.c:449 builtin/pull.c:464 msgid "See git-pull(1) for details." msgstr "Ver git-pull(1) para detalles." -#: builtin/pull.c:448 builtin/pull.c:454 builtin/pull.c:463 -#: builtin/rebase.c:1327 git-parse-remote.sh:64 +#: builtin/pull.c:451 builtin/pull.c:457 builtin/pull.c:466 +#: builtin/rebase.c:1332 git-parse-remote.sh:64 msgid "<remote>" msgstr "<remoto>" -#: builtin/pull.c:448 builtin/pull.c:463 builtin/pull.c:468 +#: builtin/pull.c:451 builtin/pull.c:466 builtin/pull.c:471 #: git-parse-remote.sh:65 msgid "<branch>" msgstr "<rama>" -#: builtin/pull.c:456 builtin/rebase.c:1319 git-parse-remote.sh:75 +#: builtin/pull.c:459 builtin/rebase.c:1324 git-parse-remote.sh:75 msgid "There is no tracking information for the current branch." msgstr "No hay información de rastreo para la rama actual." -#: builtin/pull.c:465 git-parse-remote.sh:95 +#: builtin/pull.c:468 git-parse-remote.sh:95 msgid "" "If you wish to set tracking information for this branch you can do so with:" msgstr "" "Si deseas configurar el rastreo de información para esta rama, puedes " "hacerlo con:" -#: builtin/pull.c:470 +#: builtin/pull.c:473 #, c-format msgid "" "Your configuration specifies to merge with the ref '%s'\n" @@ -16138,32 +16590,32 @@ msgstr "" "Tu configuración especifica fusionar con la ref '%s'\n" "de tu remoto, pero no se pudo hacer fetch a esa ref." -#: builtin/pull.c:574 +#: builtin/pull.c:581 #, c-format msgid "unable to access commit %s" msgstr "no es posible acceder al commit %s" -#: builtin/pull.c:854 +#: builtin/pull.c:861 msgid "ignoring --verify-signatures for rebase" msgstr "ignorando --verify-signatures para rebase" -#: builtin/pull.c:909 +#: builtin/pull.c:916 msgid "--[no-]autostash option is only valid with --rebase." msgstr "La opción --[no-]autostash sólo es válida con --rebase." -#: builtin/pull.c:917 +#: builtin/pull.c:924 msgid "Updating an unborn branch with changes added to the index." msgstr "Actualizando una rama no nata con cambios agregados al índice." -#: builtin/pull.c:921 +#: builtin/pull.c:928 msgid "pull with rebase" msgstr "pull con rebase" -#: builtin/pull.c:922 +#: builtin/pull.c:929 msgid "please commit or stash them." msgstr "por favor realiza un commit o un stash con ellos." -#: builtin/pull.c:947 +#: builtin/pull.c:954 #, c-format msgid "" "fetch updated the current branch head.\n" @@ -16174,7 +16626,7 @@ msgstr "" "realizando fast-forward al árbol de trabajo\n" "desde commit %s." -#: builtin/pull.c:953 +#: builtin/pull.c:960 #, c-format msgid "" "Cannot fast-forward your working tree.\n" @@ -16191,15 +16643,15 @@ msgstr "" "$ git reset --hard\n" "para recuperar." -#: builtin/pull.c:968 +#: builtin/pull.c:975 msgid "Cannot merge multiple branches into empty head." msgstr "No se puede fusionar múltiples ramas en un head vacío." -#: builtin/pull.c:972 +#: builtin/pull.c:979 msgid "Cannot rebase onto multiple branches." msgstr "No se puede rebasar en múltiples ramas." -#: builtin/pull.c:979 +#: builtin/pull.c:986 msgid "cannot rebase with locally recorded submodule modifications" msgstr "" "no se puede rebasar con modificaciones de submódulos grabadas localmente" @@ -16292,8 +16744,8 @@ msgid "" "your current branch '%s', without telling me what to push\n" "to update which remote branch." msgstr "" -"Está haciendo un push al remoto '%s', el cual no es el upstream de\n" -"su rama actual '%s', sin decirme qué poner en el push\n" +"Estás haciendo un push al remoto '%s', el cual no es el upstream de\n" +"la rama actual '%s', sin decirme qué poner en el push\n" "para actualizar en qué rama de remoto." #: builtin/push.c:269 @@ -16312,7 +16764,7 @@ msgstr "" "Actualizaciones fueron rechazadas porque la punta de tu rama actual está\n" "detrás de su contraparte remota. Integra los cambios remotos (es decir\n" "'git pull ...') antes de hacer push de nuevo.\n" -"Mira 'Note about fast-forwards' en 'git push --help' para mas detalles." +"Mira 'Note about fast-forwards' en 'git push --help' para más detalles." #: builtin/push.c:282 msgid "" @@ -16352,7 +16804,7 @@ msgid "" "or update a remote ref to make it point at a non-commit object,\n" "without using the '--force' option.\n" msgstr "" -"No puede actualizar un ref remoto que apunta a un objeto no-commit,\n" +"No se puede actualizar un ref remoto que apunta a un objeto no-commit,\n" "o actualizar un ref remoto para hacer que apunte a un objeto no-commit,\n" "sin usar la opción '--force'.\n" @@ -16665,7 +17117,7 @@ msgstr "git rebase--interactive [<opciones>]" msgid "keep empty commits" msgstr "mantener commits vacíos" -#: builtin/rebase.c:451 builtin/revert.c:127 +#: builtin/rebase.c:451 builtin/revert.c:128 msgid "allow commits with empty messages" msgstr "permitir commits con mensajes vacíos" @@ -16685,7 +17137,7 @@ msgstr "mover commits que comienzan con squash!/fixup!" msgid "sign commits" msgstr "firmar commits" -#: builtin/rebase.c:459 builtin/rebase.c:1397 +#: builtin/rebase.c:459 builtin/rebase.c:1403 msgid "display a diffstat of what changed upstream" msgstr "mostrar un diffstat de lo que cambió en upstream" @@ -16793,7 +17245,7 @@ msgstr "cmd" msgid "the command to run" msgstr "el comando para ejecutar" -#: builtin/rebase.c:502 builtin/rebase.c:1480 +#: builtin/rebase.c:502 builtin/rebase.c:1486 msgid "automatically re-schedule any `exec` that fails" msgstr "reprogramar automaticamente cualquier `exec` que falle" @@ -16801,7 +17253,7 @@ msgstr "reprogramar automaticamente cualquier `exec` que falle" msgid "--[no-]rebase-cousins has no effect without --rebase-merges" msgstr "--[no-]rebase-cousins no tiene efecto sin --rebase-merges" -#: builtin/rebase.c:534 builtin/rebase.c:1787 +#: builtin/rebase.c:534 #, c-format msgid "%s requires an interactive rebase" msgstr "%s requiere un rebase interactivo" @@ -16831,11 +17283,11 @@ msgstr "No se pudo leer '%s'" msgid "Cannot store %s" msgstr "No se puede guardar %s" -#: builtin/rebase.c:817 +#: builtin/rebase.c:827 msgid "could not determine HEAD revision" msgstr "no se pudo determinar revisión HEAD" -#: builtin/rebase.c:940 +#: builtin/rebase.c:950 git-rebase--preserve-merges.sh:81 msgid "" "Resolve all conflicts manually, mark them as resolved with\n" "\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n" @@ -16846,11 +17298,11 @@ msgstr "" "Resuelva todos los conflictos manualmente ya sea con \n" "\"git add/rm <archivo_conflictivo>\", luego ejecute \"git rebase --continue" "\".\n" -"Si prefiere saltar este parche, ejecute \"git rebase --skip\" .\n" -"Para abortar y regresar al estado previo al \"git rebase\", ejecute \"git " +"Si prefieres saltar este parche, ejecuta \"git rebase --skip\" .\n" +"Para abortar y regresar al estado previo al \"git rebase\", ejecuta \"git " "rebase --abort\"." -#: builtin/rebase.c:1021 +#: builtin/rebase.c:1031 #, c-format msgid "" "\n" @@ -16869,7 +17321,7 @@ msgstr "" "\n" "Como resultado, git no puede hacer rebase con ellos." -#: builtin/rebase.c:1313 +#: builtin/rebase.c:1318 #, c-format msgid "" "%s\n" @@ -16886,7 +17338,7 @@ msgstr "" " git rebase '<rama>'\n" "\n" -#: builtin/rebase.c:1329 +#: builtin/rebase.c:1334 #, c-format msgid "" "If you wish to set tracking information for this branch you can do so with:\n" @@ -16899,127 +17351,127 @@ msgstr "" " git branch --set-upstream-to=%s/<rama> %s\n" "\n" -#: builtin/rebase.c:1359 +#: builtin/rebase.c:1364 msgid "exec commands cannot contain newlines" msgstr "comandos exec no pueden contener newlines" -#: builtin/rebase.c:1363 +#: builtin/rebase.c:1368 msgid "empty exec command" msgstr "comando exec vacío" -#: builtin/rebase.c:1390 +#: builtin/rebase.c:1396 msgid "rebase onto given branch instead of upstream" msgstr "haciendo rebase hacia rama dada en lugar de upstream" -#: builtin/rebase.c:1392 +#: builtin/rebase.c:1398 msgid "allow pre-rebase hook to run" msgstr "permitir ejecutar hook pre-rebase" -#: builtin/rebase.c:1394 +#: builtin/rebase.c:1400 msgid "be quiet. implies --no-stat" msgstr "ser silencioso implica --no-stat" -#: builtin/rebase.c:1400 +#: builtin/rebase.c:1406 msgid "do not show diffstat of what changed upstream" msgstr "no mostrar un diffstat de lo que cambió en upstream" -#: builtin/rebase.c:1403 +#: builtin/rebase.c:1409 msgid "add a Signed-off-by: line to each commit" msgstr "agregar una línea \"Firmado-por\" al mensaje de cada commit" -#: builtin/rebase.c:1405 builtin/rebase.c:1409 builtin/rebase.c:1411 +#: builtin/rebase.c:1411 builtin/rebase.c:1415 builtin/rebase.c:1417 msgid "passed to 'git am'" msgstr "pasado a 'git am'" -#: builtin/rebase.c:1413 builtin/rebase.c:1415 +#: builtin/rebase.c:1419 builtin/rebase.c:1421 msgid "passed to 'git apply'" msgstr "pasado a 'git-apply'" -#: builtin/rebase.c:1417 builtin/rebase.c:1420 +#: builtin/rebase.c:1423 builtin/rebase.c:1426 msgid "cherry-pick all commits, even if unchanged" msgstr "cherry-pick todos los commits, incluso si no han cambiado" -#: builtin/rebase.c:1422 +#: builtin/rebase.c:1428 msgid "continue" msgstr "continuar" -#: builtin/rebase.c:1425 +#: builtin/rebase.c:1431 msgid "skip current patch and continue" msgstr "saltar el parche y continuar" -#: builtin/rebase.c:1427 +#: builtin/rebase.c:1433 msgid "abort and check out the original branch" msgstr "aborta y revisa la rama original" -#: builtin/rebase.c:1430 +#: builtin/rebase.c:1436 msgid "abort but keep HEAD where it is" msgstr "aborta pero mantiene HEAD donde está" -#: builtin/rebase.c:1431 +#: builtin/rebase.c:1437 msgid "edit the todo list during an interactive rebase" msgstr "editar la lista de pendientes durante el rebase interactivo" -#: builtin/rebase.c:1434 +#: builtin/rebase.c:1440 msgid "show the patch file being applied or merged" msgstr "muestra el archivo parche siendo aplicado o fusionado" -#: builtin/rebase.c:1437 +#: builtin/rebase.c:1443 msgid "use merging strategies to rebase" msgstr "usar estrategias de fusión para el rebase" -#: builtin/rebase.c:1441 +#: builtin/rebase.c:1447 msgid "let the user edit the list of commits to rebase" msgstr "permitir al usuario editar la lista de commits para rebasar" -#: builtin/rebase.c:1445 +#: builtin/rebase.c:1451 msgid "(DEPRECATED) try to recreate merges instead of ignoring them" msgstr "(DEPRECADO) intentar recrear merges en lugar de ignorarlos" -#: builtin/rebase.c:1449 +#: builtin/rebase.c:1455 msgid "preserve empty commits during rebase" msgstr "preservar commits vacíos durante el rebase" -#: builtin/rebase.c:1451 +#: builtin/rebase.c:1457 msgid "move commits that begin with squash!/fixup! under -i" msgstr "mover commits que comienzan con squash!/fixup! bajo -i" -#: builtin/rebase.c:1457 +#: builtin/rebase.c:1463 msgid "automatically stash/stash pop before and after" msgstr "ejecutar automáticamente stash/stash pop antes y después" -#: builtin/rebase.c:1459 +#: builtin/rebase.c:1465 msgid "add exec lines after each commit of the editable list" msgstr "agregar líneas exec tras cada acommit de la lista editable" -#: builtin/rebase.c:1463 +#: builtin/rebase.c:1469 msgid "allow rebasing commits with empty messages" msgstr "permitir rebase commits con mensajes vacíos" -#: builtin/rebase.c:1466 +#: builtin/rebase.c:1472 msgid "try to rebase merges instead of skipping them" msgstr "intentar fusiones por rebase en lugar de saltarlas" -#: builtin/rebase.c:1469 +#: builtin/rebase.c:1475 msgid "use 'merge-base --fork-point' to refine upstream" msgstr "use 'merge-base --fork-point' para refinar upstream" -#: builtin/rebase.c:1471 +#: builtin/rebase.c:1477 msgid "use the given merge strategy" msgstr "usar la estrategia de merge dada" -#: builtin/rebase.c:1473 builtin/revert.c:114 +#: builtin/rebase.c:1479 builtin/revert.c:115 msgid "option" msgstr "opción" -#: builtin/rebase.c:1474 +#: builtin/rebase.c:1480 msgid "pass the argument through to the merge strategy" msgstr "pasar el argumento para la estrategia de fusión" -#: builtin/rebase.c:1477 +#: builtin/rebase.c:1483 msgid "rebase all reachable commits up to the root(s)" msgstr "hacer rebase a todos los commits alcanzables hasta la raíz(raíces)" -#: builtin/rebase.c:1498 +#: builtin/rebase.c:1500 msgid "" "the rebase.useBuiltin support has been removed!\n" "See its entry in 'git help config' for details." @@ -17027,30 +17479,30 @@ msgstr "" "el soporte para rebase.useBuiltin ha sido removido!\n" "Vea su entrada en 'git help config' para detalles." -#: builtin/rebase.c:1504 +#: builtin/rebase.c:1506 msgid "It looks like 'git am' is in progress. Cannot rebase." msgstr "Parece que 'git am' está en progreso. No se puede rebasar." -#: builtin/rebase.c:1545 +#: builtin/rebase.c:1547 msgid "" "git rebase --preserve-merges is deprecated. Use --rebase-merges instead." msgstr "" "git rebase --preserve-merges está deprecado. Use --rebase-merges en su lugar." -#: builtin/rebase.c:1549 +#: builtin/rebase.c:1551 msgid "No rebase in progress?" msgstr "No hay rebase en progreso?" -#: builtin/rebase.c:1553 +#: builtin/rebase.c:1555 msgid "The --edit-todo action can only be used during interactive rebase." msgstr "" "La acción --edit-todo sólo puede ser usada al rebasar interactivamente." -#: builtin/rebase.c:1576 +#: builtin/rebase.c:1578 msgid "Cannot read HEAD" msgstr "No se puede leer el HEAD" -#: builtin/rebase.c:1588 +#: builtin/rebase.c:1590 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" @@ -17058,21 +17510,16 @@ msgstr "" "Tienes que editar todos los conflictos de fusión y luego\n" "marcarlos como resueltos usando git add" -#: builtin/rebase.c:1607 +#: builtin/rebase.c:1609 msgid "could not discard worktree changes" msgstr "no se pudo descartar los cambios del árbol de trabajo" -#: builtin/rebase.c:1626 +#: builtin/rebase.c:1628 #, c-format msgid "could not move back to %s" msgstr "no se puede regresar a %s" -#: builtin/rebase.c:1637 builtin/rm.c:369 -#, c-format -msgid "could not remove '%s'" -msgstr "no se pudo eliminar'%s'" - -#: builtin/rebase.c:1663 +#: builtin/rebase.c:1673 #, c-format msgid "" "It seems that there is already a %s directory, and\n" @@ -17085,180 +17532,184 @@ msgid "" "valuable there.\n" msgstr "" "Parece que ya hay un directorio %s, y\n" -"me pregunto si está en medio de otro rebase. Si ese es el \n" -"caso, por favor intente\n" +"me pregunto si estás en medio de otro rebase. Si ese es el \n" +"caso, por favor intenta\n" "\t%s\n" "Si no es el caso, por favor\n" "\t%s\n" -"y ejecúteme nuevamente. Me estoy deteniendo en caso de que tenga\n" +"y ejecútame nuevamente. Me estoy deteniendo en caso de que tengas\n" "algo de valor ahí.\n" -#: builtin/rebase.c:1684 +#: builtin/rebase.c:1694 msgid "switch `C' expects a numerical value" msgstr "switch `C' espera un valor numérico" -#: builtin/rebase.c:1725 +#: builtin/rebase.c:1735 #, c-format msgid "Unknown mode: %s" msgstr "Modo desconocido: %s" -#: builtin/rebase.c:1747 +#: builtin/rebase.c:1757 msgid "--strategy requires --merge or --interactive" msgstr "--strategy requiere --merge o --interactive" -#: builtin/rebase.c:1796 +#: builtin/rebase.c:1797 +msgid "--reschedule-failed-exec requires --exec or --interactive" +msgstr "--reschedule-failed-exec requiere --exec o --interactive" + +#: builtin/rebase.c:1809 msgid "cannot combine am options with either interactive or merge options" msgstr "" "no se pueden combinar opciones de am con opciones interactivas o de merge" -#: builtin/rebase.c:1815 +#: builtin/rebase.c:1828 msgid "cannot combine '--preserve-merges' with '--rebase-merges'" msgstr "no se puede combinar '--preserve-merges' con '--rebase-merges'" -#: builtin/rebase.c:1819 +#: builtin/rebase.c:1832 msgid "" "error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'" msgstr "" "error: no se puede combinar '--preserve-merges' con '--reschedule-failed-" "exec'" -#: builtin/rebase.c:1825 +#: builtin/rebase.c:1838 msgid "cannot combine '--rebase-merges' with '--strategy-option'" msgstr "no se puede combinar '--rebase-merges' con '--strategy-option'" -#: builtin/rebase.c:1828 +#: builtin/rebase.c:1841 msgid "cannot combine '--rebase-merges' with '--strategy'" msgstr "no se puede combinar '--rebase-merges' con '--strategy'" -#: builtin/rebase.c:1852 +#: builtin/rebase.c:1865 #, c-format msgid "invalid upstream '%s'" msgstr "upstream inválido '%s'" -#: builtin/rebase.c:1858 +#: builtin/rebase.c:1871 msgid "Could not create new root commit" msgstr "No se pudo crear commit raíz nuevo" -#: builtin/rebase.c:1876 +#: builtin/rebase.c:1889 #, c-format msgid "'%s': need exactly one merge base" msgstr "'%s': necesita exactamente una base de fusión" -#: builtin/rebase.c:1883 +#: builtin/rebase.c:1896 #, c-format msgid "Does not point to a valid commit '%s'" msgstr "No apunta a un commit válido '%s'" -#: builtin/rebase.c:1908 +#: builtin/rebase.c:1921 #, c-format msgid "fatal: no such branch/commit '%s'" msgstr "fatal: no existe la rama/commit: '%s'" -#: builtin/rebase.c:1916 builtin/submodule--helper.c:38 -#: builtin/submodule--helper.c:1933 +#: builtin/rebase.c:1929 builtin/submodule--helper.c:38 +#: builtin/submodule--helper.c:1934 #, c-format msgid "No such ref: %s" msgstr "No existe ref: %s" -#: builtin/rebase.c:1927 +#: builtin/rebase.c:1940 msgid "Could not resolve HEAD to a revision" msgstr "No se pudo resolver HEAD a una revisión" -#: builtin/rebase.c:1968 +#: builtin/rebase.c:1981 msgid "Cannot autostash" msgstr "No se puede ejecutar autostash" -#: builtin/rebase.c:1971 +#: builtin/rebase.c:1984 #, c-format msgid "Unexpected stash response: '%s'" msgstr "Respuesta de stash inesperada: '%s'" -#: builtin/rebase.c:1977 +#: builtin/rebase.c:1990 #, c-format msgid "Could not create directory for '%s'" msgstr "No se pudo crear el directorio para '%s'" -#: builtin/rebase.c:1980 +#: builtin/rebase.c:1993 #, c-format msgid "Created autostash: %s\n" msgstr "Autostash creado: %s\n" -#: builtin/rebase.c:1983 +#: builtin/rebase.c:1996 msgid "could not reset --hard" msgstr "no se pudo reset --hard" -#: builtin/rebase.c:1984 builtin/reset.c:114 +#: builtin/rebase.c:1997 builtin/reset.c:114 #, c-format msgid "HEAD is now at %s" msgstr "HEAD está ahora en %s" -#: builtin/rebase.c:2000 +#: builtin/rebase.c:2013 msgid "Please commit or stash them." msgstr "Por favor, confírmalos o guárdalos." -#: builtin/rebase.c:2027 +#: builtin/rebase.c:2040 #, c-format msgid "could not parse '%s'" msgstr "no se puede analizar '%s'" -#: builtin/rebase.c:2040 +#: builtin/rebase.c:2053 #, c-format msgid "could not switch to %s" msgstr "no se pudo cambiar a %s" -#: builtin/rebase.c:2051 +#: builtin/rebase.c:2064 msgid "HEAD is up to date." msgstr "HEAD está actualizado." -#: builtin/rebase.c:2053 +#: builtin/rebase.c:2066 #, c-format msgid "Current branch %s is up to date.\n" msgstr "La rama actual %s está actualizada.\n" -#: builtin/rebase.c:2061 +#: builtin/rebase.c:2074 msgid "HEAD is up to date, rebase forced." msgstr "HEAD está actualizado, rebase forzado." -#: builtin/rebase.c:2063 +#: builtin/rebase.c:2076 #, c-format msgid "Current branch %s is up to date, rebase forced.\n" msgstr "Rama actual %s está actualizada, rebase forzado.\n" -#: builtin/rebase.c:2071 +#: builtin/rebase.c:2084 msgid "The pre-rebase hook refused to rebase." msgstr "El hook pre-rebase rechazó el rebase." -#: builtin/rebase.c:2078 +#: builtin/rebase.c:2091 #, c-format msgid "Changes to %s:\n" msgstr "Cambios a %s:\n" -#: builtin/rebase.c:2081 +#: builtin/rebase.c:2094 #, c-format msgid "Changes from %s to %s:\n" msgstr "Cambios desde %s a %s:\n" -#: builtin/rebase.c:2106 +#: builtin/rebase.c:2119 #, c-format msgid "First, rewinding head to replay your work on top of it...\n" msgstr "" "En primer lugar, rebobinando HEAD para después reproducir tus cambios encima " "de ésta...\n" -#: builtin/rebase.c:2115 +#: builtin/rebase.c:2128 msgid "Could not detach HEAD" msgstr "No se puede desacoplar HEAD" -#: builtin/rebase.c:2124 +#: builtin/rebase.c:2137 #, c-format msgid "Fast-forwarded %s to %s.\n" msgstr "Avance rápido de %s a %s.\n" -#: builtin/receive-pack.c:33 +#: builtin/receive-pack.c:32 msgid "git receive-pack <git-dir>" msgstr "git receive-pack <git-dir>" -#: builtin/receive-pack.c:833 +#: builtin/receive-pack.c:832 msgid "" "By default, updating the current branch in a non-bare repository\n" "is denied, because it will make the index and work tree inconsistent\n" @@ -17281,17 +17732,17 @@ msgstr "" "arreglar\n" "el árbol de trabajo con HEAD.\n" "\n" -"Puede configurar la variable de configuración 'receive.denyCurrentBranch'\n" +"Puedes configurar la variable de configuración 'receive.denyCurrentBranch'\n" "\"ignore\" o \"warn\" en el repositorio remoto para permitir\n" -"su rama actual; Sin embargo, esto no se recomienda a menos que usted\n" -"se haya organizado para actualizar su árbol de trabajo para que coincida con " +"su rama actual; Sin embargo, esto no se recomienda a menos que tú\n" +"te hayas organizado para actualizar su árbol de trabajo para que coincida con " "lo que\n" -"enviará con el push de otra manera.\n" +"enviarás con el push de otra manera.\n" "\n" "Para suprimir este mensaje y mantener el comportamiento predeterminado,\n" -"configure 'receive.denyCurrentBranch' a 'refuse'." +"configura 'receive.denyCurrentBranch' a 'refuse'." -#: builtin/receive-pack.c:853 +#: builtin/receive-pack.c:852 msgid "" "By default, deleting the current branch is denied, because the next\n" "'git clone' won't result in any file checked out, causing confusion.\n" @@ -17310,13 +17761,13 @@ msgstr "" "en el repositorio remoto para permitir borrar la rama actual.\n" "con o sin mensaje de advertencia.\n" "\n" -"Para suprimir este mensaje, puede configurarlo en 'refuse'." +"Para suprimir este mensaje, puedes configurarlo en 'refuse'." -#: builtin/receive-pack.c:1940 +#: builtin/receive-pack.c:1938 msgid "quiet" msgstr "tranquilo" -#: builtin/receive-pack.c:1954 +#: builtin/receive-pack.c:1952 msgid "You must specify a directory." msgstr "Se tiene que especificar un directorio." @@ -17902,115 +18353,115 @@ msgstr "" "Re empaquetados incrementales son incompatibles con índices bitmap. Use \n" "--no-write-bitmap-index o deshabilite la configuración pack.writebitmaps." -#: builtin/repack.c:200 +#: builtin/repack.c:190 msgid "could not start pack-objects to repack promisor objects" msgstr "no se puede iniciar pack-objects para reempaquetar objetos promisores" -#: builtin/repack.c:239 builtin/repack.c:414 +#: builtin/repack.c:229 builtin/repack.c:408 msgid "repack: Expecting full hex object ID lines only from pack-objects." msgstr "" "repack: Esperando líneas de ID de objeto en full hex solo desde pack-objects." -#: builtin/repack.c:256 +#: builtin/repack.c:246 msgid "could not finish pack-objects to repack promisor objects" msgstr "" "no se puede finalizar pack-objects para reempaquetar objetos promisores" -#: builtin/repack.c:294 +#: builtin/repack.c:284 msgid "pack everything in a single pack" msgstr "empaquetar todo en un único paquete" -#: builtin/repack.c:296 +#: builtin/repack.c:286 msgid "same as -a, and turn unreachable objects loose" msgstr "lo mismo que -a, y pierde objetos inaccesibles" -#: builtin/repack.c:299 +#: builtin/repack.c:289 msgid "remove redundant packs, and run git-prune-packed" msgstr "eliminar paquetes redundantes, y ejecutar git-prune-packed" -#: builtin/repack.c:301 +#: builtin/repack.c:291 msgid "pass --no-reuse-delta to git-pack-objects" msgstr "pasar --no-reuse-delta a git-pack-objects" -#: builtin/repack.c:303 +#: builtin/repack.c:293 msgid "pass --no-reuse-object to git-pack-objects" msgstr "pasar --no-reuse-object a git-pack-objects" -#: builtin/repack.c:305 +#: builtin/repack.c:295 msgid "do not run git-update-server-info" msgstr "no ejecutar git-update-server-info" -#: builtin/repack.c:308 +#: builtin/repack.c:298 msgid "pass --local to git-pack-objects" msgstr "pasar --local a git-pack-objects" -#: builtin/repack.c:310 +#: builtin/repack.c:300 msgid "write bitmap index" msgstr "escribir un índice de bitmap" -#: builtin/repack.c:312 +#: builtin/repack.c:302 msgid "pass --delta-islands to git-pack-objects" msgstr "pasar --delta-islands a git-pack-objects" -#: builtin/repack.c:313 +#: builtin/repack.c:303 msgid "approxidate" msgstr "aproxime" -#: builtin/repack.c:314 +#: builtin/repack.c:304 msgid "with -A, do not loosen objects older than this" msgstr "con -A, no perder objetos más antiguos que este" -#: builtin/repack.c:316 +#: builtin/repack.c:306 msgid "with -a, repack unreachable objects" msgstr "con -a, re empaquetar objetos inalcanzables" -#: builtin/repack.c:318 +#: builtin/repack.c:308 msgid "size of the window used for delta compression" msgstr "tamaño de la ventana usado para la compresión delta" -#: builtin/repack.c:319 builtin/repack.c:325 +#: builtin/repack.c:309 builtin/repack.c:315 msgid "bytes" msgstr "bytes" -#: builtin/repack.c:320 +#: builtin/repack.c:310 msgid "same as the above, but limit memory size instead of entries count" msgstr "" "lo mismo que arriba, pero limita el tamaño de memoria en lugar de contar " "entradas" -#: builtin/repack.c:322 +#: builtin/repack.c:312 msgid "limits the maximum delta depth" msgstr "limita la profundidad máxima del delta" -#: builtin/repack.c:324 +#: builtin/repack.c:314 msgid "limits the maximum number of threads" msgstr "limita el número máximo de hilos" -#: builtin/repack.c:326 +#: builtin/repack.c:316 msgid "maximum size of each packfile" msgstr "tamaño máximo de cada paquete" -#: builtin/repack.c:328 +#: builtin/repack.c:318 msgid "repack objects in packs marked with .keep" msgstr "re-empaquetar objetos en paquetes marcados con .keep" -#: builtin/repack.c:330 +#: builtin/repack.c:320 msgid "do not repack this pack" msgstr "no reempaquetar este paquete" -#: builtin/repack.c:340 +#: builtin/repack.c:330 msgid "cannot delete packs in a precious-objects repo" msgstr "no se pueden borrar paquetes en un repositorio de objetos-preciosos" -#: builtin/repack.c:344 +#: builtin/repack.c:334 msgid "--keep-unreachable and -A are incompatible" msgstr "--keep-unreachable y -A son incompatibles" -#: builtin/repack.c:423 +#: builtin/repack.c:417 msgid "Nothing new to pack." msgstr "Nada nuevo para empaquetar." -#: builtin/repack.c:484 +#: builtin/repack.c:478 #, c-format msgid "" "WARNING: Some packs in use have been renamed by\n" @@ -18029,7 +18480,7 @@ msgstr "" "WARNING: también falló.\n" "WARNING: Por favor renombralos en %s manualmente:\n" -#: builtin/repack.c:532 +#: builtin/repack.c:526 #, c-format msgid "failed to remove '%s'" msgstr "falló al eliminar'%s'" @@ -18437,24 +18888,24 @@ msgstr "No se puede reiniciar el índice a la revisión '%s'." msgid "Could not write new index file." msgstr "No se puede escribir un nuevo archivo índice." -#: builtin/rev-list.c:405 +#: builtin/rev-list.c:412 msgid "cannot combine --exclude-promisor-objects and --missing" msgstr "no se puede combinar --exclude-promisor-objects y --missing" -#: builtin/rev-list.c:466 +#: builtin/rev-list.c:473 msgid "object filtering requires --objects" msgstr "filtrado de objetos requiere --objects" -#: builtin/rev-list.c:469 +#: builtin/rev-list.c:476 #, c-format msgid "invalid sparse value '%s'" msgstr "valor disperso inválido: '%s'" -#: builtin/rev-list.c:510 +#: builtin/rev-list.c:527 msgid "rev-list does not support display of notes" msgstr "rev-list no soporta mostrar notas" -#: builtin/rev-list.c:513 +#: builtin/rev-list.c:530 msgid "cannot combine --use-bitmap-index with object filtering" msgstr "no se puede combinar --use-bitmap-index con objetos de filtrado" @@ -18527,47 +18978,51 @@ msgstr "resumir secuencia revert o cherry-pick" msgid "cancel revert or cherry-pick sequence" msgstr "cancelar secuencia revert o cherry-pick" -#: builtin/revert.c:106 +#: builtin/revert.c:105 +msgid "skip current commit and continue" +msgstr "saltar el commit actual y continuar" + +#: builtin/revert.c:107 msgid "don't automatically commit" msgstr "no realizar commit de forma automática" -#: builtin/revert.c:107 +#: builtin/revert.c:108 msgid "edit the commit message" msgstr "editar el mensaje de commit" -#: builtin/revert.c:110 +#: builtin/revert.c:111 msgid "parent-number" msgstr "número-de-padre" -#: builtin/revert.c:111 +#: builtin/revert.c:112 msgid "select mainline parent" msgstr "seleccionar el padre principal" -#: builtin/revert.c:113 +#: builtin/revert.c:114 msgid "merge strategy" msgstr "estrategia de fusión" -#: builtin/revert.c:115 +#: builtin/revert.c:116 msgid "option for merge strategy" msgstr "opción para estrategia de fusión" -#: builtin/revert.c:124 +#: builtin/revert.c:125 msgid "append commit name" msgstr "adjuntar el nombre del commit" -#: builtin/revert.c:126 +#: builtin/revert.c:127 msgid "preserve initially empty commits" msgstr "preservar commits iniciales vacíos" -#: builtin/revert.c:128 +#: builtin/revert.c:129 msgid "keep redundant, empty commits" msgstr "mantener commits redundantes, vacíos" -#: builtin/revert.c:227 +#: builtin/revert.c:232 msgid "revert failed" msgstr "falló al revertir" -#: builtin/revert.c:240 +#: builtin/revert.c:245 msgid "cherry-pick failed" msgstr "cherry-pick falló" @@ -18740,114 +19195,114 @@ msgid_plural "ignoring %s; cannot handle more than %d refs" msgstr[0] "ignorando %s; no se puede manejar más de %d ref" msgstr[1] "ignorando %s; no se puede manejar más de %d refs" -#: builtin/show-branch.c:549 +#: builtin/show-branch.c:548 #, c-format msgid "no matching refs with %s" msgstr "no hay refs que concuerden con %s" -#: builtin/show-branch.c:646 +#: builtin/show-branch.c:645 msgid "show remote-tracking and local branches" msgstr "mostrar ramas locales y de rastreo remoto" -#: builtin/show-branch.c:648 +#: builtin/show-branch.c:647 msgid "show remote-tracking branches" msgstr "mostrar ramas de rastreo remoto" -#: builtin/show-branch.c:650 +#: builtin/show-branch.c:649 msgid "color '*!+-' corresponding to the branch" msgstr "color '*!+-' correspondiendo a la rama" -#: builtin/show-branch.c:652 +#: builtin/show-branch.c:651 msgid "show <n> more commits after the common ancestor" msgstr "mostrar <n> commits más tras encontrar el ancestro común" -#: builtin/show-branch.c:654 +#: builtin/show-branch.c:653 msgid "synonym to more=-1" msgstr "sinónimo de más=-1" -#: builtin/show-branch.c:655 +#: builtin/show-branch.c:654 msgid "suppress naming strings" msgstr "suprimir strings de nombre" -#: builtin/show-branch.c:657 +#: builtin/show-branch.c:656 msgid "include the current branch" msgstr "incluir la rama actual" -#: builtin/show-branch.c:659 +#: builtin/show-branch.c:658 msgid "name commits with their object names" msgstr "nombrar commits con sus nombres de objeto" -#: builtin/show-branch.c:661 +#: builtin/show-branch.c:660 msgid "show possible merge bases" msgstr "mostrar bases de fusión posibles" -#: builtin/show-branch.c:663 +#: builtin/show-branch.c:662 msgid "show refs unreachable from any other ref" msgstr "mostrar refs inalcanzables por ningún otro ref" -#: builtin/show-branch.c:665 +#: builtin/show-branch.c:664 msgid "show commits in topological order" msgstr "mostrar commits en orden topológico" -#: builtin/show-branch.c:668 +#: builtin/show-branch.c:667 msgid "show only commits not on the first branch" msgstr "mostrar solo commits que no están en la primera rama" -#: builtin/show-branch.c:670 +#: builtin/show-branch.c:669 msgid "show merges reachable from only one tip" msgstr "mostrar fusiones alcanzables solo por una punta" -#: builtin/show-branch.c:672 +#: builtin/show-branch.c:671 msgid "topologically sort, maintaining date order where possible" msgstr "orden topológico, manteniendo el orden de fechas donde sea posible" -#: builtin/show-branch.c:675 +#: builtin/show-branch.c:674 msgid "<n>[,<base>]" msgstr "<n>[,<base>]" -#: builtin/show-branch.c:676 +#: builtin/show-branch.c:675 msgid "show <n> most recent ref-log entries starting at base" msgstr "mostrar <n> entradas más recientes de ref-log comenzando desde la base" -#: builtin/show-branch.c:712 +#: builtin/show-branch.c:711 msgid "" "--reflog is incompatible with --all, --remotes, --independent or --merge-base" msgstr "" "--reflog no es compatible con --all, --remotes, --independent o --merge-base" -#: builtin/show-branch.c:736 +#: builtin/show-branch.c:735 msgid "no branches given, and HEAD is not valid" msgstr "no se dieron ramas, y el HEAD no es válido" -#: builtin/show-branch.c:739 +#: builtin/show-branch.c:738 msgid "--reflog option needs one branch name" msgstr "opción --reflog necesita un nombre de rama" -#: builtin/show-branch.c:742 +#: builtin/show-branch.c:741 #, c-format msgid "only %d entry can be shown at one time." msgid_plural "only %d entries can be shown at one time." msgstr[0] "solo %d entrada puede ser mostrada a la vez." msgstr[1] "solo %d entradas pueden ser mostradas a la vez." -#: builtin/show-branch.c:746 +#: builtin/show-branch.c:745 #, c-format msgid "no such ref %s" msgstr "no existe el ref %s" -#: builtin/show-branch.c:832 +#: builtin/show-branch.c:831 #, c-format msgid "cannot handle more than %d rev." msgid_plural "cannot handle more than %d revs." msgstr[0] "no se puede manejar más de %d rev." msgstr[1] "no se puede manejar más de %d revs." -#: builtin/show-branch.c:836 +#: builtin/show-branch.c:835 #, c-format msgid "'%s' is not a valid ref." msgstr "'%s' no es una ref válida." -#: builtin/show-branch.c:839 +#: builtin/show-branch.c:838 #, c-format msgid "cannot find commit %s (%s)" msgstr "no se puede encontrar el commit %s (%s)" @@ -19030,94 +19485,94 @@ msgstr "La entrada de stash se guardó en caso de ser necesario nuevamente." msgid "No branch name specified" msgstr "No se especificó el nombre de la rama" -#: builtin/stash.c:789 builtin/stash.c:826 +#: builtin/stash.c:790 builtin/stash.c:827 #, c-format msgid "Cannot update %s with %s" msgstr "No se puede actualizar %s con %s" -#: builtin/stash.c:807 builtin/stash.c:1474 builtin/stash.c:1510 +#: builtin/stash.c:808 builtin/stash.c:1461 builtin/stash.c:1497 msgid "stash message" msgstr "mensaje de stash" -#: builtin/stash.c:817 +#: builtin/stash.c:818 msgid "\"git stash store\" requires one <commit> argument" msgstr "\"git stash store\" requiere un argumento <commit>" -#: builtin/stash.c:1039 git-legacy-stash.sh:217 +#: builtin/stash.c:1040 git-legacy-stash.sh:217 msgid "No changes selected" msgstr "Sin cambios seleccionados" -#: builtin/stash.c:1135 git-legacy-stash.sh:150 +#: builtin/stash.c:1136 git-legacy-stash.sh:150 msgid "You do not have the initial commit yet" msgstr "Aún no tienes un commit inicial" -#: builtin/stash.c:1162 git-legacy-stash.sh:165 +#: builtin/stash.c:1163 git-legacy-stash.sh:165 msgid "Cannot save the current index state" msgstr "No se puede guardar el estado actual del índice" -#: builtin/stash.c:1171 git-legacy-stash.sh:180 +#: builtin/stash.c:1172 git-legacy-stash.sh:180 msgid "Cannot save the untracked files" msgstr "No se pueden guardar los archivos no rastreados" -#: builtin/stash.c:1182 builtin/stash.c:1191 git-legacy-stash.sh:200 +#: builtin/stash.c:1183 builtin/stash.c:1192 git-legacy-stash.sh:200 #: git-legacy-stash.sh:213 msgid "Cannot save the current worktree state" msgstr "No se puede guardar el estado actual del árbol de trabajo" -#: builtin/stash.c:1219 git-legacy-stash.sh:233 +#: builtin/stash.c:1220 git-legacy-stash.sh:233 msgid "Cannot record working tree state" msgstr "No se puede grabar el estado del árbol de trabajo" -#: builtin/stash.c:1268 git-legacy-stash.sh:337 +#: builtin/stash.c:1269 git-legacy-stash.sh:337 msgid "Can't use --patch and --include-untracked or --all at the same time" msgstr "No se puede usar --patch y --include-untracked o --all al mismo tiempo" -#: builtin/stash.c:1284 +#: builtin/stash.c:1285 msgid "Did you forget to 'git add'?" -msgstr "Olvidó 'git add'?" +msgstr "Olvidaste 'git add'?" -#: builtin/stash.c:1299 git-legacy-stash.sh:345 +#: builtin/stash.c:1300 git-legacy-stash.sh:345 msgid "No local changes to save" msgstr "No hay cambios locales para guardar" -#: builtin/stash.c:1306 git-legacy-stash.sh:350 +#: builtin/stash.c:1307 git-legacy-stash.sh:350 msgid "Cannot initialize stash" msgstr "No se puede inicializar stash" -#: builtin/stash.c:1321 git-legacy-stash.sh:354 +#: builtin/stash.c:1322 git-legacy-stash.sh:354 msgid "Cannot save the current status" msgstr "No se puede guardar el estado actual" -#: builtin/stash.c:1326 +#: builtin/stash.c:1327 #, c-format msgid "Saved working directory and index state %s" msgstr "Directorio de trabajo guardado y estado de índice %s" -#: builtin/stash.c:1430 git-legacy-stash.sh:384 +#: builtin/stash.c:1417 git-legacy-stash.sh:384 msgid "Cannot remove worktree changes" msgstr "No se pueden eliminar cambios del árbol de trabajo" -#: builtin/stash.c:1465 builtin/stash.c:1501 +#: builtin/stash.c:1452 builtin/stash.c:1488 msgid "keep index" msgstr "mantener index" -#: builtin/stash.c:1467 builtin/stash.c:1503 +#: builtin/stash.c:1454 builtin/stash.c:1490 msgid "stash in patch mode" msgstr "stash en modo patch" -#: builtin/stash.c:1468 builtin/stash.c:1504 +#: builtin/stash.c:1455 builtin/stash.c:1491 msgid "quiet mode" msgstr "modo tranquilo" -#: builtin/stash.c:1470 builtin/stash.c:1506 +#: builtin/stash.c:1457 builtin/stash.c:1493 msgid "include untracked files in stash" msgstr "incluir archivos sin seguimiento en stash" -#: builtin/stash.c:1472 builtin/stash.c:1508 +#: builtin/stash.c:1459 builtin/stash.c:1495 msgid "include ignore files" msgstr "incluir archivos ignorados" -#: builtin/stash.c:1568 +#: builtin/stash.c:1555 #, c-format msgid "could not exec %s" msgstr "no se pudo ejecutar %s" @@ -19139,7 +19594,7 @@ msgstr "" msgid "prepend comment character and space to each line" msgstr "anteponer carácter de comentario y espacio a cada línea" -#: builtin/submodule--helper.c:45 builtin/submodule--helper.c:1942 +#: builtin/submodule--helper.c:45 builtin/submodule--helper.c:1943 #, c-format msgid "Expecting a full ref name, got %s" msgstr "Se esperaba un nombre de ref completo, se obtuvo %s" @@ -19153,7 +19608,7 @@ msgstr "subomdule--helper print-default-remote no toma argumentos" msgid "cannot strip one component off url '%s'" msgstr "no se puede quitar un componente del url '%s'" -#: builtin/submodule--helper.c:408 builtin/submodule--helper.c:1367 +#: builtin/submodule--helper.c:408 builtin/submodule--helper.c:1368 msgid "alternative anchor for relative paths" msgstr "ancho alternativo para rutas relativas" @@ -19161,8 +19616,8 @@ msgstr "ancho alternativo para rutas relativas" msgid "git submodule--helper list [--prefix=<path>] [<path>...]" msgstr "git submodule--helper list [--prefix=<ruta>] [<ruta>...]" -#: builtin/submodule--helper.c:470 builtin/submodule--helper.c:627 -#: builtin/submodule--helper.c:650 +#: builtin/submodule--helper.c:470 builtin/submodule--helper.c:628 +#: builtin/submodule--helper.c:651 #, c-format msgid "No url found for submodule path '%s' in .gitmodules" msgstr "No se encontró url para la ruta del submódulo '%s' en .gitmodules" @@ -19181,7 +19636,7 @@ msgstr "" "run_command devolvió estado no-cero para %s\n" "." -#: builtin/submodule--helper.c:546 +#: builtin/submodule--helper.c:547 #, c-format msgid "" "run_command returned non-zero status while recursing in the nested " @@ -19192,19 +19647,19 @@ msgstr "" "anidados de %s\n" "." -#: builtin/submodule--helper.c:562 +#: builtin/submodule--helper.c:563 msgid "Suppress output of entering each submodule command" msgstr "Suprime la salida al inicializar cada comando de submódulo" -#: builtin/submodule--helper.c:564 builtin/submodule--helper.c:1049 +#: builtin/submodule--helper.c:565 builtin/submodule--helper.c:1050 msgid "Recurse into nested submodules" msgstr "Recursar en submódulos anidados" -#: builtin/submodule--helper.c:569 +#: builtin/submodule--helper.c:570 msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>" msgstr "git submodule--helper foreach [--quiet] [--recursive] [--] <comando>" -#: builtin/submodule--helper.c:596 +#: builtin/submodule--helper.c:597 #, c-format msgid "" "could not look up configuration '%s'. Assuming this repository is its own " @@ -19213,57 +19668,57 @@ msgstr "" "no se pudo encontrar configuración '%s'. Asumiendo que este repositorio es " "su propio upstream autoritativo." -#: builtin/submodule--helper.c:664 +#: builtin/submodule--helper.c:665 #, c-format msgid "Failed to register url for submodule path '%s'" msgstr "Falló al registrar el url para la ruta del submódulo '%s'" -#: builtin/submodule--helper.c:668 +#: builtin/submodule--helper.c:669 #, c-format msgid "Submodule '%s' (%s) registered for path '%s'\n" msgstr "Submódulo '%s' (%s) registrado para ruta '%s'\n" -#: builtin/submodule--helper.c:678 +#: builtin/submodule--helper.c:679 #, c-format msgid "warning: command update mode suggested for submodule '%s'\n" msgstr "" "peligro: modo de actualización de comandos sugerido para el submódulo '%s'\n" -#: builtin/submodule--helper.c:685 +#: builtin/submodule--helper.c:686 #, c-format msgid "Failed to register update mode for submodule path '%s'" msgstr "" "Error al registrar el modo de actualización para la ruta del submódulo '%s'" -#: builtin/submodule--helper.c:707 +#: builtin/submodule--helper.c:708 msgid "Suppress output for initializing a submodule" msgstr "Suprime la salida para inicializar un submódulo" -#: builtin/submodule--helper.c:712 +#: builtin/submodule--helper.c:713 msgid "git submodule--helper init [<options>] [<path>]" msgstr "git submodule--helper init [<opciones>] [<path>]" -#: builtin/submodule--helper.c:784 builtin/submodule--helper.c:910 +#: builtin/submodule--helper.c:785 builtin/submodule--helper.c:911 #, c-format msgid "no submodule mapping found in .gitmodules for path '%s'" msgstr "" "no se ha encontrado mapeo de submódulos en .gitmodules para la ruta '%s'" -#: builtin/submodule--helper.c:823 +#: builtin/submodule--helper.c:824 #, c-format msgid "could not resolve HEAD ref inside the submodule '%s'" msgstr "no pudo resolver ref de HEAD dentro del submódulo '%s'" -#: builtin/submodule--helper.c:850 builtin/submodule--helper.c:1019 +#: builtin/submodule--helper.c:851 builtin/submodule--helper.c:1020 #, c-format msgid "failed to recurse into submodule '%s'" msgstr "falló al recursar en el submódulo '%s'" -#: builtin/submodule--helper.c:874 builtin/submodule--helper.c:1185 +#: builtin/submodule--helper.c:875 builtin/submodule--helper.c:1186 msgid "Suppress submodule status output" msgstr "Suprimir output del estado del submódulo" -#: builtin/submodule--helper.c:875 +#: builtin/submodule--helper.c:876 msgid "" "Use commit stored in the index instead of the one stored in the submodule " "HEAD" @@ -19271,56 +19726,56 @@ msgstr "" "Usar el commit guardado en el índice en lugar del guardado en el submódulo " "HEAD" -#: builtin/submodule--helper.c:876 +#: builtin/submodule--helper.c:877 msgid "recurse into nested submodules" msgstr "recursar en submódulos anidados" -#: builtin/submodule--helper.c:881 +#: builtin/submodule--helper.c:882 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]" msgstr "git submodule status [--quiet] [--cached] [--recursive] [<ruta>...]" -#: builtin/submodule--helper.c:905 +#: builtin/submodule--helper.c:906 msgid "git submodule--helper name <path>" msgstr "git submodule--helper name <ruta>" -#: builtin/submodule--helper.c:969 +#: builtin/submodule--helper.c:970 #, c-format msgid "Synchronizing submodule url for '%s'\n" msgstr "Sincronizando url del submódulo para '%s'\n" -#: builtin/submodule--helper.c:975 +#: builtin/submodule--helper.c:976 #, c-format msgid "failed to register url for submodule path '%s'" msgstr "falló al registrar el url para la ruta del submódulo '%s'" -#: builtin/submodule--helper.c:989 +#: builtin/submodule--helper.c:990 #, c-format msgid "failed to get the default remote for submodule '%s'" msgstr "error al conseguir el remoto por defecto para el submódulo '%s'" -#: builtin/submodule--helper.c:1000 +#: builtin/submodule--helper.c:1001 #, c-format msgid "failed to update remote for submodule '%s'" msgstr "error al actualizar el remoto para el submódulo '%s'" -#: builtin/submodule--helper.c:1047 +#: builtin/submodule--helper.c:1048 msgid "Suppress output of synchronizing submodule url" msgstr "Suprime la salida del url del submódulo que se sincroniza" -#: builtin/submodule--helper.c:1054 +#: builtin/submodule--helper.c:1055 msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]" msgstr "git submodule--helper sync [--quiet] [--recursive] [<ruta>]" -#: builtin/submodule--helper.c:1108 +#: builtin/submodule--helper.c:1109 #, c-format msgid "" "Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you " "really want to remove it including all of its history)" msgstr "" "El árbol de trabajo del submódulo '%s' contiene un directorio .git (use 'rm -" -"rf' si realmente quiere eliminarlo incluyendo todo en su historia)" +"rf' si realmente quieres eliminarlo incluyendo todo en su historia)" -#: builtin/submodule--helper.c:1120 +#: builtin/submodule--helper.c:1121 #, c-format msgid "" "Submodule work tree '%s' contains local modifications; use '-f' to discard " @@ -19329,81 +19784,81 @@ msgstr "" "El árbol de trabajo del submódulo '%s' contiene modificaciones locales; usa " "'-f' para descartarlas" -#: builtin/submodule--helper.c:1128 +#: builtin/submodule--helper.c:1129 #, c-format msgid "Cleared directory '%s'\n" msgstr "Directorio '%s' limpiado\n" -#: builtin/submodule--helper.c:1130 +#: builtin/submodule--helper.c:1131 #, c-format msgid "Could not remove submodule work tree '%s'\n" msgstr "No se pudo eliminar el árbol de trabajo del submódulo '%s'\n" -#: builtin/submodule--helper.c:1141 +#: builtin/submodule--helper.c:1142 #, c-format msgid "could not create empty submodule directory %s" msgstr "no se pudo crear directorio vacío de submódulo %s" -#: builtin/submodule--helper.c:1157 +#: builtin/submodule--helper.c:1158 #, c-format msgid "Submodule '%s' (%s) unregistered for path '%s'\n" msgstr "Submódulo '%s' (%s) no registrado para ruta '%s'\n" -#: builtin/submodule--helper.c:1186 +#: builtin/submodule--helper.c:1187 msgid "Remove submodule working trees even if they contain local changes" msgstr "" -"Remover arboles de trabajo de submódulos incluso si contienen cambios locales" +"Remover árboles de trabajo de submódulos incluso si contienen cambios locales" -#: builtin/submodule--helper.c:1187 +#: builtin/submodule--helper.c:1188 msgid "Unregister all submodules" msgstr "Quitar todos los submódulos" -#: builtin/submodule--helper.c:1192 +#: builtin/submodule--helper.c:1193 msgid "" "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]" msgstr "" "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<ruta>...]]" -#: builtin/submodule--helper.c:1206 +#: builtin/submodule--helper.c:1207 msgid "Use '--all' if you really want to deinitialize all submodules" msgstr "Usa '--all' si realmente quieres des-inicializar todos los submódulos" -#: builtin/submodule--helper.c:1301 builtin/submodule--helper.c:1304 +#: builtin/submodule--helper.c:1302 builtin/submodule--helper.c:1305 #, c-format msgid "submodule '%s' cannot add alternate: %s" msgstr "submódulo '%s' no puede agregar alterno: %s" -#: builtin/submodule--helper.c:1340 +#: builtin/submodule--helper.c:1341 #, c-format msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized" msgstr "Valor '%s' para submodule.alternateErrorStrategy no es reconocido" -#: builtin/submodule--helper.c:1347 +#: builtin/submodule--helper.c:1348 #, c-format msgid "Value '%s' for submodule.alternateLocation is not recognized" msgstr "Valor '%s' para submodule.alternateLocation no es reconocido" -#: builtin/submodule--helper.c:1370 +#: builtin/submodule--helper.c:1371 msgid "where the new submodule will be cloned to" msgstr "a donde el nuevo submódulo será clonado" -#: builtin/submodule--helper.c:1373 +#: builtin/submodule--helper.c:1374 msgid "name of the new submodule" msgstr "nombre del nuevo submódulo" -#: builtin/submodule--helper.c:1376 +#: builtin/submodule--helper.c:1377 msgid "url where to clone the submodule from" msgstr "url de dónde clonar el submódulo" -#: builtin/submodule--helper.c:1384 +#: builtin/submodule--helper.c:1385 msgid "depth for shallow clones" msgstr "profundidad para clones superficiales" -#: builtin/submodule--helper.c:1387 builtin/submodule--helper.c:1871 +#: builtin/submodule--helper.c:1388 builtin/submodule--helper.c:1872 msgid "force cloning progress" msgstr "forzar el proceso de clonado" -#: builtin/submodule--helper.c:1392 +#: builtin/submodule--helper.c:1393 msgid "" "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " "<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>" @@ -19412,112 +19867,112 @@ msgstr "" "<repositorio>] [--name <nombre>] [--depth <profundidad>] --url <url> --path " "<ruta>" -#: builtin/submodule--helper.c:1423 +#: builtin/submodule--helper.c:1424 #, c-format msgid "clone of '%s' into submodule path '%s' failed" msgstr "clon de '%s' en la ruta de submódulo '%s' falló" -#: builtin/submodule--helper.c:1437 +#: builtin/submodule--helper.c:1438 #, c-format msgid "could not get submodule directory for '%s'" msgstr "no se pudo obtener el directorio de submódulo para '%s'" -#: builtin/submodule--helper.c:1473 +#: builtin/submodule--helper.c:1474 #, c-format msgid "Invalid update mode '%s' for submodule path '%s'" -msgstr "Modo de actualización inválido '%s' para ruta de submodulo '%s'" +msgstr "Modo de actualización inválido '%s' para ruta de submódulo '%s'" -#: builtin/submodule--helper.c:1477 +#: builtin/submodule--helper.c:1478 #, c-format msgid "Invalid update mode '%s' configured for submodule path '%s'" msgstr "" -"Modo de actualización inválido '%s' configurado para ruta de submodulo '%s'" +"Modo de actualización inválido '%s' configurado para ruta de submódulo '%s'" -#: builtin/submodule--helper.c:1570 +#: builtin/submodule--helper.c:1571 #, c-format msgid "Submodule path '%s' not initialized" msgstr "Ruta de submódulo '%s' no inicializada" -#: builtin/submodule--helper.c:1574 +#: builtin/submodule--helper.c:1575 msgid "Maybe you want to use 'update --init'?" -msgstr "Tal vez quiere usar 'update --init'?" +msgstr "Tal vez quieres usar 'update --init'?" -#: builtin/submodule--helper.c:1604 +#: builtin/submodule--helper.c:1605 #, c-format msgid "Skipping unmerged submodule %s" msgstr "Saltando submódulo %s no fusionado" -#: builtin/submodule--helper.c:1633 +#: builtin/submodule--helper.c:1634 #, c-format msgid "Skipping submodule '%s'" msgstr "Saltando submódulo '%s'" -#: builtin/submodule--helper.c:1777 +#: builtin/submodule--helper.c:1778 #, c-format msgid "Failed to clone '%s'. Retry scheduled" msgstr "Falló al clonar '%s'. Reintento programado" -#: builtin/submodule--helper.c:1788 +#: builtin/submodule--helper.c:1789 #, c-format msgid "Failed to clone '%s' a second time, aborting" msgstr "Falló al clonar '%s' una segunda vez, abortando" -#: builtin/submodule--helper.c:1850 builtin/submodule--helper.c:2092 +#: builtin/submodule--helper.c:1851 builtin/submodule--helper.c:2093 msgid "path into the working tree" msgstr "ruta hacia el árbol de trabajo" -#: builtin/submodule--helper.c:1853 +#: builtin/submodule--helper.c:1854 msgid "path into the working tree, across nested submodule boundaries" msgstr "" "ruta hacia el árbol de trabajo, a través de extremos de submódulos anidados" -#: builtin/submodule--helper.c:1857 +#: builtin/submodule--helper.c:1858 msgid "rebase, merge, checkout or none" msgstr "rebase, merge, checkout o none" -#: builtin/submodule--helper.c:1863 +#: builtin/submodule--helper.c:1864 msgid "Create a shallow clone truncated to the specified number of revisions" msgstr "Crea un clon superficial truncado al número especificado de revisión" -#: builtin/submodule--helper.c:1866 +#: builtin/submodule--helper.c:1867 msgid "parallel jobs" msgstr "trabajos paralelos" -#: builtin/submodule--helper.c:1868 +#: builtin/submodule--helper.c:1869 msgid "whether the initial clone should follow the shallow recommendation" msgstr "si el clon inicial debe seguir la recomendación superficial" -#: builtin/submodule--helper.c:1869 +#: builtin/submodule--helper.c:1870 msgid "don't print cloning progress" msgstr "no mostrar el progreso de clonado" -#: builtin/submodule--helper.c:1876 +#: builtin/submodule--helper.c:1877 msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]" msgstr "git submodule--helper update_clone [--prefix=<ruta>] [<ruta>...]" -#: builtin/submodule--helper.c:1889 +#: builtin/submodule--helper.c:1890 msgid "bad value for update parameter" msgstr "mal valor para parámetro update" -#: builtin/submodule--helper.c:1937 +#: builtin/submodule--helper.c:1938 #, c-format msgid "" "Submodule (%s) branch configured to inherit branch from superproject, but " "the superproject is not on any branch" msgstr "" -"Rama de submódulo (%s) configurada para heredar rama del superproyecto, " -"pero el superproyecto no está en ninguna rama" +"Rama de submódulo (%s) configurada para heredar rama del superproyecto, pero " +"el superproyecto no está en ninguna rama" -#: builtin/submodule--helper.c:2060 +#: builtin/submodule--helper.c:2061 #, c-format msgid "could not get a repository handle for submodule '%s'" msgstr "no se pudo conseguir un handle para el submódulo '%s'" -#: builtin/submodule--helper.c:2093 +#: builtin/submodule--helper.c:2094 msgid "recurse into submodules" msgstr "recurrir a submódulos" -#: builtin/submodule--helper.c:2099 +#: builtin/submodule--helper.c:2100 msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]" msgstr "git submodule--helper absorb-git-dirs [<opciones>] [<path>...]" @@ -19527,7 +19982,7 @@ msgstr "revisar is es seguro escribir el archivo .gitmodules" #: builtin/submodule--helper.c:2159 msgid "unset the config in the .gitmodules file" -msgstr "desconfigura la opcion en elarchivo .gitmodules" +msgstr "desconfigura la opción en elarchivo .gitmodules" #: builtin/submodule--helper.c:2164 msgid "git submodule--helper config <name> [<value>]" @@ -19547,7 +20002,7 @@ msgid "please make sure that the .gitmodules file is in the working tree" msgstr "" "por favor asegúrate que el archivo .gitmodules está en el árbol de trabajo" -#: builtin/submodule--helper.c:2235 git.c:433 git.c:685 +#: builtin/submodule--helper.c:2235 git.c:434 git.c:684 #, c-format msgid "%s doesn't support --super-prefix" msgstr "%s no soporta --super-prefix" @@ -19555,7 +20010,7 @@ msgstr "%s no soporta --super-prefix" #: builtin/submodule--helper.c:2241 #, c-format msgid "'%s' is not a valid submodule--helper subcommand" -msgstr "'%s' no es un comando submodule--helper valido" +msgstr "'%s' no es un comando submodule--helper válido" #: builtin/symbolic-ref.c:8 msgid "git symbolic-ref [<options>] <name> [<ref>]" @@ -19611,17 +20066,17 @@ msgstr "" msgid "git tag -v [--format=<format>] <tagname>..." msgstr "git tag -v [--format=<formato>] <nombre-de-tag>..." -#: builtin/tag.c:88 +#: builtin/tag.c:89 #, c-format msgid "tag '%s' not found." msgstr "tag '%s' no encontrado." -#: builtin/tag.c:104 +#: builtin/tag.c:105 #, c-format msgid "Deleted tag '%s' (was %s)\n" msgstr "Etiqueta '%s' eliminada (era %s)\n" -#: builtin/tag.c:134 +#: builtin/tag.c:135 #, c-format msgid "" "\n" @@ -19634,7 +20089,7 @@ msgstr "" " %s\n" "Las líneas que comienzan con '%c' serán ignoradas.\n" -#: builtin/tag.c:138 +#: builtin/tag.c:139 #, c-format msgid "" "\n" @@ -19649,15 +20104,15 @@ msgstr "" "Las líneas que comienzan con '%c' serán conservadas; puedes eliminarlas por " "ti mismo si quieres hacerlo.\n" -#: builtin/tag.c:192 +#: builtin/tag.c:198 msgid "unable to sign the tag" msgstr "incapaz de firmar tag" -#: builtin/tag.c:194 +#: builtin/tag.c:200 msgid "unable to write tag file" msgstr "incapaz de escribir el archivo de tag" -#: builtin/tag.c:210 +#: builtin/tag.c:216 #, c-format msgid "" "You have created a nested tag. The object referred to by your new tag is\n" @@ -19670,138 +20125,138 @@ msgstr "" "\n" "\tgit tag -f %s %s^{}" -#: builtin/tag.c:226 +#: builtin/tag.c:232 msgid "bad object type." msgstr "tipo de objeto erróneo." -#: builtin/tag.c:278 +#: builtin/tag.c:284 msgid "no tag message?" msgstr "¿Sin mensaje de tag?" -#: builtin/tag.c:285 +#: builtin/tag.c:291 #, c-format msgid "The tag message has been left in %s\n" msgstr "El mensaje del tag ha sido dejado en %s\n" -#: builtin/tag.c:396 +#: builtin/tag.c:402 msgid "list tag names" msgstr "listar nombres de tags" -#: builtin/tag.c:398 +#: builtin/tag.c:404 msgid "print <n> lines of each tag message" msgstr "imprimir <n> líneas de cada mensaje de tag" -#: builtin/tag.c:400 +#: builtin/tag.c:406 msgid "delete tags" msgstr "eliminar tags" -#: builtin/tag.c:401 +#: builtin/tag.c:407 msgid "verify tags" msgstr "verificar tags" -#: builtin/tag.c:403 +#: builtin/tag.c:409 msgid "Tag creation options" msgstr "Opciones de creación de tags" -#: builtin/tag.c:405 +#: builtin/tag.c:411 msgid "annotated tag, needs a message" msgstr "tags anotadas necesitan un mensaje" -#: builtin/tag.c:407 +#: builtin/tag.c:413 msgid "tag message" msgstr "mensaje de tag" -#: builtin/tag.c:409 +#: builtin/tag.c:415 msgid "force edit of tag message" msgstr "forzar la edición del mensaje de tag" -#: builtin/tag.c:410 +#: builtin/tag.c:416 msgid "annotated and GPG-signed tag" msgstr "tag anotado y firmado con GPG" -#: builtin/tag.c:413 +#: builtin/tag.c:419 msgid "use another key to sign the tag" msgstr "usar otra clave para firmar el tag" -#: builtin/tag.c:414 +#: builtin/tag.c:420 msgid "replace the tag if exists" msgstr "remplazar tag si existe" -#: builtin/tag.c:415 builtin/update-ref.c:369 +#: builtin/tag.c:421 builtin/update-ref.c:369 msgid "create a reflog" msgstr "crear un reflog" -#: builtin/tag.c:417 +#: builtin/tag.c:423 msgid "Tag listing options" msgstr "Opciones de listado de tag" -#: builtin/tag.c:418 +#: builtin/tag.c:424 msgid "show tag list in columns" msgstr "mostrar lista de tags en columnas" -#: builtin/tag.c:419 builtin/tag.c:421 +#: builtin/tag.c:425 builtin/tag.c:427 msgid "print only tags that contain the commit" msgstr "mostrar solo tags que contienen el commit" -#: builtin/tag.c:420 builtin/tag.c:422 +#: builtin/tag.c:426 builtin/tag.c:428 msgid "print only tags that don't contain the commit" msgstr "mostrar solo tags que no contienen el commit" -#: builtin/tag.c:423 +#: builtin/tag.c:429 msgid "print only tags that are merged" msgstr "sólo imprimir las tags que están fusionadas" -#: builtin/tag.c:424 +#: builtin/tag.c:430 msgid "print only tags that are not merged" msgstr "sólo imprimir las tags que no están fusionadas" -#: builtin/tag.c:428 +#: builtin/tag.c:434 msgid "print only tags of the object" msgstr "sólo imprimir tags de el objeto" -#: builtin/tag.c:472 +#: builtin/tag.c:482 msgid "--column and -n are incompatible" msgstr "--column y -n son incompatibles" -#: builtin/tag.c:494 +#: builtin/tag.c:504 msgid "-n option is only allowed in list mode" msgstr "opción -n solo es permitida en modo lista" -#: builtin/tag.c:496 +#: builtin/tag.c:506 msgid "--contains option is only allowed in list mode" msgstr "opción --contains solo es permitido en modo lista" -#: builtin/tag.c:498 +#: builtin/tag.c:508 msgid "--no-contains option is only allowed in list mode" msgstr "opción --no-contains solo es permitida en modo lista" -#: builtin/tag.c:500 +#: builtin/tag.c:510 msgid "--points-at option is only allowed in list mode" msgstr "opción --points-at solo es permitida en modo lista" -#: builtin/tag.c:502 +#: builtin/tag.c:512 msgid "--merged and --no-merged options are only allowed in list mode" msgstr "opciones --merged y --no-merged solo están permitidas en modo lista" -#: builtin/tag.c:513 +#: builtin/tag.c:523 msgid "only one -F or -m option is allowed." msgstr "sólo se permite una de las opciones, -m ó -F." -#: builtin/tag.c:532 +#: builtin/tag.c:542 msgid "too many params" msgstr "demasiados parámetros" -#: builtin/tag.c:538 +#: builtin/tag.c:548 #, c-format msgid "'%s' is not a valid tag name." msgstr "'%s' no es un nombre de tag válido." -#: builtin/tag.c:543 +#: builtin/tag.c:553 #, c-format msgid "tag '%s' already exists" msgstr "el tag '%s' ya existe" -#: builtin/tag.c:574 +#: builtin/tag.c:584 #, c-format msgid "Updated tag '%s' (was %s)\n" msgstr "Etiqueta '%s' actualizada (era %s)\n" @@ -19940,7 +20395,7 @@ msgstr "" #: builtin/update-index.c:1021 msgid "with --stdin: input lines are terminated by null bytes" -msgstr "con --stdin: las lineas de entrada son terminadas con bytes nulos" +msgstr "con --stdin: las líneas de entrada son terminadas con bytes nulos" #: builtin/update-index.c:1023 msgid "read list of paths to be updated from standard input" @@ -20126,15 +20581,15 @@ msgstr "no intente <directorio>/.git/ si <directorio> no es un directorio Git" msgid "interrupt transfer after <n> seconds of inactivity" msgstr "interrumpir transferencia tras <n> segundos de inactividad" -#: builtin/verify-commit.c:20 +#: builtin/verify-commit.c:19 msgid "git verify-commit [-v | --verbose] <commit>..." msgstr "git verify-commit [-v | --verbose] <commit>..." -#: builtin/verify-commit.c:76 +#: builtin/verify-commit.c:68 msgid "print commit contents" msgstr "imprimir contenido del commit" -#: builtin/verify-commit.c:77 builtin/verify-tag.c:38 +#: builtin/verify-commit.c:69 builtin/verify-tag.c:37 msgid "print raw gpg status output" msgstr "muestra la salida de status gpg en formato raw" @@ -20150,11 +20605,11 @@ msgstr "verboso" msgid "show statistics only" msgstr "solo mostrar estadísticas" -#: builtin/verify-tag.c:19 +#: builtin/verify-tag.c:18 msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..." msgstr "git verify-tag [-v | --verbose] [--format=<formato>] <tag>..." -#: builtin/verify-tag.c:37 +#: builtin/verify-tag.c:36 msgid "print tag contents" msgstr "imprimir contenido del tag" @@ -20186,7 +20641,7 @@ msgstr "git worktree remove [<opciones>] <worktree>" msgid "git worktree unlock <path>" msgstr "git worktree unlock <ruta>" -#: builtin/worktree.c:61 builtin/worktree.c:891 +#: builtin/worktree.c:61 builtin/worktree.c:899 #, c-format msgid "failed to delete '%s'" msgstr "falló al borrar '%s'" @@ -20263,124 +20718,124 @@ msgstr "" "'%s' es un árbol de trabajo faltante pero ya registrado;\n" "usa 'add -f' para sobreescribir, o 'prune' o 'remove' para limpiar" -#: builtin/worktree.c:302 +#: builtin/worktree.c:309 #, c-format msgid "could not create directory of '%s'" msgstr "no se pudo crear directorio de '%s'" -#: builtin/worktree.c:432 builtin/worktree.c:438 +#: builtin/worktree.c:440 builtin/worktree.c:446 #, c-format msgid "Preparing worktree (new branch '%s')" msgstr "Preparando árbol de trabajo (nueva rama '%s')" -#: builtin/worktree.c:434 +#: builtin/worktree.c:442 #, c-format msgid "Preparing worktree (resetting branch '%s'; was at %s)" msgstr "Preparando árbol de trabajo (reiniciando rama '%s'; estaba en %s)" -#: builtin/worktree.c:443 +#: builtin/worktree.c:451 #, c-format msgid "Preparing worktree (checking out '%s')" msgstr "Preparando árbol de trabajo (haciendo checkout a '%s')" -#: builtin/worktree.c:449 +#: builtin/worktree.c:457 #, c-format msgid "Preparing worktree (detached HEAD %s)" msgstr "Preparando árbol de trabajo (HEAD desacoplado %s)" -#: builtin/worktree.c:490 +#: builtin/worktree.c:498 msgid "checkout <branch> even if already checked out in other worktree" msgstr "" "hacer checkout a <rama> incluso si ya ha hecho checkout en otro árbol de " "trabajo" -#: builtin/worktree.c:493 +#: builtin/worktree.c:501 msgid "create a new branch" msgstr "crear una nueva rama" -#: builtin/worktree.c:495 +#: builtin/worktree.c:503 msgid "create or reset a branch" msgstr "crear o restablecer una rama" -#: builtin/worktree.c:497 +#: builtin/worktree.c:505 msgid "populate the new working tree" msgstr "popular el nuevo árbol de trabajo" -#: builtin/worktree.c:498 +#: builtin/worktree.c:506 msgid "keep the new working tree locked" msgstr "mantener el nuevo árbol de trabajo bloqueado" -#: builtin/worktree.c:501 +#: builtin/worktree.c:509 msgid "set up tracking mode (see git-branch(1))" msgstr "configurando modo tracking (mirar git-branch(1))" -#: builtin/worktree.c:504 +#: builtin/worktree.c:512 msgid "try to match the new branch name with a remote-tracking branch" msgstr "" "intentar emparejar el nuevo nombre de rama con una rama de rastreo remoto" -#: builtin/worktree.c:512 +#: builtin/worktree.c:520 msgid "-b, -B, and --detach are mutually exclusive" msgstr "-b, -B, y --detach son mutuamente exclusivas" -#: builtin/worktree.c:573 +#: builtin/worktree.c:581 msgid "--[no-]track can only be used if a new branch is created" msgstr "--[no-]track solo puede ser usado si una nueva rama es creada" -#: builtin/worktree.c:673 +#: builtin/worktree.c:681 msgid "reason for locking" msgstr "razón para bloquear" -#: builtin/worktree.c:685 builtin/worktree.c:718 builtin/worktree.c:792 -#: builtin/worktree.c:919 +#: builtin/worktree.c:693 builtin/worktree.c:726 builtin/worktree.c:800 +#: builtin/worktree.c:927 #, c-format msgid "'%s' is not a working tree" msgstr "'%s' no es un árbol de trabajo" -#: builtin/worktree.c:687 builtin/worktree.c:720 +#: builtin/worktree.c:695 builtin/worktree.c:728 msgid "The main working tree cannot be locked or unlocked" msgstr "El árbol de trabajo principal no puede ser bloqueado ni desbloqueado" -#: builtin/worktree.c:692 +#: builtin/worktree.c:700 #, c-format msgid "'%s' is already locked, reason: %s" msgstr "'%s' ya está bloqueado; razón: %s" -#: builtin/worktree.c:694 +#: builtin/worktree.c:702 #, c-format msgid "'%s' is already locked" msgstr "'%s' ya está bloqueado" -#: builtin/worktree.c:722 +#: builtin/worktree.c:730 #, c-format msgid "'%s' is not locked" msgstr "'%s' no está bloqueado" -#: builtin/worktree.c:763 +#: builtin/worktree.c:771 msgid "working trees containing submodules cannot be moved or removed" msgstr "" "árboles de trabajo conteniendo submódulos no puede ser movidos o eliminado" -#: builtin/worktree.c:771 +#: builtin/worktree.c:779 msgid "force move even if worktree is dirty or locked" msgstr "forzar move incluso si el árbol de trabajo está sucio o bloqueado" -#: builtin/worktree.c:794 builtin/worktree.c:921 +#: builtin/worktree.c:802 builtin/worktree.c:929 #, c-format msgid "'%s' is a main working tree" msgstr "'%s' es un árbol de trabajo principal" -#: builtin/worktree.c:799 +#: builtin/worktree.c:807 #, c-format msgid "could not figure out destination name from '%s'" msgstr "no se pudo descubrir el nombre de destino de '%s'" -#: builtin/worktree.c:805 +#: builtin/worktree.c:813 #, c-format msgid "target '%s' already exists" msgstr "el objetivo '%s' ya existe" -#: builtin/worktree.c:813 +#: builtin/worktree.c:821 #, c-format msgid "" "cannot move a locked working tree, lock reason: %s\n" @@ -20389,7 +20844,7 @@ msgstr "" "no se puede mover un árbol de trabajo bloqueado, motivo del bloqueo: %s\n" "use 'move -f -f' para sobreescribir o desbloquear primero" -#: builtin/worktree.c:815 +#: builtin/worktree.c:823 msgid "" "cannot move a locked working tree;\n" "use 'move -f -f' to override or unlock first" @@ -20397,36 +20852,36 @@ msgstr "" "no se puede mover un árbol de trabajo bloqueado;\n" "use 'move -f -f' para sobreescribir o desbloquear primero" -#: builtin/worktree.c:818 +#: builtin/worktree.c:826 #, c-format msgid "validation failed, cannot move working tree: %s" msgstr "falló validación, no se puede mover el árbol de trabajo: %s" -#: builtin/worktree.c:823 +#: builtin/worktree.c:831 #, c-format msgid "failed to move '%s' to '%s'" msgstr "falló al mover '%s' a '%s'" -#: builtin/worktree.c:871 +#: builtin/worktree.c:879 #, c-format msgid "failed to run 'git status' on '%s'" msgstr "falló al ejecutar 'git status' en '%s'" -#: builtin/worktree.c:875 +#: builtin/worktree.c:883 #, c-format msgid "'%s' is dirty, use --force to delete it" msgstr "'%s' está sucio, use --force para borrarlo" -#: builtin/worktree.c:880 +#: builtin/worktree.c:888 #, c-format msgid "failed to run 'git status' on '%s', code %d" msgstr "no se pudo ejecutar 'git status' en '%s', código %d" -#: builtin/worktree.c:903 +#: builtin/worktree.c:911 msgid "force removal even if worktree is dirty or locked" msgstr "forzar remoción incluso si el árbol de trabajo está sucio o bloqueado" -#: builtin/worktree.c:926 +#: builtin/worktree.c:934 #, c-format msgid "" "cannot remove a locked working tree, lock reason: %s\n" @@ -20435,7 +20890,7 @@ msgstr "" "no se pueden eliminar árbol de trabajo bloqueado, razón del bloqueo: %s\n" "use 'remove -f -f' para sobreescribir o desbloquear primero" -#: builtin/worktree.c:928 +#: builtin/worktree.c:936 msgid "" "cannot remove a locked working tree;\n" "use 'remove -f -f' to override or unlock first" @@ -20443,7 +20898,7 @@ msgstr "" "no se pueden eliminar árbol de trabajo bloqueado;\n" "use 'remove -f -f' para sobreescribir o desbloquear primero" -#: builtin/worktree.c:931 +#: builtin/worktree.c:939 #, c-format msgid "validation failed, cannot remove working tree: %s" msgstr "falló validación, no se puede eliminar árbol de trabajo: %s" @@ -20472,8 +20927,8 @@ msgid "" "\n" "\tchmod 0700 %s" msgstr "" -"Los permisos en su directorio de socket son demasiado flojos; otros\n" -"usuarios pueden leer sus credenciales almacenadas en caché. Considere " +"Los permisos en tu directorio de socket son demasiado flojos; otros\n" +"usuarios pueden leer sus credenciales almacenadas en caché. Considera " "ejecutar:\n" "\n" "\tchmod 0700 %s" @@ -20519,53 +20974,55 @@ msgstr "" msgid "" "'git help -a' and 'git help -g' list available subcommands and some\n" "concept guides. See 'git help <command>' or 'git help <concept>'\n" -"to read about a specific subcommand or concept." +"to read about a specific subcommand or concept.\n" +"See 'git help git' for an overview of the system." msgstr "" "'git help -a' y 'git help -g' listan los subcomandos disponibles y algunas\n" "guías de concepto. Consulte 'git help <command>' o 'git help <concepto>'\n" -"para leer sobre un subcomando o concepto específico." +"para leer sobre un subcomando o concepto específico.\n" +"Mira 'git help git' para una vista general del sistema." -#: git.c:185 +#: git.c:186 #, c-format msgid "no directory given for --git-dir\n" msgstr "no se entregó directorio para --git-dir\n" -#: git.c:199 +#: git.c:200 #, c-format msgid "no namespace given for --namespace\n" msgstr "no se entregó namespace para --namespace\n" -#: git.c:213 +#: git.c:214 #, c-format msgid "no directory given for --work-tree\n" msgstr "no se entregó directorio para --work-tree\n" -#: git.c:227 +#: git.c:228 #, c-format msgid "no prefix given for --super-prefix\n" msgstr "no se entregó prefijo para --super-prefix\n" -#: git.c:249 +#: git.c:250 #, c-format msgid "-c expects a configuration string\n" msgstr "-c espera un string de configuración\n" -#: git.c:287 +#: git.c:288 #, c-format msgid "no directory given for -C\n" msgstr "no se entregó directorio para -C\n" -#: git.c:313 +#: git.c:314 #, c-format msgid "unknown option: %s\n" msgstr "opción %s desconocida\n" -#: git.c:359 +#: git.c:360 #, c-format msgid "while expanding alias '%s': '%s'" msgstr "al expandir el alias '%s':'%s'" -#: git.c:368 +#: git.c:369 #, c-format msgid "" "alias '%s' changes environment variables.\n" @@ -20574,39 +21031,39 @@ msgstr "" "alias '%s' cambia las variables de entorno.\n" "Puedes usar '!git' en el alias para hacer esto" -#: git.c:376 +#: git.c:377 #, c-format msgid "empty alias for %s" msgstr "alias vacío para %s" -#: git.c:379 +#: git.c:380 #, c-format msgid "recursive alias: %s" msgstr "alias recursivo: %s" -#: git.c:459 +#: git.c:460 msgid "write failure on standard output" msgstr "error de escritura en standard output" -#: git.c:461 +#: git.c:462 msgid "unknown write failure on standard output" msgstr "error desconocido de escritura en standard output" -#: git.c:463 +#: git.c:464 msgid "close failed on standard output" msgstr "cierre falló en standard output" -#: git.c:797 +#: git.c:793 #, c-format msgid "alias loop detected: expansion of '%s' does not terminate:%s" msgstr "bucle de alias detectado: expansión de '%s' no termina: %s" -#: git.c:847 +#: git.c:843 #, c-format msgid "cannot handle %s as a builtin" msgstr "no se puede manejar %s como un builtin" -#: git.c:860 +#: git.c:856 #, c-format msgid "" "usage: %s\n" @@ -20617,12 +21074,12 @@ msgstr "" "\n" "\n" -#: git.c:880 +#: git.c:876 #, c-format msgid "expansion of alias '%s' failed; '%s' is not a git command\n" msgstr "expansión del alias '%s' falló; '%s' no es un comando de git\n" -#: git.c:892 +#: git.c:888 #, c-format msgid "failed to run command '%s': %s\n" msgstr "falló al ejecutar comando '%s': %s\n" @@ -20804,19 +21261,19 @@ msgstr "fecha de expiración" msgid "no-op (backward compatibility)" msgstr "no-op (compatibilidad con versiones anteriores)" -#: parse-options.h:304 +#: parse-options.h:305 msgid "be more verbose" -msgstr "ser mas verboso" +msgstr "ser más verboso" -#: parse-options.h:306 +#: parse-options.h:307 msgid "be more quiet" -msgstr "ser mas discreto" +msgstr "ser más discreto" -#: parse-options.h:312 +#: parse-options.h:313 msgid "use <n> digits to display SHA-1s" msgstr "usa <n> dígitos para mostrar SHA-1s" -#: parse-options.h:331 +#: parse-options.h:332 msgid "how to strip spaces and #comments from message" msgstr "cómo quitar espacios y #comentarios de mensajes" @@ -20834,6 +21291,14 @@ msgstr "" "actualizar el índice con la resolución de conflictos reutilizada si es " "posible" +#: wt-status.h:67 +msgid "HEAD detached at " +msgstr "HEAD desacoplada en " + +#: wt-status.h:68 +msgid "HEAD detached from " +msgstr "HEAD desacoplada de " + #: command-list.h:50 msgid "Add file contents to the index" msgstr "Agrega contenido de carpetas al índice" @@ -21127,7 +21592,7 @@ msgstr "Programa divisor de mbox simple de UNIX" #: command-list.h:121 msgid "Join two or more development histories together" -msgstr "Junta dos o mas historiales de desarrollo juntos" +msgstr "Junta dos o más historiales de desarrollo juntos" #: command-list.h:122 msgid "Find as good common ancestors as possible for a merge" @@ -21270,219 +21735,227 @@ msgid "Reset current HEAD to the specified state" msgstr "Reinicia el HEAD actual a un estado especifico" #: command-list.h:156 +msgid "Restore working tree files" +msgstr "Restaurar archivos de árboles de trabajo" + +#: command-list.h:157 msgid "Revert some existing commits" msgstr "Revierte algunos commits existentes" -#: command-list.h:157 +#: command-list.h:158 msgid "Lists commit objects in reverse chronological order" msgstr "Lista objetos commit en orden cronológico inverso" -#: command-list.h:158 +#: command-list.h:159 msgid "Pick out and massage parameters" msgstr "Seleccionar y masajear los parámetros" -#: command-list.h:159 +#: command-list.h:160 msgid "Remove files from the working tree and from the index" msgstr "Borra archivos del árbol de trabajo y del índice" -#: command-list.h:160 +#: command-list.h:161 msgid "Send a collection of patches as emails" msgstr "Envía una colección de parches como e-mails" -#: command-list.h:161 +#: command-list.h:162 msgid "Push objects over Git protocol to another repository" msgstr "Empujar objetos por protocolo Git a otro repositorio" -#: command-list.h:162 +#: command-list.h:163 msgid "Restricted login shell for Git-only SSH access" msgstr "Shell de inicio de sesión restringido para acceso SSH exclusivo de Git" -#: command-list.h:163 +#: command-list.h:164 msgid "Summarize 'git log' output" msgstr "Resumir la salida 'git log'" -#: command-list.h:164 +#: command-list.h:165 msgid "Show various types of objects" msgstr "Muestra varios tipos de objetos" -#: command-list.h:165 +#: command-list.h:166 msgid "Show branches and their commits" msgstr "Mostrar ramas y sus commits" -#: command-list.h:166 +#: command-list.h:167 msgid "Show packed archive index" msgstr "Mostrar el índice de archivo empaquetado" -#: command-list.h:167 +#: command-list.h:168 msgid "List references in a local repository" msgstr "Listar referencias en el repositorio local" -#: command-list.h:168 +#: command-list.h:169 msgid "Git's i18n setup code for shell scripts" msgstr "El código de configuración i18n de Git para scripts de shell" -#: command-list.h:169 +#: command-list.h:170 msgid "Common Git shell script setup code" msgstr "Código de configuración de script de shell común de Git" -#: command-list.h:170 +#: command-list.h:171 msgid "Stash the changes in a dirty working directory away" msgstr "" "Poner en un stash los cambios en un directorio de trabajo sucio de todas " "maneras" -#: command-list.h:171 +#: command-list.h:172 msgid "Add file contents to the staging area" msgstr "Agrega contenidos de un archivo al área de staging" -#: command-list.h:172 +#: command-list.h:173 msgid "Show the working tree status" msgstr "Muestra el estado del árbol de trabajo" -#: command-list.h:173 +#: command-list.h:174 msgid "Remove unnecessary whitespace" msgstr "Eliminar el espacio en blanco innecesario" -#: command-list.h:174 +#: command-list.h:175 msgid "Initialize, update or inspect submodules" msgstr "Inicializa, actualiza o inspecciona submódulos" -#: command-list.h:175 +#: command-list.h:176 msgid "Bidirectional operation between a Subversion repository and Git" msgstr "Operación bidireccional entre un repositorio Subversion y Git" -#: command-list.h:176 +#: command-list.h:177 +msgid "Switch branches" +msgstr "Cambiar branches" + +#: command-list.h:178 msgid "Read, modify and delete symbolic refs" msgstr "Lee, modifica y borra referencias simbólicas" -#: command-list.h:177 +#: command-list.h:179 msgid "Create, list, delete or verify a tag object signed with GPG" msgstr "Crea, lista, borra o verifica un tag de objeto firmado con GPG" -#: command-list.h:178 +#: command-list.h:180 msgid "Creates a temporary file with a blob's contents" msgstr "Crea un archivo temporal con contenidos de un blob" -#: command-list.h:179 +#: command-list.h:181 msgid "Unpack objects from a packed archive" msgstr "Desempaqueta objetos de un archivo empaquetado" -#: command-list.h:180 +#: command-list.h:182 msgid "Register file contents in the working tree to the index" msgstr "Registra contenidos de archivos en el árbol de trabajo al índice" -#: command-list.h:181 +#: command-list.h:183 msgid "Update the object name stored in a ref safely" msgstr "" "Actualiza el nombre del objeto almacenado en una referencia de forma segura" -#: command-list.h:182 +#: command-list.h:184 msgid "Update auxiliary info file to help dumb servers" msgstr "" "Actualiza el archivo de información auxiliar para ayudar a los servidores " "dumb" -#: command-list.h:183 +#: command-list.h:185 msgid "Send archive back to git-archive" msgstr "Enviar archivo a git-archive" -#: command-list.h:184 +#: command-list.h:186 msgid "Send objects packed back to git-fetch-pack" msgstr "Enviar objetos empaquetados a git-fetch-pack" -#: command-list.h:185 +#: command-list.h:187 msgid "Show a Git logical variable" msgstr "Mostrar una variable lógica de Git" -#: command-list.h:186 +#: command-list.h:188 msgid "Check the GPG signature of commits" msgstr "Verificar firma GPG de commits" -#: command-list.h:187 +#: command-list.h:189 msgid "Validate packed Git archive files" msgstr "Valida archivos Git empaquetados" -#: command-list.h:188 +#: command-list.h:190 msgid "Check the GPG signature of tags" msgstr "Verifica la firma GPG de etiquetas" -#: command-list.h:189 +#: command-list.h:191 msgid "Git web interface (web frontend to Git repositories)" msgstr "Interfaz web Git (interfaz web para repositorios Git)" -#: command-list.h:190 +#: command-list.h:192 msgid "Show logs with difference each commit introduces" msgstr "Muestra logs con las diferencias que cada commit introduce" -#: command-list.h:191 +#: command-list.h:193 msgid "Manage multiple working trees" msgstr "Gestiona múltiples árboles de trabajo" -#: command-list.h:192 +#: command-list.h:194 msgid "Create a tree object from the current index" msgstr "Crea un objeto árbol del índice actual" -#: command-list.h:193 +#: command-list.h:195 msgid "Defining attributes per path" msgstr "Definiendo atributos por ruta" -#: command-list.h:194 +#: command-list.h:196 msgid "Git command-line interface and conventions" msgstr "Interfaz y convenciones de línea de comandos de Git" -#: command-list.h:195 +#: command-list.h:197 msgid "A Git core tutorial for developers" msgstr "Un tutorial básico de Git para desarrolladores" -#: command-list.h:196 +#: command-list.h:198 msgid "Git for CVS users" msgstr "Git para usuarios CVS" -#: command-list.h:197 +#: command-list.h:199 msgid "Tweaking diff output" msgstr "Afinar la salida de diff" -#: command-list.h:198 +#: command-list.h:200 msgid "A useful minimum set of commands for Everyday Git" msgstr "Un conjunto mínimo útil de comandos diarios de Git" -#: command-list.h:199 +#: command-list.h:201 msgid "A Git Glossary" msgstr "Un Glosario de Git" -#: command-list.h:200 +#: command-list.h:202 msgid "Hooks used by Git" msgstr "Hooks utilizados por Git" -#: command-list.h:201 +#: command-list.h:203 msgid "Specifies intentionally untracked files to ignore" msgstr "Especifica de forma intencional archivos sin seguimiento a ignorar" -#: command-list.h:202 +#: command-list.h:204 msgid "Defining submodule properties" msgstr "Definiendo las propiedades del submódulo" -#: command-list.h:203 +#: command-list.h:205 msgid "Git namespaces" msgstr "Namespaces de Git" -#: command-list.h:204 +#: command-list.h:206 msgid "Git Repository Layout" msgstr "Disposición del repositorio Git" -#: command-list.h:205 +#: command-list.h:207 msgid "Specifying revisions and ranges for Git" msgstr "Especificando revisiones y rangos para Git" -#: command-list.h:206 +#: command-list.h:208 msgid "A tutorial introduction to Git: part two" msgstr "Un tutorial de introducción a Git: parte dos" -#: command-list.h:207 +#: command-list.h:209 msgid "A tutorial introduction to Git" msgstr "Un tutorial de introducción para Git" -#: command-list.h:208 +#: command-list.h:210 msgid "An overview of recommended workflows with Git" msgstr "Una visión general de flujos de trabajo recomendados con Git" @@ -21574,7 +22047,7 @@ msgid "" "Error: Your local changes to the following files would be overwritten by " "merge" msgstr "" -"Error: Sus cambios locales de los siguientes archivos serán sobrescritos por " +"Error: Tus cambios locales de los siguientes archivos serán sobrescritos por " "la fusión" #: git-merge-octopus.sh:61 @@ -21757,9 +22230,9 @@ msgid "" msgstr "" "Si quiere reusar este directorio git local en lugar de clonar nuevamente de\n" " $realrepo\n" -"use la opción '--force'. Si el directorio git local no es el repositorio " +"usa la opción '--force'. Si el directorio git local no es el repositorio " "correcto\n" -"o no está seguro de lo que esto significa, escoja otro nombre con la opción " +"o no estás seguro de lo que esto significa, escoge otro nombre con la opción " "'--name'." #: git-submodule.sh:286 @@ -21900,12 +22373,21 @@ msgstr "" msgid "See git-${cmd}(1) for details." msgstr "Véase git-${cmd}(1) para más detalles." -#: git-rebase--preserve-merges.sh:136 +#: git-rebase--preserve-merges.sh:109 +msgid "Applied autostash." +msgstr "Autostash aplicado." + +#: git-rebase--preserve-merges.sh:112 +#, sh-format +msgid "Cannot store $stash_sha1" +msgstr "No se puede almacenar $stash_sha1" + +#: git-rebase--preserve-merges.sh:191 #, sh-format msgid "Rebasing ($new_count/$total)" msgstr "Rebasando ($new_count/$total)" -#: git-rebase--preserve-merges.sh:152 +#: git-rebase--preserve-merges.sh:207 msgid "" "\n" "Commands:\n" @@ -21945,7 +22427,7 @@ msgstr "" "Estas líneas pueden ser reordenadas; son ejecutadas desde arriba hacia " "abajo.\n" -#: git-rebase--preserve-merges.sh:215 +#: git-rebase--preserve-merges.sh:270 #, sh-format msgid "" "You can amend the commit now, with\n" @@ -21956,91 +22438,91 @@ msgid "" "\n" "\tgit rebase --continue" msgstr "" -"Puede enmendar el commit ahora, con\n" +"Puedes enmendar el commit ahora, con\n" "\n" "\tgit commit --amend $gpg_sign_opt_quoted\n" "\n" -"Una vez que esté satisfecho con los cambios, ejecute\n" +"Una vez que estés satisfecho con los cambios, ejecuta\n" "\n" "\tgit rebase --continue" -#: git-rebase--preserve-merges.sh:240 +#: git-rebase--preserve-merges.sh:295 #, sh-format msgid "$sha1: not a commit that can be picked" msgstr "$sha1: no es un commit que pueda ser cogido" -#: git-rebase--preserve-merges.sh:279 +#: git-rebase--preserve-merges.sh:334 #, sh-format msgid "Invalid commit name: $sha1" msgstr "Nombre de commit inválido: $sha1" -#: git-rebase--preserve-merges.sh:309 +#: git-rebase--preserve-merges.sh:364 msgid "Cannot write current commit's replacement sha1" msgstr "No se puede escribir el remplazo sha1 del commit actual" -#: git-rebase--preserve-merges.sh:360 +#: git-rebase--preserve-merges.sh:415 #, sh-format msgid "Fast-forward to $sha1" msgstr "Avance rápido a $sha1" -#: git-rebase--preserve-merges.sh:362 +#: git-rebase--preserve-merges.sh:417 #, sh-format msgid "Cannot fast-forward to $sha1" msgstr "No se puede realizar avance rápido a $sha1" -#: git-rebase--preserve-merges.sh:371 +#: git-rebase--preserve-merges.sh:426 #, sh-format msgid "Cannot move HEAD to $first_parent" msgstr "No se puede mover HEAD a $first_parent" -#: git-rebase--preserve-merges.sh:376 +#: git-rebase--preserve-merges.sh:431 #, sh-format msgid "Refusing to squash a merge: $sha1" msgstr "Rehusando a ejecutar squash en fusión: $sha1" -#: git-rebase--preserve-merges.sh:394 +#: git-rebase--preserve-merges.sh:449 #, sh-format msgid "Error redoing merge $sha1" msgstr "Error rehaciendo fusión $sha1" -#: git-rebase--preserve-merges.sh:403 +#: git-rebase--preserve-merges.sh:458 #, sh-format msgid "Could not pick $sha1" msgstr "No se pudo coger $sha1" -#: git-rebase--preserve-merges.sh:412 +#: git-rebase--preserve-merges.sh:467 #, sh-format msgid "This is the commit message #${n}:" msgstr "Este es el mensaje del commit #${n}:" -#: git-rebase--preserve-merges.sh:417 +#: git-rebase--preserve-merges.sh:472 #, sh-format msgid "The commit message #${n} will be skipped:" msgstr "El mensaje del commit #${n} será ignorado:" -#: git-rebase--preserve-merges.sh:428 +#: git-rebase--preserve-merges.sh:483 #, sh-format msgid "This is a combination of $count commit." msgid_plural "This is a combination of $count commits." msgstr[0] "Esta es una combinación de $count commit." msgstr[1] "Esta es la combinación de $count commits." -#: git-rebase--preserve-merges.sh:437 +#: git-rebase--preserve-merges.sh:492 #, sh-format msgid "Cannot write $fixup_msg" msgstr "No se puede escribir $fixup_msg" -#: git-rebase--preserve-merges.sh:440 +#: git-rebase--preserve-merges.sh:495 msgid "This is a combination of 2 commits." msgstr "Esto es una combinación de 2 commits." -#: git-rebase--preserve-merges.sh:481 git-rebase--preserve-merges.sh:524 -#: git-rebase--preserve-merges.sh:527 +#: git-rebase--preserve-merges.sh:536 git-rebase--preserve-merges.sh:579 +#: git-rebase--preserve-merges.sh:582 #, sh-format msgid "Could not apply $sha1... $rest" msgstr "No se puede aplicar $sha1... $rest" -#: git-rebase--preserve-merges.sh:556 +#: git-rebase--preserve-merges.sh:611 #, sh-format msgid "" "Could not amend commit after successfully picking $sha1... $rest\n" @@ -22053,35 +22535,35 @@ msgstr "" "$rest\n" "Esto es probablemente debido a un mensaje de commit vacío, o el hook pre-" "commit\n" -"ha fallado. Si el hook pre-commit falló, es posible que deba resolver el " +"ha fallado. Si el hook pre-commit falló, es posible que debas resolver el " "problema antes\n" "de que sea capaz de reformular el commit." -#: git-rebase--preserve-merges.sh:571 +#: git-rebase--preserve-merges.sh:626 #, sh-format msgid "Stopped at $sha1_abbrev... $rest" msgstr "Detenido en $sha1_abbrev... $rest" -#: git-rebase--preserve-merges.sh:586 +#: git-rebase--preserve-merges.sh:641 #, sh-format msgid "Cannot '$squash_style' without a previous commit" msgstr "No se puede '$squash_style' sin un commit previo" -#: git-rebase--preserve-merges.sh:628 +#: git-rebase--preserve-merges.sh:683 #, sh-format msgid "Executing: $rest" msgstr "Ejecutando: $rest" -#: git-rebase--preserve-merges.sh:636 +#: git-rebase--preserve-merges.sh:691 #, sh-format msgid "Execution failed: $rest" msgstr "Ejecución fallida: $rest" -#: git-rebase--preserve-merges.sh:638 +#: git-rebase--preserve-merges.sh:693 msgid "and made changes to the index and/or the working tree" msgstr "y hizo cambios al índice y/o al árbol de trabajo" -#: git-rebase--preserve-merges.sh:640 +#: git-rebase--preserve-merges.sh:695 msgid "" "You can fix the problem, and then run\n" "\n" @@ -22092,7 +22574,7 @@ msgstr "" "\tgit rebase --continue" #. TRANSLATORS: after these lines is a command to be issued by the user -#: git-rebase--preserve-merges.sh:653 +#: git-rebase--preserve-merges.sh:708 #, sh-format msgid "" "Execution succeeded: $rest\n" @@ -22103,29 +22585,29 @@ msgid "" msgstr "" "La ejecución tuvo éxito: $rest\n" "Pero dejó cambios en el índice y/o en el árbol de trabajo\n" -"Realice un commit o stash con los cambios y, a continuación, ejecute\n" +"Realiza un commit o stash con los cambios y, a continuación, ejecuta\n" "\n" "\tgit rebase --continue" -#: git-rebase--preserve-merges.sh:664 +#: git-rebase--preserve-merges.sh:719 #, sh-format msgid "Unknown command: $command $sha1 $rest" msgstr "Comando desconocido: $command $sha1 $rest" -#: git-rebase--preserve-merges.sh:665 +#: git-rebase--preserve-merges.sh:720 msgid "Please fix this using 'git rebase --edit-todo'." msgstr "Por favor, corrige esto usando 'git rebase --edit-todo'." -#: git-rebase--preserve-merges.sh:700 +#: git-rebase--preserve-merges.sh:755 #, sh-format msgid "Successfully rebased and updated $head_name." msgstr "$head_name rebasado y actualizado satisfactoriamente." -#: git-rebase--preserve-merges.sh:757 +#: git-rebase--preserve-merges.sh:812 msgid "Could not remove CHERRY_PICK_HEAD" msgstr "No se pudo eliminar CHERRY_PICK_HEAD" -#: git-rebase--preserve-merges.sh:762 +#: git-rebase--preserve-merges.sh:817 #, sh-format msgid "" "You have staged changes in your working tree.\n" @@ -22142,26 +22624,26 @@ msgid "" "\n" " git rebase --continue\n" msgstr "" -"Tiene cambios en el área de stage de su árbol de trabajo.\n" +"Tienes cambios en el área de stage de tu árbol de trabajo.\n" "Si estos cambios están destinados a \n" -"ser aplastados en el commit previo, ejecute:\n" +"ser aplastados en el commit previo, ejecuta:\n" "\n" " git commit --amend $gpg_sign_opt_quoted\n" "\n" -"Si estos están destinados a ir en un nuevo commit, ejecute:\n" +"Si estos están destinados a ir en un nuevo commit, ejecuta:\n" "\n" " git commit $gpg_sign_opt_quoted\n" "\n" -"En ambos casos, cuando termine, continue con:\n" +"En ambos casos, cuando termines, continue con:\n" "\n" " git rebase --continue\n" -#: git-rebase--preserve-merges.sh:779 +#: git-rebase--preserve-merges.sh:834 msgid "Error trying to find the author identity to amend commit" msgstr "" "Error tratando de encontrar la identidad del autor para remediar el commit" -#: git-rebase--preserve-merges.sh:784 +#: git-rebase--preserve-merges.sh:839 msgid "" "You have uncommitted changes in your working tree. Please commit them\n" "first and then run 'git rebase --continue' again." @@ -22169,40 +22651,40 @@ msgstr "" "Tienes cambios sin confirmar en tu árbol de trabajo. Por favor, confírmalos\n" "primero y entonces ejecuta 'git rebase --continue' de nuevo." -#: git-rebase--preserve-merges.sh:789 git-rebase--preserve-merges.sh:793 +#: git-rebase--preserve-merges.sh:844 git-rebase--preserve-merges.sh:848 msgid "Could not commit staged changes." msgstr "No se pudo realizar el commit con los cambios en el área de stage." -#: git-rebase--preserve-merges.sh:824 git-rebase--preserve-merges.sh:910 +#: git-rebase--preserve-merges.sh:879 git-rebase--preserve-merges.sh:965 msgid "Could not execute editor" msgstr "No se pudo ejecutar el editor" -#: git-rebase--preserve-merges.sh:845 +#: git-rebase--preserve-merges.sh:900 #, sh-format msgid "Could not checkout $switch_to" msgstr "No se pudo actualizar el árbol de trabajo a $switch_to" -#: git-rebase--preserve-merges.sh:852 +#: git-rebase--preserve-merges.sh:907 msgid "No HEAD?" msgstr "¿Sin HEAD?" -#: git-rebase--preserve-merges.sh:853 +#: git-rebase--preserve-merges.sh:908 #, sh-format msgid "Could not create temporary $state_dir" msgstr "No se pudo crear $state_dir temporalmente" -#: git-rebase--preserve-merges.sh:856 +#: git-rebase--preserve-merges.sh:911 msgid "Could not mark as interactive" msgstr "No se pudo marcar como interactivo" -#: git-rebase--preserve-merges.sh:888 +#: git-rebase--preserve-merges.sh:943 #, sh-format msgid "Rebase $shortrevisions onto $shortonto ($todocount command)" msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)" msgstr[0] "Rebase $shortrevisions en $shortonto ($todocount comando)" msgstr[1] "Rebase $shortrevisions en $shortonto ($todocount comandos)" -#: git-rebase--preserve-merges.sh:942 git-rebase--preserve-merges.sh:947 +#: git-rebase--preserve-merges.sh:997 git-rebase--preserve-merges.sh:1002 msgid "Could not init rewritten commits" msgstr "No se puede inicializar los commits reescritos" @@ -22276,81 +22758,81 @@ msgid "Unable to determine absolute path of git directory" msgstr "Incapaz de determinar la ruta absoluta del directorio git" #. TRANSLATORS: you can adjust this to align "git add -i" status menu -#: git-add--interactive.perl:196 +#: git-add--interactive.perl:210 #, perl-format msgid "%12s %12s %s" msgstr "%12s %12s %s" -#: git-add--interactive.perl:197 +#: git-add--interactive.perl:211 msgid "staged" msgstr "rastreado" -#: git-add--interactive.perl:197 +#: git-add--interactive.perl:211 msgid "unstaged" msgstr "no rastreado" -#: git-add--interactive.perl:253 git-add--interactive.perl:278 +#: git-add--interactive.perl:267 git-add--interactive.perl:292 msgid "binary" msgstr "binario" -#: git-add--interactive.perl:262 git-add--interactive.perl:316 +#: git-add--interactive.perl:276 git-add--interactive.perl:330 msgid "nothing" msgstr "nada" -#: git-add--interactive.perl:298 git-add--interactive.perl:313 +#: git-add--interactive.perl:312 git-add--interactive.perl:327 msgid "unchanged" msgstr "sin cambios" -#: git-add--interactive.perl:609 +#: git-add--interactive.perl:623 #, perl-format msgid "added %d path\n" msgid_plural "added %d paths\n" msgstr[0] "agregada %d ruta\n" msgstr[1] "agregadas %d rutas\n" -#: git-add--interactive.perl:612 +#: git-add--interactive.perl:626 #, perl-format msgid "updated %d path\n" msgid_plural "updated %d paths\n" msgstr[0] "actualizada %d ruta\n" msgstr[1] "actualizadas %d rutas\n" -#: git-add--interactive.perl:615 +#: git-add--interactive.perl:629 #, perl-format msgid "reverted %d path\n" msgid_plural "reverted %d paths\n" msgstr[0] "revertida %d ruta\n" msgstr[1] "revertidas %d rutas\n" -#: git-add--interactive.perl:618 +#: git-add--interactive.perl:632 #, perl-format msgid "touched %d path\n" msgid_plural "touched %d paths\n" msgstr[0] "touch hecho a %d ruta\n" msgstr[1] "touch hecho a %d rutas\n" -#: git-add--interactive.perl:627 +#: git-add--interactive.perl:641 msgid "Update" msgstr "Actualizar" -#: git-add--interactive.perl:639 +#: git-add--interactive.perl:653 msgid "Revert" msgstr "Revertir" -#: git-add--interactive.perl:662 +#: git-add--interactive.perl:676 #, perl-format msgid "note: %s is untracked now.\n" msgstr "nota: %s no es rastreado ahora.\n" -#: git-add--interactive.perl:673 +#: git-add--interactive.perl:687 msgid "Add untracked" msgstr "Agregar no rastreados" -#: git-add--interactive.perl:679 +#: git-add--interactive.perl:693 msgid "No untracked files.\n" msgstr "No hay archivos sin rastrear.\n" -#: git-add--interactive.perl:1033 +#: git-add--interactive.perl:1051 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for staging." @@ -22358,7 +22840,7 @@ msgstr "" "Si el parche aplica limpiamente, el hunk editado sera marcado\n" "inmediatamente para el área de stage." -#: git-add--interactive.perl:1036 +#: git-add--interactive.perl:1054 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for stashing." @@ -22366,7 +22848,7 @@ msgstr "" "Si el parche aplica limpiamente, el hunk editado sera marcado\n" "inmediatamente para aplicar stash." -#: git-add--interactive.perl:1039 +#: git-add--interactive.perl:1057 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for unstaging." @@ -22374,7 +22856,8 @@ msgstr "" "Si el parche aplica limpiamente, el hunk editado sera marcado\n" "inmediatamente para sacar del área de stage." -#: git-add--interactive.perl:1042 git-add--interactive.perl:1051 +#: git-add--interactive.perl:1060 git-add--interactive.perl:1069 +#: git-add--interactive.perl:1075 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for applying." @@ -22382,7 +22865,8 @@ msgstr "" "Si el parche aplica de forma limpia, el hunk editado sera marcado \n" "inmediatamente para aplicar." -#: git-add--interactive.perl:1045 git-add--interactive.perl:1048 +#: git-add--interactive.perl:1063 git-add--interactive.perl:1066 +#: git-add--interactive.perl:1072 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for discarding." @@ -22390,16 +22874,16 @@ msgstr "" "Si el parche aplica de forma limpia, el hunk editado sera marcado\n" "inmediatamente para descarte." -#: git-add--interactive.perl:1085 +#: git-add--interactive.perl:1109 #, perl-format msgid "failed to open hunk edit file for writing: %s" msgstr "falló al abrir el archivo de adición del hunk para escritura: %s" -#: git-add--interactive.perl:1086 +#: git-add--interactive.perl:1110 msgid "Manual hunk edit mode -- see bottom for a quick guide.\n" msgstr "Modo de edición manual de hunk -- vea abajo para una guía rápida.\n" -#: git-add--interactive.perl:1092 +#: git-add--interactive.perl:1116 #, perl-format msgid "" "---\n" @@ -22413,17 +22897,17 @@ msgstr "" "Lineas comenzando con %s serán removidas.\n" #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages. -#: git-add--interactive.perl:1100 +#: git-add--interactive.perl:1124 msgid "" "If it does not apply cleanly, you will be given an opportunity to\n" "edit again. If all lines of the hunk are removed, then the edit is\n" "aborted and the hunk is left unchanged.\n" msgstr "" -"Si esto no aplica de manera limpia, se le da la oportunidad de \n" +"Si esto no aplica de manera limpia, se te da la oportunidad de \n" "editar nuevamente. Si todas las líneas del hunk son removidas, entonces \n" "la edición es abortada y el hunk queda sin cambios.\n" -#: git-add--interactive.perl:1114 +#: git-add--interactive.perl:1138 #, perl-format msgid "failed to open hunk edit file for reading: %s" msgstr "falló al abrir el archivo de edición del hunk para lectura: %s" @@ -22434,13 +22918,13 @@ msgstr "falló al abrir el archivo de edición del hunk para lectura: %s" #. Consider translating (saying "no" discards!) as #. (saying "n" for "no" discards!) if the translation #. of the word "no" does not start with n. -#: git-add--interactive.perl:1213 +#: git-add--interactive.perl:1237 msgid "" "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " msgstr "" "Tu hunk editado no aplica. Editar nuevamente (decir \"no\" descarta!) [y/n]? " -#: git-add--interactive.perl:1222 +#: git-add--interactive.perl:1246 msgid "" "y - stage this hunk\n" "n - do not stage this hunk\n" @@ -22455,7 +22939,7 @@ msgstr "" "d - no aplicar stage a este hunk o a ninguno de los posteriores en este " "archivo" -#: git-add--interactive.perl:1228 +#: git-add--interactive.perl:1252 msgid "" "y - stash this hunk\n" "n - do not stash this hunk\n" @@ -22469,7 +22953,7 @@ msgstr "" "a - aplicar stash a este hunk y a todos los posteriores en el archivo\n" "d - no aplicar stash a este hunk o ninguno de los posteriores en el archivo" -#: git-add--interactive.perl:1234 +#: git-add--interactive.perl:1258 msgid "" "y - unstage this hunk\n" "n - do not unstage this hunk\n" @@ -22484,7 +22968,7 @@ msgstr "" "d - no sacar del area de stage este hunk o ninguno de los posteriores en el " "archivo" -#: git-add--interactive.perl:1240 +#: git-add--interactive.perl:1264 msgid "" "y - apply this hunk to index\n" "n - do not apply this hunk to index\n" @@ -22498,7 +22982,7 @@ msgstr "" "a - aplicar este hunk y todos los posteriores en el archivo\n" "d - no aplicar este hunko ninguno de los posteriores en el archivo" -#: git-add--interactive.perl:1246 +#: git-add--interactive.perl:1270 git-add--interactive.perl:1288 msgid "" "y - discard this hunk from worktree\n" "n - do not discard this hunk from worktree\n" @@ -22512,7 +22996,7 @@ msgstr "" "a - descartar este hunk y todos los posteriores en este archivo\n" "d - no descartar este hunk o ninguno de los posteriores en el archivo" -#: git-add--interactive.perl:1252 +#: git-add--interactive.perl:1276 msgid "" "y - discard this hunk from index and worktree\n" "n - do not discard this hunk from index and worktree\n" @@ -22526,7 +23010,7 @@ msgstr "" "a - descartar este hunk y todos los posteriores en este archivo\n" "d - no descartar este hunk o ninguno posterior en el archivo" -#: git-add--interactive.perl:1258 +#: git-add--interactive.perl:1282 msgid "" "y - apply this hunk to index and worktree\n" "n - do not apply this hunk to index and worktree\n" @@ -22540,7 +23024,21 @@ msgstr "" "a - aplicar este hunk y todos los posteriores en el archivo\n" "d - no aplicar este hunk o ninguno de los siguientes en este archivo" -#: git-add--interactive.perl:1273 +#: git-add--interactive.perl:1294 +msgid "" +"y - apply this hunk to worktree\n" +"n - do not apply this hunk to worktree\n" +"q - quit; do not apply this hunk or any of the remaining ones\n" +"a - apply this hunk and all later hunks in the file\n" +"d - do not apply this hunk or any of the later hunks in the file" +msgstr "" +"y - aplicar este hunk al índice y al árbol de trabajo\n" +"n - no aplicar este hunk al índice y al árbol de trabajo\n" +"q - quit; no aplicar este hunk o ninguno de los restantes\n" +"a - aplicar este hunk y todos los posteriores en el archivo\n" +"d - no aplicar este hunk o ninguno de los siguientes en este archivo" + +#: git-add--interactive.perl:1309 msgid "" "g - select a hunk to go to\n" "/ - search for a hunk matching the given regex\n" @@ -22558,217 +23056,232 @@ msgstr "" "J - dejar este hunk por definir, ver siguiente hunk\n" "k - dejar este hunk por definir, ver hunk previo por definir\n" "K - dejar este hunk por definir, ver hunk previo\n" -"s - dividir el hunk actual en hunks mas pequeños\n" +"s - dividir el hunk actual en hunks más pequeños\n" "e - editar manualmente el hunk actual\n" "? - imprimir ayuda\n" -#: git-add--interactive.perl:1304 +#: git-add--interactive.perl:1340 msgid "The selected hunks do not apply to the index!\n" msgstr "Los hunks seleccionados no aplican al índice!\n" -#: git-add--interactive.perl:1305 +#: git-add--interactive.perl:1341 msgid "Apply them to the worktree anyway? " msgstr "Aplicarlos al árbol de trabajo de todas maneras? " -#: git-add--interactive.perl:1308 +#: git-add--interactive.perl:1344 msgid "Nothing was applied.\n" msgstr "Nada fue aplicado.\n" -#: git-add--interactive.perl:1319 +#: git-add--interactive.perl:1355 #, perl-format msgid "ignoring unmerged: %s\n" msgstr "ignorando lo no fusionado: %s\n" -#: git-add--interactive.perl:1328 +#: git-add--interactive.perl:1364 msgid "Only binary files changed.\n" msgstr "Solo cambiaron archivos binarios.\n" -#: git-add--interactive.perl:1330 +#: git-add--interactive.perl:1366 msgid "No changes.\n" msgstr "Sin cambios.\n" -#: git-add--interactive.perl:1338 +#: git-add--interactive.perl:1374 msgid "Patch update" msgstr "Actualización del parche" -#: git-add--interactive.perl:1390 +#: git-add--interactive.perl:1426 #, perl-format msgid "Stage mode change [y,n,q,a,d%s,?]? " msgstr "Cambio de modo de stage [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1391 +#: git-add--interactive.perl:1427 #, perl-format msgid "Stage deletion [y,n,q,a,d%s,?]? " msgstr "Aplicar stage al borrado [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1392 +#: git-add--interactive.perl:1428 #, perl-format msgid "Stage this hunk [y,n,q,a,d%s,?]? " msgstr "Aplicar stage a este hunk [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1395 +#: git-add--interactive.perl:1431 #, perl-format msgid "Stash mode change [y,n,q,a,d%s,?]? " msgstr "Aplicar stash al cambio de modo [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1396 +#: git-add--interactive.perl:1432 #, perl-format msgid "Stash deletion [y,n,q,a,d%s,?]? " msgstr "Aplicar stash al borrado [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1397 +#: git-add--interactive.perl:1433 #, perl-format msgid "Stash this hunk [y,n,q,a,d%s,?]? " msgstr "Aplicar stash a este hunk [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1400 +#: git-add--interactive.perl:1436 #, perl-format msgid "Unstage mode change [y,n,q,a,d%s,?]? " msgstr "Sacar cambio de modo del stage [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1401 +#: git-add--interactive.perl:1437 #, perl-format msgid "Unstage deletion [y,n,q,a,d%s,?]? " msgstr "Sacar borrado del stage [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1402 +#: git-add--interactive.perl:1438 #, perl-format msgid "Unstage this hunk [y,n,q,a,d%s,?]? " msgstr "Sacar este hunk del stage [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1405 +#: git-add--interactive.perl:1441 #, perl-format msgid "Apply mode change to index [y,n,q,a,d%s,?]? " msgstr "Aplicar cambio de modo al índice [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1406 +#: git-add--interactive.perl:1442 #, perl-format msgid "Apply deletion to index [y,n,q,a,d%s,?]? " msgstr "Aplicar borrado al índice [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1407 +#: git-add--interactive.perl:1443 #, perl-format msgid "Apply this hunk to index [y,n,q,a,d%s,?]? " msgstr "Aplicar este hunk al índice [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1410 +#: git-add--interactive.perl:1446 git-add--interactive.perl:1461 #, perl-format msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? " msgstr "Descartar cambio de modo del árbol de trabajo [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1411 +#: git-add--interactive.perl:1447 git-add--interactive.perl:1462 #, perl-format msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? " msgstr "Descartar borrado del árbol de trabajo [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1412 +#: git-add--interactive.perl:1448 git-add--interactive.perl:1463 #, perl-format msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? " msgstr "Descartar este hunk del árbol de trabajo [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1415 +#: git-add--interactive.perl:1451 #, perl-format msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? " msgstr "" "Descartar cambio de modo del índice y el árbol de trabajo [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1416 +#: git-add--interactive.perl:1452 #, perl-format msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? " msgstr "Descartar borrado del índice y el árbol de trabajo [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1417 +#: git-add--interactive.perl:1453 #, perl-format msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? " msgstr "Descartar este hunk del índice y el árbol de trabajo [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1420 +#: git-add--interactive.perl:1456 #, perl-format msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? " msgstr "" "Aplicar cambio de modo para el índice y el árbol de trabajo [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1421 +#: git-add--interactive.perl:1457 #, perl-format msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? " msgstr "Aplicar borrado al índice y al árbol de trabajo [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1422 +#: git-add--interactive.perl:1458 #, perl-format msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? " msgstr "Aplicar este hunk al índice y árbol de trabajo [y,n,q,a,d,/%s,?]? " -#: git-add--interactive.perl:1522 +#: git-add--interactive.perl:1466 +#, perl-format +msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? " +msgstr "Aplicar cambio de modo para el árbol de trabajo [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1467 +#, perl-format +msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? " +msgstr "Aplicar borrado al árbol de trabajo [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1468 +#, perl-format +msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? " +msgstr "Aplicar este hunk al árbol de trabajo [y,n,q,a,d,/%s,?]? " + +#: git-add--interactive.perl:1568 msgid "No other hunks to goto\n" msgstr "No hay más pedazos para el ir\n" -#: git-add--interactive.perl:1529 +#: git-add--interactive.perl:1575 msgid "go to which hunk (<ret> to see more)? " -msgstr "a que hunk ir (<enter> para ver mas)? " +msgstr "a que hunk ir (<enter> para ver más)? " -#: git-add--interactive.perl:1531 +#: git-add--interactive.perl:1577 msgid "go to which hunk? " msgstr "a que hunk ir? " -#: git-add--interactive.perl:1540 +#: git-add--interactive.perl:1586 #, perl-format msgid "Invalid number: '%s'\n" msgstr "Numero inválido: '%s'\n" -#: git-add--interactive.perl:1545 +#: git-add--interactive.perl:1591 #, perl-format msgid "Sorry, only %d hunk available.\n" msgid_plural "Sorry, only %d hunks available.\n" msgstr[0] "Lo siento, solo %d hunk disponible.\n" msgstr[1] "Lo siento, solo %d hunks disponibles.\n" -#: git-add--interactive.perl:1571 +#: git-add--interactive.perl:1617 msgid "No other hunks to search\n" msgstr "No hay más pedazos para buscar\n" -#: git-add--interactive.perl:1575 +#: git-add--interactive.perl:1621 msgid "search for regex? " msgstr "buscar para regexp? " -#: git-add--interactive.perl:1588 +#: git-add--interactive.perl:1634 #, perl-format msgid "Malformed search regexp %s: %s\n" msgstr "Regexp para la búsqueda mal formado %s: %s\n" -#: git-add--interactive.perl:1598 +#: git-add--interactive.perl:1644 msgid "No hunk matches the given pattern\n" msgstr "No hay hunks que concuerden con el patrón entregado.\n" -#: git-add--interactive.perl:1610 git-add--interactive.perl:1632 +#: git-add--interactive.perl:1656 git-add--interactive.perl:1678 msgid "No previous hunk\n" msgstr "No el anterior hunk\n" -#: git-add--interactive.perl:1619 git-add--interactive.perl:1638 +#: git-add--interactive.perl:1665 git-add--interactive.perl:1684 msgid "No next hunk\n" msgstr "No el siguiente hunk\n" -#: git-add--interactive.perl:1644 +#: git-add--interactive.perl:1690 msgid "Sorry, cannot split this hunk\n" msgstr "Perdón, no se puede dividir este pedazo\n" -#: git-add--interactive.perl:1650 +#: git-add--interactive.perl:1696 #, perl-format msgid "Split into %d hunk.\n" msgid_plural "Split into %d hunks.\n" msgstr[0] "Cortar en %d hunk.\n" msgstr[1] "Cortar en %d hunks.\n" -#: git-add--interactive.perl:1660 +#: git-add--interactive.perl:1706 msgid "Sorry, cannot edit this hunk\n" msgstr "Perdón, no se puede editar este pedazo\n" -#: git-add--interactive.perl:1706 +#: git-add--interactive.perl:1752 msgid "Review diff" msgstr "Revisión de diff" #. TRANSLATORS: please do not translate the command names #. 'status', 'update', 'revert', etc. -#: git-add--interactive.perl:1725 +#: git-add--interactive.perl:1771 msgid "" "status - show paths with changes\n" "update - add working tree state to the staged set of changes\n" @@ -22788,18 +23301,19 @@ msgstr "" "add untracked - agrega contenidos de archivos no rastreados al grupo de " "cambios del area de stage\n" -#: git-add--interactive.perl:1742 git-add--interactive.perl:1747 -#: git-add--interactive.perl:1750 git-add--interactive.perl:1757 -#: git-add--interactive.perl:1761 git-add--interactive.perl:1767 +#: git-add--interactive.perl:1788 git-add--interactive.perl:1793 +#: git-add--interactive.perl:1796 git-add--interactive.perl:1803 +#: git-add--interactive.perl:1806 git-add--interactive.perl:1813 +#: git-add--interactive.perl:1817 git-add--interactive.perl:1823 msgid "missing --" msgstr "falta --" -#: git-add--interactive.perl:1763 +#: git-add--interactive.perl:1819 #, perl-format msgid "unknown --patch mode: %s" msgstr "modo --patch desconocido: %s" -#: git-add--interactive.perl:1769 git-add--interactive.perl:1775 +#: git-add--interactive.perl:1825 git-add--interactive.perl:1831 #, perl-format msgid "invalid argument %s, expecting --" msgstr "argumento inválido %s, se esperaba --" @@ -22812,31 +23326,31 @@ msgstr "la zona local difiere de GMT por un intervalo de cero minutos\n" msgid "local time offset greater than or equal to 24 hours\n" msgstr "el offset del tiempo local es mayor o igual a 24 horas\n" -#: git-send-email.perl:219 git-send-email.perl:225 +#: git-send-email.perl:223 git-send-email.perl:229 msgid "the editor exited uncleanly, aborting everything" msgstr "el editor se cerro inapropiadamente, abortando todo" -#: git-send-email.perl:302 +#: git-send-email.perl:310 #, perl-format msgid "" "'%s' contains an intermediate version of the email you were composing.\n" msgstr "" "'%s' contiene una versión intermedia del correo que se estaba generando.\n" -#: git-send-email.perl:307 +#: git-send-email.perl:315 #, perl-format msgid "'%s.final' contains the composed email.\n" msgstr "'%s.final' contiene el email generado.\n" -#: git-send-email.perl:326 +#: git-send-email.perl:408 msgid "--dump-aliases incompatible with other options\n" msgstr "--dump-aliases no es compatible con otras opciones.\n" -#: git-send-email.perl:395 git-send-email.perl:656 +#: git-send-email.perl:481 git-send-email.perl:683 msgid "Cannot run git format-patch from outside a repository\n" msgstr "No se puede ejecutar git format-patch desde fuera del repositorio.\n" -#: git-send-email.perl:398 +#: git-send-email.perl:484 msgid "" "`batch-size` and `relogin` must be specified together (via command-line or " "configuration option)\n" @@ -22844,37 +23358,37 @@ msgstr "" "`batch-size` y `relogin` deben ser especificados juntos (via la línea de " "comando o por opción de configuración)\n" -#: git-send-email.perl:470 +#: git-send-email.perl:497 #, perl-format msgid "Unknown --suppress-cc field: '%s'\n" msgstr "Campo --suppress-cc desconocido: '%s'\n" -#: git-send-email.perl:501 +#: git-send-email.perl:528 #, perl-format msgid "Unknown --confirm setting: '%s'\n" msgstr "Configuración --confirm desconocida: '%s'\n" -#: git-send-email.perl:529 +#: git-send-email.perl:556 #, perl-format msgid "warning: sendmail alias with quotes is not supported: %s\n" msgstr "peligro: alias de sendmail con comillas no es soportado: %s\n" -#: git-send-email.perl:531 +#: git-send-email.perl:558 #, perl-format msgid "warning: `:include:` not supported: %s\n" msgstr "peligro: `:include:` no soportado: %s\n" -#: git-send-email.perl:533 +#: git-send-email.perl:560 #, perl-format msgid "warning: `/file` or `|pipe` redirection not supported: %s\n" msgstr "advertencia: redirección `/file` o `|pipe` no soportada : %s\n" -#: git-send-email.perl:538 +#: git-send-email.perl:565 #, perl-format msgid "warning: sendmail line is not recognized: %s\n" msgstr "advertencia: línea sendmail no reconocida: %s\n" -#: git-send-email.perl:622 +#: git-send-email.perl:649 #, perl-format msgid "" "File '%s' exists but it could also be the range of commits\n" @@ -22889,12 +23403,12 @@ msgstr "" " * Diciendo \"./%s\" si se quiere decir un archivo; o\n" " * Agregando la opción --format-patch si se quiere decir un rango.\n" -#: git-send-email.perl:643 +#: git-send-email.perl:670 #, perl-format msgid "Failed to opendir %s: %s" msgstr "Falló al abrir directorio %s: %s" -#: git-send-email.perl:667 +#: git-send-email.perl:694 #, perl-format msgid "" "fatal: %s: %s\n" @@ -22903,7 +23417,7 @@ msgstr "" "fatal: %s: %s\n" "peligro: no se mandaron parches\n" -#: git-send-email.perl:678 +#: git-send-email.perl:705 msgid "" "\n" "No patch files specified!\n" @@ -22913,17 +23427,17 @@ msgstr "" "No se especificaron parches!\n" "\n" -#: git-send-email.perl:691 +#: git-send-email.perl:718 #, perl-format msgid "No subject line in %s?" msgstr "No hay línea de subject en %s?" -#: git-send-email.perl:701 +#: git-send-email.perl:728 #, perl-format msgid "Failed to open for writing %s: %s" msgstr "Falló al abrir para escritura %s: %s" -#: git-send-email.perl:712 +#: git-send-email.perl:739 msgid "" "Lines beginning in \"GIT:\" will be removed.\n" "Consider including an overall diffstat or table of contents\n" @@ -22933,31 +23447,31 @@ msgid "" msgstr "" "Lineas que comienzan en \"GIT:\" serán removidas.\n" "Considere incluir un diffstat global o una tabla de contenidos\n" -"para el parche que está escribiendo.\n" +"para el parche que estás escribiendo.\n" "\n" -"Limpiar el contenido de body si usted no desea mandar un resumen.\n" +"Limpiar el contenido de body si no deseas mandar un resumen.\n" -#: git-send-email.perl:736 +#: git-send-email.perl:763 #, perl-format msgid "Failed to open %s: %s" msgstr "Falló al abrir %s: %s" -#: git-send-email.perl:753 +#: git-send-email.perl:780 #, perl-format msgid "Failed to open %s.final: %s" msgstr "Falló al abrir %s.final: %s" -#: git-send-email.perl:796 +#: git-send-email.perl:823 msgid "Summary email is empty, skipping it\n" msgstr "Archivo de resumen está vacío, saltando al siguiente\n" #. TRANSLATORS: please keep [y/N] as is. -#: git-send-email.perl:831 +#: git-send-email.perl:858 #, perl-format msgid "Are you sure you want to use <%s> [y/N]? " -msgstr "Esta seguro de que desea usar <%s> [y/N]? " +msgstr "Estás seguro de que deseas usar <%s> [y/N]? " -#: git-send-email.perl:886 +#: git-send-email.perl:913 msgid "" "The following files are 8bit, but do not declare a Content-Transfer-" "Encoding.\n" @@ -22965,11 +23479,11 @@ msgstr "" "Los siguientes archivos son 8bit, pero no declaran un Content-Transfer-" "Encoding.\n" -#: git-send-email.perl:891 +#: git-send-email.perl:918 msgid "Which 8bit encoding should I declare [UTF-8]? " msgstr "Que codificación de 8bit debería declarar [UTF-8]? " -#: git-send-email.perl:899 +#: git-send-email.perl:926 #, perl-format msgid "" "Refusing to send because the patch\n" @@ -22982,39 +23496,39 @@ msgstr "" "tiene el template '*** SUBJECT HERE ***'. Agrega --force si realmente lo " "deseas mandar.\n" -#: git-send-email.perl:918 +#: git-send-email.perl:945 msgid "To whom should the emails be sent (if anyone)?" msgstr "A quien se deben mandar los correos (si existe)?" -#: git-send-email.perl:936 +#: git-send-email.perl:963 #, perl-format msgid "fatal: alias '%s' expands to itself\n" msgstr "fatal: alias '%s' se expande a si mismo\n" -#: git-send-email.perl:948 +#: git-send-email.perl:975 msgid "Message-ID to be used as In-Reply-To for the first email (if any)? " msgstr "" "Qué id de mensaje será usado como En-Respuesta-Para en el primer email (si " "existe alguno)? " -#: git-send-email.perl:1006 git-send-email.perl:1014 +#: git-send-email.perl:1033 git-send-email.perl:1041 #, perl-format msgid "error: unable to extract a valid address from: %s\n" -msgstr "error: no es posible extraer una dirección valida de %s\n" +msgstr "error: no es posible extraer una dirección válida de %s\n" #. TRANSLATORS: Make sure to include [q] [d] [e] in your #. translation. The program will only accept English input #. at this point. -#: git-send-email.perl:1018 +#: git-send-email.perl:1045 msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): " msgstr "Que hacer con esta dirección? ([q]salir|[d]botar|[e]ditar): " -#: git-send-email.perl:1335 +#: git-send-email.perl:1362 #, perl-format msgid "CA path \"%s\" does not exist" msgstr "Ruta CA \"%s\" no existe" -#: git-send-email.perl:1418 +#: git-send-email.perl:1445 msgid "" " The Cc list above has been expanded by additional\n" " addresses found in the patch commit message. By default\n" @@ -23034,7 +23548,7 @@ msgstr "" " Este comportamiento is controlado por el valor de configuración " "sendemail.confirm.\n" "\n" -" Para mas información, ejecuta 'git send-email --help'.\n" +" Para más información, ejecuta 'git send-email --help'.\n" " Para mantener el comportamiento actual, pero evitar este mensaje,\n" " ejecuta 'git config --global sendemail.confirm auto'.\n" "\n" @@ -23042,134 +23556,194 @@ msgstr "" #. TRANSLATORS: Make sure to include [y] [n] [e] [q] [a] in your #. translation. The program will only accept English input #. at this point. -#: git-send-email.perl:1433 +#: git-send-email.perl:1460 msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): " msgstr "Mandar este email? ([y]si||[n]o|[e]editar|[q]salir|[a]todo): " -#: git-send-email.perl:1436 +#: git-send-email.perl:1463 msgid "Send this email reply required" msgstr "Necesitas mandar esta respuesta de email" -#: git-send-email.perl:1464 +#: git-send-email.perl:1491 msgid "The required SMTP server is not properly defined." msgstr "El servidor SMTP no esta definido adecuadamente." -#: git-send-email.perl:1511 +#: git-send-email.perl:1538 #, perl-format msgid "Server does not support STARTTLS! %s" msgstr "El servidor no soporta STARTTLS! %s" -#: git-send-email.perl:1516 git-send-email.perl:1520 +#: git-send-email.perl:1543 git-send-email.perl:1547 #, perl-format msgid "STARTTLS failed! %s" msgstr "Falló STARTTLS! %s" -#: git-send-email.perl:1529 +#: git-send-email.perl:1556 msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug." msgstr "" "No es posible inicializar SMTP adecuadamente. Verificar config y usar ---" "smtp-debug." -#: git-send-email.perl:1547 +#: git-send-email.perl:1574 #, perl-format msgid "Failed to send %s\n" msgstr "Falló al enviar %s\n" -#: git-send-email.perl:1550 +#: git-send-email.perl:1577 #, perl-format msgid "Dry-Sent %s\n" msgstr "Dry-Sent %s\n" -#: git-send-email.perl:1550 +#: git-send-email.perl:1577 #, perl-format msgid "Sent %s\n" msgstr "Enviado %s\n" -#: git-send-email.perl:1552 +#: git-send-email.perl:1579 msgid "Dry-OK. Log says:\n" msgstr "Dry-OK. Log dice:\n" -#: git-send-email.perl:1552 +#: git-send-email.perl:1579 msgid "OK. Log says:\n" msgstr "OK. Log dice:\n" -#: git-send-email.perl:1564 +#: git-send-email.perl:1591 msgid "Result: " msgstr "Resultado: " -#: git-send-email.perl:1567 +#: git-send-email.perl:1594 msgid "Result: OK\n" msgstr "Resultado: OK\n" -#: git-send-email.perl:1585 +#: git-send-email.perl:1612 #, perl-format msgid "can't open file %s" msgstr "no se puede abrir el archivo %s" -#: git-send-email.perl:1632 git-send-email.perl:1652 +#: git-send-email.perl:1659 git-send-email.perl:1679 #, perl-format msgid "(mbox) Adding cc: %s from line '%s'\n" msgstr "(mbox) Agregando cc: %s de línea '%s'\n" -#: git-send-email.perl:1638 +#: git-send-email.perl:1665 #, perl-format msgid "(mbox) Adding to: %s from line '%s'\n" msgstr "(mbox) Agregando para: %s de la línea '%s'\n" -#: git-send-email.perl:1691 +#: git-send-email.perl:1718 #, perl-format msgid "(non-mbox) Adding cc: %s from line '%s'\n" msgstr "(non-mbox) Agregando cc: %s de la línea '%s'\n" -#: git-send-email.perl:1726 +#: git-send-email.perl:1753 #, perl-format msgid "(body) Adding cc: %s from line '%s'\n" msgstr "(body) Agregando cc: %s de la línea '%s'\n" -#: git-send-email.perl:1837 +#: git-send-email.perl:1864 #, perl-format msgid "(%s) Could not execute '%s'" msgstr "(%s) no se pudo ejecutar '%s'" -#: git-send-email.perl:1844 +#: git-send-email.perl:1871 #, perl-format msgid "(%s) Adding %s: %s from: '%s'\n" msgstr "(%s) Agregando %s: %s de: '%s'\n" -#: git-send-email.perl:1848 +#: git-send-email.perl:1875 #, perl-format msgid "(%s) failed to close pipe to '%s'" msgstr "(%s) falló al cerrar el pipe para '%s'" -#: git-send-email.perl:1878 +#: git-send-email.perl:1905 msgid "cannot send message as 7bit" msgstr "no se puede mandar mensaje como 7bit" -#: git-send-email.perl:1886 +#: git-send-email.perl:1913 msgid "invalid transfer encoding" msgstr "codificación de transferencia inválida" -#: git-send-email.perl:1927 git-send-email.perl:1979 git-send-email.perl:1989 +#: git-send-email.perl:1954 git-send-email.perl:2006 git-send-email.perl:2016 #, perl-format msgid "unable to open %s: %s\n" msgstr "no es posible abrir %s: %s\n" -#: git-send-email.perl:1930 +#: git-send-email.perl:1957 #, perl-format msgid "%s: patch contains a line longer than 998 characters" -msgstr "%s: el parche contiene una línea con mas de 998 caracteres" +msgstr "%s: el parche contiene una línea con más de 998 caracteres" -#: git-send-email.perl:1947 +#: git-send-email.perl:1974 #, perl-format msgid "Skipping %s with backup suffix '%s'.\n" msgstr "Saltando %s con el sufijo de backup '%s'.\n" #. TRANSLATORS: please keep "[y|N]" as is. -#: git-send-email.perl:1951 +#: git-send-email.perl:1978 #, perl-format msgid "Do you really want to send %s? [y|N]: " msgstr "Realmente deseas mandar %s?[y|N]: " +#~ msgid "Server supports multi_ack_detailed" +#~ msgstr "El servidor soporta ulti_ack_detailed" + +#~ msgid "Server supports no-done" +#~ msgstr "El servidor soporta no-done" + +#~ msgid "Server supports multi_ack" +#~ msgstr "El servidor soporta multi_ack" + +#~ msgid "Server supports side-band-64k" +#~ msgstr "El servidor soporta side-band-64k" + +#~ msgid "Server supports side-band" +#~ msgstr "El servidor soporta side-band" + +#~ msgid "Server supports allow-tip-sha1-in-want" +#~ msgstr "El servidor soporta allow-tip-sha1-in-want" + +#~ msgid "Server supports allow-reachable-sha1-in-want" +#~ msgstr "El servidor soporta allow-reachable-sha1-in-want" + +#~ msgid "Server supports ofs-delta" +#~ msgstr "El servidor soporta ofs-delta" + +#~ msgid "(HEAD detached at %s)" +#~ msgstr "(HEAD desacoplado en %s)" + +#~ msgid "(HEAD detached from %s)" +#~ msgstr "(HEAD desacoplado de %s)" + +#~ msgid "Checking out files" +#~ msgstr "Revisando archivos" + +#~ msgid "cannot be interactive without stdin connected to a terminal." +#~ msgstr "no se puede ser interactivo sin stdin conectado a un terminal." + +#~ msgid "failed to open '%s'" +#~ msgstr "falló al abrir '%s'" + +#~ msgid "failed to stat %s\n" +#~ msgstr "falló al analizar %s\n" + +#~ msgid "" +#~ "If you wish to skip this commit, use:\n" +#~ "\n" +#~ " git reset\n" +#~ "\n" +#~ "Then \"git cherry-pick --continue\" will resume cherry-picking\n" +#~ "the remaining commits.\n" +#~ msgstr "" +#~ "Si quiere saltar este commit, use:\n" +#~ "\n" +#~ " git reset\n" +#~ "\n" +#~ "Luego \"git cherry-pick --continue\" continuara el cherry-picking\n" +#~ "para los commits restantes.\n" + +#~ msgid "unrecognized verb: %s" +#~ msgstr "verbo no reconocido: %s" + #~ msgid "hash version %X does not match version %X" #~ msgstr "versión de hash %X no concuerda con versión %X" @@ -23341,12 +23915,6 @@ msgstr "Realmente deseas mandar %s?[y|N]: " #~ msgid "cannot remove a locked working tree" #~ msgstr "no se puede eliminar árbol de trabajo encerrado" -#~ msgid "Applied autostash." -#~ msgstr "Autostash aplicado." - -#~ msgid "Cannot store $stash_sha1" -#~ msgstr "No se puede almacenar $stash_sha1" - #~ msgid "" #~ "\n" #~ "\tHowever, if you remove everything, the rebase will be aborted.\n" @@ -75,8 +75,8 @@ msgid "" msgstr "" "Project-Id-Version: git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2019-02-15 10:09+0800\n" -"PO-Revision-Date: 2019-06-05 11:20+0200\n" +"POT-Creation-Date: 2019-08-10 20:12+0800\n" +"PO-Revision-Date: 2019-08-10 18:17+0200\n" "Last-Translator: Cédric Malard <c.malard-git@valdun.net>\n" "Language-Team: Jean-Noël Avila <jn.avila@free.fr>\n" "Language: fr\n" @@ -84,38 +84,39 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n<=1 ?0 : 1;\n" +"X-Generator: Poedit 2.2.3\n" -#: advice.c:103 +#: advice.c:109 #, c-format msgid "%shint: %.*s%s\n" msgstr "%sastuce: %.*s%s\n" -#: advice.c:156 +#: advice.c:162 msgid "Cherry-picking is not possible because you have unmerged files." msgstr "Impossible de picorer car vous avez des fichiers non fusionnés." -#: advice.c:158 +#: advice.c:164 msgid "Committing is not possible because you have unmerged files." msgstr "Impossible de valider car vous avez des fichiers non fusionnés." -#: advice.c:160 +#: advice.c:166 msgid "Merging is not possible because you have unmerged files." msgstr "Impossible de fusionner car vous avez des fichiers non fusionnés." -#: advice.c:162 +#: advice.c:168 msgid "Pulling is not possible because you have unmerged files." msgstr "Impossible de tirer car vous avez des fichiers non fusionnés." -#: advice.c:164 +#: advice.c:170 msgid "Reverting is not possible because you have unmerged files." msgstr "Impossible d'annuler car vous avez des fichiers non fusionnés." -#: advice.c:166 +#: advice.c:172 #, c-format msgid "It is not possible to %s because you have unmerged files." msgstr "%s n'est pas possible car vous avez des fichiers non fusionnés." -#: advice.c:174 +#: advice.c:180 msgid "" "Fix them up in the work tree, and then use 'git add/rm <file>'\n" "as appropriate to mark resolution and make a commit." @@ -123,52 +124,65 @@ msgstr "" "Corrigez-les puis lancez 'git add/rm <fichier>'\n" "si nécessaire pour marquer la résolution et valider." -#: advice.c:182 +#: advice.c:188 msgid "Exiting because of an unresolved conflict." msgstr "Abandon à cause de conflit non résolu." -#: advice.c:187 builtin/merge.c:1320 +#: advice.c:193 builtin/merge.c:1327 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "Vous n'avez pas terminé votre fusion (MERGE_HEAD existe)." -#: advice.c:189 +#: advice.c:195 msgid "Please, commit your changes before merging." msgstr "Veuillez valider vos changements avant de fusionner." -#: advice.c:190 +#: advice.c:196 msgid "Exiting because of unfinished merge." msgstr "Abandon à cause d'une fusion non terminée." -#: advice.c:196 +#: advice.c:202 #, c-format msgid "" -"Note: checking out '%s'.\n" +"Note: switching to '%s'.\n" "\n" "You are in 'detached HEAD' state. You can look around, make experimental\n" "changes and commit them, and you can discard any commits you make in this\n" -"state without impacting any branches by performing another checkout.\n" +"state without impacting any branches by switching back to a branch.\n" "\n" "If you want to create a new branch to retain commits you create, you may\n" -"do so (now or later) by using -b with the checkout command again. Example:\n" +"do so (now or later) by using -c with the switch command. Example:\n" "\n" -" git checkout -b <new-branch-name>\n" +" git switch -c <new-branch-name>\n" +"\n" +"Or undo this operation with:\n" +"\n" +" git switch -\n" +"\n" +"Turn off this advice by setting config variable advice.detachedHead to " +"false\n" "\n" msgstr "" -"Note : extraction de '%s'.\n" +"Note : basculement sur '%s'.\n" "\n" "Vous êtes dans l'état « HEAD détachée ». Vous pouvez visiter, faire des " "modifications\n" -"expérimentales et les valider. Il vous suffit de faire une autre extraction " +"expérimentales et les valider. Il vous suffit de faire un autre basculement " "pour\n" "abandonner les commits que vous faites dans cet état sans impacter les " "autres branches\n" "\n" "Si vous voulez créer une nouvelle branche pour conserver les commits que " "vous créez,\n" -"il vous suffit d'utiliser « checkout -b » (maintenant ou plus tard) comme " -"ceci :\n" +"il vous suffit d'utiliser l'option -c de la commande switch comme ceci :\n" +"\n" +" git switch -c <nom-de-la-nouvelle-branche>\n" "\n" -" git checkout -b <nom-de-la-nouvelle-branche>\n" +"Ou annuler cette opération avec :\n" +"\n" +" git switch -\n" +"\n" +"Désactivez ce conseil en renseignant la variable de configuration advice." +"detachedHead à false\n" "\n" #: alias.c:50 @@ -179,99 +193,99 @@ msgstr "cmdline se termine par \\" msgid "unclosed quote" msgstr "citation non fermée" -#: apply.c:63 +#: apply.c:69 #, c-format msgid "unrecognized whitespace option '%s'" msgstr "option d'espace non reconnue '%s'" -#: apply.c:79 +#: apply.c:85 #, c-format msgid "unrecognized whitespace ignore option '%s'" msgstr "option d'ignorance d'espace non reconnue '%s'" -#: apply.c:129 +#: apply.c:135 msgid "--reject and --3way cannot be used together." msgstr "--reject et --3way ne peuvent pas être utilisés ensemble." -#: apply.c:131 +#: apply.c:137 msgid "--cached and --3way cannot be used together." msgstr "--cached et --3way ne peuvent pas être utilisés ensemble." -#: apply.c:134 +#: apply.c:140 msgid "--3way outside a repository" msgstr "--3way hors d'un dépôt" -#: apply.c:145 +#: apply.c:151 msgid "--index outside a repository" msgstr "--index hors d'un dépôt" -#: apply.c:148 +#: apply.c:154 msgid "--cached outside a repository" msgstr "--cached hors d'un dépôt" -#: apply.c:829 +#: apply.c:801 #, c-format msgid "Cannot prepare timestamp regexp %s" msgstr "Impossible de préparer la regexp d'horodatage %s" -#: apply.c:838 +#: apply.c:810 #, c-format msgid "regexec returned %d for input: %s" msgstr "regexec a retourné %d pour l'entrée : %s" -#: apply.c:912 +#: apply.c:884 #, c-format msgid "unable to find filename in patch at line %d" msgstr "nom de fichier du patch introuvable à la ligne %d" -#: apply.c:950 +#: apply.c:922 #, c-format msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" msgstr "" "git apply : mauvais format de git-diff - /dev/null attendu, %s trouvé à la " "ligne %d" -#: apply.c:956 +#: apply.c:928 #, c-format msgid "git apply: bad git-diff - inconsistent new filename on line %d" msgstr "" "git apply : mauvais format de git-diff - nouveau nom de fichier inconsistant " "à la ligne %d" -#: apply.c:957 +#: apply.c:929 #, c-format msgid "git apply: bad git-diff - inconsistent old filename on line %d" msgstr "" "git apply : mauvais format de git-diff - ancien nom de fichier inconsistant " "à la ligne %d" -#: apply.c:962 +#: apply.c:934 #, c-format msgid "git apply: bad git-diff - expected /dev/null on line %d" msgstr "" "git apply : mauvais format de git-diff - /dev/null attendu à la ligne %d" -#: apply.c:991 +#: apply.c:963 #, c-format msgid "invalid mode on line %d: %s" msgstr "mode invalide dans la ligne %d : %s" -#: apply.c:1310 +#: apply.c:1282 #, c-format msgid "inconsistent header lines %d and %d" msgstr "lignes d'entête inconsistantes %d et %d" -#: apply.c:1482 +#: apply.c:1460 #, c-format msgid "recount: unexpected line: %.*s" msgstr "recomptage : ligne inattendue : %.*s" -#: apply.c:1551 +#: apply.c:1529 #, c-format msgid "patch fragment without header at line %d: %.*s" msgstr "fragment de patch sans en-tête à la ligne %d : %.*s" -#: apply.c:1571 +#: apply.c:1551 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -286,83 +300,83 @@ msgstr[1] "" "information de nom de fichier manquante dans l'en-tête de git diff lors de " "la suppression de %d composants de préfixe de chemin (ligne %d)" -#: apply.c:1584 +#: apply.c:1564 #, c-format msgid "git diff header lacks filename information (line %d)" msgstr "" "information de nom de fichier manquante dans l'en-tête de git diff (ligne %d)" -#: apply.c:1772 +#: apply.c:1752 msgid "new file depends on old contents" msgstr "le nouveau fichier dépend de contenus anciens" -#: apply.c:1774 +#: apply.c:1754 msgid "deleted file still has contents" msgstr "le fichier supprimé a encore du contenu" -#: apply.c:1808 +#: apply.c:1788 #, c-format msgid "corrupt patch at line %d" msgstr "patch corrompu à la ligne %d" -#: apply.c:1845 +#: apply.c:1825 #, c-format msgid "new file %s depends on old contents" msgstr "le nouveau fichier %s dépend de contenus anciens" -#: apply.c:1847 +#: apply.c:1827 #, c-format msgid "deleted file %s still has contents" msgstr "le fichier supprimé %s a encore du contenu" -#: apply.c:1850 +#: apply.c:1830 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "** attention : le fichier %s devient vide mais n'est pas supprimé" -#: apply.c:1997 +#: apply.c:1977 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "patch binaire corrompu à la ligne %d : %.*s" -#: apply.c:2034 +#: apply.c:2014 #, c-format msgid "unrecognized binary patch at line %d" msgstr "patch binaire non reconnu à la ligne %d" -#: apply.c:2196 +#: apply.c:2176 #, c-format msgid "patch with only garbage at line %d" msgstr "patch totalement incompréhensible à la ligne %d" -#: apply.c:2282 +#: apply.c:2262 #, c-format msgid "unable to read symlink %s" msgstr "lecture du lien symbolique %s impossible" -#: apply.c:2286 +#: apply.c:2266 #, c-format msgid "unable to open or read %s" msgstr "ouverture ou lecture de %s impossible" -#: apply.c:2945 +#: apply.c:2925 #, c-format msgid "invalid start of line: '%c'" msgstr "début de ligne invalide : '%c'" -#: apply.c:3066 +#: apply.c:3046 #, c-format msgid "Hunk #%d succeeded at %d (offset %d line)." msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." msgstr[0] "La section n°%d a réussi à la ligne %d (offset %d ligne)." msgstr[1] "La section n°%d a réussi à la ligne %d (offset %d lignes)." -#: apply.c:3078 +#: apply.c:3058 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "Contexte réduit à (%ld/%ld) pour appliquer le fragment à la ligne %d" -#: apply.c:3084 +#: apply.c:3064 #, c-format msgid "" "while searching for:\n" @@ -371,463 +385,463 @@ msgstr "" "pendant la recherche de :\n" "%.*s" -#: apply.c:3106 +#: apply.c:3086 #, c-format msgid "missing binary patch data for '%s'" msgstr "données de patch binaire manquantes pour '%s'" -#: apply.c:3114 +#: apply.c:3094 #, c-format msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'" msgstr "" "impossible d'appliquer l'inverse d'un patch binaire à '%s' sans la section " "inverse" -#: apply.c:3161 +#: apply.c:3141 #, c-format msgid "cannot apply binary patch to '%s' without full index line" msgstr "" "impossible d'appliquer un patch binaire à '%s' sans la ligne complète d'index" -#: apply.c:3171 +#: apply.c:3151 #, c-format msgid "" "the patch applies to '%s' (%s), which does not match the current contents." msgstr "" "le patch s'applique à '%s' (%s), ce qui ne correspond pas au contenu actuel." -#: apply.c:3179 +#: apply.c:3159 #, c-format msgid "the patch applies to an empty '%s' but it is not empty" msgstr "le patch s'applique à un '%s' vide mais ce n'est pas vide" -#: apply.c:3197 +#: apply.c:3177 #, c-format msgid "the necessary postimage %s for '%s' cannot be read" msgstr "l'image postérieure nécessaire %s pour '%s' ne peut pas être lue" -#: apply.c:3210 +#: apply.c:3190 #, c-format msgid "binary patch does not apply to '%s'" msgstr "le patch binaire ne s'applique par correctement à '%s'" -#: apply.c:3216 +#: apply.c:3196 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "" "le patch binaire sur '%s' crée un résultat incorrect (%s attendu, mais %s " "trouvé)" -#: apply.c:3237 +#: apply.c:3217 #, c-format msgid "patch failed: %s:%ld" msgstr "le patch a échoué : %s:%ld" -#: apply.c:3360 +#: apply.c:3340 #, c-format msgid "cannot checkout %s" msgstr "extraction de %s impossible" -#: apply.c:3412 apply.c:3423 apply.c:3469 midx.c:59 setup.c:279 +#: apply.c:3392 apply.c:3403 apply.c:3449 midx.c:62 setup.c:279 #, c-format msgid "failed to read %s" msgstr "échec de la lecture de %s" -#: apply.c:3420 +#: apply.c:3400 #, c-format msgid "reading from '%s' beyond a symbolic link" msgstr "lecture depuis '%s' au-delà d'un lien symbolique" -#: apply.c:3449 apply.c:3692 +#: apply.c:3429 apply.c:3672 #, c-format msgid "path %s has been renamed/deleted" msgstr "le chemin %s a été renommé/supprimé" -#: apply.c:3535 apply.c:3707 +#: apply.c:3515 apply.c:3687 #, c-format msgid "%s: does not exist in index" msgstr "%s : n'existe pas dans l'index" -#: apply.c:3544 apply.c:3715 +#: apply.c:3524 apply.c:3695 #, c-format msgid "%s: does not match index" msgstr "%s : ne correspond pas à l'index" -#: apply.c:3579 +#: apply.c:3559 msgid "repository lacks the necessary blob to fall back on 3-way merge." msgstr "" "le dépôt n'a pas les blobs nécessaires pour un retour à une fusion à 3 " "points." -#: apply.c:3582 +#: apply.c:3562 #, c-format msgid "Falling back to three-way merge...\n" msgstr "Retour à une fusion à 3 points…\n" -#: apply.c:3598 apply.c:3602 +#: apply.c:3578 apply.c:3582 #, c-format msgid "cannot read the current contents of '%s'" msgstr "impossible de lire le contenu actuel de '%s'" -#: apply.c:3614 +#: apply.c:3594 #, c-format msgid "Failed to fall back on three-way merge...\n" msgstr "Échec du retour à une fusion à 3 points…\n" -#: apply.c:3628 +#: apply.c:3608 #, c-format msgid "Applied patch to '%s' with conflicts.\n" msgstr "Patch %s appliqué avec des conflits.\n" -#: apply.c:3633 +#: apply.c:3613 #, c-format msgid "Applied patch to '%s' cleanly.\n" msgstr "Patch %s appliqué proprement.\n" -#: apply.c:3659 +#: apply.c:3639 msgid "removal patch leaves file contents" msgstr "le patch de suppression laisse un contenu dans le fichier" -#: apply.c:3732 +#: apply.c:3712 #, c-format msgid "%s: wrong type" msgstr "%s : type erroné" -#: apply.c:3734 +#: apply.c:3714 #, c-format msgid "%s has type %o, expected %o" msgstr "%s est de type %o, mais %o attendu" -#: apply.c:3885 apply.c:3887 read-cache.c:830 read-cache.c:856 +#: apply.c:3865 apply.c:3867 read-cache.c:830 read-cache.c:856 #: read-cache.c:1309 #, c-format msgid "invalid path '%s'" msgstr "chemin invalide '%s'" -#: apply.c:3943 +#: apply.c:3923 #, c-format msgid "%s: already exists in index" msgstr "%s : existe déjà dans l'index" -#: apply.c:3946 +#: apply.c:3926 #, c-format msgid "%s: already exists in working directory" msgstr "%s : existe déjà dans la copie de travail" -#: apply.c:3966 +#: apply.c:3946 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "le nouveau mode (%o) de %s ne correspond pas à l'ancien mode (%o)" -#: apply.c:3971 +#: apply.c:3951 #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "" "le nouveau mode (%o) de %s ne correspond pas à l'ancien mode (%o) de %s" -#: apply.c:3991 +#: apply.c:3971 #, c-format msgid "affected file '%s' is beyond a symbolic link" msgstr "le fichier affecté '%s' est au-delà d'un lien symbolique" -#: apply.c:3995 +#: apply.c:3975 #, c-format msgid "%s: patch does not apply" msgstr "%s : le patch ne s'applique pas" -#: apply.c:4010 +#: apply.c:3990 #, c-format msgid "Checking patch %s..." msgstr "Vérification du patch %s..." -#: apply.c:4102 +#: apply.c:4082 #, c-format msgid "sha1 information is lacking or useless for submodule %s" msgstr "" "l'information sha1 est manquante ou inutilisable pour le sous-module %s" -#: apply.c:4109 +#: apply.c:4089 #, c-format msgid "mode change for %s, which is not in current HEAD" msgstr "le mode change pour %s, qui n'est pas dans la HEAD actuelle" -#: apply.c:4112 +#: apply.c:4092 #, c-format msgid "sha1 information is lacking or useless (%s)." msgstr "l'information de sha1 est manquante ou inutilisable (%s)." -#: apply.c:4117 builtin/checkout.c:257 builtin/reset.c:143 +#: apply.c:4097 builtin/checkout.c:278 builtin/reset.c:143 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "échec de make_cache_entry pour le chemin '%s'" -#: apply.c:4121 +#: apply.c:4101 #, c-format msgid "could not add %s to temporary index" msgstr "impossible d'ajouter %s à l'index temporaire" -#: apply.c:4131 +#: apply.c:4111 #, c-format msgid "could not write temporary index to %s" msgstr "impossible d'écrire l'index temporaire dans %s" -#: apply.c:4269 +#: apply.c:4249 #, c-format msgid "unable to remove %s from index" msgstr "suppression de %s dans l'index impossible" -#: apply.c:4303 +#: apply.c:4283 #, c-format msgid "corrupt patch for submodule %s" msgstr "patch corrompu pour le sous-module %s" -#: apply.c:4309 +#: apply.c:4289 #, c-format msgid "unable to stat newly created file '%s'" msgstr "stat du fichier nouvellement créé '%s' impossible" -#: apply.c:4317 +#: apply.c:4297 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "" "création du magasin de stockage pour le fichier nouvellement créé %s " "impossible" -#: apply.c:4323 apply.c:4468 +#: apply.c:4303 apply.c:4448 #, c-format msgid "unable to add cache entry for %s" msgstr "ajout de l'élément de cache %s impossible" -#: apply.c:4366 +#: apply.c:4346 #, c-format msgid "failed to write to '%s'" msgstr "échec de l'écriture dans '%s'" -#: apply.c:4370 +#: apply.c:4350 #, c-format msgid "closing file '%s'" msgstr "fermeture du fichier '%s'" -#: apply.c:4440 +#: apply.c:4420 #, c-format msgid "unable to write file '%s' mode %o" msgstr "écriture du fichier '%s' mode %o impossible" -#: apply.c:4538 +#: apply.c:4518 #, c-format msgid "Applied patch %s cleanly." msgstr "Patch %s appliqué proprement." -#: apply.c:4546 +#: apply.c:4526 msgid "internal error" msgstr "erreur interne" -#: apply.c:4549 +#: apply.c:4529 #, c-format msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." msgstr[0] "Application du patch %%s avec %d rejet..." msgstr[1] "Application du patch %%s avec %d rejets..." -#: apply.c:4560 +#: apply.c:4540 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "troncature du nom de fichier .rej en %.*s.rej" -#: apply.c:4568 builtin/fetch.c:837 builtin/fetch.c:1118 +#: apply.c:4548 builtin/fetch.c:878 builtin/fetch.c:1168 #, c-format msgid "cannot open %s" msgstr "impossible d'ouvrir %s" -#: apply.c:4582 +#: apply.c:4562 #, c-format msgid "Hunk #%d applied cleanly." msgstr "Section n°%d appliquée proprement." -#: apply.c:4586 +#: apply.c:4566 #, c-format msgid "Rejected hunk #%d." msgstr "Section n°%d rejetée." -#: apply.c:4696 +#: apply.c:4676 #, c-format msgid "Skipped patch '%s'." msgstr "Chemin '%s' non traité." -#: apply.c:4704 +#: apply.c:4684 msgid "unrecognized input" msgstr "entrée non reconnue" -#: apply.c:4724 +#: apply.c:4704 msgid "unable to read index file" msgstr "lecture du fichier d'index impossible" -#: apply.c:4879 +#: apply.c:4859 #, c-format msgid "can't open patch '%s': %s" msgstr "ouverture impossible du patch '%s' :%s" -#: apply.c:4906 +#: apply.c:4886 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "%d erreur d'espace ignorée" msgstr[1] "%d erreurs d'espace ignorées" -#: apply.c:4912 apply.c:4927 +#: apply.c:4892 apply.c:4907 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." msgstr[0] "%d ligne a ajouté des erreurs d'espace." msgstr[1] "%d lignes ont ajouté des erreurs d'espace." -#: apply.c:4920 +#: apply.c:4900 #, c-format msgid "%d line applied after fixing whitespace errors." msgid_plural "%d lines applied after fixing whitespace errors." msgstr[0] "%d ligne ajoutée après correction des erreurs d'espace." msgstr[1] "%d lignes ajoutées après correction des erreurs d'espace." -#: apply.c:4936 builtin/add.c:540 builtin/mv.c:301 builtin/rm.c:390 +#: apply.c:4916 builtin/add.c:540 builtin/mv.c:301 builtin/rm.c:390 msgid "Unable to write new index file" msgstr "Impossible d'écrire le nouveau fichier d'index" -#: apply.c:4963 apply.c:4966 builtin/am.c:2210 builtin/am.c:2213 -#: builtin/clone.c:120 builtin/fetch.c:118 builtin/merge.c:271 -#: builtin/pull.c:207 builtin/submodule--helper.c:407 -#: builtin/submodule--helper.c:1366 builtin/submodule--helper.c:1369 -#: builtin/submodule--helper.c:1849 builtin/submodule--helper.c:1852 -#: builtin/submodule--helper.c:2091 git-add--interactive.perl:197 +#: apply.c:4943 apply.c:4946 builtin/am.c:2208 builtin/am.c:2211 +#: builtin/clone.c:123 builtin/fetch.c:128 builtin/merge.c:273 +#: builtin/pull.c:208 builtin/submodule--helper.c:407 +#: builtin/submodule--helper.c:1367 builtin/submodule--helper.c:1370 +#: builtin/submodule--helper.c:1850 builtin/submodule--helper.c:1853 +#: builtin/submodule--helper.c:2092 git-add--interactive.perl:211 msgid "path" msgstr "chemin" -#: apply.c:4964 +#: apply.c:4944 msgid "don't apply changes matching the given path" msgstr "ne pas appliquer les modifications qui correspondent au chemin donné" -#: apply.c:4967 +#: apply.c:4947 msgid "apply changes matching the given path" msgstr "appliquer les modifications qui correspondent au chemin donné" -#: apply.c:4969 builtin/am.c:2219 +#: apply.c:4949 builtin/am.c:2217 msgid "num" msgstr "num" -#: apply.c:4970 +#: apply.c:4950 msgid "remove <num> leading slashes from traditional diff paths" msgstr "supprimer <num> barres obliques des chemins traditionnels de diff" -#: apply.c:4973 +#: apply.c:4953 msgid "ignore additions made by the patch" msgstr "ignorer les additions réalisées par le patch" -#: apply.c:4975 +#: apply.c:4955 msgid "instead of applying the patch, output diffstat for the input" msgstr "au lieu d'appliquer le patch, afficher le diffstat de l'entrée" -#: apply.c:4979 +#: apply.c:4959 msgid "show number of added and deleted lines in decimal notation" msgstr "" "afficher le nombre de lignes ajoutées et supprimées en notation décimale" -#: apply.c:4981 +#: apply.c:4961 msgid "instead of applying the patch, output a summary for the input" msgstr "au lieu d'appliquer le patch, afficher un résumé de l'entrée" -#: apply.c:4983 +#: apply.c:4963 msgid "instead of applying the patch, see if the patch is applicable" msgstr "au lieu d'appliquer le patch, voir si le patch est applicable" -#: apply.c:4985 +#: apply.c:4965 msgid "make sure the patch is applicable to the current index" msgstr "s'assurer que le patch est applicable sur l'index actuel" -#: apply.c:4987 +#: apply.c:4967 msgid "mark new files with `git add --intent-to-add`" msgstr "marquer les nouveaux fichiers `git add --intent-to-add`" -#: apply.c:4989 +#: apply.c:4969 msgid "apply a patch without touching the working tree" msgstr "appliquer les patch sans toucher à la copie de travail" -#: apply.c:4991 +#: apply.c:4971 msgid "accept a patch that touches outside the working area" msgstr "accepter un patch qui touche hors de la copie de travail" -#: apply.c:4994 +#: apply.c:4974 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "appliquer aussi le patch (à utiliser avec --stat/--summary/--check)" -#: apply.c:4996 +#: apply.c:4976 msgid "attempt three-way merge if a patch does not apply" msgstr "tenter une fusion à 3 points si le patch ne s'applique pas proprement" -#: apply.c:4998 +#: apply.c:4978 msgid "build a temporary index based on embedded index information" msgstr "" "construire un index temporaire fondé sur l'information de l'index embarqué" -#: apply.c:5001 builtin/checkout-index.c:173 builtin/ls-files.c:524 +#: apply.c:4981 builtin/checkout-index.c:173 builtin/ls-files.c:524 msgid "paths are separated with NUL character" msgstr "les chemins sont séparés par un caractère NUL" -#: apply.c:5003 +#: apply.c:4983 msgid "ensure at least <n> lines of context match" msgstr "s'assurer d'au moins <n> lignes de correspondance de contexte" -#: apply.c:5004 builtin/am.c:2198 builtin/interpret-trailers.c:97 -#: builtin/interpret-trailers.c:99 builtin/interpret-trailers.c:101 -#: builtin/pack-objects.c:3317 builtin/rebase.c:1415 +#: apply.c:4984 builtin/am.c:2196 builtin/interpret-trailers.c:98 +#: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102 +#: builtin/pack-objects.c:3330 builtin/rebase.c:1421 msgid "action" msgstr "action" -#: apply.c:5005 +#: apply.c:4985 msgid "detect new or modified lines that have whitespace errors" msgstr "" "détecter des lignes nouvelles ou modifiées qui contiennent des erreurs " "d'espace" -#: apply.c:5008 apply.c:5011 +#: apply.c:4988 apply.c:4991 msgid "ignore changes in whitespace when finding context" msgstr "ignorer des modifications d'espace lors de la recherche de contexte" -#: apply.c:5014 +#: apply.c:4994 msgid "apply the patch in reverse" msgstr "appliquer le patch en sens inverse" -#: apply.c:5016 +#: apply.c:4996 msgid "don't expect at least one line of context" msgstr "ne pas s'attendre à au moins une ligne de contexte" -#: apply.c:5018 +#: apply.c:4998 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "laisser les sections rejetées dans les fichiers *.rej correspondants" -#: apply.c:5020 +#: apply.c:5000 msgid "allow overlapping hunks" msgstr "accepter les recouvrements de sections" -#: apply.c:5021 builtin/add.c:291 builtin/check-ignore.c:22 -#: builtin/commit.c:1317 builtin/count-objects.c:98 builtin/fsck.c:786 -#: builtin/log.c:2045 builtin/mv.c:123 builtin/read-tree.c:128 +#: apply.c:5001 builtin/add.c:291 builtin/check-ignore.c:22 +#: builtin/commit.c:1337 builtin/count-objects.c:98 builtin/fsck.c:786 +#: builtin/log.c:2068 builtin/mv.c:123 builtin/read-tree.c:128 msgid "be verbose" msgstr "mode verbeux" -#: apply.c:5023 +#: apply.c:5003 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "" "tolérer des erreurs de détection de retours chariot manquants en fin de " "fichier" -#: apply.c:5026 +#: apply.c:5006 msgid "do not trust the line counts in the hunk headers" msgstr "ne pas se fier au compte de lignes dans les en-têtes de section" -#: apply.c:5028 builtin/am.c:2207 +#: apply.c:5008 builtin/am.c:2205 msgid "root" msgstr "racine" -#: apply.c:5029 +#: apply.c:5009 msgid "prepend <root> to all filenames" msgstr "préfixer tous les noms de fichier avec <root>" @@ -870,98 +884,98 @@ msgstr "nom d'objet invalide : %s" msgid "not a tree object: %s" msgstr "objet arbre invalide : %s" -#: archive.c:424 +#: archive.c:426 msgid "current working directory is untracked" msgstr "l'arbre de travail actuel est non-suivi" -#: archive.c:455 +#: archive.c:457 msgid "fmt" msgstr "fmt" -#: archive.c:455 +#: archive.c:457 msgid "archive format" msgstr "format d'archive" -#: archive.c:456 builtin/log.c:1557 +#: archive.c:458 builtin/log.c:1580 msgid "prefix" msgstr "préfixe" -#: archive.c:457 +#: archive.c:459 msgid "prepend prefix to each pathname in the archive" msgstr "préfixer chaque chemin de fichier dans l'archive" -#: archive.c:458 builtin/blame.c:821 builtin/blame.c:822 -#: builtin/commit-tree.c:117 builtin/config.c:129 builtin/fast-export.c:1091 -#: builtin/fast-export.c:1093 builtin/grep.c:895 builtin/hash-object.c:105 +#: archive.c:460 builtin/blame.c:862 builtin/blame.c:874 builtin/blame.c:875 +#: builtin/commit-tree.c:117 builtin/config.c:129 builtin/fast-export.c:1134 +#: builtin/fast-export.c:1136 builtin/grep.c:897 builtin/hash-object.c:105 #: builtin/ls-files.c:560 builtin/ls-files.c:563 builtin/notes.c:412 #: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:177 msgid "file" msgstr "fichier" -#: archive.c:459 builtin/archive.c:90 +#: archive.c:461 builtin/archive.c:90 msgid "write the archive to this file" msgstr "écrire l'archive dans ce fichier" -#: archive.c:461 +#: archive.c:463 msgid "read .gitattributes in working directory" msgstr "lire .gitattributes dans le répertoire de travail" -#: archive.c:462 +#: archive.c:464 msgid "report archived files on stderr" msgstr "afficher les fichiers archivés sur stderr" -#: archive.c:463 +#: archive.c:465 msgid "store only" msgstr "stockage seulement" -#: archive.c:464 +#: archive.c:466 msgid "compress faster" msgstr "compression rapide" -#: archive.c:472 +#: archive.c:474 msgid "compress better" msgstr "compression efficace" -#: archive.c:475 +#: archive.c:477 msgid "list supported archive formats" msgstr "afficher les formats d'archive supportés" -#: archive.c:477 builtin/archive.c:91 builtin/clone.c:110 builtin/clone.c:113 -#: builtin/submodule--helper.c:1378 builtin/submodule--helper.c:1858 +#: archive.c:479 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116 +#: builtin/submodule--helper.c:1379 builtin/submodule--helper.c:1859 msgid "repo" msgstr "dépôt" -#: archive.c:478 builtin/archive.c:92 +#: archive.c:480 builtin/archive.c:92 msgid "retrieve the archive from remote repository <repo>" msgstr "récupérer l'archive depuis le dépôt distant <dépôt>" -#: archive.c:479 builtin/archive.c:93 builtin/difftool.c:707 +#: archive.c:481 builtin/archive.c:93 builtin/difftool.c:707 #: builtin/notes.c:498 msgid "command" msgstr "commande" -#: archive.c:480 builtin/archive.c:94 +#: archive.c:482 builtin/archive.c:94 msgid "path to the remote git-upload-archive command" msgstr "chemin vers la commande distante git-upload-archive" -#: archive.c:487 +#: archive.c:489 msgid "Unexpected option --remote" msgstr "Option --remote inattendue" -#: archive.c:489 +#: archive.c:491 msgid "Option --exec can only be used together with --remote" msgstr "L'option --exec ne peut être utilisée qu'en complément de --remote" -#: archive.c:491 +#: archive.c:493 msgid "Unexpected option --output" msgstr "Option --output inattendue" -#: archive.c:513 +#: archive.c:515 #, c-format msgid "Unknown archive format '%s'" msgstr "Format d'archive inconnu '%s'" -#: archive.c:520 +#: archive.c:522 #, c-format msgid "Argument not supported for format '%s': -%d" msgstr "Argument non supporté pour le format '%s' : -%d" @@ -1005,7 +1019,7 @@ msgstr "le chemin n'est pas codé en UTF-8 valide : %s" msgid "path too long (%d chars, SHA1: %s): %s" msgstr "le chemin est trop long (%d caractères, SHA1 : %s) : %s" -#: archive-zip.c:474 builtin/pack-objects.c:226 builtin/pack-objects.c:229 +#: archive-zip.c:474 builtin/pack-objects.c:230 builtin/pack-objects.c:233 #, c-format msgid "deflate error (%d)" msgstr "erreur de compression (%d)" @@ -1108,12 +1122,12 @@ msgstr "Bissection : une base de fusion doit être testée\n" msgid "a %s revision is needed" msgstr "une révision %s est nécessaire" -#: bisect.c:884 builtin/notes.c:177 builtin/tag.c:248 +#: bisect.c:884 builtin/notes.c:177 builtin/tag.c:254 #, c-format msgid "could not create file '%s'" msgstr "impossible de créer le fichier '%s'" -#: bisect.c:928 builtin/merge.c:146 +#: bisect.c:928 builtin/merge.c:148 #, c-format msgid "could not read file '%s'" msgstr "impossible de lire le fichier '%s'" @@ -1153,41 +1167,41 @@ msgid_plural "Bisecting: %d revisions left to test after this %s\n" msgstr[0] "Bissection : %d révision à tester après ceci %s\n" msgstr[1] "Bissection : %d révisions à tester après ceci %s\n" -#: blame.c:1794 +#: blame.c:2697 msgid "--contents and --reverse do not blend well." msgstr "--contents et --reverse ne font pas bon ménage." -#: blame.c:1808 +#: blame.c:2711 msgid "cannot use --contents with final commit object name" msgstr "on ne peut pas utiliser --contents avec un nom d'objet commit final" -#: blame.c:1829 +#: blame.c:2732 msgid "--reverse and --first-parent together require specified latest commit" msgstr "" "--reverse et --first-parent ensemble nécessitent la spécification d'un " "dernier commit" -#: blame.c:1838 bundle.c:164 ref-filter.c:2077 remote.c:1938 sequencer.c:2030 -#: sequencer.c:4224 builtin/commit.c:1017 builtin/log.c:382 builtin/log.c:940 -#: builtin/log.c:1428 builtin/log.c:1804 builtin/log.c:2094 builtin/merge.c:415 -#: builtin/pack-objects.c:3140 builtin/pack-objects.c:3155 +#: blame.c:2741 bundle.c:167 ref-filter.c:2196 remote.c:1938 sequencer.c:2033 +#: sequencer.c:4348 builtin/commit.c:1020 builtin/log.c:387 builtin/log.c:963 +#: builtin/log.c:1451 builtin/log.c:1827 builtin/log.c:2117 builtin/merge.c:411 +#: builtin/pack-objects.c:3148 builtin/pack-objects.c:3163 #: builtin/shortlog.c:192 msgid "revision walk setup failed" msgstr "échec de la préparation du parcours des révisions" -#: blame.c:1856 +#: blame.c:2759 msgid "" "--reverse --first-parent together require range along first-parent chain" msgstr "" "--reverse --first-parent ensemble nécessitent une portée avec la chaîne de " "premier parent" -#: blame.c:1867 +#: blame.c:2770 #, c-format msgid "no such path %s in %s" msgstr "pas de chemin %s dans %s" -#: blame.c:1878 +#: blame.c:2781 #, c-format msgid "cannot read blob %s for path %s" msgstr "impossible de lire le blob %s pour le chemin %s" @@ -1330,12 +1344,12 @@ msgstr "Nom d'objet ambigu : '%s'." msgid "Not a valid branch point: '%s'." msgstr "Point d'embranchement invalide : '%s'." -#: branch.c:359 +#: branch.c:364 #, c-format msgid "'%s' is already checked out at '%s'" msgstr "'%s' est déjà extrait dans '%s'" -#: branch.c:382 +#: branch.c:387 #, c-format msgid "HEAD of working tree %s is not updated" msgstr "la HEAD de la copie de travail %s n'est pas mise à jour" @@ -1350,8 +1364,8 @@ msgstr "'%s' ne semble pas être un fichier bundle v2" msgid "unrecognized header: %s%s (%d)" msgstr "en-tête non reconnu : %s%s (%d)" -#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2281 sequencer.c:2916 -#: builtin/commit.c:788 +#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2283 sequencer.c:3024 +#: builtin/commit.c:791 #, c-format msgid "could not open '%s'" msgstr "impossible d'ouvrir '%s'" @@ -1360,60 +1374,64 @@ msgstr "impossible d'ouvrir '%s'" msgid "Repository lacks these prerequisite commits:" msgstr "Le dépôt ne dispose pas des commits prérequis suivants :" -#: bundle.c:194 +#: bundle.c:146 +msgid "need a repository to verify a bundle" +msgstr "la vérification d'un colis requiert un dépôt" + +#: bundle.c:197 #, c-format msgid "The bundle contains this ref:" msgid_plural "The bundle contains these %d refs:" msgstr[0] "Le colis contient cette référence :" msgstr[1] "Le colis contient ces %d références :" -#: bundle.c:201 +#: bundle.c:204 msgid "The bundle records a complete history." msgstr "Le colis enregistre l'historique complet." -#: bundle.c:203 +#: bundle.c:206 #, c-format msgid "The bundle requires this ref:" msgid_plural "The bundle requires these %d refs:" msgstr[0] "Le colis exige cette référence :" msgstr[1] "Le colis exige ces %d références :" -#: bundle.c:269 +#: bundle.c:272 msgid "unable to dup bundle descriptor" msgstr "impossible de dupliquer le descripteur de liasse" -#: bundle.c:276 +#: bundle.c:279 msgid "Could not spawn pack-objects" msgstr "Impossible de créer des objets groupés" -#: bundle.c:287 +#: bundle.c:290 msgid "pack-objects died" msgstr "les objets groupés ont disparu" -#: bundle.c:329 +#: bundle.c:332 msgid "rev-list died" msgstr "rev-list a disparu" -#: bundle.c:378 +#: bundle.c:381 #, c-format msgid "ref '%s' is excluded by the rev-list options" msgstr "la référence '%s' est exclue par les options de rev-list" -#: bundle.c:457 builtin/log.c:197 builtin/log.c:1709 builtin/shortlog.c:306 +#: bundle.c:460 builtin/log.c:202 builtin/log.c:1732 builtin/shortlog.c:306 #, c-format msgid "unrecognized argument: %s" msgstr "argument non reconnu : %s" -#: bundle.c:465 +#: bundle.c:468 msgid "Refusing to create empty bundle." msgstr "Refus de créer un colis vide." -#: bundle.c:475 +#: bundle.c:478 #, c-format msgid "cannot create '%s'" msgstr "impossible de créer '%s'" -#: bundle.c:500 +#: bundle.c:503 msgid "index-pack died" msgstr "l'index de groupe a disparu" @@ -1422,8 +1440,8 @@ msgstr "l'index de groupe a disparu" msgid "invalid color value: %.*s" msgstr "Valeur invalide de couleur : %.*s" -#: commit.c:50 sequencer.c:2697 builtin/am.c:355 builtin/am.c:399 -#: builtin/am.c:1377 builtin/am.c:2022 builtin/replace.c:455 +#: commit.c:50 sequencer.c:2727 builtin/am.c:355 builtin/am.c:399 +#: builtin/am.c:1378 builtin/am.c:2020 builtin/replace.c:455 #, c-format msgid "could not parse %s" msgstr "impossible d'analyser %s" @@ -1433,7 +1451,7 @@ msgstr "impossible d'analyser %s" msgid "%s %s is not a commit!" msgstr "%s %s n'est pas un commit !" -#: commit.c:193 +#: commit.c:192 msgid "" "Support for <GIT_DIR>/info/grafts is deprecated\n" "and will be removed in a future Git version.\n" @@ -1453,27 +1471,27 @@ msgstr "" "Supprimez ce message en lançant\n" "\"git config advice.graftFileDeprecated false\"" -#: commit.c:1128 +#: commit.c:1127 #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." msgstr "La validation %s a une signature GPG non fiable, prétendument par %s." -#: commit.c:1131 +#: commit.c:1130 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." msgstr "La validation %s a une mauvaise signature GPG prétendument par %s." -#: commit.c:1134 +#: commit.c:1133 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "La validation %s n'a pas de signature GPG." -#: commit.c:1137 +#: commit.c:1136 #, c-format msgid "Commit %s has a good GPG signature by %s\n" msgstr "La validation %s a une signature GPG correcte par %s\n" -#: commit.c:1391 +#: commit.c:1390 msgid "" "Warning: commit message did not conform to UTF-8.\n" "You may want to amend it after fixing the message, or set the config\n" @@ -1485,187 +1503,245 @@ msgstr "" "variable de configuration i18n.commitencoding à l'encodage utilisé par votre " "projet.\n" -#: commit-graph.c:105 +#: commit-graph.c:127 msgid "commit-graph file is too small" msgstr "le graphe de commit est trop petit" -#: commit-graph.c:170 +#: commit-graph.c:192 #, c-format msgid "commit-graph signature %X does not match signature %X" msgstr "" "la signature du graphe de commit %X ne correspond pas à la signature %X" -#: commit-graph.c:177 +#: commit-graph.c:199 #, c-format msgid "commit-graph version %X does not match version %X" msgstr "la version %X du graphe de commit ne correspond pas à la version %X" -#: commit-graph.c:184 +#: commit-graph.c:206 #, c-format msgid "commit-graph hash version %X does not match version %X" msgstr "" "l'empreinte de la version %X du graphe de commit ne correspond pas à la " "version %X" -#: commit-graph.c:207 +#: commit-graph.c:229 msgid "commit-graph chunk lookup table entry missing; file may be incomplete" msgstr "" "entrée de table de consultation de morceaux de graphe de commite manquante ; " "le fichier est peut être incomplet" -#: commit-graph.c:218 +#: commit-graph.c:240 #, c-format msgid "commit-graph improper chunk offset %08x%08x" msgstr "décalage de bloc %08x%08x du graphe de commit inadéquat" -#: commit-graph.c:255 +#: commit-graph.c:283 #, c-format msgid "commit-graph chunk id %08x appears multiple times" msgstr "l'id de bloc de graphe de commit %08x apparaît des multiples fois" -#: commit-graph.c:390 +#: commit-graph.c:347 +msgid "commit-graph has no base graphs chunk" +msgstr "le graphe de commit n'a pas de section de graphes de base" + +#: commit-graph.c:357 +msgid "commit-graph chain does not match" +msgstr "la chaîne de graphe de commit ne correspond pas" + +#: commit-graph.c:404 +#, c-format +msgid "invalid commit-graph chain: line '%s' not a hash" +msgstr "" +"chaîne de graphe de commit invalide : la ligne '%s' n'est pas une empreinte" + +#: commit-graph.c:430 +msgid "unable to find all commit-graph files" +msgstr "impossible de trouver tous les fichiers du graphe de commit" + +#: commit-graph.c:554 commit-graph.c:614 +msgid "invalid commit position. commit-graph is likely corrupt" +msgstr "" +"position de commit invalide. Le graphe de commit est vraisemblablement " +"corrompu" + +#: commit-graph.c:575 #, c-format msgid "could not find commit %s" msgstr "impossible de trouver le commit %s" -#: commit-graph.c:732 builtin/pack-objects.c:2649 +#: commit-graph.c:1002 builtin/pack-objects.c:2657 #, c-format msgid "unable to get type of object %s" msgstr "impossible d'obtenir le type de l'objet %s" -#: commit-graph.c:765 +#: commit-graph.c:1034 msgid "Loading known commits in commit graph" msgstr "Lecture des commits connus dans un graphe de commit" -#: commit-graph.c:781 +#: commit-graph.c:1051 msgid "Expanding reachable commits in commit graph" msgstr "Expansion des commits joignables dans un graphe de commit" -#: commit-graph.c:793 +#: commit-graph.c:1070 msgid "Clearing commit marks in commit graph" msgstr "Suppression les marques de commit dans le graphe de commits" -#: commit-graph.c:813 +#: commit-graph.c:1089 msgid "Computing commit graph generation numbers" msgstr "Calcul des chiffres de génération du graphe de commits" -#: commit-graph.c:930 +#: commit-graph.c:1163 #, c-format msgid "Finding commits for commit graph in %d pack" msgid_plural "Finding commits for commit graph in %d packs" msgstr[0] "Recherche de commits pour un graphe de commits dans %d paquet" msgstr[1] "Recherche de commits pour un graphe de commits dans %d paquets" -#: commit-graph.c:943 +#: commit-graph.c:1176 #, c-format msgid "error adding pack %s" msgstr "erreur à l'ajout du packet %s" -#: commit-graph.c:945 +#: commit-graph.c:1180 #, c-format msgid "error opening index for %s" msgstr "erreur à l'ouverture de l'index pour %s" -#: commit-graph.c:959 +#: commit-graph.c:1204 #, c-format msgid "Finding commits for commit graph from %d ref" msgid_plural "Finding commits for commit graph from %d refs" msgstr[0] "Recherche de commits pour un graphe de commits depuis %d réf" msgstr[1] "Recherche de commits pour un graphe de commits depuis %d réfs" -#: commit-graph.c:991 +#: commit-graph.c:1238 msgid "Finding commits for commit graph among packed objects" msgstr "" "Recherche de commits pour un graphe de commits parmi les objets empaquetés" -#: commit-graph.c:1004 +#: commit-graph.c:1253 msgid "Counting distinct commits in commit graph" msgstr "Comptage des commits distincts dans un graphe de commit" -#: commit-graph.c:1017 -#, c-format -msgid "the commit graph format cannot write %d commits" -msgstr "le graphe de commits ne peut pas écrire %d commits" - -#: commit-graph.c:1026 +#: commit-graph.c:1284 msgid "Finding extra edges in commit graph" msgstr "Recherche d'arêtes supplémentaires dans un graphe de commits" -#: commit-graph.c:1050 -msgid "too many commits to write graph" -msgstr "trop de commits pour écrire un graphe" +#: commit-graph.c:1332 +msgid "failed to write correct number of base graph ids" +msgstr "échec à l'écriture le nombre correct d'id de base de fusion" -#: commit-graph.c:1057 midx.c:819 +#: commit-graph.c:1365 midx.c:811 #, c-format msgid "unable to create leading directories of %s" msgstr "impossible de créer les répertoires de premier niveau de %s" -#: commit-graph.c:1097 +#: commit-graph.c:1377 builtin/index-pack.c:306 builtin/repack.c:240 +#, c-format +msgid "unable to create '%s'" +msgstr "impossible de créer '%s'" + +#: commit-graph.c:1437 #, c-format msgid "Writing out commit graph in %d pass" msgid_plural "Writing out commit graph in %d passes" msgstr[0] "Écriture le graphe de commits en %d passe" msgstr[1] "Écriture le graphe de commits en %d passes" -#: commit-graph.c:1162 +#: commit-graph.c:1478 +msgid "unable to open commit-graph chain file" +msgstr "impossible d'ouvrir le fichier de graphe de commit" + +#: commit-graph.c:1490 +msgid "failed to rename base commit-graph file" +msgstr "échec du renommage du fichier de graphe de commits" + +#: commit-graph.c:1510 +msgid "failed to rename temporary commit-graph file" +msgstr "impossible de renommer le fichier temporaire de graphe de commits" + +#: commit-graph.c:1621 +msgid "Scanning merged commits" +msgstr "Analyse des commits de fusion" + +#: commit-graph.c:1632 +#, c-format +msgid "unexpected duplicate commit id %s" +msgstr "id de commit %s dupliqué inattendu" + +#: commit-graph.c:1657 +msgid "Merging commit-graph" +msgstr "fusion du graphe de commits" + +#: commit-graph.c:1844 +#, c-format +msgid "the commit graph format cannot write %d commits" +msgstr "le graphe de commits ne peut pas écrire %d commits" + +#: commit-graph.c:1855 +msgid "too many commits to write graph" +msgstr "trop de commits pour écrire un graphe" + +#: commit-graph.c:1945 msgid "the commit-graph file has incorrect checksum and is likely corrupt" msgstr "" "le graphe de commit a une somme de contrôle incorrecte et est " "vraisemblablement corrompu" -#: commit-graph.c:1172 +#: commit-graph.c:1955 #, c-format msgid "commit-graph has incorrect OID order: %s then %s" msgstr "le graphe de commit a un ordre d'OID incorrect : %s puis %s" -#: commit-graph.c:1182 commit-graph.c:1197 +#: commit-graph.c:1965 commit-graph.c:1980 #, c-format msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u" msgstr "" "le graphe de commit a une valeur de dispersion incorrecte : dispersion[%d] = " "%u != %u" -#: commit-graph.c:1189 +#: commit-graph.c:1972 #, c-format msgid "failed to parse commit %s from commit-graph" msgstr "échec de l'analyse le commit %s depuis le graphe de commits" -#: commit-graph.c:1206 +#: commit-graph.c:1989 msgid "Verifying commits in commit graph" msgstr "Verification des commits dans le graphe de commits" -#: commit-graph.c:1219 +#: commit-graph.c:2002 #, c-format msgid "failed to parse commit %s from object database for commit-graph" msgstr "" "échec de l'analyse du commit %s depuis la base de données d'objets pour le " "graphe de commit" -#: commit-graph.c:1226 +#: commit-graph.c:2009 #, c-format msgid "root tree OID for commit %s in commit-graph is %s != %s" msgstr "" "l'OID de l'arbre racine pour le commit %s dans le graphe de commit est %s != " "%s" -#: commit-graph.c:1236 +#: commit-graph.c:2019 #, c-format msgid "commit-graph parent list for commit %s is too long" msgstr "" "la liste des parents du graphe de commit pour le commit %s est trop longue" -#: commit-graph.c:1242 +#: commit-graph.c:2028 #, c-format msgid "commit-graph parent for %s is %s != %s" msgstr "le parent du graphe de commit pour %s est %s != %s" -#: commit-graph.c:1255 +#: commit-graph.c:2041 #, c-format msgid "commit-graph parent list for commit %s terminates early" msgstr "" "la liste de parents du graphe de commit pour le commit %s se termine trop tôt" -#: commit-graph.c:1260 +#: commit-graph.c:2046 #, c-format msgid "" "commit-graph has generation number zero for commit %s, but non-zero elsewhere" @@ -1673,7 +1749,7 @@ msgstr "" "le graphe de commit a un numéro de génération nul pour le commit %s, mais " "non-nul ailleurs" -#: commit-graph.c:1264 +#: commit-graph.c:2050 #, c-format msgid "" "commit-graph has non-zero generation number for commit %s, but zero elsewhere" @@ -1681,12 +1757,12 @@ msgstr "" "le graphe de commit a un numéro de génération non-nul pour le commit %s, " "mais nul ailleurs" -#: commit-graph.c:1279 +#: commit-graph.c:2065 #, c-format msgid "commit-graph generation for commit %s is %u != %u" msgstr "la génération du graphe de commit pour le commit %s est %u != %u" -#: commit-graph.c:1285 +#: commit-graph.c:2071 #, c-format msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>" msgstr "" @@ -1697,7 +1773,7 @@ msgstr "" msgid "memory exhausted" msgstr "plus de mémoire" -#: config.c:123 +#: config.c:124 #, c-format msgid "" "exceeded maximum include depth (%d) while including\n" @@ -1712,313 +1788,313 @@ msgstr "" "\t%s\n" "possibilité d'inclusions multiples." -#: config.c:139 +#: config.c:140 #, c-format msgid "could not expand include path '%s'" msgstr "expansion impossible du chemin d'inclusion '%s'" -#: config.c:150 +#: config.c:151 msgid "relative config includes must come from files" msgstr "les inclusions de configuration relatives doivent venir de fichiers" -#: config.c:190 +#: config.c:197 msgid "relative config include conditionals must come from files" msgstr "" "les conditions d'inclusion de configuration relative doivent venir de " "fichiers" -#: config.c:348 +#: config.c:376 #, c-format msgid "key does not contain a section: %s" msgstr "la clé ne contient pas de section: %s" -#: config.c:354 +#: config.c:382 #, c-format msgid "key does not contain variable name: %s" msgstr "la clé ne contient pas de nom de variable : %s" -#: config.c:378 sequencer.c:2459 +#: config.c:406 sequencer.c:2463 #, c-format msgid "invalid key: %s" msgstr "clé invalide : %s" -#: config.c:384 +#: config.c:412 #, c-format msgid "invalid key (newline): %s" msgstr "clé invalide (retour chariot) : %s" -#: config.c:420 config.c:432 +#: config.c:448 config.c:460 #, c-format msgid "bogus config parameter: %s" msgstr "paramètre de configuration mal formé: %s" -#: config.c:467 +#: config.c:495 #, c-format msgid "bogus format in %s" msgstr "formatage mal formé dans %s" -#: config.c:793 +#: config.c:821 #, c-format msgid "bad config line %d in blob %s" msgstr "ligne %d de config incorrecte dans le blob %s" -#: config.c:797 +#: config.c:825 #, c-format msgid "bad config line %d in file %s" msgstr "ligne %d de config incorrecte dans le fichier %s" -#: config.c:801 +#: config.c:829 #, c-format msgid "bad config line %d in standard input" msgstr "ligne %d de config incorrecte dans l'entrée standard" -#: config.c:805 +#: config.c:833 #, c-format msgid "bad config line %d in submodule-blob %s" msgstr "ligne %d de config incorrecte dans le blob de sous-module %s" -#: config.c:809 +#: config.c:837 #, c-format msgid "bad config line %d in command line %s" msgstr "ligne %d de config incorrecte dans la ligne de commande %s" -#: config.c:813 +#: config.c:841 #, c-format msgid "bad config line %d in %s" msgstr "ligne %d de config incorrecte dans %s" -#: config.c:952 +#: config.c:978 msgid "out of range" msgstr "hors plage" -#: config.c:952 +#: config.c:978 msgid "invalid unit" msgstr "unité invalide" -#: config.c:958 +#: config.c:979 #, c-format msgid "bad numeric config value '%s' for '%s': %s" msgstr "valeur numérique de configuration invalide '%s' pour '%s' : %s" -#: config.c:963 +#: config.c:998 #, c-format msgid "bad numeric config value '%s' for '%s' in blob %s: %s" msgstr "" "valeur numérique de configuration incorrecte '%s' pour '%s' dans le blob " "%s : %s" -#: config.c:966 +#: config.c:1001 #, c-format msgid "bad numeric config value '%s' for '%s' in file %s: %s" msgstr "" "valeur numérique de configuration incorrecte '%s' pour '%s' dans le fichier " "%s : %s" -#: config.c:969 +#: config.c:1004 #, c-format msgid "bad numeric config value '%s' for '%s' in standard input: %s" msgstr "" "valeur numérique de configuration incorrecte '%s' pour '%s' dans l'entrée " "standard : %s" -#: config.c:972 +#: config.c:1007 #, c-format msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s" msgstr "" "valeur numérique de configuration incorrecte '%s' pour '%s' dans le blob de " "sous-module %s : %s" -#: config.c:975 +#: config.c:1010 #, c-format msgid "bad numeric config value '%s' for '%s' in command line %s: %s" msgstr "" "valeur numérique de configuration incorrecte '%s' pour '%s' dans la ligne de " "commande %s : %s" -#: config.c:978 +#: config.c:1013 #, c-format msgid "bad numeric config value '%s' for '%s' in %s: %s" msgstr "" "valeur numérique de configuration incorrecte '%s' pour '%s' dans %s : %s" -#: config.c:1073 +#: config.c:1108 #, c-format msgid "failed to expand user dir in: '%s'" msgstr "impossible d'étendre le répertoire utilisateur dans : '%s'" -#: config.c:1082 +#: config.c:1117 #, c-format msgid "'%s' for '%s' is not a valid timestamp" msgstr "'%s' pour '%s' n'est pas un horodatage valide" -#: config.c:1173 +#: config.c:1208 #, c-format msgid "abbrev length out of range: %d" msgstr "longueur d'abbrev hors plage : %d" -#: config.c:1187 config.c:1198 +#: config.c:1222 config.c:1233 #, c-format msgid "bad zlib compression level %d" msgstr "niveau de compression zlib incorrect %d" -#: config.c:1290 +#: config.c:1325 msgid "core.commentChar should only be one character" msgstr "core.commentChar ne devrait être qu'un unique caractère" -#: config.c:1323 +#: config.c:1358 #, c-format msgid "invalid mode for object creation: %s" msgstr "mode invalide pour la création d'objet : %s" -#: config.c:1395 +#: config.c:1430 #, c-format msgid "malformed value for %s" msgstr "valeur mal formée pour %s" -#: config.c:1421 +#: config.c:1456 #, c-format msgid "malformed value for %s: %s" msgstr "valeur mal formée pour %s : %s" -#: config.c:1422 +#: config.c:1457 msgid "must be one of nothing, matching, simple, upstream or current" msgstr "doit être parmi nothing, matching, simple, upstream ou current" -#: config.c:1483 builtin/pack-objects.c:3397 +#: config.c:1518 builtin/pack-objects.c:3410 #, c-format msgid "bad pack compression level %d" msgstr "niveau de compression du paquet %d" -#: config.c:1604 +#: config.c:1639 #, c-format msgid "unable to load config blob object '%s'" msgstr "impossible de charger l'objet blob de config '%s'" -#: config.c:1607 +#: config.c:1642 #, c-format msgid "reference '%s' does not point to a blob" msgstr "la référence '%s' ne pointe pas sur un blob" -#: config.c:1624 +#: config.c:1659 #, c-format msgid "unable to resolve config blob '%s'" msgstr "impossible de résoudre le blob de config '%s'" -#: config.c:1654 +#: config.c:1689 #, c-format msgid "failed to parse %s" msgstr "échec de l'analyse de %s" -#: config.c:1710 +#: config.c:1745 msgid "unable to parse command-line config" msgstr "lecture de la configuration de ligne de commande impossible" -#: config.c:2059 +#: config.c:2094 msgid "unknown error occurred while reading the configuration files" msgstr "erreur inconnue pendant la lecture des fichiers de configuration" -#: config.c:2229 +#: config.c:2264 #, c-format msgid "Invalid %s: '%s'" msgstr "%s invalide : '%s'" -#: config.c:2272 +#: config.c:2307 #, c-format msgid "unknown core.untrackedCache value '%s'; using 'keep' default value" msgstr "" "valeur '%s' de core.untrackedCache inconnue ; utilisation de 'keep' par " "défaut" -#: config.c:2298 +#: config.c:2333 #, c-format msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100" msgstr "" "la valeur '%d' de splitIndex.maxPercentChange devrait se situer entre 0 et " "100" -#: config.c:2344 +#: config.c:2379 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "" "impossible d'analyser '%s' depuis le configuration en ligne de commande" -#: config.c:2346 +#: config.c:2381 #, c-format msgid "bad config variable '%s' in file '%s' at line %d" msgstr "" "variable de configuration '%s' incorrecte dans le fichier '%s' à la ligne %d" -#: config.c:2427 +#: config.c:2462 #, c-format msgid "invalid section name '%s'" msgstr "nom de section invalide '%s'" -#: config.c:2459 +#: config.c:2494 #, c-format msgid "%s has multiple values" msgstr "%s a des valeurs multiples" -#: config.c:2488 +#: config.c:2523 #, c-format msgid "failed to write new configuration file %s" msgstr "impossible d'écrire le fichier de configuration %s" -#: config.c:2740 config.c:3064 +#: config.c:2775 config.c:3099 #, c-format msgid "could not lock config file %s" msgstr "impossible de verrouiller le fichier de configuration %s" -#: config.c:2751 +#: config.c:2786 #, c-format msgid "opening %s" msgstr "ouverture de %s" -#: config.c:2786 builtin/config.c:328 +#: config.c:2821 builtin/config.c:328 #, c-format msgid "invalid pattern: %s" msgstr "motif invalide : %s" -#: config.c:2811 +#: config.c:2846 #, c-format msgid "invalid config file %s" msgstr "fichier de configuration invalide %s" -#: config.c:2824 config.c:3077 +#: config.c:2859 config.c:3112 #, c-format msgid "fstat on %s failed" msgstr "échec de fstat sur %s" -#: config.c:2835 +#: config.c:2870 #, c-format msgid "unable to mmap '%s'" msgstr "impossible de réaliser un map de '%s'" -#: config.c:2844 config.c:3082 +#: config.c:2879 config.c:3117 #, c-format msgid "chmod on %s failed" msgstr "échec de chmod sur %s" -#: config.c:2929 config.c:3179 +#: config.c:2964 config.c:3214 #, c-format msgid "could not write config file %s" msgstr "impossible d'écrire le fichier de configuration %s" -#: config.c:2963 +#: config.c:2998 #, c-format msgid "could not set '%s' to '%s'" msgstr "impossible de régler '%s' à '%s'" -#: config.c:2965 builtin/remote.c:782 +#: config.c:3000 builtin/remote.c:782 #, c-format msgid "could not unset '%s'" msgstr "impossible de désinitialiser '%s'" -#: config.c:3055 +#: config.c:3090 #, c-format msgid "invalid section name: %s" msgstr "nom de section invalide : %s" -#: config.c:3222 +#: config.c:3257 #, c-format msgid "missing value for '%s'" msgstr "valeur manquante pour '%s'" @@ -2184,19 +2260,19 @@ msgstr "chemin étrange '%s' bloqué" msgid "unable to fork" msgstr "fork impossible" -#: connected.c:85 builtin/fsck.c:221 builtin/prune.c:43 +#: connected.c:86 builtin/fsck.c:221 builtin/prune.c:43 msgid "Checking connectivity" msgstr "Vérification de la connectivité" -#: connected.c:97 +#: connected.c:98 msgid "Could not run 'git rev-list'" msgstr "Impossible de lancer 'git rev-list'" -#: connected.c:117 +#: connected.c:118 msgid "failed write to rev-list" msgstr "impossible d'écrire dans la rev-list" -#: connected.c:124 +#: connected.c:125 msgid "failed to close rev-list's stdin" msgstr "impossible de fermer l'entrée standard du rev-list" @@ -2419,7 +2495,7 @@ msgstr "" "l'expression rationnelle depuis la configuration a trop de groupes de " "capture (max=%d)" -#: delta-islands.c:466 +#: delta-islands.c:467 #, c-format msgid "Marked %d islands, done.\n" msgstr "Marquage de %d îlots, fait.\n" @@ -2497,35 +2573,35 @@ msgstr "" "Erreurs dans la variable de configuration 'diff.dirstat' :\n" "%s" -#: diff.c:4210 +#: diff.c:4215 #, c-format msgid "external diff died, stopping at %s" msgstr "l'application de diff externe a disparu, arrêt à %s" -#: diff.c:4555 +#: diff.c:4560 msgid "--name-only, --name-status, --check and -s are mutually exclusive" msgstr "--name-only, --name-status, --check et -s sont mutuellement exclusifs" -#: diff.c:4558 +#: diff.c:4563 msgid "-G, -S and --find-object are mutually exclusive" msgstr "-G, -S et --find-object sont mutuellement exclusifs" -#: diff.c:4636 +#: diff.c:4641 msgid "--follow requires exactly one pathspec" msgstr "--follow a besoin d'une spécification de chemin unique" -#: diff.c:4684 +#: diff.c:4689 #, c-format msgid "invalid --stat value: %s" msgstr "valeur invalide de --stat : %s" -#: diff.c:4689 diff.c:4694 diff.c:4699 diff.c:4704 diff.c:5217 +#: diff.c:4694 diff.c:4699 diff.c:4704 diff.c:4709 diff.c:5222 #: parse-options.c:199 parse-options.c:203 #, c-format msgid "%s expects a numerical value" msgstr "%s attend une valeur numérique" -#: diff.c:4721 +#: diff.c:4726 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -2534,42 +2610,42 @@ msgstr "" "Impossible d'analyser le paramètre de l'option --dirstat/-X :\n" "%s" -#: diff.c:4806 +#: diff.c:4811 #, c-format msgid "unknown change class '%c' in --diff-filter=%s" msgstr "classe de modification inconnue '%c' dans --diff-fileter=%s" -#: diff.c:4830 +#: diff.c:4835 #, c-format msgid "unknown value after ws-error-highlight=%.*s" msgstr "valeur inconnue après ws-error-highlight=%.*s" -#: diff.c:4844 +#: diff.c:4849 #, c-format msgid "unable to resolve '%s'" msgstr "impossible de résoudre '%s'" -#: diff.c:4894 diff.c:4900 +#: diff.c:4899 diff.c:4905 #, c-format msgid "%s expects <n>/<m> form" msgstr "forme <n>/<m> attendue par %s" -#: diff.c:4912 +#: diff.c:4917 #, c-format msgid "%s expects a character, got '%s'" msgstr "caractère attendu par %s, '%s' trouvé" -#: diff.c:4933 +#: diff.c:4938 #, c-format msgid "bad --color-moved argument: %s" msgstr "mauvais argument --color-moved : %s" -#: diff.c:4952 +#: diff.c:4957 #, c-format msgid "invalid mode '%s' in --color-moved-ws" msgstr "mode invalide '%s' dans --color-moved-ws" -#: diff.c:4992 +#: diff.c:4997 msgid "" "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " "\"histogram\"" @@ -2577,155 +2653,155 @@ msgstr "" "l'option diff-algorithm accept \"myers\", \"minimal\", \"patience\" et " "\"histogram\"" -#: diff.c:5028 diff.c:5048 +#: diff.c:5033 diff.c:5053 #, c-format msgid "invalid argument to %s" msgstr "argument invalide pour %s" -#: diff.c:5186 +#: diff.c:5191 #, c-format msgid "failed to parse --submodule option parameter: '%s'" msgstr "échec de l'analyse du paramètre de l'option --submodule : '%s'" -#: diff.c:5242 +#: diff.c:5247 #, c-format msgid "bad --word-diff argument: %s" msgstr "mauvais argument pour --word-diff : %s" -#: diff.c:5265 +#: diff.c:5270 msgid "Diff output format options" msgstr "Options de format de sortie de diff" -#: diff.c:5267 diff.c:5273 +#: diff.c:5272 diff.c:5278 msgid "generate patch" msgstr "générer la rustine" -#: diff.c:5270 builtin/log.c:167 +#: diff.c:5275 builtin/log.c:172 msgid "suppress diff output" msgstr "supprimer la sortie des différences" -#: diff.c:5275 diff.c:5389 diff.c:5396 +#: diff.c:5280 diff.c:5394 diff.c:5401 msgid "<n>" msgstr "<n>" -#: diff.c:5276 diff.c:5279 +#: diff.c:5281 diff.c:5284 msgid "generate diffs with <n> lines context" msgstr "générer les diffs avec <n> lignes de contexte" -#: diff.c:5281 +#: diff.c:5286 msgid "generate the diff in raw format" msgstr "générer le diff en format brut" -#: diff.c:5284 +#: diff.c:5289 msgid "synonym for '-p --raw'" msgstr "synonyme de '-p --raw'" -#: diff.c:5288 +#: diff.c:5293 msgid "synonym for '-p --stat'" msgstr "synonyme de '-p --stat'" -#: diff.c:5292 +#: diff.c:5297 msgid "machine friendly --stat" msgstr "--stat pour traitement automatique" -#: diff.c:5295 +#: diff.c:5300 msgid "output only the last line of --stat" msgstr "afficher seulement la dernière ligne de --stat" -#: diff.c:5297 diff.c:5305 +#: diff.c:5302 diff.c:5310 msgid "<param1,param2>..." msgstr "<param1,param2>..." -#: diff.c:5298 +#: diff.c:5303 msgid "" "output the distribution of relative amount of changes for each sub-directory" msgstr "" "afficher la distribution des quantités de modifications relatives pour " "chaque sous-répertoire" -#: diff.c:5302 +#: diff.c:5307 msgid "synonym for --dirstat=cumulative" msgstr "synonyme pour --dirstat=cumulative" -#: diff.c:5306 +#: diff.c:5311 msgid "synonym for --dirstat=files,param1,param2..." msgstr "synonyme pour --dirstat=files,param1,param2..." -#: diff.c:5310 +#: diff.c:5315 msgid "warn if changes introduce conflict markers or whitespace errors" msgstr "" "avertir si les modifications introduisent des marqueurs de conflit ou des " "erreurs d'espace" -#: diff.c:5313 +#: diff.c:5318 msgid "condensed summary such as creations, renames and mode changes" msgstr "" "résumé succinct tel que les créations, les renommages et les modifications " "de mode" -#: diff.c:5316 +#: diff.c:5321 msgid "show only names of changed files" msgstr "n'afficher que les noms de fichiers modifiés" -#: diff.c:5319 +#: diff.c:5324 msgid "show only names and status of changed files" msgstr "n'afficher que les noms et les status des fichiers modifiés" -#: diff.c:5321 +#: diff.c:5326 msgid "<width>[,<name-width>[,<count>]]" msgstr "<largeur>[,<largeur-de-nom>[,<compte>]]" -#: diff.c:5322 +#: diff.c:5327 msgid "generate diffstat" msgstr "générer un diffstat" -#: diff.c:5324 diff.c:5327 diff.c:5330 +#: diff.c:5329 diff.c:5332 diff.c:5335 msgid "<width>" msgstr "<largeur>" -#: diff.c:5325 +#: diff.c:5330 msgid "generate diffstat with a given width" msgstr "générer un diffstat avec la largeur indiquée" -#: diff.c:5328 +#: diff.c:5333 msgid "generate diffstat with a given name width" msgstr "génerer un diffstat avec la largeur de nom indiquée" -#: diff.c:5331 +#: diff.c:5336 msgid "generate diffstat with a given graph width" msgstr "génerer un diffstat avec la largeur de graphe indiquée" -#: diff.c:5333 +#: diff.c:5338 msgid "<count>" msgstr "<compte>" -#: diff.c:5334 +#: diff.c:5339 msgid "generate diffstat with limited lines" msgstr "générer un diffstat avec des lignes limitées" -#: diff.c:5337 +#: diff.c:5342 msgid "generate compact summary in diffstat" msgstr "générer une résumé compact dans le diffstat" -#: diff.c:5340 +#: diff.c:5345 msgid "output a binary diff that can be applied" msgstr "produire un diff binaire qui peut être appliqué" -#: diff.c:5343 +#: diff.c:5348 msgid "show full pre- and post-image object names on the \"index\" lines" msgstr "" "afficher les noms complets des objets pre- et post-image sur les lignes " "\"index\"" -#: diff.c:5345 +#: diff.c:5350 msgid "show colored diff" msgstr "afficher un diff coloré" -#: diff.c:5346 +#: diff.c:5351 msgid "<kind>" msgstr "<sorte>" -#: diff.c:5347 +#: diff.c:5352 msgid "" "highlight whitespace errors in the 'context', 'old' or 'new' lines in the " "diff" @@ -2733,7 +2809,7 @@ msgstr "" "surligner les erreurs d'espace dans les lignes 'contexte', 'ancien', " "'nouveau' dans le diff" -#: diff.c:5350 +#: diff.c:5355 msgid "" "do not munge pathnames and use NULs as output field terminators in --raw or " "--numstat" @@ -2741,93 +2817,93 @@ msgstr "" "ne pas compresser les chemins et utiliser des NULs comme terminateurs de " "champs dans --raw ou --numstat" -#: diff.c:5353 diff.c:5356 diff.c:5359 diff.c:5465 +#: diff.c:5358 diff.c:5361 diff.c:5364 diff.c:5470 msgid "<prefix>" msgstr "<préfixe>" -#: diff.c:5354 +#: diff.c:5359 msgid "show the given source prefix instead of \"a/\"" msgstr "afficher le préfixe de source indiqué au lieu de \"a/\"" -#: diff.c:5357 +#: diff.c:5362 msgid "show the given destination prefix instead of \"b/\"" msgstr "afficher le préfixe de destination indiqué au lieu de \"b/\"" -#: diff.c:5360 +#: diff.c:5365 msgid "prepend an additional prefix to every line of output" msgstr "préfixer toutes les lignes en sortie avec la chaîne indiquée" -#: diff.c:5363 +#: diff.c:5368 msgid "do not show any source or destination prefix" msgstr "n'afficher aucun préfixe, ni de source, ni de destination" -#: diff.c:5366 +#: diff.c:5371 msgid "show context between diff hunks up to the specified number of lines" msgstr "" "afficher le contexte entre les sections à concurrence du nombre de ligne " "indiqué" -#: diff.c:5370 diff.c:5375 diff.c:5380 +#: diff.c:5375 diff.c:5380 diff.c:5385 msgid "<char>" msgstr "<caractère>" -#: diff.c:5371 +#: diff.c:5376 msgid "specify the character to indicate a new line instead of '+'" msgstr "spécifier le caractère pour indiquer une nouvelle ligne au lieu de '+'" -#: diff.c:5376 +#: diff.c:5381 msgid "specify the character to indicate an old line instead of '-'" msgstr "spécifier le caractère pour indiquer une ancienne ligne au lieu de '-'" -#: diff.c:5381 +#: diff.c:5386 msgid "specify the character to indicate a context instead of ' '" msgstr "" "spécifier le caractère pour indiquer une ligne de contexte au lieu de ' '" -#: diff.c:5384 +#: diff.c:5389 msgid "Diff rename options" msgstr "Options de renommage de diff" -#: diff.c:5385 +#: diff.c:5390 msgid "<n>[/<m>]" msgstr "<n>[/<m>]" -#: diff.c:5386 +#: diff.c:5391 msgid "break complete rewrite changes into pairs of delete and create" msgstr "" "casser les modifications d'une réécrire complète en paires de suppression et " "création" -#: diff.c:5390 +#: diff.c:5395 msgid "detect renames" msgstr "détecter les renommages" -#: diff.c:5394 +#: diff.c:5399 msgid "omit the preimage for deletes" msgstr "supprimer la pré-image pour les suppressions" -#: diff.c:5397 +#: diff.c:5402 msgid "detect copies" msgstr "détecter les copies" -#: diff.c:5401 +#: diff.c:5406 msgid "use unmodified files as source to find copies" msgstr "" "utiliser les fichiers non-modifiés comme sources pour trouver des copies" -#: diff.c:5403 +#: diff.c:5408 msgid "disable rename detection" msgstr "désactiver la détection de renommage" -#: diff.c:5406 +#: diff.c:5411 msgid "use empty blobs as rename source" msgstr "utiliser des blobs vides comme source de renommage" -#: diff.c:5408 +#: diff.c:5413 msgid "continue listing the history of a file beyond renames" msgstr "continuer à afficher l'historique d'un fichier au delà des renommages" -#: diff.c:5411 +#: diff.c:5416 msgid "" "prevent rename/copy detection if the number of rename/copy targets exceeds " "given limit" @@ -2835,161 +2911,161 @@ msgstr "" "empêcher la détection de renommage/copie si le nombre de cibles de renommage/" "copie excède la limite indiquée" -#: diff.c:5413 +#: diff.c:5418 msgid "Diff algorithm options" msgstr "Options de l'algorithme de diff" -#: diff.c:5415 +#: diff.c:5420 msgid "produce the smallest possible diff" msgstr "produire le diff le plus petit possible" -#: diff.c:5418 +#: diff.c:5423 msgid "ignore whitespace when comparing lines" msgstr "ignorer les espaces lors de la comparaison de ligne" -#: diff.c:5421 +#: diff.c:5426 msgid "ignore changes in amount of whitespace" msgstr "ignorer des modifications du nombre d'espaces" -#: diff.c:5424 +#: diff.c:5429 msgid "ignore changes in whitespace at EOL" msgstr "ignorer des modifications d'espace en fin de ligne" -#: diff.c:5427 +#: diff.c:5432 msgid "ignore carrier-return at the end of line" msgstr "ignore le retour chariot en fin de ligne" -#: diff.c:5430 +#: diff.c:5435 msgid "ignore changes whose lines are all blank" msgstr "ignorer les modifications dont les lignes sont vides" -#: diff.c:5433 +#: diff.c:5438 msgid "heuristic to shift diff hunk boundaries for easy reading" msgstr "" "heuristique qui déplace les limites de sections de diff pour faciliter la " "lecture" -#: diff.c:5436 +#: diff.c:5441 msgid "generate diff using the \"patience diff\" algorithm" msgstr "générer un diff en utilisant l'algorithme de différence \"patience\"" -#: diff.c:5440 +#: diff.c:5445 msgid "generate diff using the \"histogram diff\" algorithm" msgstr "" "générer un diff en utilisant l'algorithme de différence \"histogramme\"" -#: diff.c:5442 +#: diff.c:5447 msgid "<algorithm>" msgstr "<algorithme>" -#: diff.c:5443 +#: diff.c:5448 msgid "choose a diff algorithm" msgstr "choisir un algorithme de différence" -#: diff.c:5445 +#: diff.c:5450 msgid "<text>" msgstr "<texte>" -#: diff.c:5446 +#: diff.c:5451 msgid "generate diff using the \"anchored diff\" algorithm" msgstr "générer un diff en utilisant l'algorithme de différence \"ancré\"" -#: diff.c:5448 diff.c:5457 diff.c:5460 +#: diff.c:5453 diff.c:5462 diff.c:5465 msgid "<mode>" msgstr "<mode>" -#: diff.c:5449 +#: diff.c:5454 msgid "show word diff, using <mode> to delimit changed words" msgstr "" "afficher des différences par mot, en utilisant <mode> pour délimiter les " "mots modifiés" -#: diff.c:5451 diff.c:5454 diff.c:5499 +#: diff.c:5456 diff.c:5459 diff.c:5504 msgid "<regex>" msgstr "<regex>" -#: diff.c:5452 +#: diff.c:5457 msgid "use <regex> to decide what a word is" msgstr "utiliser <regex> pour décider ce qu'est un mot" -#: diff.c:5455 +#: diff.c:5460 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>" msgstr "équivalent à --word-diff=color --word-diff-regex=<regex>" -#: diff.c:5458 +#: diff.c:5463 msgid "moved lines of code are colored differently" msgstr "les lignes déplacées sont colorées différemment" -#: diff.c:5461 +#: diff.c:5466 msgid "how white spaces are ignored in --color-moved" msgstr "comment les espaces sont ignorés dans --color-moved" -#: diff.c:5464 +#: diff.c:5469 msgid "Other diff options" msgstr "Autres options diff" -#: diff.c:5466 +#: diff.c:5471 msgid "when run from subdir, exclude changes outside and show relative paths" msgstr "" "lancé depuis un sous-répertoire, exclure les modifications en dehors et " "afficher les chemins relatifs" -#: diff.c:5470 +#: diff.c:5475 msgid "treat all files as text" msgstr "traiter les fichiers comme texte" -#: diff.c:5472 +#: diff.c:5477 msgid "swap two inputs, reverse the diff" msgstr "échanger les entrées, inverser le diff" -#: diff.c:5474 +#: diff.c:5479 msgid "exit with 1 if there were differences, 0 otherwise" msgstr "sortir un code d'erreur 1 s'il y avait de différences, 0 sinon" -#: diff.c:5476 +#: diff.c:5481 msgid "disable all output of the program" msgstr "désactiver tous les affichages du programme" -#: diff.c:5478 +#: diff.c:5483 msgid "allow an external diff helper to be executed" msgstr "autoriser l'exécution d'un assistant externe de diff" -#: diff.c:5480 +#: diff.c:5485 msgid "run external text conversion filters when comparing binary files" msgstr "" "lancer les filtres externes de conversion en texte lors de la comparaison de " "fichiers binaires" -#: diff.c:5482 +#: diff.c:5487 msgid "<when>" msgstr "<quand>" -#: diff.c:5483 +#: diff.c:5488 msgid "ignore changes to submodules in the diff generation" msgstr "" "ignorer les modifications dans les sous-modules lors de la génération de diff" -#: diff.c:5486 +#: diff.c:5491 msgid "<format>" msgstr "<format>" -#: diff.c:5487 +#: diff.c:5492 msgid "specify how differences in submodules are shown" msgstr "spécifier comment les différences dans les sous-modules sont affichées" -#: diff.c:5491 +#: diff.c:5496 msgid "hide 'git add -N' entries from the index" msgstr "masquer les entrées 'git add -N' de l'index" -#: diff.c:5494 +#: diff.c:5499 msgid "treat 'git add -N' entries as real in the index" msgstr "traiter les entrées 'git add -N' comme réelles dans l'index" -#: diff.c:5496 +#: diff.c:5501 msgid "<string>" msgstr "<chaîne>" -#: diff.c:5497 +#: diff.c:5502 msgid "" "look for differences that change the number of occurrences of the specified " "string" @@ -2997,7 +3073,7 @@ msgstr "" "rechercher les différences qui modifient le nombre d'occurrences de la " "chaîne spécifiée" -#: diff.c:5500 +#: diff.c:5505 msgid "" "look for differences that change the number of occurrences of the specified " "regex" @@ -3005,26 +3081,26 @@ msgstr "" "rechercher les différences qui modifient le nombre d'occurrences de la regex " "spécifiée" -#: diff.c:5503 +#: diff.c:5508 msgid "show all changes in the changeset with -S or -G" msgstr "" "afficher toutes les modifications dans l'ensemble de modifications avec -S " "ou -G" -#: diff.c:5506 +#: diff.c:5511 msgid "treat <string> in -S as extended POSIX regular expression" msgstr "" "traiter <chaîne> dans -S comme une expression rationnelle POSIX étendue" -#: diff.c:5509 +#: diff.c:5514 msgid "control the order in which files appear in the output" msgstr "contrôler l'ordre dans lequel les fichiers apparaissent dans la sortie" -#: diff.c:5510 +#: diff.c:5515 msgid "<object-id>" msgstr "<id-objet>" -#: diff.c:5511 +#: diff.c:5516 msgid "" "look for differences that change the number of occurrences of the specified " "object" @@ -3032,35 +3108,35 @@ msgstr "" "rechercher les différences qui modifient le nombre d'occurrences de l'objet " "indiqué" -#: diff.c:5513 +#: diff.c:5518 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]" msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]" -#: diff.c:5514 +#: diff.c:5519 msgid "select files by diff type" msgstr "sélectionner les fichiers par types de diff" -#: diff.c:5516 +#: diff.c:5521 msgid "<file>" msgstr "<fichier>" -#: diff.c:5517 +#: diff.c:5522 msgid "Output to a specific file" msgstr "Sortie vers un fichier spécifié" -#: diff.c:6150 +#: diff.c:6177 msgid "inexact rename detection was skipped due to too many files." msgstr "" "détection de renommage inexact annulée à cause d'un trop grand nombre de " "fichiers." -#: diff.c:6153 +#: diff.c:6180 msgid "only found copies from modified paths due to too many files." msgstr "" "recherche uniquement des copies par modification de chemin à cause d'un trop " "grand nombre de fichiers." -#: diff.c:6156 +#: diff.c:6183 #, c-format msgid "" "you may want to set your %s variable to at least %d and retry the command." @@ -3168,32 +3244,32 @@ msgstr "impossible d'écrire sur un distant" msgid "--stateless-rpc requires multi_ack_detailed" msgstr "--stateless-rpc nécessite multi_ack_detailed" -#: fetch-pack.c:360 fetch-pack.c:1271 +#: fetch-pack.c:360 fetch-pack.c:1284 #, c-format msgid "invalid shallow line: %s" msgstr "ligne de superficiel invalide : %s" -#: fetch-pack.c:366 fetch-pack.c:1277 +#: fetch-pack.c:366 fetch-pack.c:1290 #, c-format msgid "invalid unshallow line: %s" msgstr "ligne de fin de superficiel invalide : %s" -#: fetch-pack.c:368 fetch-pack.c:1279 +#: fetch-pack.c:368 fetch-pack.c:1292 #, c-format msgid "object not found: %s" msgstr "objet non trouvé : %s" -#: fetch-pack.c:371 fetch-pack.c:1282 +#: fetch-pack.c:371 fetch-pack.c:1295 #, c-format msgid "error in object: %s" msgstr "Erreur dans l'objet : %s" -#: fetch-pack.c:373 fetch-pack.c:1284 +#: fetch-pack.c:373 fetch-pack.c:1297 #, c-format msgid "no shallow found: %s" msgstr "Pas de superficiel trouvé : %s" -#: fetch-pack.c:376 fetch-pack.c:1288 +#: fetch-pack.c:376 fetch-pack.c:1301 #, c-format msgid "expected shallow/unshallow, got %s" msgstr "superficiel/non superficiel attendu, %s trouvé" @@ -3212,7 +3288,7 @@ msgstr "commit invalide %s" msgid "giving up" msgstr "abandon" -#: fetch-pack.c:477 progress.c:284 +#: fetch-pack.c:477 progress.c:277 msgid "done" msgstr "fait" @@ -3253,154 +3329,130 @@ msgstr "échec de %s" msgid "error in sideband demultiplexer" msgstr "erreur dans le démultiplexer latéral" -#: fetch-pack.c:906 -msgid "Server does not support shallow clients" -msgstr "Le serveur ne supporte les clients superficiels" - -#: fetch-pack.c:910 -msgid "Server supports multi_ack_detailed" -msgstr "Le serveur supporte multi_ack_detailed" - -#: fetch-pack.c:913 -msgid "Server supports no-done" -msgstr "Le serveur support no-done" - -#: fetch-pack.c:919 -msgid "Server supports multi_ack" -msgstr "Le serveur supporte multi_ack" - -#: fetch-pack.c:923 -msgid "Server supports side-band-64k" -msgstr "Le serveur supporte side-band-64k" - -#: fetch-pack.c:927 -msgid "Server supports side-band" -msgstr "Le serveru supporte side-band" - -#: fetch-pack.c:931 -msgid "Server supports allow-tip-sha1-in-want" -msgstr "Le serveur supporte allow-tip-sha1-in-want" - -#: fetch-pack.c:935 -msgid "Server supports allow-reachable-sha1-in-want" -msgstr "Le serveur supporte allow-reachable-sha1-in-want" - -#: fetch-pack.c:945 -msgid "Server supports ofs-delta" -msgstr "Le serveur supporte ofs-delta" - -#: fetch-pack.c:951 fetch-pack.c:1144 -msgid "Server supports filter" -msgstr "Le serveur supporte filter" - -#: fetch-pack.c:959 +#: fetch-pack.c:908 #, c-format msgid "Server version is %.*s" msgstr "La version du serveur est %.*s" -#: fetch-pack.c:965 +#: fetch-pack.c:913 fetch-pack.c:919 fetch-pack.c:922 fetch-pack.c:928 +#: fetch-pack.c:932 fetch-pack.c:936 fetch-pack.c:940 fetch-pack.c:944 +#: fetch-pack.c:948 fetch-pack.c:952 fetch-pack.c:956 fetch-pack.c:960 +#: fetch-pack.c:966 fetch-pack.c:972 fetch-pack.c:977 fetch-pack.c:982 +#, c-format +msgid "Server supports %s" +msgstr "Le serveur supporte %s" + +#: fetch-pack.c:915 +msgid "Server does not support shallow clients" +msgstr "Le serveur ne supporte les clients superficiels" + +#: fetch-pack.c:975 msgid "Server does not support --shallow-since" msgstr "Le receveur ne gère pas --shallow-since" -#: fetch-pack.c:969 +#: fetch-pack.c:980 msgid "Server does not support --shallow-exclude" msgstr "Le receveur ne gère pas --shallow-exclude" -#: fetch-pack.c:971 +#: fetch-pack.c:984 msgid "Server does not support --deepen" msgstr "Le receveur ne gère pas --deepen" -#: fetch-pack.c:988 +#: fetch-pack.c:1001 msgid "no common commits" msgstr "pas de commit commun" -#: fetch-pack.c:1000 fetch-pack.c:1449 +#: fetch-pack.c:1013 fetch-pack.c:1462 msgid "git fetch-pack: fetch failed." msgstr "git fetch-pack : échec de le récupération." -#: fetch-pack.c:1138 +#: fetch-pack.c:1151 msgid "Server does not support shallow requests" msgstr "Le serveur ne supporte les requêtes superficielles" -#: fetch-pack.c:1171 +#: fetch-pack.c:1157 +msgid "Server supports filter" +msgstr "Le serveur supporte filter" + +#: fetch-pack.c:1184 msgid "unable to write request to remote" msgstr "impossible d'écrire la requête sur le distant" -#: fetch-pack.c:1189 +#: fetch-pack.c:1202 #, c-format msgid "error reading section header '%s'" msgstr "erreur à la lecture de l'entête de section '%s'" -#: fetch-pack.c:1195 +#: fetch-pack.c:1208 #, c-format msgid "expected '%s', received '%s'" msgstr "'%s' attendu, '%s' reçu" -#: fetch-pack.c:1234 +#: fetch-pack.c:1247 #, c-format msgid "unexpected acknowledgment line: '%s'" msgstr "ligne d'acquittement inattendue : '%s'" -#: fetch-pack.c:1239 +#: fetch-pack.c:1252 #, c-format msgid "error processing acks: %d" msgstr "erreur lors du traitement des acquittements : %d" -#: fetch-pack.c:1249 +#: fetch-pack.c:1262 msgid "expected packfile to be sent after 'ready'" msgstr "fichier paquet attendu à envoyer après 'ready'" -#: fetch-pack.c:1251 +#: fetch-pack.c:1264 msgid "expected no other sections to be sent after no 'ready'" msgstr "aucune autre section attendue à envoyer après absence de 'ready'" -#: fetch-pack.c:1293 +#: fetch-pack.c:1306 #, c-format msgid "error processing shallow info: %d" msgstr "erreur lors du traitement de l'information de superficialité : %d" -#: fetch-pack.c:1340 +#: fetch-pack.c:1353 #, c-format msgid "expected wanted-ref, got '%s'" msgstr "wanted-ref attendu, '%s' trouvé" -#: fetch-pack.c:1345 +#: fetch-pack.c:1358 #, c-format msgid "unexpected wanted-ref: '%s'" msgstr "wanted-ref inattendu : '%s'" -#: fetch-pack.c:1350 +#: fetch-pack.c:1363 #, c-format msgid "error processing wanted refs: %d" msgstr "erreur lors du traitement des références voulues : %d" -#: fetch-pack.c:1676 +#: fetch-pack.c:1689 msgid "no matching remote head" msgstr "pas de HEAD distante correspondante" -#: fetch-pack.c:1699 builtin/clone.c:673 +#: fetch-pack.c:1712 builtin/clone.c:686 msgid "remote did not send all necessary objects" msgstr "le serveur distant n'a pas envoyé tous les objets nécessaires" -#: fetch-pack.c:1726 +#: fetch-pack.c:1739 #, c-format msgid "no such remote ref %s" msgstr "référence distante inconnue %s" -#: fetch-pack.c:1729 +#: fetch-pack.c:1742 #, c-format msgid "Server does not allow request for unadvertised object %s" msgstr "Le serveur n'autorise pas de requête pour l'objet %s non annoncé" -#: gpg-interface.c:318 +#: gpg-interface.c:321 msgid "gpg failed to sign the data" msgstr "gpg n'a pas pu signer les données" -#: gpg-interface.c:344 +#: gpg-interface.c:347 msgid "could not create temporary file" msgstr "impossible de créer un fichier temporaire" -#: gpg-interface.c:347 +#: gpg-interface.c:350 #, c-format msgid "failed writing detached signature to '%s'" msgstr "impossible d'écrire la signature détachée dans '%s'" @@ -3410,18 +3462,18 @@ msgstr "impossible d'écrire la signature détachée dans '%s'" msgid "ignore invalid color '%.*s' in log.graphColors" msgstr "couleur invalide '%.*s' ignorée dans log.graphColors" -#: grep.c:2113 +#: grep.c:2117 #, c-format msgid "'%s': unable to read %s" msgstr "'%s' : lecture de %s impossible" -#: grep.c:2130 setup.c:164 builtin/clone.c:411 builtin/diff.c:82 +#: grep.c:2134 setup.c:164 builtin/clone.c:409 builtin/diff.c:82 #: builtin/rm.c:135 #, c-format msgid "failed to stat '%s'" msgstr "échec du stat de '%s'" -#: grep.c:2141 +#: grep.c:2145 #, c-format msgid "'%s': short read" msgstr "'%s' : lecture tronquée" @@ -3492,7 +3544,7 @@ msgstr "commandes git disponibles depuis un autre endroit de votre $PATH" msgid "These are common Git commands used in various situations:" msgstr "Ci-dessous les commandes Git habituelles dans diverses situations :" -#: help.c:363 git.c:97 +#: help.c:363 git.c:98 #, c-format msgid "unsupported command listing type '%s'" msgstr "type de liste de commandes non supporté '%s'" @@ -3641,7 +3693,7 @@ msgstr "nom d'identifiant vide (pour <%s>) non permis" msgid "name consists only of disallowed characters: %s" msgstr "le nom n'est constitué que de caractères interdits : %s" -#: ident.c:436 builtin/commit.c:608 +#: ident.c:436 builtin/commit.c:611 #, c-format msgid "invalid date format: %s" msgstr "format de date invalide : %s" @@ -3675,6 +3727,11 @@ msgstr "attendu : 'tree:<profondeur>'" msgid "sparse:path filters support has been dropped" msgstr "sparse : le support des filtres de chemin a été abandonné" +#: list-objects-filter-options.c:94 +#, c-format +msgid "invalid filter-spec '%s'" +msgstr "spécificateur de filtre invalide '%s'" + #: list-objects-filter-options.c:158 msgid "cannot change partial clone promisor remote" msgstr "impossible de modifier le prometteur distant de clone partiel" @@ -3707,8 +3764,8 @@ msgstr "Impossible de créer '%s.lock' : %s" msgid "failed to read the cache" msgstr "impossible de lire le cache" -#: merge.c:107 rerere.c:720 builtin/am.c:1887 builtin/am.c:1921 -#: builtin/checkout.c:461 builtin/checkout.c:811 builtin/clone.c:773 +#: merge.c:107 rerere.c:720 builtin/am.c:1885 builtin/am.c:1919 +#: builtin/checkout.c:536 builtin/checkout.c:796 builtin/clone.c:786 #: builtin/stash.c:264 msgid "unable to write new index file" msgstr "impossible d'écrire le nouveau fichier d'index" @@ -3731,93 +3788,93 @@ msgstr "échec de addinfo_cache pour le chemin '%s' ; abandon de la fusion." msgid "error building trees" msgstr "erreur de construction des arbres" -#: merge-recursive.c:861 +#: merge-recursive.c:863 #, c-format msgid "failed to create path '%s'%s" msgstr "impossible de créer le chemin '%s' %s" -#: merge-recursive.c:872 +#: merge-recursive.c:874 #, c-format msgid "Removing %s to make room for subdirectory\n" msgstr "Suppression de %s pour faire de la place pour le sous-répertoire\n" -#: merge-recursive.c:886 merge-recursive.c:905 +#: merge-recursive.c:888 merge-recursive.c:907 msgid ": perhaps a D/F conflict?" msgstr ": peut-être un conflit D/F ?" -#: merge-recursive.c:895 +#: merge-recursive.c:897 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "refus de perdre le fichier non suivi '%s'" -#: merge-recursive.c:936 builtin/cat-file.c:40 +#: merge-recursive.c:938 builtin/cat-file.c:40 #, c-format msgid "cannot read object %s '%s'" msgstr "impossible de lire l'objet %s '%s'" -#: merge-recursive.c:939 +#: merge-recursive.c:941 #, c-format msgid "blob expected for %s '%s'" msgstr "blob attendu pour %s '%s'" -#: merge-recursive.c:963 +#: merge-recursive.c:965 #, c-format msgid "failed to open '%s': %s" msgstr "échec à l'ouverture de '%s' : %s" -#: merge-recursive.c:974 +#: merge-recursive.c:976 #, c-format msgid "failed to symlink '%s': %s" msgstr "échec à la création du lien symbolique '%s' : %s" -#: merge-recursive.c:979 +#: merge-recursive.c:981 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "ne sait pas traiter %06o %s '%s'" -#: merge-recursive.c:1175 +#: merge-recursive.c:1177 #, c-format msgid "Failed to merge submodule %s (not checked out)" msgstr "Échec de la fusion du sous-module %s (non extrait)" -#: merge-recursive.c:1182 +#: merge-recursive.c:1184 #, c-format msgid "Failed to merge submodule %s (commits not present)" msgstr "Échec de fusion du sous-module %s (commits non présents)" -#: merge-recursive.c:1189 +#: merge-recursive.c:1191 #, c-format msgid "Failed to merge submodule %s (commits don't follow merge-base)" msgstr "" "Échec de la fusion du sous-module %s (les commits ne descendent pas de la " "base de fusion)" -#: merge-recursive.c:1197 merge-recursive.c:1209 +#: merge-recursive.c:1199 merge-recursive.c:1211 #, c-format msgid "Fast-forwarding submodule %s to the following commit:" msgstr "Avance rapide du sous-module %s au commit suivant :" -#: merge-recursive.c:1200 merge-recursive.c:1212 +#: merge-recursive.c:1202 merge-recursive.c:1214 #, c-format msgid "Fast-forwarding submodule %s" msgstr "Avance rapide du sous-module %s" -#: merge-recursive.c:1235 +#: merge-recursive.c:1237 #, c-format msgid "Failed to merge submodule %s (merge following commits not found)" msgstr "" "Échec de fusion du sous-module %s (fusion suivant les commits non trouvée)" -#: merge-recursive.c:1239 +#: merge-recursive.c:1241 #, c-format msgid "Failed to merge submodule %s (not fast-forward)" msgstr "Échec de fusion du sous-module %s (pas en avance rapide)" -#: merge-recursive.c:1240 +#: merge-recursive.c:1242 msgid "Found a possible merge resolution for the submodule:\n" msgstr "Résolution possible de fusion trouvée pour le sous-module :\n" -#: merge-recursive.c:1243 +#: merge-recursive.c:1245 #, c-format msgid "" "If this is correct simply add it to the index for example\n" @@ -3834,33 +3891,33 @@ msgstr "" "\n" "qui acceptera cette suggestion.\n" -#: merge-recursive.c:1252 +#: merge-recursive.c:1254 #, c-format msgid "Failed to merge submodule %s (multiple merges found)" msgstr "Échec de fusion du sous-module %s (plusieurs fusions trouvées)" -#: merge-recursive.c:1325 +#: merge-recursive.c:1327 msgid "Failed to execute internal merge" msgstr "Échec à l'exécution de la fusion interne" -#: merge-recursive.c:1330 +#: merge-recursive.c:1332 #, c-format msgid "Unable to add %s to database" msgstr "Impossible d'ajouter %s à la base de données" -#: merge-recursive.c:1362 +#: merge-recursive.c:1364 #, c-format msgid "Auto-merging %s" msgstr "Fusion automatique de %s" -#: merge-recursive.c:1385 +#: merge-recursive.c:1387 #, c-format msgid "Error: Refusing to lose untracked file at %s; writing to %s instead." msgstr "" "Erreur : refus de perdre le fichier non suivi %s ; écriture dans %s à la " "place." -#: merge-recursive.c:1457 +#: merge-recursive.c:1459 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -3869,7 +3926,7 @@ msgstr "" "CONFLIT (%s/suppression) : %s supprimé dans %s et %s dans %s. Version %s de " "%s laissée dans l'arbre." -#: merge-recursive.c:1462 +#: merge-recursive.c:1464 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -3878,7 +3935,7 @@ msgstr "" "CONFLIT (%s/suppression) : %s supprimé dans %s et %s à %s dans %s. Version " "%s de %s laissée dans l'arbre." -#: merge-recursive.c:1469 +#: merge-recursive.c:1471 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -3887,7 +3944,7 @@ msgstr "" "CONFLIT (%s/suppression) : %s supprimé dans %s et %s dans %s. Version %s de " "%s laissée dans l'arbre dans le fichier %s." -#: merge-recursive.c:1474 +#: merge-recursive.c:1476 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -3896,41 +3953,41 @@ msgstr "" "CONFLIT (%s/suppression) : %s supprimé dans %s et %s à %s dans %s. Version " "%s de %s laissée dans l'arbre dans le fichier %s." -#: merge-recursive.c:1509 +#: merge-recursive.c:1511 msgid "rename" msgstr "renommage" -#: merge-recursive.c:1509 +#: merge-recursive.c:1511 msgid "renamed" msgstr "renommé" -#: merge-recursive.c:1589 merge-recursive.c:2445 merge-recursive.c:3085 +#: merge-recursive.c:1591 merge-recursive.c:2450 merge-recursive.c:3094 #, c-format msgid "Refusing to lose dirty file at %s" msgstr "Refus de perdre le fichier modifié %s" -#: merge-recursive.c:1599 +#: merge-recursive.c:1601 #, c-format msgid "Refusing to lose untracked file at %s, even though it's in the way." msgstr "Refus de perdre le fichier non suivi %s, même s'il gêne." -#: merge-recursive.c:1657 +#: merge-recursive.c:1659 #, c-format msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s" msgstr "" "CONFLIT (renommage/ajout) : Renommage de %s->%s dans %s. %s ajouté dans %s" -#: merge-recursive.c:1687 +#: merge-recursive.c:1690 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "%s est un répertoire dans %s ajouté plutôt comme %s" -#: merge-recursive.c:1692 +#: merge-recursive.c:1695 #, c-format msgid "Refusing to lose untracked file at %s; adding as %s instead" msgstr "Refus de perdre le fichier non suivi %s ; ajout comme %s à la place" -#: merge-recursive.c:1711 +#: merge-recursive.c:1714 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" @@ -3939,18 +3996,18 @@ msgstr "" "CONFLIT (renommage/renommage) : Renommage de \"%s\"->\"%s\" dans la branche " "\"%s\" et renommage \"%s\"->\"%s\" dans \"%s\"%s" -#: merge-recursive.c:1716 +#: merge-recursive.c:1719 msgid " (left unresolved)" msgstr " (laissé non résolu)" -#: merge-recursive.c:1825 +#: merge-recursive.c:1828 #, c-format msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" msgstr "" "CONFLIT (renommage/renommage) : renommage '%s'->'%s' dans %s. Renommage '%s'-" ">'%s' dans %s" -#: merge-recursive.c:2030 +#: merge-recursive.c:2035 #, c-format msgid "" "CONFLICT (directory rename split): Unclear where to place %s because " @@ -3961,7 +4018,7 @@ msgstr "" "parce que le répertoire %s a été renommé en plusieurs autres répertoires, " "sans aucune destination récupérant la majorité des fichiers." -#: merge-recursive.c:2062 +#: merge-recursive.c:2067 #, c-format msgid "" "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of " @@ -3970,7 +4027,7 @@ msgstr "" "CONFLIT (renommage implicite de répertoire) : le répertoire/fichier %s gêne " "des renommages implicites de répertoire déplaçant les chemins suivants : %s." -#: merge-recursive.c:2072 +#: merge-recursive.c:2077 #, c-format msgid "" "CONFLICT (implicit dir rename): Cannot map more than one path to %s; " @@ -3979,7 +4036,7 @@ msgstr "" "CONFLIT (renommage implicite de répertoire) : impossible de transformer " "plusieurs chemins sur %s ; les chemins concernés sont : %s" -#: merge-recursive.c:2164 +#: merge-recursive.c:2169 #, c-format msgid "" "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-" @@ -3988,7 +4045,7 @@ msgstr "" "CONFLIT (renommage/renommage) : renommage du répertoire %s->%s dans %s. " "Renommage de répertoire %s->%s dans %s" -#: merge-recursive.c:2408 +#: merge-recursive.c:2413 #, c-format msgid "" "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was " @@ -3997,52 +4054,52 @@ msgstr "" "AVERTISSEMENT : ne renomme pas %s->%s dans %s, parce que %s lui-même a été " "renommé." -#: merge-recursive.c:2929 +#: merge-recursive.c:2938 #, c-format msgid "cannot read object %s" msgstr "impossible de lire l'objet %s" -#: merge-recursive.c:2932 +#: merge-recursive.c:2941 #, c-format msgid "object %s is not a blob" msgstr "l'objet %s n'est pas un blob" -#: merge-recursive.c:2996 +#: merge-recursive.c:3005 msgid "modify" msgstr "modification" -#: merge-recursive.c:2996 +#: merge-recursive.c:3005 msgid "modified" msgstr "modifié" -#: merge-recursive.c:3008 +#: merge-recursive.c:3017 msgid "content" msgstr "contenu" -#: merge-recursive.c:3012 +#: merge-recursive.c:3021 msgid "add/add" msgstr "ajout/ajout" -#: merge-recursive.c:3035 +#: merge-recursive.c:3044 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "%s sauté (fusion identique à l'existant)" -#: merge-recursive.c:3057 git-submodule.sh:937 +#: merge-recursive.c:3066 git-submodule.sh:937 msgid "submodule" msgstr "sous-module" -#: merge-recursive.c:3058 +#: merge-recursive.c:3067 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "CONFLIT (%s) : Conflit de fusion dans %s" -#: merge-recursive.c:3088 +#: merge-recursive.c:3097 #, c-format msgid "Adding as %s instead" msgstr "Ajout plutôt comme %s" -#: merge-recursive.c:3170 +#: merge-recursive.c:3179 #, c-format msgid "" "Path updated: %s added in %s inside a directory that was renamed in %s; " @@ -4051,7 +4108,7 @@ msgstr "" "Chemin mis à jour : %s ajouté dans %s dans un répertoire qui a été renommé " "en %s ; déplacé dans %s." -#: merge-recursive.c:3173 +#: merge-recursive.c:3182 #, c-format msgid "" "CONFLICT (file location): %s added in %s inside a directory that was renamed " @@ -4061,7 +4118,7 @@ msgstr "" "a été renommé dans %s, ce qui suggère qu'il devrait peut-être être déplacé " "vers %s." -#: merge-recursive.c:3177 +#: merge-recursive.c:3186 #, c-format msgid "" "Path updated: %s renamed to %s in %s, inside a directory that was renamed in " @@ -4070,7 +4127,7 @@ msgstr "" "Chemin mis à jour : %s renommé en %s dans %s, dans un répertoire qui a été " "renommé en %s ; déplacé dans %s." -#: merge-recursive.c:3180 +#: merge-recursive.c:3189 #, c-format msgid "" "CONFLICT (file location): %s renamed to %s in %s, inside a directory that " @@ -4080,36 +4137,36 @@ msgstr "" "répertoire qui a été renommé dans %s, ce qui suggère qu'il devrait peut-être " "être déplacé vers %s." -#: merge-recursive.c:3294 +#: merge-recursive.c:3303 #, c-format msgid "Removing %s" msgstr "Suppression de %s" -#: merge-recursive.c:3317 +#: merge-recursive.c:3326 msgid "file/directory" msgstr "fichier/répertoire" -#: merge-recursive.c:3322 +#: merge-recursive.c:3331 msgid "directory/file" msgstr "répertoire/fichier" -#: merge-recursive.c:3329 +#: merge-recursive.c:3338 #, c-format msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" msgstr "" "CONFLIT (%s) : Il y a un répertoire nommé %s dans %s. Ajout de %s comme %s" -#: merge-recursive.c:3338 +#: merge-recursive.c:3347 #, c-format msgid "Adding %s" msgstr "Ajout de %s" -#: merge-recursive.c:3347 +#: merge-recursive.c:3356 #, c-format msgid "CONFLICT (add/add): Merge conflict in %s" msgstr "CONFLIT (ajout/ajout) : Conflit de fusion dans %s" -#: merge-recursive.c:3385 +#: merge-recursive.c:3394 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -4119,132 +4176,137 @@ msgstr "" "fusion :\n" " %s" -#: merge-recursive.c:3396 +#: merge-recursive.c:3405 msgid "Already up to date!" msgstr "Déjà à jour !" -#: merge-recursive.c:3405 +#: merge-recursive.c:3414 #, c-format msgid "merging of trees %s and %s failed" msgstr "échec de fusion des arbres %s et %s" -#: merge-recursive.c:3504 +#: merge-recursive.c:3513 msgid "Merging:" msgstr "Fusion :" -#: merge-recursive.c:3517 +#: merge-recursive.c:3526 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "%u ancêtre commun trouvé :" msgstr[1] "%u ancêtres communs trouvés :" -#: merge-recursive.c:3556 +#: merge-recursive.c:3565 msgid "merge returned no commit" msgstr "la fusion n'a pas retourné de commit" -#: merge-recursive.c:3622 +#: merge-recursive.c:3631 #, c-format msgid "Could not parse object '%s'" msgstr "Impossible d'analyser l'objet '%s'" -#: merge-recursive.c:3638 builtin/merge.c:702 builtin/merge.c:873 +#: merge-recursive.c:3647 builtin/merge.c:698 builtin/merge.c:869 msgid "Unable to write index." msgstr "Impossible d'écrire l'index." -#: midx.c:66 +#: midx.c:69 #, c-format msgid "multi-pack-index file %s is too small" msgstr "le fichier d'index multi-paquet %s est trop petit" -#: midx.c:82 +#: midx.c:85 #, c-format msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x" msgstr "" "la signature de l'index multi-paquet 0x%08x ne correspond pas à la signature " "0x%08x" -#: midx.c:87 +#: midx.c:90 #, c-format msgid "multi-pack-index version %d not recognized" msgstr "la version d'index multi-paquet %d n'est pas reconnue" -#: midx.c:92 +#: midx.c:95 #, c-format msgid "hash version %u does not match" msgstr "la version %u du condensé ne correspond pas" -#: midx.c:106 +#: midx.c:109 msgid "invalid chunk offset (too large)" msgstr "décalage de section invalide (trop grand)" -#: midx.c:130 +#: midx.c:133 msgid "terminating multi-pack-index chunk id appears earlier than expected" msgstr "" "identifiant de terminaison de tronçon d'index multi-paquet terminant " "apparaît plus tôt qu'attendu" -#: midx.c:143 +#: midx.c:146 msgid "multi-pack-index missing required pack-name chunk" msgstr "index multi-paquet manque de tronçon de nom de paquet" -#: midx.c:145 +#: midx.c:148 msgid "multi-pack-index missing required OID fanout chunk" msgstr "index multi-paquet manque de tronçon de d'étalement OID requis" -#: midx.c:147 +#: midx.c:150 msgid "multi-pack-index missing required OID lookup chunk" msgstr "index multi-paquet manque de tronçon de recherche OID" -#: midx.c:149 +#: midx.c:152 msgid "multi-pack-index missing required object offsets chunk" msgstr "index multi-paquet manque de tronçon de décalage d'objet" -#: midx.c:163 +#: midx.c:166 #, c-format msgid "multi-pack-index pack names out of order: '%s' before '%s'" msgstr "" "index multi-paquet les noms de paquets sont en désordre : '%s' avant '%s'" -#: midx.c:208 +#: midx.c:211 #, c-format msgid "bad pack-int-id: %u (%u total packs)" msgstr "mauvais pack-int-id : %u (%u paquets au total)" -#: midx.c:258 +#: midx.c:261 msgid "multi-pack-index stores a 64-bit offset, but off_t is too small" msgstr "" "multi-pack-index stock un décalage en 64-bit, mais off_t est trop petit" -#: midx.c:286 +#: midx.c:289 msgid "error preparing packfile from multi-pack-index" msgstr "erreur à la préparation du fichier paquet depuis un index multi-paquet" -#: midx.c:457 +#: midx.c:470 #, c-format msgid "failed to add packfile '%s'" msgstr "échec de l'ajout du fichier paquet '%s'" -#: midx.c:463 +#: midx.c:476 #, c-format msgid "failed to open pack-index '%s'" msgstr "échec à l'ouverture du fichier paquet '%s'" -#: midx.c:557 +#: midx.c:536 #, c-format msgid "failed to locate object %d in packfile" msgstr "échec de localisation de l'objet %d dans le fichier paquet" -#: midx.c:993 +#: midx.c:865 +#, c-format +msgid "did not see pack-file %s to drop" +msgstr "fichier paquet à éliminer %s non trouvé" + +#: midx.c:1036 #, c-format msgid "failed to clear multi-pack-index at %s" msgstr "échec du nettoyage de l'index de multi-paquet à %s" -#: midx.c:1048 +#: midx.c:1091 msgid "Looking for referenced packfiles" msgstr "Recherche de fichiers paquets référencés" -#: midx.c:1063 +#: midx.c:1106 #, c-format msgid "" "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]" @@ -4252,49 +4314,57 @@ msgstr "" "étalement oid en désordre : étalement[%d] = %<PRIx32> > %<PRIx32> = " "étalement[%d]" -#: midx.c:1067 +#: midx.c:1110 msgid "Verifying OID order in MIDX" msgstr "Vérification de l'ordre des OID dans MIDX" -#: midx.c:1076 +#: midx.c:1119 #, c-format msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]" msgstr "recherche d'oid en désordre : oid[%d] = %s >= %s = oid[%d]" -#: midx.c:1095 +#: midx.c:1138 msgid "Sorting objects by packfile" msgstr "Classement des objets par fichier paquet" -#: midx.c:1101 +#: midx.c:1144 msgid "Verifying object offsets" msgstr "Vérification des décalages des objets" -#: midx.c:1117 +#: midx.c:1160 #, c-format msgid "failed to load pack entry for oid[%d] = %s" msgstr "échec de la lecture de l'élément de cache pour oid[%d] = %s" -#: midx.c:1123 +#: midx.c:1166 #, c-format msgid "failed to load pack-index for packfile %s" msgstr "impossible de lire le fichier paquet %s" -#: midx.c:1132 +#: midx.c:1175 #, c-format msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>" msgstr "décalage d'objet incorrect pour oid[%d] = %s : %<PRIx64> != %<PRIx64>" -#: name-hash.c:531 +#: midx.c:1350 +msgid "could not start pack-objects" +msgstr "Impossible de démarrer le groupement d'objets" + +#: midx.c:1369 +msgid "could not finish pack-objects" +msgstr "Impossible de finir le groupement d'objets" + +#: name-hash.c:532 #, c-format msgid "unable to create lazy_dir thread: %s" msgstr "impossible de créer le fil lazy_dir : %s" -#: name-hash.c:553 +#: name-hash.c:554 #, c-format msgid "unable to create lazy_name thread: %s" msgstr "impossible de créer le fil lazy_name : %s" -#: name-hash.c:559 +#: name-hash.c:560 #, c-format msgid "unable to join lazy_name thread: %s" msgstr "impossible de joindre le fil lazy_name : %s" @@ -4363,16 +4433,16 @@ msgstr "impossible d'analyser l'objet : %s" msgid "hash mismatch %s" msgstr "incohérence de hachage %s" -#: packfile.c:617 +#: packfile.c:648 msgid "offset before end of packfile (broken .idx?)" msgstr "offset avant la fin du fichier paquet (.idx cassé ?)" -#: packfile.c:1868 +#: packfile.c:1899 #, c-format msgid "offset before start of pack index for %s (corrupt index?)" msgstr "offset avant le début de l'index de paquet pour %s (index corrompu ?)" -#: packfile.c:1872 +#: packfile.c:1903 #, c-format msgid "offset beyond end of pack index for %s (truncated index?)" msgstr "" @@ -4634,24 +4704,29 @@ msgstr "impossible de créer le lstat en fil : %s" msgid "unable to parse --pretty format" msgstr "impossible d'analyser le format --pretty" -#: range-diff.c:56 +#: range-diff.c:70 msgid "could not start `log`" msgstr "impossible de démarrer `log`" -#: range-diff.c:59 +#: range-diff.c:72 msgid "could not read `log` output" msgstr "impossible de lire la sortie de `log`" -#: range-diff.c:74 sequencer.c:4897 +#: range-diff.c:91 sequencer.c:5021 #, c-format msgid "could not parse commit '%s'" msgstr "impossible d'analyser le commit '%s'" -#: range-diff.c:224 +#: range-diff.c:117 +#, c-format +msgid "could not parse git header '%.*s'" +msgstr "impossible d'analyser l'entête git '%.*s'" + +#: range-diff.c:274 msgid "failed to generate diff" msgstr "échec de la génération de diff" -#: range-diff.c:455 range-diff.c:457 +#: range-diff.c:506 range-diff.c:508 #, c-format msgid "could not parse log for '%s'" msgstr "impossible d'analyser le journal pour '%s'" @@ -4768,11 +4843,10 @@ msgid "unordered stage entries for '%s'" msgstr "entrées de préparation non ordonnées pour '%s'" #: read-cache.c:1946 read-cache.c:2234 rerere.c:565 rerere.c:599 rerere.c:1111 -#: builtin/add.c:460 builtin/check-ignore.c:178 builtin/checkout.c:358 -#: builtin/checkout.c:672 builtin/checkout.c:1060 builtin/clean.c:955 -#: builtin/commit.c:344 builtin/diff-tree.c:120 builtin/grep.c:498 -#: builtin/mv.c:145 builtin/reset.c:245 builtin/rm.c:271 -#: builtin/submodule--helper.c:330 +#: builtin/add.c:460 builtin/check-ignore.c:178 builtin/checkout.c:467 +#: builtin/checkout.c:651 builtin/clean.c:956 builtin/commit.c:347 +#: builtin/diff-tree.c:120 builtin/grep.c:499 builtin/mv.c:145 +#: builtin/reset.c:245 builtin/rm.c:271 builtin/submodule--helper.c:330 msgid "index file corrupt" msgstr "fichier d'index corrompu" @@ -4826,12 +4900,12 @@ msgstr "impossible de rafraîchir l'index partagé '%s'" msgid "broken index, expect %s in %s, got %s" msgstr "index cassé, %s attendu dans %s, %s obtenu" -#: read-cache.c:2989 wrapper.c:658 builtin/merge.c:1117 +#: read-cache.c:2989 wrapper.c:658 builtin/merge.c:1114 #, c-format msgid "could not close '%s'" msgstr "impossible de fermer '%s'" -#: read-cache.c:3092 sequencer.c:2354 sequencer.c:3807 +#: read-cache.c:3092 sequencer.c:2358 sequencer.c:3928 #, c-format msgid "could not stat '%s'" msgstr "stat impossible de '%s'" @@ -4912,7 +4986,7 @@ msgid_plural "Rebase %s onto %s (%d commands)" msgstr[0] "Rebasage de %s sur %s (%d commande)" msgstr[1] "Rebasage de %s sur %s (%d commandes)" -#: rebase-interactive.c:65 git-rebase--preserve-merges.sh:173 +#: rebase-interactive.c:65 git-rebase--preserve-merges.sh:228 msgid "" "\n" "Do not remove any line. Use 'drop' explicitly to remove a commit.\n" @@ -4921,7 +4995,7 @@ msgstr "" "Ne supprimez aucune ligne. Utilisez 'drop' explicitement pour supprimer un " "commit.\n" -#: rebase-interactive.c:68 git-rebase--preserve-merges.sh:177 +#: rebase-interactive.c:68 git-rebase--preserve-merges.sh:232 msgid "" "\n" "If you remove a line here THAT COMMIT WILL BE LOST.\n" @@ -4929,7 +5003,7 @@ msgstr "" "\n" "Si vous éliminez une ligne ici, LE COMMIT CORRESPONDANT SERA PERDU.\n" -#: rebase-interactive.c:74 git-rebase--preserve-merges.sh:816 +#: rebase-interactive.c:74 git-rebase--preserve-merges.sh:871 msgid "" "\n" "You are editing the todo file of an ongoing interactive rebase.\n" @@ -4944,7 +5018,7 @@ msgstr "" " git rebase --continue\n" "\n" -#: rebase-interactive.c:79 git-rebase--preserve-merges.sh:893 +#: rebase-interactive.c:79 git-rebase--preserve-merges.sh:948 msgid "" "\n" "However, if you remove everything, the rebase will be aborted.\n" @@ -4954,12 +5028,12 @@ msgstr "" "Cependant, si vous effacez tout, le rebasage sera annulé.\n" "\n" -#: rebase-interactive.c:85 git-rebase--preserve-merges.sh:900 +#: rebase-interactive.c:85 git-rebase--preserve-merges.sh:955 msgid "Note that empty commits are commented out" msgstr "Veuillez noter que les commits vides sont en commentaire" -#: rebase-interactive.c:105 rerere.c:485 rerere.c:692 sequencer.c:3339 -#: sequencer.c:3365 sequencer.c:4996 builtin/fsck.c:356 builtin/rebase.c:235 +#: rebase-interactive.c:105 rerere.c:485 rerere.c:692 sequencer.c:3447 +#: sequencer.c:3473 sequencer.c:5120 builtin/fsck.c:356 builtin/rebase.c:235 #, c-format msgid "could not write '%s'" msgstr "impossible d'écrire '%s'" @@ -4996,97 +5070,98 @@ msgstr "" "Les comportements disponibles sont : ignore, warn, error.\n" "\n" -#: refs.c:192 +#: refs.c:262 #, c-format msgid "%s does not point to a valid object!" msgstr "%s ne pointe pas sur un objet valide!" -#: refs.c:597 +#: refs.c:667 #, c-format msgid "ignoring dangling symref %s" msgstr "symref pendant %s ignoré" -#: refs.c:599 ref-filter.c:1982 +#: refs.c:669 ref-filter.c:2092 #, c-format msgid "ignoring broken ref %s" msgstr "réf cassé %s ignoré" -#: refs.c:734 +#: refs.c:804 #, c-format msgid "could not open '%s' for writing: %s" msgstr "impossible d'ouvrir '%s' en écriture : %s" -#: refs.c:744 refs.c:795 +#: refs.c:814 refs.c:865 #, c-format msgid "could not read ref '%s'" msgstr "impossible de lire la réf '%s'" -#: refs.c:750 +#: refs.c:820 #, c-format msgid "ref '%s' already exists" msgstr "la référence '%s' existe déjà" -#: refs.c:755 +#: refs.c:825 #, c-format msgid "unexpected object ID when writing '%s'" msgstr "id d'objet inattendu pendant l'écriture de '%s'" -#: refs.c:763 sequencer.c:400 sequencer.c:2679 sequencer.c:2805 -#: sequencer.c:2819 sequencer.c:3076 sequencer.c:4913 wrapper.c:656 +#: refs.c:833 sequencer.c:403 sequencer.c:2709 sequencer.c:2913 +#: sequencer.c:2927 sequencer.c:3184 sequencer.c:5037 wrapper.c:656 #, c-format msgid "could not write to '%s'" msgstr "impossible d'écrire dans '%s'" -#: refs.c:790 wrapper.c:225 wrapper.c:395 builtin/am.c:715 builtin/rebase.c:993 +#: refs.c:860 wrapper.c:225 wrapper.c:395 builtin/am.c:715 +#: builtin/rebase.c:1003 #, c-format msgid "could not open '%s' for writing" msgstr "impossible d'ouvrir '%s' en écriture" -#: refs.c:797 +#: refs.c:867 #, c-format msgid "unexpected object ID when deleting '%s'" msgstr "id d'objet inattendu pendant la suppression de '%s'" -#: refs.c:928 +#: refs.c:998 #, c-format msgid "log for ref %s has gap after %s" msgstr "le journal pour la réf %s contient un trou après %s" -#: refs.c:934 +#: refs.c:1004 #, c-format msgid "log for ref %s unexpectedly ended on %s" msgstr "le journal pour la réf %s s'arrête de manière inattendue sur %s" -#: refs.c:993 +#: refs.c:1063 #, c-format msgid "log for %s is empty" msgstr "le journal pour la réf %s est vide" -#: refs.c:1085 +#: refs.c:1155 #, c-format msgid "refusing to update ref with bad name '%s'" msgstr "refus de mettre à jour une réf avec un nom cassé '%s'" -#: refs.c:1161 +#: refs.c:1231 #, c-format msgid "update_ref failed for ref '%s': %s" msgstr "échec de update_ref pour la réf '%s' : %s" -#: refs.c:1942 +#: refs.c:2012 #, c-format msgid "multiple updates for ref '%s' not allowed" msgstr "mises à jour multiples pour la réf '%s' non permises" -#: refs.c:1974 +#: refs.c:2044 msgid "ref updates forbidden inside quarantine environment" msgstr "mises à jour des références interdites en environnement de quarantaine" -#: refs.c:2070 refs.c:2100 +#: refs.c:2140 refs.c:2170 #, c-format msgid "'%s' exists; cannot create '%s'" msgstr "'%s' existe ; impossible de créer '%s'" -#: refs.c:2076 refs.c:2111 +#: refs.c:2146 refs.c:2181 #, c-format msgid "cannot process '%s' and '%s' at the same time" msgstr "impossible de traiter '%s' et '%s' en même temps" @@ -5113,268 +5188,252 @@ msgid "invalid refspec '%s'" msgstr "spécificateur de réference invalide : '%s'" # à priori on parle d'une branche ici -#: ref-filter.c:39 wt-status.c:1909 +#: ref-filter.c:42 wt-status.c:1934 msgid "gone" msgstr "disparue" -#: ref-filter.c:40 +#: ref-filter.c:43 #, c-format msgid "ahead %d" msgstr "en avance de %d" -#: ref-filter.c:41 +#: ref-filter.c:44 #, c-format msgid "behind %d" msgstr "en retard de %d" -#: ref-filter.c:42 +#: ref-filter.c:45 #, c-format msgid "ahead %d, behind %d" msgstr "en avance de %d, en retard de %d" -#: ref-filter.c:138 +#: ref-filter.c:162 #, c-format msgid "expected format: %%(color:<color>)" msgstr "format attendu : %%(color:<couleur>)" -#: ref-filter.c:140 +#: ref-filter.c:164 #, c-format msgid "unrecognized color: %%(color:%s)" msgstr "couleur non reconnue : %%(color:%s)" -#: ref-filter.c:162 +#: ref-filter.c:186 #, c-format msgid "Integer value expected refname:lstrip=%s" msgstr "Valeur entière attendue refname:lstrip=%s" -#: ref-filter.c:166 +#: ref-filter.c:190 #, c-format msgid "Integer value expected refname:rstrip=%s" msgstr "Valeur entière attendue refname:rstrip=%s" -#: ref-filter.c:168 +#: ref-filter.c:192 #, c-format msgid "unrecognized %%(%s) argument: %s" msgstr "argument %%(%s) non reconnu : %s" -#: ref-filter.c:223 +#: ref-filter.c:247 #, c-format msgid "%%(objecttype) does not take arguments" msgstr "%%(objecttype) n'accepte pas d'argument" -#: ref-filter.c:245 +#: ref-filter.c:269 #, c-format msgid "unrecognized %%(objectsize) argument: %s" msgstr "argument %%(objectsize) non reconnu : %s" -#: ref-filter.c:253 +#: ref-filter.c:277 #, c-format msgid "%%(deltabase) does not take arguments" msgstr "%%(deltabase) n'accepte pas d'argument" -#: ref-filter.c:265 +#: ref-filter.c:289 #, c-format msgid "%%(body) does not take arguments" msgstr "%%(body) n'accepte pas d'argument" -#: ref-filter.c:274 +#: ref-filter.c:298 #, c-format msgid "%%(subject) does not take arguments" msgstr "%%(subject) n'accepte pas d'argument" -#: ref-filter.c:296 +#: ref-filter.c:320 #, c-format msgid "unknown %%(trailers) argument: %s" msgstr "argument %%(trailers) inconnu : %s" -#: ref-filter.c:325 +#: ref-filter.c:349 #, c-format msgid "positive value expected contents:lines=%s" msgstr "valeur positive attendue contents:lines=%s" -#: ref-filter.c:327 +#: ref-filter.c:351 #, c-format msgid "unrecognized %%(contents) argument: %s" msgstr "argument %%(contents) non reconnu : %s" -#: ref-filter.c:342 +#: ref-filter.c:366 #, c-format msgid "positive value expected objectname:short=%s" msgstr "valeur positive attendue objectname:short=%s" -#: ref-filter.c:346 +#: ref-filter.c:370 #, c-format msgid "unrecognized %%(objectname) argument: %s" msgstr "argument %%(objectname) non reconnu : %s" -#: ref-filter.c:376 +#: ref-filter.c:400 #, c-format msgid "expected format: %%(align:<width>,<position>)" msgstr "format attendu : %%(align:<largeur>,<position>)" -#: ref-filter.c:388 +#: ref-filter.c:412 #, c-format msgid "unrecognized position:%s" msgstr "position non reconnue : %s" -#: ref-filter.c:395 +#: ref-filter.c:419 #, c-format msgid "unrecognized width:%s" msgstr "largeur non reconnue : %s" -#: ref-filter.c:404 +#: ref-filter.c:428 #, c-format msgid "unrecognized %%(align) argument: %s" msgstr "argument %%(align) non reconnu : %s" -#: ref-filter.c:412 +#: ref-filter.c:436 #, c-format msgid "positive width expected with the %%(align) atom" msgstr "valeur positive attendue avec l'atome %%(align)" -#: ref-filter.c:430 +#: ref-filter.c:454 #, c-format msgid "unrecognized %%(if) argument: %s" msgstr "argument %%(if) non reconnu : %s" -#: ref-filter.c:531 +#: ref-filter.c:556 #, c-format msgid "malformed field name: %.*s" msgstr "nom de champ malformé %.*s" -#: ref-filter.c:558 +#: ref-filter.c:583 #, c-format msgid "unknown field name: %.*s" msgstr "nom de champ inconnu : %.*s" -#: ref-filter.c:562 +#: ref-filter.c:587 #, c-format msgid "" "not a git repository, but the field '%.*s' requires access to object data" msgstr "" "pas un dépôt git, mais le champ '%.*s' nécessite l'accès aux données d'objet" -#: ref-filter.c:686 +#: ref-filter.c:711 #, c-format msgid "format: %%(if) atom used without a %%(then) atom" msgstr "format : atome %%(if) utilisé sans un atome %%(then)" -#: ref-filter.c:749 +#: ref-filter.c:774 #, c-format msgid "format: %%(then) atom used without an %%(if) atom" msgstr "format : atome %%(then) utilisé sans un atome %%(if)" -#: ref-filter.c:751 +#: ref-filter.c:776 #, c-format msgid "format: %%(then) atom used more than once" msgstr "format : atome %%(then) utilisé plus d'une fois" -#: ref-filter.c:753 +#: ref-filter.c:778 #, c-format msgid "format: %%(then) atom used after %%(else)" msgstr "format: atome %%(then) utilisé après %%(else)" -#: ref-filter.c:781 +#: ref-filter.c:806 #, c-format msgid "format: %%(else) atom used without an %%(if) atom" msgstr "format : atome %%(else) utilisé sans un atome %%(if)" -#: ref-filter.c:783 +#: ref-filter.c:808 #, c-format msgid "format: %%(else) atom used without a %%(then) atom" msgstr "format : atome %%(else) utilisé sans un atome %%(then)" -#: ref-filter.c:785 +#: ref-filter.c:810 #, c-format msgid "format: %%(else) atom used more than once" msgstr "format : atome %%(else) utilisé plus d'une fois" -#: ref-filter.c:800 +#: ref-filter.c:825 #, c-format msgid "format: %%(end) atom used without corresponding atom" msgstr "format : atome %%(end) utilisé sans atome correspondant" -#: ref-filter.c:857 +#: ref-filter.c:882 #, c-format msgid "malformed format string %s" msgstr "Chaîne de formatage mal formée %s" -#: ref-filter.c:1453 +#: ref-filter.c:1485 #, c-format -msgid "(no branch, rebasing %s)" -msgstr "(aucune branche, rebasage de %s)" +msgid "no branch, rebasing %s" +msgstr "aucune branche, rebasage de %s" -#: ref-filter.c:1456 +#: ref-filter.c:1488 #, c-format -msgid "(no branch, rebasing detached HEAD %s)" -msgstr "(aucune branche, rebasage de la HEAD détachée %s)" +msgid "no branch, rebasing detached HEAD %s" +msgstr "aucune branche, rebasage de la HEAD détachée %s" -#: ref-filter.c:1459 +#: ref-filter.c:1491 #, c-format -msgid "(no branch, bisect started on %s)" -msgstr "(aucune branche, bisect a démarré sur %s)" +msgid "no branch, bisect started on %s" +msgstr "aucune branche, bisect a démarré sur %s" -#. TRANSLATORS: make sure this matches "HEAD -#. detached at " in wt-status.c -#. -#: ref-filter.c:1467 -#, c-format -msgid "(HEAD detached at %s)" -msgstr "(HEAD détachée sur %s)" +#: ref-filter.c:1501 +msgid "no branch" +msgstr "aucune branche" -#. TRANSLATORS: make sure this matches "HEAD -#. detached from " in wt-status.c -#. -#: ref-filter.c:1474 -#, c-format -msgid "(HEAD detached from %s)" -msgstr "(HEAD détachée depuis %s)" - -#: ref-filter.c:1478 -msgid "(no branch)" -msgstr "(aucune branche)" - -#: ref-filter.c:1512 ref-filter.c:1669 +#: ref-filter.c:1537 ref-filter.c:1743 #, c-format msgid "missing object %s for %s" msgstr "objet manquant %s pour %s" -#: ref-filter.c:1522 +#: ref-filter.c:1547 #, c-format msgid "parse_object_buffer failed on %s for %s" msgstr "échec de parse_object_buffer sur %s pour %s" -#: ref-filter.c:1888 +#: ref-filter.c:1998 #, c-format msgid "malformed object at '%s'" msgstr "objet malformé à '%s'" -#: ref-filter.c:1977 +#: ref-filter.c:2087 #, c-format msgid "ignoring ref with broken name %s" msgstr "réf avec un nom cassé %s ignoré" -#: ref-filter.c:2263 +#: ref-filter.c:2382 #, c-format msgid "format: %%(end) atom missing" msgstr "format: atome %%(end) manquant" -#: ref-filter.c:2363 +#: ref-filter.c:2482 #, c-format msgid "option `%s' is incompatible with --merged" msgstr "l'option « %s » est incompatible avec --merged" -#: ref-filter.c:2366 +#: ref-filter.c:2485 #, c-format msgid "option `%s' is incompatible with --no-merged" msgstr "l'option « %s » est incompatible avec --no-merged" -#: ref-filter.c:2376 +#: ref-filter.c:2495 #, c-format msgid "malformed object name %s" msgstr "nom d'objet malformé %s" -#: ref-filter.c:2381 +#: ref-filter.c:2500 #, c-format msgid "option `%s' must point to a commit" msgstr "l'option '%s' doit pointer sur un commit" @@ -5728,8 +5787,8 @@ msgstr "impossible de délier '%s' qui est errant" msgid "Recorded preimage for '%s'" msgstr "Pré-image enregistrée pour '%s'" -#: rerere.c:881 submodule.c:2024 builtin/log.c:1750 -#: builtin/submodule--helper.c:1417 builtin/submodule--helper.c:1427 +#: rerere.c:881 submodule.c:2023 builtin/log.c:1773 +#: builtin/submodule--helper.c:1418 builtin/submodule--helper.c:1428 #, c-format msgid "could not create directory '%s'" msgstr "impossible de créer le répertoire '%s'" @@ -5763,20 +5822,20 @@ msgstr "Résolution pour '%s' oubliée\n" msgid "unable to open rr-cache directory" msgstr "impossible d'ouvrir le répertoire rr-cache" -#: revision.c:2476 +#: revision.c:2507 msgid "your current branch appears to be broken" msgstr "votre branche actuelle semble cassée" -#: revision.c:2479 +#: revision.c:2510 #, c-format msgid "your current branch '%s' does not have any commits yet" msgstr "votre branche actuelle '%s' ne contient encore aucun commit" -#: revision.c:2679 +#: revision.c:2710 msgid "--first-parent is incompatible with --bisect" msgstr "--first-parent est incompatible avec --bisect" -#: revision.c:2683 +#: revision.c:2714 msgid "-L does not yet support diff formats besides -p and -s" msgstr "-L ne supporte pas encore les formats de diff autres que -p et -s" @@ -5849,24 +5908,29 @@ msgstr "mode de nettoyage invalide de message de validation '%s'" msgid "could not delete '%s'" msgstr "Impossible de supprimer '%s'" -#: sequencer.c:318 +#: sequencer.c:311 builtin/rebase.c:759 builtin/rebase.c:1645 builtin/rm.c:369 +#, c-format +msgid "could not remove '%s'" +msgstr "impossible de supprimer '%s'" + +#: sequencer.c:321 msgid "revert" msgstr "revert" -#: sequencer.c:320 +#: sequencer.c:323 msgid "cherry-pick" msgstr "cherry-pick" -#: sequencer.c:322 +#: sequencer.c:325 msgid "rebase -i" msgstr "rebase -i" -#: sequencer.c:324 +#: sequencer.c:327 #, c-format msgid "unknown action: %d" msgstr "action inconnue : %d" -#: sequencer.c:382 +#: sequencer.c:385 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'" @@ -5874,7 +5938,7 @@ msgstr "" "après résolution des conflits, marquez les chemins corrigés\n" "avec 'git add <chemins>' ou 'git rm <chemins>'" -#: sequencer.c:385 +#: sequencer.c:388 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'\n" @@ -5884,44 +5948,44 @@ msgstr "" "avec 'git add <chemins>' ou 'git rm <chemins>'\n" "puis validez le résultat avec 'git commit'" -#: sequencer.c:398 sequencer.c:2801 +#: sequencer.c:401 sequencer.c:2909 #, c-format msgid "could not lock '%s'" msgstr "impossible de verrouiller '%s'" -#: sequencer.c:405 +#: sequencer.c:408 #, c-format msgid "could not write eol to '%s'" msgstr "impossible d'écrire la fin de ligne dans '%s'" -#: sequencer.c:410 sequencer.c:2684 sequencer.c:2807 sequencer.c:2821 -#: sequencer.c:3084 +#: sequencer.c:413 sequencer.c:2714 sequencer.c:2915 sequencer.c:2929 +#: sequencer.c:3192 #, c-format msgid "failed to finalize '%s'" msgstr "échec lors de la finalisation de '%s'" -#: sequencer.c:433 sequencer.c:978 sequencer.c:1652 sequencer.c:2704 -#: sequencer.c:3066 sequencer.c:3175 builtin/am.c:245 builtin/commit.c:760 -#: builtin/merge.c:1115 builtin/rebase.c:567 +#: sequencer.c:436 sequencer.c:981 sequencer.c:1655 sequencer.c:2734 +#: sequencer.c:3174 sequencer.c:3283 builtin/am.c:245 builtin/commit.c:763 +#: builtin/merge.c:1112 builtin/rebase.c:567 #, c-format msgid "could not read '%s'" msgstr "impossible de lire '%s'" -#: sequencer.c:459 +#: sequencer.c:462 #, c-format msgid "your local changes would be overwritten by %s." msgstr "vos modifications locales seraient écrasées par %s." -#: sequencer.c:463 +#: sequencer.c:466 msgid "commit your changes or stash them to proceed." msgstr "validez vos modifications ou les remiser pour continuer." -#: sequencer.c:495 +#: sequencer.c:498 #, c-format msgid "%s: fast-forward" msgstr "%s : avance rapide" -#: sequencer.c:534 builtin/tag.c:555 +#: sequencer.c:537 builtin/tag.c:565 #, c-format msgid "Invalid cleanup mode %s" msgstr "Mode de nettoyage invalide %s" @@ -5929,70 +5993,70 @@ msgstr "Mode de nettoyage invalide %s" #. TRANSLATORS: %s will be "revert", "cherry-pick" or #. "rebase -i". #. -#: sequencer.c:629 +#: sequencer.c:632 #, c-format msgid "%s: Unable to write new index file" msgstr "%s: Impossible d'écrire le nouveau fichier index" -#: sequencer.c:646 +#: sequencer.c:649 msgid "unable to update cache tree" msgstr "impossible de mettre à jour l'arbre de cache" -#: sequencer.c:660 +#: sequencer.c:663 msgid "could not resolve HEAD commit" msgstr "impossible de résoudre le commit HEAD" -#: sequencer.c:740 +#: sequencer.c:743 #, c-format msgid "no key present in '%.*s'" msgstr "aucune clé présente dans '%.*s'" -#: sequencer.c:751 +#: sequencer.c:754 #, c-format msgid "unable to dequote value of '%s'" msgstr "Impossible de décoter la valeur de '%s'" -#: sequencer.c:788 wrapper.c:227 wrapper.c:397 builtin/am.c:706 -#: builtin/am.c:798 builtin/merge.c:1112 builtin/rebase.c:1035 +#: sequencer.c:791 wrapper.c:227 wrapper.c:397 builtin/am.c:706 +#: builtin/am.c:798 builtin/merge.c:1109 builtin/rebase.c:1045 #, c-format msgid "could not open '%s' for reading" msgstr "impossible d'ouvrir '%s' en lecture" -#: sequencer.c:798 +#: sequencer.c:801 msgid "'GIT_AUTHOR_NAME' already given" msgstr "'GIT_AUTHOR_NAME' déjà fourni" -#: sequencer.c:803 +#: sequencer.c:806 msgid "'GIT_AUTHOR_EMAIL' already given" msgstr "'GIT_AUTHOR_EMAIL' déjà fourni" -#: sequencer.c:808 +#: sequencer.c:811 msgid "'GIT_AUTHOR_DATE' already given" msgstr "'GIT_AUTHOR_DATE' déjà fourni" -#: sequencer.c:812 +#: sequencer.c:815 #, c-format msgid "unknown variable '%s'" msgstr "variable inconnue '%s'" -#: sequencer.c:817 +#: sequencer.c:820 msgid "missing 'GIT_AUTHOR_NAME'" msgstr "'GIT_AUTHOR_NAME' manquant" -#: sequencer.c:819 +#: sequencer.c:822 msgid "missing 'GIT_AUTHOR_EMAIL'" msgstr "'GIT_AUTHOR_EMAIL' manquant" -#: sequencer.c:821 +#: sequencer.c:824 msgid "missing 'GIT_AUTHOR_DATE'" msgstr "'GIT_AUTHOR_DATE' manquant" -#: sequencer.c:881 +#: sequencer.c:884 #, c-format msgid "invalid date format '%s' in '%s'" msgstr "format de date invalide '%s' dans '%s'" -#: sequencer.c:898 +#: sequencer.c:901 #, c-format msgid "" "you have staged changes in your working tree\n" @@ -6021,15 +6085,15 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c:992 +#: sequencer.c:995 msgid "writing root commit" msgstr "écriture du commit racine" -#: sequencer.c:1213 +#: sequencer.c:1216 msgid "'prepare-commit-msg' hook failed" msgstr "échec du crochet 'prepare-commit-msg'" -#: sequencer.c:1220 +#: sequencer.c:1223 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -6058,7 +6122,7 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: sequencer.c:1233 +#: sequencer.c:1236 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -6084,306 +6148,349 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: sequencer.c:1275 +#: sequencer.c:1278 msgid "couldn't look up newly created commit" msgstr "impossible de retrouver le commit nouvellement créé" -#: sequencer.c:1277 +#: sequencer.c:1280 msgid "could not parse newly created commit" msgstr "impossible d'analyser le commit nouvellement créé" -#: sequencer.c:1323 +#: sequencer.c:1326 msgid "unable to resolve HEAD after creating commit" msgstr "impossible de résoudre HEAD après création du commit" -#: sequencer.c:1325 +#: sequencer.c:1328 msgid "detached HEAD" msgstr "HEAD détachée" -#: sequencer.c:1329 +#: sequencer.c:1332 msgid " (root-commit)" msgstr " (commit racine)" -#: sequencer.c:1350 +#: sequencer.c:1353 msgid "could not parse HEAD" msgstr "impossible de lire HEAD" -#: sequencer.c:1352 +#: sequencer.c:1355 #, c-format msgid "HEAD %s is not a commit!" msgstr "HEAD %s n'est pas un commit !" -#: sequencer.c:1356 builtin/commit.c:1551 +#: sequencer.c:1359 builtin/commit.c:1571 msgid "could not parse HEAD commit" msgstr "impossible d'analyser le commit HEAD" -#: sequencer.c:1408 sequencer.c:2001 +#: sequencer.c:1411 sequencer.c:2004 msgid "unable to parse commit author" msgstr "impossible d'analyser l'auteur du commit" -#: sequencer.c:1418 builtin/am.c:1572 builtin/merge.c:688 +#: sequencer.c:1421 builtin/am.c:1573 builtin/merge.c:684 msgid "git write-tree failed to write a tree" msgstr "git write-tree a échoué à écrire un arbre" -#: sequencer.c:1435 sequencer.c:1496 +#: sequencer.c:1438 sequencer.c:1499 #, c-format msgid "unable to read commit message from '%s'" msgstr "impossible de lire le message de validation de '%s'" -#: sequencer.c:1462 builtin/am.c:1594 builtin/commit.c:1650 builtin/merge.c:882 -#: builtin/merge.c:906 +#: sequencer.c:1465 builtin/am.c:1595 builtin/commit.c:1670 builtin/merge.c:878 +#: builtin/merge.c:903 msgid "failed to write commit object" msgstr "échec de l'écriture de l'objet commit" -#: sequencer.c:1523 +#: sequencer.c:1526 #, c-format msgid "could not parse commit %s" msgstr "impossible d'analyser le commit %s" -#: sequencer.c:1528 +#: sequencer.c:1531 #, c-format msgid "could not parse parent commit %s" msgstr "impossible d'analyser le commit parent %s" -#: sequencer.c:1602 sequencer.c:1712 +#: sequencer.c:1605 sequencer.c:1715 #, c-format msgid "unknown command: %d" msgstr "commande inconnue : %d" -#: sequencer.c:1659 sequencer.c:1684 +#: sequencer.c:1662 sequencer.c:1687 #, c-format msgid "This is a combination of %d commits." msgstr "Ceci est la combinaison de %d commits." -#: sequencer.c:1669 +#: sequencer.c:1672 msgid "need a HEAD to fixup" msgstr "une HEAD est nécessaire à la correction" -#: sequencer.c:1671 sequencer.c:3111 +#: sequencer.c:1674 sequencer.c:3219 msgid "could not read HEAD" msgstr "Impossible de lire HEAD" -#: sequencer.c:1673 +#: sequencer.c:1676 msgid "could not read HEAD's commit message" msgstr "impossible de lire le message de validation de HEAD" -#: sequencer.c:1679 +#: sequencer.c:1682 #, c-format msgid "cannot write '%s'" msgstr "impossible d'écrire '%s'" -#: sequencer.c:1686 git-rebase--preserve-merges.sh:441 +#: sequencer.c:1689 git-rebase--preserve-merges.sh:496 msgid "This is the 1st commit message:" msgstr "Ceci est le premier message de validation :" -#: sequencer.c:1694 +#: sequencer.c:1697 #, c-format msgid "could not read commit message of %s" msgstr "impossible de lire le message de validation de %s" -#: sequencer.c:1701 +#: sequencer.c:1704 #, c-format msgid "This is the commit message #%d:" msgstr "Ceci est le message de validation numéro %d :" -#: sequencer.c:1707 +#: sequencer.c:1710 #, c-format msgid "The commit message #%d will be skipped:" msgstr "Le message de validation %d sera ignoré :" -#: sequencer.c:1795 +#: sequencer.c:1798 msgid "your index file is unmerged." msgstr "votre fichier d'index n'est pas fusionné." -#: sequencer.c:1802 +#: sequencer.c:1805 msgid "cannot fixup root commit" msgstr "impossible de réparer le commit racine" -#: sequencer.c:1821 +#: sequencer.c:1824 #, c-format msgid "commit %s is a merge but no -m option was given." msgstr "le commit %s est une fusion mais l'option -m n'a pas été spécifiée." -#: sequencer.c:1829 sequencer.c:1837 +#: sequencer.c:1832 sequencer.c:1840 #, c-format msgid "commit %s does not have parent %d" msgstr "le commit %s n'a pas de parent %d" -#: sequencer.c:1843 +#: sequencer.c:1846 #, c-format msgid "cannot get commit message for %s" msgstr "impossible d'obtenir un message de validation pour %s" #. TRANSLATORS: The first %s will be a "todo" command like #. "revert" or "pick", the second %s a SHA1. -#: sequencer.c:1862 +#: sequencer.c:1865 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s : impossible d'analyser le commit parent %s" -#: sequencer.c:1927 +#: sequencer.c:1930 #, c-format msgid "could not rename '%s' to '%s'" msgstr "impossible de renommer '%s' en '%s'" -#: sequencer.c:1982 +#: sequencer.c:1985 #, c-format msgid "could not revert %s... %s" msgstr "impossible d'annuler %s... %s" -#: sequencer.c:1983 +#: sequencer.c:1986 #, c-format msgid "could not apply %s... %s" msgstr "impossible d'appliquer %s... %s" -#: sequencer.c:2042 +#: sequencer.c:2045 #, c-format msgid "git %s: failed to read the index" msgstr "git %s : échec à la lecture de l'index" -#: sequencer.c:2049 +#: sequencer.c:2052 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s : échec du rafraîchissement de l'index" -#: sequencer.c:2118 +#: sequencer.c:2128 #, c-format msgid "%s does not accept arguments: '%s'" msgstr "%s n'accepte pas d'argument : '%s'" -#: sequencer.c:2127 +#: sequencer.c:2137 #, c-format msgid "missing arguments for %s" msgstr "argument manquant pour %s" -#: sequencer.c:2164 +#: sequencer.c:2174 #, c-format msgid "could not parse '%.*s'" msgstr "impossible d'analyser '%.*s'" -#: sequencer.c:2226 +#: sequencer.c:2228 #, c-format msgid "invalid line %d: %.*s" msgstr "ligne %d invalide : %.*s" -#: sequencer.c:2237 +#: sequencer.c:2239 #, c-format msgid "cannot '%s' without a previous commit" msgstr "'%s' impossible avec le commit précédent" -#: sequencer.c:2285 builtin/rebase.c:153 builtin/rebase.c:178 +#: sequencer.c:2287 builtin/rebase.c:153 builtin/rebase.c:178 #: builtin/rebase.c:204 builtin/rebase.c:229 #, c-format msgid "could not read '%s'." msgstr "impossible de lire '%s'." -#: sequencer.c:2360 +#: sequencer.c:2323 +msgid "cancelling a cherry picking in progress" +msgstr "annulation d'un picorage en cours" + +#: sequencer.c:2330 +msgid "cancelling a revert in progress" +msgstr "annulation d'un retour en cours" + +#: sequencer.c:2364 msgid "please fix this using 'git rebase --edit-todo'." msgstr "veuillez corriger ceci en utilisant 'git rebase --edit-todo'." -#: sequencer.c:2362 +#: sequencer.c:2366 #, c-format msgid "unusable instruction sheet: '%s'" msgstr "feuille d'instruction inutilisable : '%s'" -#: sequencer.c:2367 +#: sequencer.c:2371 msgid "no commits parsed." msgstr "aucun commit analysé." -#: sequencer.c:2378 +#: sequencer.c:2382 msgid "cannot cherry-pick during a revert." msgstr "impossible de picorer pendant l'annulation d'un commit." -#: sequencer.c:2380 +#: sequencer.c:2384 msgid "cannot revert during a cherry-pick." msgstr "impossible d'annuler un commit pendant un picorage." -#: sequencer.c:2462 +#: sequencer.c:2466 #, c-format msgid "invalid value for %s: %s" msgstr "valeur invalide pour %s : %s" -#: sequencer.c:2549 +#: sequencer.c:2553 msgid "unusable squash-onto" msgstr "\"écrase-sur\" inutilisable" -#: sequencer.c:2565 +#: sequencer.c:2569 #, c-format msgid "malformed options sheet: '%s'" msgstr "feuille d'options malformée : %s" -#: sequencer.c:2648 sequencer.c:4227 +#: sequencer.c:2652 sequencer.c:4351 msgid "empty commit set passed" msgstr "l'ensemble de commits spécifié est vide" -#: sequencer.c:2656 -msgid "a cherry-pick or revert is already in progress" -msgstr "un picorage ou un retour est déjà en cours" +#: sequencer.c:2668 +msgid "revert is already in progress" +msgstr "un retour est déjà en cours" + +#: sequencer.c:2670 +#, c-format +msgid "try \"git revert (--continue | %s--abort | --quit)\"" +msgstr "essayez \"git revert (--continue | %s--abort | --quit)\"" -#: sequencer.c:2657 -msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" -msgstr "essayez \"git cherry-pick (--continue | --quit | --abort)\"" +#: sequencer.c:2673 +msgid "cherry-pick is already in progress" +msgstr "un picorage est déjà en cours" -#: sequencer.c:2660 +#: sequencer.c:2675 +#, c-format +msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\"" +msgstr "essayez \"git cherry-pick (--continue | %s--abort | --quit)\"" + +#: sequencer.c:2689 #, c-format msgid "could not create sequencer directory '%s'" msgstr "impossible de créer le répertoire de séquenceur '%s'" -#: sequencer.c:2674 +#: sequencer.c:2704 msgid "could not lock HEAD" msgstr "impossible de verrouiller HEAD" -#: sequencer.c:2729 sequencer.c:3979 +#: sequencer.c:2764 sequencer.c:4103 msgid "no cherry-pick or revert in progress" msgstr "aucun picorage ou retour en cours" -#: sequencer.c:2731 +#: sequencer.c:2766 sequencer.c:2777 msgid "cannot resolve HEAD" msgstr "impossible de résoudre HEAD" -#: sequencer.c:2733 sequencer.c:2768 +#: sequencer.c:2768 sequencer.c:2812 msgid "cannot abort from a branch yet to be born" msgstr "impossible d'abandonner depuis une branche non encore créée" -#: sequencer.c:2754 builtin/grep.c:732 +#: sequencer.c:2798 builtin/grep.c:734 #, c-format msgid "cannot open '%s'" msgstr "impossible d'ouvrir '%s'" -#: sequencer.c:2756 +#: sequencer.c:2800 #, c-format msgid "cannot read '%s': %s" msgstr "impossible de lire '%s' : %s" -#: sequencer.c:2757 +#: sequencer.c:2801 msgid "unexpected end of file" msgstr "fin de fichier inattendue" -#: sequencer.c:2763 +#: sequencer.c:2807 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "le fichier HEAD de préparation de picorage '%s' est corrompu" -#: sequencer.c:2774 +#: sequencer.c:2818 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!" msgstr "" "Vous semblez avoir déplacé la HEAD. Pas de rembobinage, vérifiez votre HEAD !" -#: sequencer.c:2903 sequencer.c:3894 +#: sequencer.c:2859 +msgid "no revert in progress" +msgstr "Pas de retour en cours ?" + +#: sequencer.c:2867 +msgid "no cherry-pick in progress" +msgstr "aucun picorage en cours" + +#: sequencer.c:2877 +msgid "failed to skip the commit" +msgstr "échec du saut de commit" + +#: sequencer.c:2884 +msgid "there is nothing to skip" +msgstr "il n'y a rien à sauter" + +#: sequencer.c:2887 +#, c-format +msgid "" +"have you committed already?\n" +"try \"git %s --continue\"" +msgstr "" +"Avez-vous déjà validé ?\n" +"essayez \"git %s -continue\"" + +#: sequencer.c:3011 sequencer.c:4015 #, c-format msgid "could not update %s" msgstr "impossible de mettre à jour %s" -#: sequencer.c:2941 sequencer.c:3874 +#: sequencer.c:3049 sequencer.c:3995 msgid "cannot read HEAD" msgstr "impossible de lire HEAD" -#: sequencer.c:2958 +#: sequencer.c:3066 #, c-format msgid "unable to copy '%s' to '%s'" msgstr "impossible de copier '%s' vers '%s'" -#: sequencer.c:2966 +#: sequencer.c:3074 #, c-format msgid "" "You can amend the commit now, with\n" @@ -6402,27 +6509,27 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c:2976 +#: sequencer.c:3084 #, c-format msgid "Could not apply %s... %.*s" msgstr "impossible d'appliquer %s... %.*s" -#: sequencer.c:2983 +#: sequencer.c:3091 #, c-format msgid "Could not merge %.*s" msgstr "Impossible de fusionner %.*s" -#: sequencer.c:2997 sequencer.c:3001 builtin/difftool.c:633 +#: sequencer.c:3105 sequencer.c:3109 builtin/difftool.c:633 #, c-format msgid "could not copy '%s' to '%s'" msgstr "impossible de copier '%s' vers '%s'" -#: sequencer.c:3023 sequencer.c:3446 builtin/rebase.c:839 builtin/rebase.c:1580 -#: builtin/rebase.c:1940 builtin/rebase.c:1995 +#: sequencer.c:3131 sequencer.c:3558 builtin/rebase.c:849 builtin/rebase.c:1582 +#: builtin/rebase.c:1953 builtin/rebase.c:2008 msgid "could not read index" msgstr "impossible de lire l'index" -#: sequencer.c:3028 +#: sequencer.c:3136 #, c-format msgid "" "execution failed: %s\n" @@ -6437,11 +6544,11 @@ msgstr "" "git rebase --continue\n" "\n" -#: sequencer.c:3034 +#: sequencer.c:3142 msgid "and made changes to the index and/or the working tree\n" msgstr "et a mis à jour l'index ou l'arbre de travail\n" -#: sequencer.c:3040 +#: sequencer.c:3148 #, c-format msgid "" "execution succeeded: %s\n" @@ -6458,77 +6565,77 @@ msgstr "" " git rebase --continue\n" "\n" -#: sequencer.c:3101 +#: sequencer.c:3209 #, c-format msgid "illegal label name: '%.*s'" msgstr "nom de label illégal '%.*s'" -#: sequencer.c:3155 +#: sequencer.c:3263 msgid "writing fake root commit" msgstr "écriture d'un commit racine bidon" -#: sequencer.c:3160 +#: sequencer.c:3268 msgid "writing squash-onto" msgstr "écriture de 'écraser-sur'" -#: sequencer.c:3198 builtin/rebase.c:844 builtin/rebase.c:850 +#: sequencer.c:3306 builtin/rebase.c:854 builtin/rebase.c:860 #, c-format msgid "failed to find tree of %s" msgstr "impossible de trouver l'arbre de %s" -#: sequencer.c:3216 builtin/rebase.c:863 +#: sequencer.c:3324 builtin/rebase.c:873 msgid "could not write index" msgstr "impossible d'écrire l'index" -#: sequencer.c:3243 +#: sequencer.c:3351 #, c-format msgid "could not resolve '%s'" msgstr "impossible de résoudre '%s'" -#: sequencer.c:3271 +#: sequencer.c:3379 msgid "cannot merge without a current revision" msgstr "impossible de fusionner avec une révision courante" -#: sequencer.c:3293 +#: sequencer.c:3401 #, c-format msgid "unable to parse '%.*s'" msgstr "impossible d'analyser '%.*s'" -#: sequencer.c:3302 +#: sequencer.c:3410 #, c-format msgid "nothing to merge: '%.*s'" msgstr "rien à fusionner : '%.*s'" -#: sequencer.c:3314 +#: sequencer.c:3422 msgid "octopus merge cannot be executed on top of a [new root]" msgstr "" "une fusion octopus ne peut pas être exécutée par dessus une nouvelle racine" -#: sequencer.c:3329 +#: sequencer.c:3437 #, c-format msgid "could not get commit message of '%s'" msgstr "impossible de lire le message de validation de '%s'" -#: sequencer.c:3478 +#: sequencer.c:3590 #, c-format msgid "could not even attempt to merge '%.*s'" msgstr "impossible de seulement essayer de fusionner '%.*s'" -#: sequencer.c:3494 +#: sequencer.c:3606 msgid "merge: Unable to write new index file" msgstr "fusion : Impossible d'écrire le nouveau fichier index" -#: sequencer.c:3562 builtin/rebase.c:711 +#: sequencer.c:3675 builtin/rebase.c:711 #, c-format msgid "Applied autostash.\n" msgstr "Autoremisage appliqué.\n" -#: sequencer.c:3574 +#: sequencer.c:3687 #, c-format msgid "cannot store %s" msgstr "impossible de stocker %s" -#: sequencer.c:3577 builtin/rebase.c:727 +#: sequencer.c:3690 builtin/rebase.c:727 git-rebase--preserve-merges.sh:113 #, c-format msgid "" "Applying autostash resulted in conflicts.\n" @@ -6539,31 +6646,31 @@ msgstr "" "Vos modifications sont à l'abri dans la remise.\n" "Vous pouvez lancer \"git stash pop\" ou \"git stash drop\" à tout moment.\n" -#: sequencer.c:3638 +#: sequencer.c:3751 #, c-format msgid "could not checkout %s" msgstr "extraction de %s impossible" -#: sequencer.c:3652 +#: sequencer.c:3765 #, c-format msgid "%s: not a valid OID" msgstr "%s n'est pas un OID valide" -#: sequencer.c:3657 git-rebase--preserve-merges.sh:724 +#: sequencer.c:3770 git-rebase--preserve-merges.sh:779 msgid "could not detach HEAD" msgstr "Impossible de détacher HEAD" -#: sequencer.c:3672 +#: sequencer.c:3785 #, c-format msgid "Stopped at HEAD\n" msgstr "arrêt à HEAD\n" -#: sequencer.c:3674 +#: sequencer.c:3787 #, c-format msgid "Stopped at %s\n" msgstr "Arrêté à %s\n" -#: sequencer.c:3682 +#: sequencer.c:3795 #, c-format msgid "" "Could not execute the todo command\n" @@ -6584,48 +6691,48 @@ msgstr "" " git rebase --edit-todo\n" " git rebase --continue\n" -#: sequencer.c:3759 +#: sequencer.c:3877 #, c-format msgid "Stopped at %s... %.*s\n" msgstr "arrêt à %s... %.*s\n" -#: sequencer.c:3837 +#: sequencer.c:3958 #, c-format msgid "unknown command %d" msgstr "commande inconnue %d" -#: sequencer.c:3882 +#: sequencer.c:4003 msgid "could not read orig-head" msgstr "impossible de lire orig-head" -#: sequencer.c:3887 +#: sequencer.c:4008 msgid "could not read 'onto'" msgstr "impossible de lire 'onto'" -#: sequencer.c:3901 +#: sequencer.c:4022 #, c-format msgid "could not update HEAD to %s" msgstr "impossible de mettre à jour HEAD sur %s" -#: sequencer.c:3991 +#: sequencer.c:4115 msgid "cannot rebase: You have unstaged changes." msgstr "impossible de rebaser : vous avez des modifications non indexées." -#: sequencer.c:4000 +#: sequencer.c:4124 msgid "cannot amend non-existing commit" msgstr "impossible de corriger un commit non-existant" -#: sequencer.c:4002 +#: sequencer.c:4126 #, c-format msgid "invalid file: '%s'" msgstr "fichier invalide : '%s'" -#: sequencer.c:4004 +#: sequencer.c:4128 #, c-format msgid "invalid contents: '%s'" msgstr "contenu invalide : '%s'" -#: sequencer.c:4007 +#: sequencer.c:4131 msgid "" "\n" "You have uncommitted changes in your working tree. Please, commit them\n" @@ -6635,42 +6742,42 @@ msgstr "" "Vous avez des modifications non validées dans votre copie de travail.\n" "Veuillez les valider d'abord, puis relancer 'git rebase --continue'." -#: sequencer.c:4043 sequencer.c:4081 +#: sequencer.c:4167 sequencer.c:4205 #, c-format msgid "could not write file: '%s'" msgstr "impossible d'écrire le fichier : '%s'" -#: sequencer.c:4096 +#: sequencer.c:4220 msgid "could not remove CHERRY_PICK_HEAD" msgstr "impossible de supprimer CHERRY_PICK_HEAD" -#: sequencer.c:4103 +#: sequencer.c:4227 msgid "could not commit staged changes." msgstr "impossible de valider les modifications indexées." -#: sequencer.c:4204 +#: sequencer.c:4328 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s : impossible de picorer un %s" -#: sequencer.c:4208 +#: sequencer.c:4332 #, c-format msgid "%s: bad revision" msgstr "%s : mauvaise révision" -#: sequencer.c:4243 +#: sequencer.c:4367 msgid "can't revert as initial commit" msgstr "impossible d'annuler en tant que commit initial" -#: sequencer.c:4686 +#: sequencer.c:4810 msgid "make_script: unhandled options" msgstr "make_script : options non gérées" -#: sequencer.c:4689 +#: sequencer.c:4813 msgid "make_script: error preparing revisions" msgstr "make_script : erreur lors de la préparation des révisions" -#: sequencer.c:4847 +#: sequencer.c:4971 msgid "" "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --" "continue'.\n" @@ -6680,15 +6787,15 @@ msgstr "" "rebase --continue'.\n" "Ou vous pouvez abandonner le rebasage avec 'git rebase --abort'.\n" -#: sequencer.c:4959 sequencer.c:4976 +#: sequencer.c:5083 sequencer.c:5100 msgid "nothing to do" msgstr "rien à faire" -#: sequencer.c:4990 +#: sequencer.c:5114 msgid "could not skip unnecessary pick commands" msgstr "impossible d'éviter les commandes de picorage non nécessaires" -#: sequencer.c:5073 +#: sequencer.c:5197 msgid "the script was already rearranged." msgstr "le script a déjà été réarrangé." @@ -6916,195 +7023,200 @@ msgstr "le dépôt de référence '%s' est superficiel" msgid "reference repository '%s' is grafted" msgstr "le dépôt de référence '%s' est greffé" -#: sha1-file.c:846 +#: sha1-file.c:792 +#, c-format +msgid "invalid line while parsing alternate refs: %s" +msgstr "ligne invalide pendant l'analyse des refs alternatives : %s" + +#: sha1-file.c:944 #, c-format msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>" msgstr "essai de mmap %<PRIuMAX> au delà de la limite %<PRIuMAX>" -#: sha1-file.c:871 +#: sha1-file.c:969 msgid "mmap failed" msgstr "échec de mmap" -#: sha1-file.c:1035 +#: sha1-file.c:1133 #, c-format msgid "object file %s is empty" msgstr "le fichier objet %s est vide" -#: sha1-file.c:1159 sha1-file.c:2297 +#: sha1-file.c:1257 sha1-file.c:2396 #, c-format msgid "corrupt loose object '%s'" msgstr "objet libre corrompu '%s'" -#: sha1-file.c:1161 sha1-file.c:2301 +#: sha1-file.c:1259 sha1-file.c:2400 #, c-format msgid "garbage at end of loose object '%s'" msgstr "données incorrectes à la fin de l'objet libre '%s'" -#: sha1-file.c:1203 +#: sha1-file.c:1301 msgid "invalid object type" msgstr "type d'objet invalide" -#: sha1-file.c:1287 +#: sha1-file.c:1385 #, c-format msgid "unable to unpack %s header with --allow-unknown-type" msgstr "impossible de dépaqueter l'entête %s avec --allow-unknow-type" -#: sha1-file.c:1290 +#: sha1-file.c:1388 #, c-format msgid "unable to unpack %s header" msgstr "impossible de dépaqueter l'entête %s" -#: sha1-file.c:1296 +#: sha1-file.c:1394 #, c-format msgid "unable to parse %s header with --allow-unknown-type" msgstr "impossible d'analyser l'entête %s avec --allow-unknow-type" -#: sha1-file.c:1299 +#: sha1-file.c:1397 #, c-format msgid "unable to parse %s header" msgstr "impossible d'analyser l'entête %s" -#: sha1-file.c:1490 +#: sha1-file.c:1588 #, c-format msgid "failed to read object %s" msgstr "impossible de lire l'objet %s" -#: sha1-file.c:1494 +#: sha1-file.c:1592 #, c-format msgid "replacement %s not found for %s" msgstr "remplacement %s non trouvé pour %s" -#: sha1-file.c:1498 +#: sha1-file.c:1596 #, c-format msgid "loose object %s (stored in %s) is corrupt" msgstr "l'objet libre %s (stocké dans %s) est corrompu" -#: sha1-file.c:1502 +#: sha1-file.c:1600 #, c-format msgid "packed object %s (stored in %s) is corrupt" msgstr "l'objet empaqueté %s (stocké dans %s) est corrompu" -#: sha1-file.c:1604 +#: sha1-file.c:1703 #, c-format msgid "unable to write file %s" msgstr "impossible d'écrire le fichier %s" -#: sha1-file.c:1611 +#: sha1-file.c:1710 #, c-format msgid "unable to set permission to '%s'" msgstr "impossible de régler les droits de '%s'" -#: sha1-file.c:1618 +#: sha1-file.c:1717 msgid "file write error" msgstr "erreur d'écriture d'un fichier" -#: sha1-file.c:1637 +#: sha1-file.c:1736 msgid "error when closing loose object file" msgstr "erreur en fermeture du fichier d'objet esseulé" -#: sha1-file.c:1702 +#: sha1-file.c:1801 #, c-format msgid "insufficient permission for adding an object to repository database %s" msgstr "" "droits insuffisants pour ajouter un objet à la base de données %s du dépôt" -#: sha1-file.c:1704 +#: sha1-file.c:1803 msgid "unable to create temporary file" msgstr "impossible de créer un fichier temporaire" -#: sha1-file.c:1728 +#: sha1-file.c:1827 msgid "unable to write loose object file" msgstr "impossible d'écrire le fichier d'objet esseulé" -#: sha1-file.c:1734 +#: sha1-file.c:1833 #, c-format msgid "unable to deflate new object %s (%d)" msgstr "impossible de compresser le nouvel objet %s (%d)" -#: sha1-file.c:1738 +#: sha1-file.c:1837 #, c-format msgid "deflateEnd on object %s failed (%d)" msgstr "échec de deflateEnd sur l'objet %s (%d)" -#: sha1-file.c:1742 +#: sha1-file.c:1841 #, c-format msgid "confused by unstable object source data for %s" msgstr "données de source d'objet instable pour %s" -#: sha1-file.c:1752 builtin/pack-objects.c:920 +#: sha1-file.c:1851 builtin/pack-objects.c:925 #, c-format msgid "failed utime() on %s" msgstr "échec de utime() sur %s" -#: sha1-file.c:1827 +#: sha1-file.c:1926 #, c-format msgid "cannot read object for %s" msgstr "impossible de lire l'objet pour %s" -#: sha1-file.c:1867 +#: sha1-file.c:1966 msgid "corrupt commit" msgstr "commit corrompu" -#: sha1-file.c:1875 +#: sha1-file.c:1974 msgid "corrupt tag" msgstr "étiquette corrompue" -#: sha1-file.c:1974 +#: sha1-file.c:2073 #, c-format msgid "read error while indexing %s" msgstr "erreur de lecture à l'indexation de %s" -#: sha1-file.c:1977 +#: sha1-file.c:2076 #, c-format msgid "short read while indexing %s" msgstr "lecture tronquée pendant l'indexation de %s" -#: sha1-file.c:2050 sha1-file.c:2059 +#: sha1-file.c:2149 sha1-file.c:2158 #, c-format msgid "%s: failed to insert into database" msgstr "%s : échec de l'insertion dans la base de données" -#: sha1-file.c:2065 +#: sha1-file.c:2164 #, c-format msgid "%s: unsupported file type" msgstr "%s : type de fichier non supporté" -#: sha1-file.c:2089 +#: sha1-file.c:2188 #, c-format msgid "%s is not a valid object" msgstr "%s n'est pas un objet valide" -#: sha1-file.c:2091 +#: sha1-file.c:2190 #, c-format msgid "%s is not a valid '%s' object" msgstr "%s n'est pas un objet '%s' valide" -#: sha1-file.c:2118 builtin/index-pack.c:154 +#: sha1-file.c:2217 builtin/index-pack.c:155 #, c-format msgid "unable to open %s" msgstr "impossible d'ouvrir %s" -#: sha1-file.c:2308 sha1-file.c:2360 +#: sha1-file.c:2407 sha1-file.c:2459 #, c-format msgid "hash mismatch for %s (expected %s)" msgstr "incohérence de hachage pour %s (%s attendu)" -#: sha1-file.c:2332 +#: sha1-file.c:2431 #, c-format msgid "unable to mmap %s" msgstr "impossible de mmap %s" -#: sha1-file.c:2337 +#: sha1-file.c:2436 #, c-format msgid "unable to unpack header of %s" msgstr "impossible de dépaqueter l'entête de %s" -#: sha1-file.c:2343 +#: sha1-file.c:2442 #, c-format msgid "unable to parse header of %s" msgstr "impossible d'analyser l'entête de %s" -#: sha1-file.c:2354 +#: sha1-file.c:2453 #, c-format msgid "unable to unpack contents of %s" msgstr "impossible de dépaqueter le contenu de %s" @@ -7124,18 +7236,17 @@ msgid "" "because it will be ignored when you just specify 40-hex. These refs\n" "may be created by mistake. For example,\n" "\n" -" git checkout -b $br $(git rev-parse ...)\n" +" git switch -c $br $(git rev-parse ...)\n" "\n" "where \"$br\" is somehow empty and a 40-hex ref is created. Please\n" "examine these refs and maybe delete them. Turn this message off by\n" "running \"git config advice.objectNameWarning false\"" msgstr "" -"Git ne crée normalement jamais de référence qui se termine par 40 caractères " -"hexa\n" -"car elle serait ignorée si vous spécifiiez 40-hexa. Ces références\n" -"peuvent être créées par erreur. Par exemple,\n" +"Git ne crée normalement jamais de référence qui se termine par 40\n" +"caractères hexa car elle serait ignorée si vous spécifiez juste\n" +"40-hexa. Ces références peuvent être créées par erreur. Par exemple,\n" "\n" -" git checkout -b $br $(git rev-parse ...)\n" +" git switch -c $br $(git rev-parse ...)\n" "\n" "où \"$br\" est d'une manière ou d'une autre vide et une référence 40-hexa " "est créée.\n" @@ -7143,6 +7254,58 @@ msgstr "" "message\n" "en lançant \"git config advice.objectNameWarning false\"" +#. TRANSLATORS: IEC 80000-13:2008 gibibyte +#: strbuf.c:821 +#, c-format +msgid "%u.%2.2u GiB" +msgstr "%u.%2.2u Gio" + +#. TRANSLATORS: IEC 80000-13:2008 gibibyte/second +#: strbuf.c:823 +#, c-format +msgid "%u.%2.2u GiB/s" +msgstr "%u.%2.2u Gio/s" + +#. TRANSLATORS: IEC 80000-13:2008 mebibyte +#: strbuf.c:831 +#, c-format +msgid "%u.%2.2u MiB" +msgstr "%u.%2.2u Mio" + +#. TRANSLATORS: IEC 80000-13:2008 mebibyte/second +#: strbuf.c:833 +#, c-format +msgid "%u.%2.2u MiB/s" +msgstr "%u.%2.2u Mio/s" + +#. TRANSLATORS: IEC 80000-13:2008 kibibyte +#: strbuf.c:840 +#, c-format +msgid "%u.%2.2u KiB" +msgstr "%u.%2.2u Kio" + +#. TRANSLATORS: IEC 80000-13:2008 kibibyte/second +#: strbuf.c:842 +#, c-format +msgid "%u.%2.2u KiB/s" +msgstr "%u.%2.2u Kio/s" + +#. TRANSLATORS: IEC 80000-13:2008 byte +#: strbuf.c:848 +#, c-format +msgid "%u byte" +msgid_plural "%u bytes" +msgstr[0] "%u octet" +msgstr[1] "%u octets" + +#. TRANSLATORS: IEC 80000-13:2008 byte/second +#: strbuf.c:850 +#, c-format +msgid "%u byte/s" +msgid_plural "%u bytes/s" +msgstr[0] "%u octet/s" +msgstr[1] "%u octets/s" + #: submodule.c:114 submodule.c:143 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" msgstr "" @@ -7179,7 +7342,7 @@ msgstr "Le chemin '%s' est dans le sous-module '%.*s'" msgid "submodule entry '%s' (%s) is a %s, not a commit" msgstr "l'entrée de sous-module '%s' (%s) est un %s, pas un commit" -#: submodule.c:1147 builtin/branch.c:672 builtin/submodule--helper.c:1988 +#: submodule.c:1147 builtin/branch.c:680 builtin/submodule--helper.c:1989 msgid "Failed to resolve HEAD as a valid ref." msgstr "Échec de résolution de HEAD comme référence valide." @@ -7218,7 +7381,7 @@ msgstr "le sous-module '%s' a un index sale" msgid "Submodule '%s' could not be updated." msgstr "le sous-module '%s' n'a pas pu être mis à jour." -#: submodule.c:2008 +#: submodule.c:2007 #, c-format msgid "" "relocate_gitdir for submodule '%s' with more than one worktree not supported" @@ -7226,12 +7389,12 @@ msgstr "" "relocate_gitdir pour le sous-module '%s' avec plus d'un arbre de travail " "n'est pas supporté" -#: submodule.c:2020 submodule.c:2076 +#: submodule.c:2019 submodule.c:2074 #, c-format msgid "could not lookup name for submodule '%s'" msgstr "impossible de trouve le nom pour le sous-module '%s'" -#: submodule.c:2027 +#: submodule.c:2026 #, c-format msgid "" "Migrating git directory of '%s%s' from\n" @@ -7242,16 +7405,16 @@ msgstr "" "'%s' sur\n" "'%s'\n" -#: submodule.c:2111 +#: submodule.c:2109 #, c-format msgid "could not recurse into submodule '%s'" msgstr "récursion impossible dans le sous-module '%s'" -#: submodule.c:2155 +#: submodule.c:2153 msgid "could not start ls-files in .." msgstr "impossible de démarrer ls-files dans .." -#: submodule.c:2194 +#: submodule.c:2192 #, c-format msgid "ls-tree returned unexpected return code %d" msgstr "ls-tree a renvoyé un code de retour inattendu %d" @@ -7425,15 +7588,10 @@ msgstr "Abandon." msgid "failed to push all needed submodules" msgstr "échec de la poussée de tous les sous-modules nécessaires" -#: transport.c:1326 transport-helper.c:645 +#: transport.c:1340 transport-helper.c:645 msgid "operation not supported by protocol" msgstr "option non supportée par le protocole" -#: transport.c:1430 -#, c-format -msgid "invalid line while parsing alternate refs: %s" -msgstr "ligne invalide pendant l'analyse des refs alternatives : %s" - #: transport-helper.c:51 transport-helper.c:80 msgid "full write to remote helper failed" msgstr "échec de l'écriture totale sur l'assistant distant" @@ -7479,7 +7637,7 @@ msgstr "impossible de lancer fast-import" msgid "error while running fast-import" msgstr "erreur au lancement de fast-import" -#: transport-helper.c:533 transport-helper.c:1099 +#: transport-helper.c:533 transport-helper.c:1105 #, c-format msgid "could not read ref %s" msgstr "impossible de lire la réf %s" @@ -7534,26 +7692,26 @@ msgstr "l'assistant %s ne gère pas --signed=if-asked" msgid "helper %s does not support 'push-option'" msgstr "l'assistant %s ne gère pas 'push-option'" -#: transport-helper.c:939 +#: transport-helper.c:945 msgid "remote-helper doesn't support push; refspec needed" msgstr "" "l'assistant %s ne gère pas push ; un spécificateur de référence est " "nécessaire" -#: transport-helper.c:944 +#: transport-helper.c:950 #, c-format msgid "helper %s does not support 'force'" msgstr "l'assistant %s ne gère pas 'force'" -#: transport-helper.c:991 +#: transport-helper.c:997 msgid "couldn't run fast-export" msgstr "impossible de lancer fast-export" -#: transport-helper.c:996 +#: transport-helper.c:1002 msgid "error while running fast-export" msgstr "erreur au lancement de fast-export" -#: transport-helper.c:1021 +#: transport-helper.c:1027 #, c-format msgid "" "No refs in common and none specified; doing nothing.\n" @@ -7562,47 +7720,47 @@ msgstr "" "Aucune référence en commun et aucune spécfiée ; rien à faire.\n" "Vous devriez peut-être spécifier une branche telle que 'master'.\n" -#: transport-helper.c:1085 +#: transport-helper.c:1091 #, c-format msgid "malformed response in ref list: %s" msgstr "réponse malformée dans le liste de réfs : %s" -#: transport-helper.c:1238 +#: transport-helper.c:1244 #, c-format msgid "read(%s) failed" msgstr "échec de read(%s)" -#: transport-helper.c:1265 +#: transport-helper.c:1271 #, c-format msgid "write(%s) failed" msgstr "échec de write(%s)" -#: transport-helper.c:1314 +#: transport-helper.c:1320 #, c-format msgid "%s thread failed" msgstr "échec du fil d'exécution %s" -#: transport-helper.c:1318 +#: transport-helper.c:1324 #, c-format msgid "%s thread failed to join: %s" msgstr "échec de jonction du fil d'exécution %s : %s" -#: transport-helper.c:1337 transport-helper.c:1341 +#: transport-helper.c:1343 transport-helper.c:1347 #, c-format msgid "can't start thread for copying data: %s" msgstr "impossible de démarrer le fil d'exécution pour copier les données : %s" -#: transport-helper.c:1378 +#: transport-helper.c:1384 #, c-format msgid "%s process failed to wait" msgstr "échec du processus %s pour l'attente" -#: transport-helper.c:1382 +#: transport-helper.c:1388 #, c-format msgid "%s process failed" msgstr "échec du processus %s" -#: transport-helper.c:1400 transport-helper.c:1409 +#: transport-helper.c:1406 transport-helper.c:1415 msgid "can't start thread for copying data" msgstr "impossible de démarrer le fil d'exécution pour copier les données" @@ -7618,7 +7776,7 @@ msgstr "mode invalide dans l'entrée d'arbre" msgid "empty filename in tree entry" msgstr "nom de fichier vide dans une entrée de l'arbre" -#: tree-walk.c:116 +#: tree-walk.c:118 msgid "too-short tree file" msgstr "fichier arbre trop court" @@ -7859,8 +8017,8 @@ msgid "Aborting\n" msgstr "Abandon\n" #: unpack-trees.c:318 -msgid "Checking out files" -msgstr "Extraction des fichiers" +msgid "Updating files" +msgstr "Mise à jour des fichiers" #: unpack-trees.c:350 msgid "" @@ -7901,35 +8059,35 @@ msgstr "numéro de port invalide" msgid "invalid '..' path segment" msgstr "segment de chemin '..' invalide" -#: worktree.c:255 builtin/am.c:2097 +#: worktree.c:258 builtin/am.c:2095 #, c-format msgid "failed to read '%s'" msgstr "échec de la lecture de '%s'" -#: worktree.c:301 +#: worktree.c:304 #, c-format msgid "'%s' at main working tree is not the repository directory" msgstr "" "'%s' dans l'arbre de travail principal n'est pas le répertoire de dépôt" -#: worktree.c:312 +#: worktree.c:315 #, c-format msgid "'%s' file does not contain absolute path to the working tree location" msgstr "" "le fichier '%s' ne contient pas de chemin absolu à l'emplacement de l'arbre " "de travail" -#: worktree.c:324 +#: worktree.c:327 #, c-format msgid "'%s' does not exist" msgstr "'%s' n'existe pas" -#: worktree.c:330 +#: worktree.c:333 #, c-format msgid "'%s' is not a .git file, error code %d" msgstr "'%s' n'est pas un fichier .git, code d'erreur %d" -#: worktree.c:338 +#: worktree.c:341 #, c-format msgid "'%s' does not point back to '%s'" msgstr "'%s' ne pointe pas en retour sur '%s'" @@ -7948,158 +8106,164 @@ msgstr "impossible d'accéder à '%s'" msgid "unable to get current working directory" msgstr "impossible d'accéder au répertoire de travail courant" -#: wt-status.c:156 +#: wt-status.c:158 msgid "Unmerged paths:" msgstr "Chemins non fusionnés :" -#: wt-status.c:183 wt-status.c:210 +#: wt-status.c:187 wt-status.c:219 +msgid " (use \"git restore --staged <file>...\" to unstage)" +msgstr " (utilisez \"git restore --staged <fichier>...\" pour désindexer)" + +#: wt-status.c:190 wt-status.c:222 #, c-format -msgid " (use \"git reset %s <file>...\" to unstage)" -msgstr " (utilisez \"git reset %s <fichier>...\" pour désindexer)" +msgid " (use \"git restore --source=%s --staged <file>...\" to unstage)" +msgstr "" +" (utilisez \"git restore --source=%s --staged <fichier>...\" pour " +"désindexer)" -#: wt-status.c:185 wt-status.c:212 +#: wt-status.c:193 wt-status.c:225 msgid " (use \"git rm --cached <file>...\" to unstage)" msgstr " (utilisez \"git rm --cached <fichier>...\" pour désindexer)" -#: wt-status.c:189 +#: wt-status.c:197 msgid " (use \"git add <file>...\" to mark resolution)" msgstr " (utilisez \"git add <fichier>...\" pour marquer comme résolu)" -#: wt-status.c:191 wt-status.c:195 +#: wt-status.c:199 wt-status.c:203 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)" msgstr "" " (utilisez \"git add/rm <fichier>...\" si nécessaire pour marquer comme " "résolu)" -#: wt-status.c:193 +#: wt-status.c:201 msgid " (use \"git rm <file>...\" to mark resolution)" msgstr " (utilisez \"git rm <fichier>...\" pour marquer comme résolu)" -#: wt-status.c:204 wt-status.c:1064 +#: wt-status.c:211 wt-status.c:1074 msgid "Changes to be committed:" msgstr "Modifications qui seront validées :" -#: wt-status.c:222 wt-status.c:1073 +#: wt-status.c:234 wt-status.c:1083 msgid "Changes not staged for commit:" msgstr "Modifications qui ne seront pas validées :" -#: wt-status.c:226 +#: wt-status.c:238 msgid " (use \"git add <file>...\" to update what will be committed)" msgstr "" " (utilisez \"git add <fichier>...\" pour mettre à jour ce qui sera validé)" -#: wt-status.c:228 +#: wt-status.c:240 msgid " (use \"git add/rm <file>...\" to update what will be committed)" msgstr "" " (utilisez \"git add/rm <fichier>...\" pour mettre à jour ce qui sera " "validé)" -#: wt-status.c:229 +#: wt-status.c:241 msgid "" -" (use \"git checkout -- <file>...\" to discard changes in working directory)" +" (use \"git restore <file>...\" to discard changes in working directory)" msgstr "" -" (utilisez \"git checkout -- <fichier>...\" pour annuler les modifications " -"dans la copie de travail)" +" (utilisez \"git restore <fichier>...\" pour annuler les modifications dans " +"le répertoire de travail)" -#: wt-status.c:231 +#: wt-status.c:243 msgid " (commit or discard the untracked or modified content in submodules)" msgstr "" " (valider ou annuler le contenu non suivi ou modifié dans les sous-modules)" -#: wt-status.c:243 +#: wt-status.c:254 #, c-format msgid " (use \"git %s <file>...\" to include in what will be committed)" msgstr "" " (utilisez \"git %s <fichier>...\" pour inclure dans ce qui sera validé)" -#: wt-status.c:258 +#: wt-status.c:268 msgid "both deleted:" msgstr "supprimé des deux côtés :" -#: wt-status.c:260 +#: wt-status.c:270 msgid "added by us:" msgstr "ajouté par nous :" -#: wt-status.c:262 +#: wt-status.c:272 msgid "deleted by them:" msgstr "supprimé par eux :" -#: wt-status.c:264 +#: wt-status.c:274 msgid "added by them:" msgstr "ajouté par eux :" -#: wt-status.c:266 +#: wt-status.c:276 msgid "deleted by us:" msgstr "supprimé par nous :" -#: wt-status.c:268 +#: wt-status.c:278 msgid "both added:" msgstr "ajouté de deux côtés :" -#: wt-status.c:270 +#: wt-status.c:280 msgid "both modified:" msgstr "modifié des deux côtés :" -#: wt-status.c:280 +#: wt-status.c:290 msgid "new file:" msgstr "nouveau fichier :" -#: wt-status.c:282 +#: wt-status.c:292 msgid "copied:" msgstr "copié :" -#: wt-status.c:284 +#: wt-status.c:294 msgid "deleted:" msgstr "supprimé :" -#: wt-status.c:286 +#: wt-status.c:296 msgid "modified:" msgstr "modifié :" -#: wt-status.c:288 +#: wt-status.c:298 msgid "renamed:" msgstr "renommé :" -#: wt-status.c:290 +#: wt-status.c:300 msgid "typechange:" msgstr "modif. type :" -#: wt-status.c:292 +#: wt-status.c:302 msgid "unknown:" msgstr "inconnu :" -#: wt-status.c:294 +#: wt-status.c:304 msgid "unmerged:" msgstr "non fusionné :" -#: wt-status.c:374 +#: wt-status.c:384 msgid "new commits, " msgstr "nouveaux commits, " -#: wt-status.c:376 +#: wt-status.c:386 msgid "modified content, " msgstr "contenu modifié, " -#: wt-status.c:378 +#: wt-status.c:388 msgid "untracked content, " msgstr "contenu non suivi, " -#: wt-status.c:896 +#: wt-status.c:906 #, c-format msgid "Your stash currently has %d entry" msgid_plural "Your stash currently has %d entries" msgstr[0] "Votre remisage contient actuellement %d entrée" msgstr[1] "Votre remisage contient actuellement %d entrées" -#: wt-status.c:928 +#: wt-status.c:938 msgid "Submodules changed but not updated:" msgstr "Sous-modules modifiés mais non mis à jour :" -#: wt-status.c:930 +#: wt-status.c:940 msgid "Submodule changes to be committed:" msgstr "Changements du sous-module à valider :" -#: wt-status.c:1012 +#: wt-status.c:1022 msgid "" "Do not modify or remove the line above.\n" "Everything below it will be ignored." @@ -8107,107 +8271,119 @@ msgstr "" "Ne touchez pas à la ligne ci-dessus.\n" "Tout ce qui suit sera éliminé." -#: wt-status.c:1119 +#: wt-status.c:1114 +#, c-format +msgid "" +"\n" +"It took %.2f seconds to compute the branch ahead/behind values.\n" +"You can use '--no-ahead-behind' to avoid this.\n" +msgstr "" +"\n" +"%.2f secondes ont été nécessaires pour calculer les valeurs d'avance/retard " +"de la branche.\n" +"Vous pouvez utiliser '--no-ahead-behind' pour éviter ceci.\n" + +#: wt-status.c:1144 msgid "You have unmerged paths." msgstr "Vous avez des chemins non fusionnés." -#: wt-status.c:1122 +#: wt-status.c:1147 msgid " (fix conflicts and run \"git commit\")" msgstr " (réglez les conflits puis lancez \"git commit\")" -#: wt-status.c:1124 +#: wt-status.c:1149 msgid " (use \"git merge --abort\" to abort the merge)" msgstr " (utilisez \"git merge --abort\" pour annuler la fusion)" -#: wt-status.c:1128 +#: wt-status.c:1153 msgid "All conflicts fixed but you are still merging." msgstr "Tous les conflits sont réglés mais la fusion n'est pas terminée." -#: wt-status.c:1131 +#: wt-status.c:1156 msgid " (use \"git commit\" to conclude merge)" msgstr " (utilisez \"git commit\" pour terminer la fusion)" -#: wt-status.c:1140 +#: wt-status.c:1165 msgid "You are in the middle of an am session." msgstr "Vous êtes au milieu d'une session am." -#: wt-status.c:1143 +#: wt-status.c:1168 msgid "The current patch is empty." msgstr "Le patch actuel est vide." -#: wt-status.c:1147 +#: wt-status.c:1172 msgid " (fix conflicts and then run \"git am --continue\")" msgstr " (réglez les conflits puis lancez \"git am --continue\")" -#: wt-status.c:1149 +#: wt-status.c:1174 msgid " (use \"git am --skip\" to skip this patch)" msgstr " (utilisez \"git am --skip\" pour sauter ce patch)" -#: wt-status.c:1151 +#: wt-status.c:1176 msgid " (use \"git am --abort\" to restore the original branch)" msgstr " (utilisez \"git am --abort\" pour restaurer la branche d'origine)" -#: wt-status.c:1284 +#: wt-status.c:1309 msgid "git-rebase-todo is missing." msgstr "git-rebase-todo est manquant." -#: wt-status.c:1286 +#: wt-status.c:1311 msgid "No commands done." msgstr "Aucune commande réalisée." -#: wt-status.c:1289 +#: wt-status.c:1314 #, c-format msgid "Last command done (%d command done):" msgid_plural "Last commands done (%d commands done):" msgstr[0] "Dernière commande effectuée (%d commande effectuée) :" msgstr[1] "Dernières commandes effectuées (%d commandes effectuées) :" -#: wt-status.c:1300 +#: wt-status.c:1325 #, c-format msgid " (see more in file %s)" msgstr " (voir plus dans le fichier %s)" -#: wt-status.c:1305 +#: wt-status.c:1330 msgid "No commands remaining." msgstr "Aucune commande restante." -#: wt-status.c:1308 +#: wt-status.c:1333 #, c-format msgid "Next command to do (%d remaining command):" msgid_plural "Next commands to do (%d remaining commands):" msgstr[0] "Prochaine commande à effectuer (%d commande restante) :" msgstr[1] "Prochaines commandes à effectuer (%d commandes restantes) :" -#: wt-status.c:1316 +#: wt-status.c:1341 msgid " (use \"git rebase --edit-todo\" to view and edit)" msgstr " (utilisez \"git rebase --edit-todo\" pour voir et éditer)" -#: wt-status.c:1328 +#: wt-status.c:1353 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." msgstr "Vous êtes en train de rebaser la branche '%s' sur '%s'." -#: wt-status.c:1333 +#: wt-status.c:1358 msgid "You are currently rebasing." msgstr "Vous êtes en train de rebaser." -#: wt-status.c:1346 +#: wt-status.c:1371 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr " (réglez les conflits puis lancez \"git rebase --continue\")" -#: wt-status.c:1348 +#: wt-status.c:1373 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr " (utilisez \"git rebase --skip\" pour sauter ce patch)" -#: wt-status.c:1350 +#: wt-status.c:1375 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr " (utilisez \"git rebase --abort\" pour extraire la branche d'origine)" -#: wt-status.c:1357 +#: wt-status.c:1382 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr " (tous les conflits sont réglés : lancez \"git rebase --continue\")" -#: wt-status.c:1361 +#: wt-status.c:1386 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." @@ -8215,144 +8391,136 @@ msgstr "" "Vous êtes actuellement en train de fractionner un commit pendant un rebasage " "de la branche '%s' sur '%s'." -#: wt-status.c:1366 +#: wt-status.c:1391 msgid "You are currently splitting a commit during a rebase." msgstr "" "Vous êtes actuellement en train de fractionner un commit pendant un rebasage." -#: wt-status.c:1369 +#: wt-status.c:1394 msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr "" " (Une fois la copie de travail nettoyée, lancez \"git rebase --continue\")" -#: wt-status.c:1373 +#: wt-status.c:1398 #, c-format msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." msgstr "" "Vous êtes actuellement en train d'éditer un commit pendant un rebasage de la " "branche '%s' sur '%s'." -#: wt-status.c:1378 +#: wt-status.c:1403 msgid "You are currently editing a commit during a rebase." msgstr "" "Vous êtes actuellement en train d'éditer un commit pendant un rebasage." -#: wt-status.c:1381 +#: wt-status.c:1406 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr " (utilisez \"git commit --amend\" pour corriger le commit actuel)" -#: wt-status.c:1383 +#: wt-status.c:1408 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr "" " (utilisez \"git rebase --continue\" quand vous avez effectué toutes vos " "modifications)" -#: wt-status.c:1394 +#: wt-status.c:1419 msgid "Cherry-pick currently in progress." msgstr "Picorage en cours." -#: wt-status.c:1397 +#: wt-status.c:1422 #, c-format msgid "You are currently cherry-picking commit %s." msgstr "Vous êtes actuellement en train de picorer le commit %s." -#: wt-status.c:1404 +#: wt-status.c:1429 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr " (réglez les conflits puis lancez \"git cherry-pick --continue\")" -#: wt-status.c:1407 +#: wt-status.c:1432 msgid " (run \"git cherry-pick --continue\" to continue)" msgstr " (lancez \"git cherry-pick --continue\" pour continuer)" -#: wt-status.c:1410 +#: wt-status.c:1435 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr "" " (tous les conflits sont réglés : lancez \"git cherry-pick --continue\")" -#: wt-status.c:1412 +#: wt-status.c:1437 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr " (utilisez \"git cherry-pick --abort\" pour annuler le picorage)" -#: wt-status.c:1422 +#: wt-status.c:1447 msgid "Revert currently in progress." msgstr "Rétablissement en cours." -#: wt-status.c:1425 +#: wt-status.c:1450 #, c-format msgid "You are currently reverting commit %s." msgstr "Vous êtes actuellement en train de rétablir le commit %s." -#: wt-status.c:1431 +#: wt-status.c:1456 msgid " (fix conflicts and run \"git revert --continue\")" msgstr " (réglez les conflits puis lancez \"git revert --continue\")" -#: wt-status.c:1434 +#: wt-status.c:1459 msgid " (run \"git revert --continue\" to continue)" msgstr " (lancez \"git revert --continue\" pour continuer)" -#: wt-status.c:1437 +#: wt-status.c:1462 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr " (tous les conflits sont réglés : lancez \"git revert --continue\")" -#: wt-status.c:1439 +#: wt-status.c:1464 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr " (utilisez \"git revert --abort\" pour annuler le rétablissement)" -#: wt-status.c:1449 +#: wt-status.c:1474 #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "Vous êtes en cours de bissection, depuis la branche '%s'." -#: wt-status.c:1453 +#: wt-status.c:1478 msgid "You are currently bisecting." msgstr "Vous êtes en cours de bissection." -#: wt-status.c:1456 +#: wt-status.c:1481 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr " (utilisez \"git bisect reset\" pour revenir à la branche d'origine)" -#: wt-status.c:1665 +#: wt-status.c:1690 msgid "On branch " msgstr "Sur la branche " -#: wt-status.c:1672 +#: wt-status.c:1697 msgid "interactive rebase in progress; onto " msgstr "rebasage interactif en cours ; sur " -#: wt-status.c:1674 +#: wt-status.c:1699 msgid "rebase in progress; onto " msgstr "rebasage en cours ; sur " -#: wt-status.c:1679 -msgid "HEAD detached at " -msgstr "HEAD détachée sur " - -#: wt-status.c:1681 -msgid "HEAD detached from " -msgstr "HEAD détachée depuis " - -#: wt-status.c:1684 +#: wt-status.c:1709 msgid "Not currently on any branch." msgstr "Actuellement sur aucun branche." -#: wt-status.c:1701 +#: wt-status.c:1726 msgid "Initial commit" msgstr "Validation initiale" -#: wt-status.c:1702 +#: wt-status.c:1727 msgid "No commits yet" msgstr "Aucun commit" -#: wt-status.c:1716 +#: wt-status.c:1741 msgid "Untracked files" msgstr "Fichiers non suivis" -#: wt-status.c:1718 +#: wt-status.c:1743 msgid "Ignored files" msgstr "Fichiers ignorés" -#: wt-status.c:1722 +#: wt-status.c:1747 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -8364,32 +8532,32 @@ msgstr "" "oublier d'ajouter les nouveaux fichiers par vous-même (voir 'git help " "status')." -#: wt-status.c:1728 +#: wt-status.c:1753 #, c-format msgid "Untracked files not listed%s" msgstr "Fichiers non suivis non affichés%s" -#: wt-status.c:1730 +#: wt-status.c:1755 msgid " (use -u option to show untracked files)" msgstr " (utilisez -u pour afficher les fichiers non suivis)" -#: wt-status.c:1736 +#: wt-status.c:1761 msgid "No changes" msgstr "Aucune modification" -#: wt-status.c:1741 +#: wt-status.c:1766 #, c-format msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" msgstr "" "aucune modification n'a été ajoutée à la validation (utilisez \"git add\" ou " "\"git commit -a\")\n" -#: wt-status.c:1744 +#: wt-status.c:1769 #, c-format msgid "no changes added to commit\n" msgstr "aucune modification ajoutée à la validation\n" -#: wt-status.c:1747 +#: wt-status.c:1772 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " @@ -8398,66 +8566,66 @@ msgstr "" "aucune modification ajoutée à la validation mais des fichiers non suivis " "sont présents (utilisez \"git add\" pour les suivre)\n" -#: wt-status.c:1750 +#: wt-status.c:1775 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "" "aucune modification ajoutée à la validation mais des fichiers non suivis " "sont présents\n" -#: wt-status.c:1753 +#: wt-status.c:1778 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "" "rien à valider (créez/copiez des fichiers et utilisez \"git add\" pour les " "suivre)\n" -#: wt-status.c:1756 wt-status.c:1761 +#: wt-status.c:1781 wt-status.c:1786 #, c-format msgid "nothing to commit\n" msgstr "rien à valider\n" -#: wt-status.c:1759 +#: wt-status.c:1784 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "rien à valider (utilisez -u pour afficher les fichiers non suivis)\n" -#: wt-status.c:1763 +#: wt-status.c:1788 #, c-format msgid "nothing to commit, working tree clean\n" msgstr "rien à valider, la copie de travail est propre\n" -#: wt-status.c:1876 +#: wt-status.c:1901 msgid "No commits yet on " msgstr "Encore aucun commit sur " -#: wt-status.c:1880 +#: wt-status.c:1905 msgid "HEAD (no branch)" msgstr "HEAD (aucune branche)" -#: wt-status.c:1911 +#: wt-status.c:1936 msgid "different" msgstr "différent" -#: wt-status.c:1913 wt-status.c:1921 +#: wt-status.c:1938 wt-status.c:1946 msgid "behind " msgstr "derrière " -#: wt-status.c:1916 wt-status.c:1919 +#: wt-status.c:1941 wt-status.c:1944 msgid "ahead " msgstr "devant " #. TRANSLATORS: the action is e.g. "pull with rebase" -#: wt-status.c:2443 +#: wt-status.c:2466 #, c-format msgid "cannot %s: You have unstaged changes." msgstr "Impossible de %s : vous avez des modifications non indexées." -#: wt-status.c:2449 +#: wt-status.c:2472 msgid "additionally, your index contains uncommitted changes." msgstr "de plus, votre index contient des modifications non validées." -#: wt-status.c:2451 +#: wt-status.c:2474 #, c-format msgid "cannot %s: Your index contains uncommitted changes." msgstr "%s impossible : votre index contient des modifications non validées." @@ -8471,7 +8639,7 @@ msgstr "git add [<options>] [--] <chemin>..." msgid "unexpected diff status %c" msgstr "état de diff inattendu %c" -#: builtin/add.c:89 builtin/commit.c:285 +#: builtin/add.c:89 builtin/commit.c:288 msgid "updating files failed" msgstr "échec de la mise à jour des fichiers" @@ -8520,8 +8688,8 @@ msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "" "Les chemins suivants sont ignorés par un de vos fichiers .gitignore :\n" -#: builtin/add.c:290 builtin/clean.c:908 builtin/fetch.c:137 builtin/mv.c:124 -#: builtin/prune-packed.c:56 builtin/pull.c:221 builtin/push.c:560 +#: builtin/add.c:290 builtin/clean.c:909 builtin/fetch.c:147 builtin/mv.c:124 +#: builtin/prune-packed.c:56 builtin/pull.c:222 builtin/push.c:560 #: builtin/remote.c:1345 builtin/rm.c:241 builtin/send-pack.c:165 msgid "dry run" msgstr "simuler l'action" @@ -8530,7 +8698,7 @@ msgstr "simuler l'action" msgid "interactive picking" msgstr "sélection interactive" -#: builtin/add.c:294 builtin/checkout.c:1379 builtin/reset.c:306 +#: builtin/add.c:294 builtin/checkout.c:1480 builtin/reset.c:306 msgid "select hunks interactively" msgstr "sélection interactive des sections" @@ -8703,7 +8871,7 @@ msgstr "décalage horaire invalide" msgid "Patch format detection failed." msgstr "Échec de détection du format du patch." -#: builtin/am.c:949 builtin/clone.c:409 +#: builtin/am.c:949 builtin/clone.c:407 #, c-format msgid "failed to create directory '%s'" msgstr "échec de la création du répertoire '%s'" @@ -8712,7 +8880,7 @@ msgstr "échec de la création du répertoire '%s'" msgid "Failed to split patches." msgstr "Échec de découpage des patchs." -#: builtin/am.c:1084 builtin/commit.c:371 +#: builtin/am.c:1084 builtin/commit.c:374 msgid "unable to write index file" msgstr "impossible d'écrire le fichier d'index" @@ -8753,18 +8921,18 @@ msgstr "ligne d'identification invalide : %.*s" msgid "unable to parse commit %s" msgstr "impossible d'analyser le commit %s" -#: builtin/am.c:1495 +#: builtin/am.c:1496 msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "" "Le dépôt n'a pas les blobs nécessaires pour un retour à une fusion à 3 " "points." -#: builtin/am.c:1497 +#: builtin/am.c:1498 msgid "Using index info to reconstruct a base tree..." msgstr "" "Utilisation de l'information de l'index pour reconstruire un arbre de base..." -#: builtin/am.c:1516 +#: builtin/am.c:1517 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." @@ -8772,29 +8940,24 @@ msgstr "" "Avez-vous édité le patch à la main ?\n" "Il ne s'applique pas aux blobs enregistrés dans son index." -#: builtin/am.c:1522 +#: builtin/am.c:1523 msgid "Falling back to patching base and 3-way merge..." msgstr "Retour à un patch de la base et fusion à 3 points..." -#: builtin/am.c:1548 +#: builtin/am.c:1549 msgid "Failed to merge in the changes." msgstr "Échec d'intégration des modifications." -#: builtin/am.c:1580 +#: builtin/am.c:1581 msgid "applying to an empty history" msgstr "application à un historique vide" -#: builtin/am.c:1627 builtin/am.c:1631 +#: builtin/am.c:1628 builtin/am.c:1632 #, c-format msgid "cannot resume: %s does not exist." msgstr "impossible de continuer : %s n'existe pas." -#: builtin/am.c:1647 -msgid "cannot be interactive without stdin connected to a terminal." -msgstr "" -"impossible d'être interactif sans entrée standard connectée à un terminal." - -#: builtin/am.c:1652 +#: builtin/am.c:1650 msgid "Commit Body is:" msgstr "Le corps de la validation est :" @@ -8802,35 +8965,36 @@ msgstr "Le corps de la validation est :" #. in your translation. The program will only accept English #. input at this point. #. -#: builtin/am.c:1662 +#: builtin/am.c:1660 +#, c-format msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " msgstr "Appliquer ? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all : " -#: builtin/am.c:1712 +#: builtin/am.c:1710 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "Index sale : impossible d'appliquer des patchs (sales : %s)" -#: builtin/am.c:1752 builtin/am.c:1820 +#: builtin/am.c:1750 builtin/am.c:1818 #, c-format msgid "Applying: %.*s" msgstr "Application de %.*s" -#: builtin/am.c:1769 +#: builtin/am.c:1767 msgid "No changes -- Patch already applied." msgstr "Pas de changement -- Patch déjà appliqué." -#: builtin/am.c:1775 +#: builtin/am.c:1773 #, c-format msgid "Patch failed at %s %.*s" msgstr "le patch a échoué à %s %.*s" -#: builtin/am.c:1779 +#: builtin/am.c:1777 msgid "Use 'git am --show-current-patch' to see the failed patch" msgstr "" "Utilisez 'git am --show-current-patch' pour visualiser le patch en échec" -#: builtin/am.c:1823 +#: builtin/am.c:1821 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" @@ -8841,7 +9005,7 @@ msgstr "" "introduit les mêmes changements ; vous pourriez avoir envie de sauter ce " "patch." -#: builtin/am.c:1830 +#: builtin/am.c:1828 msgid "" "You still have unmerged paths in your index.\n" "You should 'git add' each file with resolved conflicts to mark them as " @@ -8854,17 +9018,17 @@ msgstr "" "Vous pouvez lancer 'git rm' sur un fichier \"supprimé par eux\" pour " "accepter son état." -#: builtin/am.c:1937 builtin/am.c:1941 builtin/am.c:1953 builtin/reset.c:329 +#: builtin/am.c:1935 builtin/am.c:1939 builtin/am.c:1951 builtin/reset.c:329 #: builtin/reset.c:337 #, c-format msgid "Could not parse object '%s'." msgstr "Impossible d'analyser l'objet '%s'." -#: builtin/am.c:1989 +#: builtin/am.c:1987 msgid "failed to clean index" msgstr "échec du nettoyage de l'index" -#: builtin/am.c:2033 +#: builtin/am.c:2031 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" @@ -8872,145 +9036,145 @@ msgstr "" "Vous semblez avoir déplacé la HEAD depuis le dernier échec de 'am'.\n" "Pas de retour à ORIG_HEAD" -#: builtin/am.c:2130 +#: builtin/am.c:2128 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "Valeur invalide pour --patch-format : %s" -#: builtin/am.c:2166 +#: builtin/am.c:2164 msgid "git am [<options>] [(<mbox> | <Maildir>)...]" msgstr "git am [<options>] [(<mbox> | <Maildir>)...]" -#: builtin/am.c:2167 +#: builtin/am.c:2165 msgid "git am [<options>] (--continue | --skip | --abort)" msgstr "git am [<options>] (--continue | --skip | --abort)" -#: builtin/am.c:2173 +#: builtin/am.c:2171 msgid "run interactively" msgstr "exécution interactive" -#: builtin/am.c:2175 +#: builtin/am.c:2173 msgid "historical option -- no-op" msgstr "option historique -- no-op" -#: builtin/am.c:2177 +#: builtin/am.c:2175 msgid "allow fall back on 3way merging if needed" msgstr "permettre de revenir à une fusion à 3 points si nécessaire" -#: builtin/am.c:2178 builtin/init-db.c:494 builtin/prune-packed.c:58 -#: builtin/repack.c:306 builtin/stash.c:805 +#: builtin/am.c:2176 builtin/init-db.c:494 builtin/prune-packed.c:58 +#: builtin/repack.c:296 builtin/stash.c:806 msgid "be quiet" msgstr "être silencieux" -#: builtin/am.c:2180 +#: builtin/am.c:2178 msgid "add a Signed-off-by line to the commit message" msgstr "ajouter une ligne Signed-off-by au message de validation" -#: builtin/am.c:2183 +#: builtin/am.c:2181 msgid "recode into utf8 (default)" msgstr "recoder en utf-8 (par défaut)" -#: builtin/am.c:2185 +#: builtin/am.c:2183 msgid "pass -k flag to git-mailinfo" msgstr "passer l'option -k à git-mailinfo" -#: builtin/am.c:2187 +#: builtin/am.c:2185 msgid "pass -b flag to git-mailinfo" msgstr "passer l'option -b à git-mailinfo" -#: builtin/am.c:2189 +#: builtin/am.c:2187 msgid "pass -m flag to git-mailinfo" msgstr "passer l'option -m à git-mailinfo" -#: builtin/am.c:2191 +#: builtin/am.c:2189 msgid "pass --keep-cr flag to git-mailsplit for mbox format" msgstr "passer l'option --keep-cr à git-mailsplit fpour le format mbox" -#: builtin/am.c:2194 +#: builtin/am.c:2192 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" msgstr "" "ne pas passer l'option --keep-cr à git-mailsplit indépendamment de am.keepcr" -#: builtin/am.c:2197 +#: builtin/am.c:2195 msgid "strip everything before a scissors line" msgstr "retirer tout le contenu avant la ligne des ciseaux" -#: builtin/am.c:2199 builtin/am.c:2202 builtin/am.c:2205 builtin/am.c:2208 -#: builtin/am.c:2211 builtin/am.c:2214 builtin/am.c:2217 builtin/am.c:2220 -#: builtin/am.c:2226 +#: builtin/am.c:2197 builtin/am.c:2200 builtin/am.c:2203 builtin/am.c:2206 +#: builtin/am.c:2209 builtin/am.c:2212 builtin/am.c:2215 builtin/am.c:2218 +#: builtin/am.c:2224 msgid "pass it through git-apply" msgstr "le passer jusqu'à git-apply" -#: builtin/am.c:2216 builtin/commit.c:1348 builtin/fmt-merge-msg.c:671 -#: builtin/fmt-merge-msg.c:674 builtin/grep.c:879 builtin/merge.c:247 -#: builtin/pull.c:158 builtin/pull.c:217 builtin/rebase.c:1412 -#: builtin/repack.c:317 builtin/repack.c:321 builtin/repack.c:323 -#: builtin/show-branch.c:651 builtin/show-ref.c:172 builtin/tag.c:397 -#: parse-options.h:141 parse-options.h:162 parse-options.h:311 +#: builtin/am.c:2214 builtin/commit.c:1368 builtin/fmt-merge-msg.c:671 +#: builtin/fmt-merge-msg.c:674 builtin/grep.c:881 builtin/merge.c:249 +#: builtin/pull.c:159 builtin/pull.c:218 builtin/rebase.c:1418 +#: builtin/repack.c:307 builtin/repack.c:311 builtin/repack.c:313 +#: builtin/show-branch.c:650 builtin/show-ref.c:172 builtin/tag.c:403 +#: parse-options.h:141 parse-options.h:162 parse-options.h:312 msgid "n" msgstr "n" -#: builtin/am.c:2222 builtin/branch.c:653 builtin/for-each-ref.c:38 -#: builtin/replace.c:554 builtin/tag.c:431 builtin/verify-tag.c:39 +#: builtin/am.c:2220 builtin/branch.c:661 builtin/for-each-ref.c:38 +#: builtin/replace.c:554 builtin/tag.c:437 builtin/verify-tag.c:38 msgid "format" msgstr "format" -#: builtin/am.c:2223 +#: builtin/am.c:2221 msgid "format the patch(es) are in" msgstr "format de présentation des patchs" -#: builtin/am.c:2229 +#: builtin/am.c:2227 msgid "override error message when patch failure occurs" msgstr "surcharger le message d'erreur lors d'un échec d'application de patch" -#: builtin/am.c:2231 +#: builtin/am.c:2229 msgid "continue applying patches after resolving a conflict" msgstr "continuer à appliquer les patchs après résolution d'un conflit" -#: builtin/am.c:2234 +#: builtin/am.c:2232 msgid "synonyms for --continue" msgstr "synonymes de --continue" -#: builtin/am.c:2237 +#: builtin/am.c:2235 msgid "skip the current patch" msgstr "sauter le patch courant" -#: builtin/am.c:2240 +#: builtin/am.c:2238 msgid "restore the original branch and abort the patching operation." msgstr "" "restaurer la branche originale et abandonner les applications de patch." -#: builtin/am.c:2243 +#: builtin/am.c:2241 msgid "abort the patching operation but keep HEAD where it is." msgstr "abandonne l'opération de patch mais garde HEAD où il est." -#: builtin/am.c:2246 +#: builtin/am.c:2244 msgid "show the patch being applied." msgstr "afficher le patch en cours d'application." -#: builtin/am.c:2250 +#: builtin/am.c:2248 msgid "lie about committer date" msgstr "mentir sur la date de validation" -#: builtin/am.c:2252 +#: builtin/am.c:2250 msgid "use current timestamp for author date" msgstr "utiliser l'horodatage actuel pour la date d'auteur" -#: builtin/am.c:2254 builtin/commit-tree.c:120 builtin/commit.c:1491 -#: builtin/merge.c:282 builtin/pull.c:192 builtin/rebase.c:489 -#: builtin/rebase.c:1453 builtin/revert.c:116 builtin/tag.c:412 +#: builtin/am.c:2252 builtin/commit-tree.c:120 builtin/commit.c:1511 +#: builtin/merge.c:286 builtin/pull.c:193 builtin/rebase.c:489 +#: builtin/rebase.c:1459 builtin/revert.c:117 builtin/tag.c:418 msgid "key-id" msgstr "id-clé" -#: builtin/am.c:2255 builtin/rebase.c:490 builtin/rebase.c:1454 +#: builtin/am.c:2253 builtin/rebase.c:490 builtin/rebase.c:1460 msgid "GPG-sign commits" msgstr "signer les commits avec GPG" -#: builtin/am.c:2258 +#: builtin/am.c:2256 msgid "(internal use for git-rebase)" msgstr "(utilisation interne pour git-rebase)" -#: builtin/am.c:2276 +#: builtin/am.c:2274 msgid "" "The -b/--binary option has been a no-op for long time, and\n" "it will be removed. Please do not use it anymore." @@ -9018,17 +9182,17 @@ msgstr "" "L'option -b/--binary ne fait plus rien depuis longtemps,\n" "et elle sera supprimée. Veuillez ne plus l'utiliser." -#: builtin/am.c:2283 +#: builtin/am.c:2281 msgid "failed to read the index" msgstr "échec à la lecture de l'index" -#: builtin/am.c:2298 +#: builtin/am.c:2296 #, c-format msgid "previous rebase directory %s still exists but mbox given." msgstr "" "le répertoire précédent de rebasage %s existe toujours mais mbox donnée." -#: builtin/am.c:2322 +#: builtin/am.c:2320 #, c-format msgid "" "Stray %s directory found.\n" @@ -9037,12 +9201,16 @@ msgstr "" "Répertoire abandonné %s trouvé.\n" "Utilisez \"git am --abort\" pour le supprimer." -#: builtin/am.c:2328 +#: builtin/am.c:2326 msgid "Resolve operation not in progress, we are not resuming." msgstr "" "Pas de résolution de l'opération en cours, nous ne sommes pas dans une " "reprise." +#: builtin/am.c:2336 +msgid "interactive mode requires patches on the command line" +msgstr "le mode interactif requiert des rustines sur la ligne de commande" + #: builtin/apply.c:8 msgid "git apply [<options>] [<patch>...]" msgstr "git apply [<options>] [<patch>...]" @@ -9276,79 +9444,84 @@ msgstr "refus de bissecter sur un arbre 'cg-seeked'" msgid "bad HEAD - strange symbolic ref" msgstr "mauvaise HEAD - référence symbolique douteuse" -#: builtin/bisect--helper.c:627 +#: builtin/bisect--helper.c:574 +#, c-format +msgid "invalid ref: '%s'" +msgstr "réference invalide : '%s'" + +#: builtin/bisect--helper.c:630 msgid "perform 'git bisect next'" msgstr "effectuer 'git bisect next'" -#: builtin/bisect--helper.c:629 +#: builtin/bisect--helper.c:632 msgid "write the terms to .git/BISECT_TERMS" msgstr "écrire les termes dans .git/BISECT_TERMS" -#: builtin/bisect--helper.c:631 +#: builtin/bisect--helper.c:634 msgid "cleanup the bisection state" msgstr "vérifier l'état de la bissection" -#: builtin/bisect--helper.c:633 +#: builtin/bisect--helper.c:636 msgid "check for expected revs" msgstr "vérifier si des révisions sont attendues" -#: builtin/bisect--helper.c:635 +#: builtin/bisect--helper.c:638 msgid "reset the bisection state" msgstr "réinitialiser l'état de la bissection" -#: builtin/bisect--helper.c:637 +#: builtin/bisect--helper.c:640 msgid "write out the bisection state in BISECT_LOG" msgstr "écrire l'état de la bissection dans BISECT_LOG" -#: builtin/bisect--helper.c:639 +#: builtin/bisect--helper.c:642 msgid "check and set terms in a bisection state" msgstr "vérifier et régler les termes dans un état de la bissection" -#: builtin/bisect--helper.c:641 +#: builtin/bisect--helper.c:644 msgid "check whether bad or good terms exist" msgstr "vérifier si les termes bons ou mauvais existent" -#: builtin/bisect--helper.c:643 +#: builtin/bisect--helper.c:646 msgid "print out the bisect terms" msgstr "afficher les termes de bissection" -#: builtin/bisect--helper.c:645 +#: builtin/bisect--helper.c:648 msgid "start the bisect session" msgstr "démarrer une session de bissection" -#: builtin/bisect--helper.c:647 +#: builtin/bisect--helper.c:650 msgid "update BISECT_HEAD instead of checking out the current commit" msgstr "mettre à jour BISECT_HEAD au lieu d'extraire le commit actuel" -#: builtin/bisect--helper.c:649 +#: builtin/bisect--helper.c:652 msgid "no log for BISECT_WRITE" msgstr "pas de journal pour BISECT_WRITE" -#: builtin/bisect--helper.c:666 +#: builtin/bisect--helper.c:669 msgid "--write-terms requires two arguments" msgstr "--write-terms exige deux arguments" -#: builtin/bisect--helper.c:670 +#: builtin/bisect--helper.c:673 msgid "--bisect-clean-state requires no arguments" msgstr "--bisect-clean-state ne supporte aucun argument" -#: builtin/bisect--helper.c:677 +#: builtin/bisect--helper.c:680 msgid "--bisect-reset requires either no argument or a commit" msgstr "--bisect-reset supporte soit aucun argument, soit un commit" -#: builtin/bisect--helper.c:681 +#: builtin/bisect--helper.c:684 msgid "--bisect-write requires either 4 or 5 arguments" msgstr "--bisect-write supporte soit 4 arguments, soit 5 arguments" -#: builtin/bisect--helper.c:687 +#: builtin/bisect--helper.c:690 msgid "--check-and-set-terms requires 3 arguments" msgstr "--check-and-set-terms exige 3 arguments" -#: builtin/bisect--helper.c:693 +#: builtin/bisect--helper.c:696 msgid "--bisect-next-check requires 2 or 3 arguments" msgstr "--bisect-next-check exige 2 ou 3 arguments" -#: builtin/bisect--helper.c:699 +#: builtin/bisect--helper.c:702 msgid "--bisect-terms requires 0 or 1 argument" msgstr "--bisect-terms exige 0 ou 1 argument" @@ -9360,140 +9533,157 @@ msgstr "git blame [<options>] [<rev-opts>] [<rev>] [--] <fichier>" msgid "<rev-opts> are documented in git-rev-list(1)" msgstr "<options-de-révision> sont documentés dans git-rev-list(1)" -#: builtin/blame.c:407 +#: builtin/blame.c:410 #, c-format msgid "expecting a color: %s" msgstr "couleur attendue : %s" -#: builtin/blame.c:414 +#: builtin/blame.c:417 msgid "must end with a color" msgstr "doit finir avec une couleur" -#: builtin/blame.c:701 +#: builtin/blame.c:730 #, c-format msgid "invalid color '%s' in color.blame.repeatedLines" msgstr "couleur invalide '%s' dans color.blame.repeatedlines" -#: builtin/blame.c:719 +#: builtin/blame.c:748 msgid "invalid value for blame.coloring" msgstr "valeur invalide pour blame.coloring" -#: builtin/blame.c:794 +#: builtin/blame.c:823 +#, c-format +msgid "cannot find revision %s to ignore" +msgstr "référence à ignorer %s introuvable" + +#: builtin/blame.c:845 msgid "Show blame entries as we find them, incrementally" msgstr "" "Montrer les éléments de blâme au fur et à mesure de leur découverte, de " "manière incrémentale" -#: builtin/blame.c:795 +#: builtin/blame.c:846 msgid "Show blank SHA-1 for boundary commits (Default: off)" msgstr "Montrer un SHA-1 blanc pour les commits de limite (Défaut : désactivé)" -#: builtin/blame.c:796 +#: builtin/blame.c:847 msgid "Do not treat root commits as boundaries (Default: off)" msgstr "" "Ne pas traiter les commits racine comme des limites (Défaut : désactivé)" -#: builtin/blame.c:797 +#: builtin/blame.c:848 msgid "Show work cost statistics" msgstr "Montrer les statistiques de coût d'activité" -#: builtin/blame.c:798 +#: builtin/blame.c:849 msgid "Force progress reporting" msgstr "Forcer l'affichage de l'état d'avancement" -#: builtin/blame.c:799 +#: builtin/blame.c:850 msgid "Show output score for blame entries" msgstr "Montrer le score de sortie pour les éléments de blâme" -#: builtin/blame.c:800 +#: builtin/blame.c:851 msgid "Show original filename (Default: auto)" msgstr "Montrer les noms de fichier originaux (Défaut : auto)" -#: builtin/blame.c:801 +#: builtin/blame.c:852 msgid "Show original linenumber (Default: off)" msgstr "Montrer les numéros de lignes originaux (Défaut : désactivé)" -#: builtin/blame.c:802 +#: builtin/blame.c:853 msgid "Show in a format designed for machine consumption" msgstr "Afficher dans un format propice à la consommation par machine" -#: builtin/blame.c:803 +#: builtin/blame.c:854 msgid "Show porcelain format with per-line commit information" msgstr "Afficher en format porcelaine avec l'information de commit par ligne" -#: builtin/blame.c:804 +#: builtin/blame.c:855 msgid "Use the same output mode as git-annotate (Default: off)" msgstr "Utiliser le même mode de sortie que git-annotate (Défaut : désactivé)" -#: builtin/blame.c:805 +#: builtin/blame.c:856 msgid "Show raw timestamp (Default: off)" msgstr "Afficher les horodatages bruts (Défaut : désactivé)" -#: builtin/blame.c:806 +#: builtin/blame.c:857 msgid "Show long commit SHA1 (Default: off)" msgstr "Afficher les longs SHA1 de commits (Défaut : désactivé)" -#: builtin/blame.c:807 +#: builtin/blame.c:858 msgid "Suppress author name and timestamp (Default: off)" msgstr "Supprimer le nom de l'auteur et l'horodatage (Défaut : désactivé)" -#: builtin/blame.c:808 +#: builtin/blame.c:859 msgid "Show author email instead of name (Default: off)" msgstr "Afficher le courriel de l'auteur au lieu du nom (Défaut : désactivé)" -#: builtin/blame.c:809 +#: builtin/blame.c:860 msgid "Ignore whitespace differences" msgstr "Ignorer les différences d'espace" -#: builtin/blame.c:810 +#: builtin/blame.c:861 builtin/log.c:1629 +msgid "rev" +msgstr "rév" + +#: builtin/blame.c:861 +msgid "Ignore <rev> when blaming" +msgstr "ignore <rev> pendant le blâme" + +#: builtin/blame.c:862 +msgid "Ignore revisions from <file>" +msgstr "ignorer les révisions listées dans <fichier>" + +#: builtin/blame.c:863 msgid "color redundant metadata from previous line differently" msgstr "" "colorer différemment les métadonnées redondantes avec la ligne précédente" -#: builtin/blame.c:811 +#: builtin/blame.c:864 msgid "color lines by age" msgstr "colorier les lignes par âge" -#: builtin/blame.c:818 +#: builtin/blame.c:871 msgid "Use an experimental heuristic to improve diffs" msgstr "Utiliser une heuristique expérimentale pour améliorer les diffs" -#: builtin/blame.c:820 +#: builtin/blame.c:873 msgid "Spend extra cycles to find better match" msgstr "" "Dépenser des cycles supplémentaires pour trouver une meilleure correspondance" -#: builtin/blame.c:821 +#: builtin/blame.c:874 msgid "Use revisions from <file> instead of calling git-rev-list" msgstr "" "Utiliser les révisions du fichier <fichier> au lieu d'appeler git-rev-list" -#: builtin/blame.c:822 +#: builtin/blame.c:875 msgid "Use <file>'s contents as the final image" msgstr "Utiliser le contenu de <fichier> comme image finale" -#: builtin/blame.c:823 builtin/blame.c:824 +#: builtin/blame.c:876 builtin/blame.c:877 msgid "score" msgstr "score" -#: builtin/blame.c:823 +#: builtin/blame.c:876 msgid "Find line copies within and across files" msgstr "Trouver les copies de ligne dans et entre les fichiers" -#: builtin/blame.c:824 +#: builtin/blame.c:877 msgid "Find line movements within and across files" msgstr "Trouver les mouvements de ligne dans et entre les fichiers" -#: builtin/blame.c:825 +#: builtin/blame.c:878 msgid "n,m" msgstr "n,m" -#: builtin/blame.c:825 +#: builtin/blame.c:878 msgid "Process only line range n,m, counting from 1" msgstr "" "Traiter seulement l'intervalle de ligne n,m en commençant le compte à 1" -#: builtin/blame.c:876 +#: builtin/blame.c:929 msgid "--progress can't be used with --incremental or porcelain formats" msgstr "" "--progress ne peut pas être utilisé avec --incremental ou les formats " @@ -9507,18 +9697,18 @@ msgstr "" #. your language may need more or fewer display #. columns. #. -#: builtin/blame.c:927 +#: builtin/blame.c:980 msgid "4 years, 11 months ago" msgstr "il y a 10 ans et 11 mois" -#: builtin/blame.c:1031 +#: builtin/blame.c:1087 #, c-format msgid "file %s has only %lu line" msgid_plural "file %s has only %lu lines" msgstr[0] "le fichier %s n'a qu'%lu ligne" msgstr[1] "le fichier %s n'a que %lu lignes" -#: builtin/blame.c:1077 +#: builtin/blame.c:1133 msgid "Blaming lines" msgstr "Assignation de blâme aux lignes" @@ -9552,7 +9742,7 @@ msgstr "git branch [<options>] [-r | -a] [--points-at]" msgid "git branch [<options>] [-r | -a] [--format]" msgstr "git branch [<options>] [-r | -a] [--format]" -#: builtin/branch.c:151 +#: builtin/branch.c:154 #, c-format msgid "" "deleting branch '%s' that has been merged to\n" @@ -9561,7 +9751,7 @@ msgstr "" "suppression de la branche '%s' qui a été fusionnée dans\n" " '%s', mais pas dans HEAD." -#: builtin/branch.c:155 +#: builtin/branch.c:158 #, c-format msgid "" "not deleting branch '%s' that is not yet merged to\n" @@ -9570,12 +9760,12 @@ msgstr "" "branche '%s' non supprimée car elle n'a pas été fusionnée dans\n" " '%s', même si elle est fusionnée dans HEAD." -#: builtin/branch.c:169 +#: builtin/branch.c:172 #, c-format msgid "Couldn't look up commit object for '%s'" msgstr "Impossible de rechercher l'objet commit pour '%s'" -#: builtin/branch.c:173 +#: builtin/branch.c:176 #, c-format msgid "" "The branch '%s' is not fully merged.\n" @@ -9584,125 +9774,125 @@ msgstr "" "La branche '%s' n'est pas totalement fusionnée.\n" "Si vous souhaitez réellement la supprimer, lancez 'git branch -D %s'." -#: builtin/branch.c:186 +#: builtin/branch.c:189 msgid "Update of config-file failed" msgstr "Échec de la mise à jour du fichier de configuration" -#: builtin/branch.c:217 +#: builtin/branch.c:220 msgid "cannot use -a with -d" msgstr "impossible d'utiliser -a avec -d" -#: builtin/branch.c:223 +#: builtin/branch.c:226 msgid "Couldn't look up commit object for HEAD" msgstr "Impossible de rechercher l'objet commit pour HEAD" -#: builtin/branch.c:237 +#: builtin/branch.c:240 #, c-format msgid "Cannot delete branch '%s' checked out at '%s'" msgstr "Impossible de supprimer la branche '%s' extraite dans '%s'" -#: builtin/branch.c:252 +#: builtin/branch.c:255 #, c-format msgid "remote-tracking branch '%s' not found." msgstr "branche de suivi '%s' non trouvée." -#: builtin/branch.c:253 +#: builtin/branch.c:256 #, c-format msgid "branch '%s' not found." msgstr "branche '%s' non trouvée." -#: builtin/branch.c:268 +#: builtin/branch.c:271 #, c-format msgid "Error deleting remote-tracking branch '%s'" msgstr "Erreur lors de la suppression de la branche de suivi '%s'" -#: builtin/branch.c:269 +#: builtin/branch.c:272 #, c-format msgid "Error deleting branch '%s'" msgstr "Erreur lors de la suppression de la branche '%s'" -#: builtin/branch.c:276 +#: builtin/branch.c:279 #, c-format msgid "Deleted remote-tracking branch %s (was %s).\n" msgstr "Branche de suivi %s supprimée (précédemment %s).\n" -#: builtin/branch.c:277 +#: builtin/branch.c:280 #, c-format msgid "Deleted branch %s (was %s).\n" msgstr "Branche %s supprimée (précédemment %s).\n" -#: builtin/branch.c:421 builtin/tag.c:60 +#: builtin/branch.c:429 builtin/tag.c:61 msgid "unable to parse format string" msgstr "impossible d'analyser la chaîne de format" -#: builtin/branch.c:452 +#: builtin/branch.c:460 msgid "could not resolve HEAD" msgstr "impossible de résoudre HEAD" -#: builtin/branch.c:458 +#: builtin/branch.c:466 #, c-format msgid "HEAD (%s) points outside of refs/heads/" msgstr "HEAD (%s) pointe hors de refs/heads/" -#: builtin/branch.c:473 +#: builtin/branch.c:481 #, c-format msgid "Branch %s is being rebased at %s" msgstr "La branche %s est en cours de rebasage sur %s" -#: builtin/branch.c:477 +#: builtin/branch.c:485 #, c-format msgid "Branch %s is being bisected at %s" msgstr "La branche %s est en cours de bissection sur %s" -#: builtin/branch.c:494 +#: builtin/branch.c:502 msgid "cannot copy the current branch while not on any." msgstr "impossible de copier la branche actuelle, il n'y en a pas." -#: builtin/branch.c:496 +#: builtin/branch.c:504 msgid "cannot rename the current branch while not on any." msgstr "impossible de renommer la branche actuelle, il n'y en a pas." -#: builtin/branch.c:507 +#: builtin/branch.c:515 #, c-format msgid "Invalid branch name: '%s'" msgstr "Nom de branche invalide : '%s'" -#: builtin/branch.c:534 +#: builtin/branch.c:542 msgid "Branch rename failed" msgstr "Échec de renommage de la branche" -#: builtin/branch.c:536 +#: builtin/branch.c:544 msgid "Branch copy failed" msgstr "Échec de copie de la branche" -#: builtin/branch.c:540 +#: builtin/branch.c:548 #, c-format msgid "Created a copy of a misnamed branch '%s'" msgstr "Création d'une copie d'une branche mal nommée '%s'" -#: builtin/branch.c:543 +#: builtin/branch.c:551 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "Renommage d'une branche mal nommée '%s'" -#: builtin/branch.c:549 +#: builtin/branch.c:557 #, c-format msgid "Branch renamed to %s, but HEAD is not updated!" msgstr "La branche a été renommée en %s, mais HEAD n'est pas mise à jour !" -#: builtin/branch.c:558 +#: builtin/branch.c:566 msgid "Branch is renamed, but update of config-file failed" msgstr "" "La branche est renommée, mais la mise à jour du fichier de configuration a " "échoué" -#: builtin/branch.c:560 +#: builtin/branch.c:568 msgid "Branch is copied, but update of config-file failed" msgstr "" "La branche est copiée, mais la mise à jour du fichier de configuration a " "échoué" -#: builtin/branch.c:576 +#: builtin/branch.c:584 #, c-format msgid "" "Please edit the description for the branch\n" @@ -9713,180 +9903,180 @@ msgstr "" " %s\n" "Les lignes commençant par '%c' seront ignorées.\n" -#: builtin/branch.c:610 +#: builtin/branch.c:618 msgid "Generic options" msgstr "Options génériques" -#: builtin/branch.c:612 +#: builtin/branch.c:620 msgid "show hash and subject, give twice for upstream branch" msgstr "afficher le hachage et le sujet, doublé pour la branche amont" -#: builtin/branch.c:613 +#: builtin/branch.c:621 msgid "suppress informational messages" msgstr "supprimer les messages d'information" -#: builtin/branch.c:614 +#: builtin/branch.c:622 msgid "set up tracking mode (see git-pull(1))" msgstr "régler le mode de suivi (voir git-pull(1))" -#: builtin/branch.c:616 +#: builtin/branch.c:624 msgid "do not use" msgstr "ne pas utiliser" -#: builtin/branch.c:618 builtin/rebase.c:485 +#: builtin/branch.c:626 builtin/rebase.c:485 msgid "upstream" msgstr "amont" -#: builtin/branch.c:618 +#: builtin/branch.c:626 msgid "change the upstream info" msgstr "modifier l'information amont" -#: builtin/branch.c:619 +#: builtin/branch.c:627 msgid "Unset the upstream info" msgstr "Désactiver l'information amont" -#: builtin/branch.c:620 +#: builtin/branch.c:628 msgid "use colored output" msgstr "utiliser la coloration dans la sortie" -#: builtin/branch.c:621 +#: builtin/branch.c:629 msgid "act on remote-tracking branches" msgstr "agir sur les branches de suivi distantes" -#: builtin/branch.c:623 builtin/branch.c:625 +#: builtin/branch.c:631 builtin/branch.c:633 msgid "print only branches that contain the commit" msgstr "afficher seulement les branches qui contiennent le commit" -#: builtin/branch.c:624 builtin/branch.c:626 +#: builtin/branch.c:632 builtin/branch.c:634 msgid "print only branches that don't contain the commit" msgstr "afficher seulement les branches qui ne contiennent pas le commit" -#: builtin/branch.c:629 +#: builtin/branch.c:637 msgid "Specific git-branch actions:" msgstr "Actions spécifiques à git-branch :" -#: builtin/branch.c:630 +#: builtin/branch.c:638 msgid "list both remote-tracking and local branches" msgstr "afficher à la fois les branches de suivi et les branches locales" -#: builtin/branch.c:632 +#: builtin/branch.c:640 msgid "delete fully merged branch" msgstr "supprimer une branche totalement fusionnée" -#: builtin/branch.c:633 +#: builtin/branch.c:641 msgid "delete branch (even if not merged)" msgstr "supprimer une branche (même non fusionnée)" -#: builtin/branch.c:634 +#: builtin/branch.c:642 msgid "move/rename a branch and its reflog" msgstr "déplacer/renommer une branche et son reflog" -#: builtin/branch.c:635 +#: builtin/branch.c:643 msgid "move/rename a branch, even if target exists" msgstr "déplacer/renommer une branche, même si la cible existe" -#: builtin/branch.c:636 +#: builtin/branch.c:644 msgid "copy a branch and its reflog" msgstr "copier une branche et son reflog" -#: builtin/branch.c:637 +#: builtin/branch.c:645 msgid "copy a branch, even if target exists" msgstr "copier une branche, même si la cible existe" -#: builtin/branch.c:638 +#: builtin/branch.c:646 msgid "list branch names" msgstr "afficher les noms des branches" -#: builtin/branch.c:639 +#: builtin/branch.c:647 msgid "show current branch name" msgstr "afficher le nom de la branche courante" -#: builtin/branch.c:640 +#: builtin/branch.c:648 msgid "create the branch's reflog" msgstr "créer le reflog de la branche" -#: builtin/branch.c:642 +#: builtin/branch.c:650 msgid "edit the description for the branch" msgstr "éditer la description de la branche" -#: builtin/branch.c:643 +#: builtin/branch.c:651 msgid "force creation, move/rename, deletion" msgstr "forcer la création, le déplacement/renommage, ou la suppression" -#: builtin/branch.c:644 +#: builtin/branch.c:652 msgid "print only branches that are merged" msgstr "afficher seulement les branches qui sont fusionnées" -#: builtin/branch.c:645 +#: builtin/branch.c:653 msgid "print only branches that are not merged" msgstr "afficher seulement les branches qui ne sont pas fusionnées" -#: builtin/branch.c:646 +#: builtin/branch.c:654 msgid "list branches in columns" msgstr "afficher les branches en colonnes" -#: builtin/branch.c:649 builtin/for-each-ref.c:42 builtin/notes.c:415 +#: builtin/branch.c:657 builtin/for-each-ref.c:42 builtin/notes.c:415 #: builtin/notes.c:418 builtin/notes.c:581 builtin/notes.c:584 -#: builtin/tag.c:427 +#: builtin/tag.c:433 msgid "object" msgstr "objet" -#: builtin/branch.c:650 +#: builtin/branch.c:658 msgid "print only branches of the object" msgstr "afficher seulement les branches de l'objet" -#: builtin/branch.c:652 builtin/for-each-ref.c:48 builtin/tag.c:434 +#: builtin/branch.c:660 builtin/for-each-ref.c:48 builtin/tag.c:440 msgid "sorting and filtering are case insensitive" msgstr "le tri et le filtrage sont non-sensibles à la casse" -#: builtin/branch.c:653 builtin/for-each-ref.c:38 builtin/tag.c:432 -#: builtin/verify-tag.c:39 +#: builtin/branch.c:661 builtin/for-each-ref.c:38 builtin/tag.c:438 +#: builtin/verify-tag.c:38 msgid "format to use for the output" msgstr "format à utiliser pour la sortie" -#: builtin/branch.c:676 builtin/clone.c:748 +#: builtin/branch.c:684 builtin/clone.c:761 msgid "HEAD not found below refs/heads!" msgstr "HEAD non trouvée sous refs/heads !" -#: builtin/branch.c:700 +#: builtin/branch.c:708 msgid "--column and --verbose are incompatible" msgstr "--column et --verbose sont incompatibles" -#: builtin/branch.c:715 builtin/branch.c:769 builtin/branch.c:778 +#: builtin/branch.c:723 builtin/branch.c:777 builtin/branch.c:786 msgid "branch name required" msgstr "le nom de branche est requis" -#: builtin/branch.c:745 +#: builtin/branch.c:753 msgid "Cannot give description to detached HEAD" msgstr "Impossible de décrire une HEAD détachée" -#: builtin/branch.c:750 +#: builtin/branch.c:758 msgid "cannot edit description of more than one branch" msgstr "impossible d'éditer la description de plus d'une branche" -#: builtin/branch.c:757 +#: builtin/branch.c:765 #, c-format msgid "No commit on branch '%s' yet." msgstr "Aucun commit sur la branche '%s'." -#: builtin/branch.c:760 +#: builtin/branch.c:768 #, c-format msgid "No branch named '%s'." msgstr "Aucune branche nommée '%s'." -#: builtin/branch.c:775 +#: builtin/branch.c:783 msgid "too many branches for a copy operation" msgstr "trop de branches pour une opération de copie" -#: builtin/branch.c:784 +#: builtin/branch.c:792 msgid "too many arguments for a rename operation" msgstr "trop d'arguments pour une opération de renommage" -#: builtin/branch.c:789 +#: builtin/branch.c:797 msgid "too many arguments to set new upstream" msgstr "trop d'arguments pour spécifier une branche amont" -#: builtin/branch.c:793 +#: builtin/branch.c:801 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." @@ -9894,37 +10084,41 @@ msgstr "" "impossible de spécifier une branche amont de HEAD par %s qui ne pointe sur " "aucune branche." -#: builtin/branch.c:796 builtin/branch.c:819 +#: builtin/branch.c:804 builtin/branch.c:827 #, c-format msgid "no such branch '%s'" msgstr "pas de branche '%s'" -#: builtin/branch.c:800 +#: builtin/branch.c:808 #, c-format msgid "branch '%s' does not exist" msgstr "la branche '%s' n'existe pas" -#: builtin/branch.c:813 +#: builtin/branch.c:821 msgid "too many arguments to unset upstream" msgstr "trop d'arguments pour désactiver un amont" -#: builtin/branch.c:817 +#: builtin/branch.c:825 msgid "could not unset upstream of HEAD when it does not point to any branch." msgstr "" "impossible de désactiver une branche amont de HEAD quand elle ne pointe sur " "aucune branche." -#: builtin/branch.c:823 +#: builtin/branch.c:831 #, c-format msgid "Branch '%s' has no upstream information" msgstr "La branche '%s' n'a aucune information de branche amont" -#: builtin/branch.c:833 -msgid "-a and -r options to 'git branch' do not make sense with a branch name" +#: builtin/branch.c:841 +msgid "" +"The -a, and -r, options to 'git branch' do not take a branch name.\n" +"Did you mean to use: -a|-r --list <pattern>?" msgstr "" -"les options -a et -r de 'git branch' n'ont pas de sens avec un nom de branche" +"Les options -a et -r de 'git branch' n'ont pas de sens avec un nom de " +"branche.\n" +"Vouliez-vous plutôt dire -a|-r --list <motif> ?" -#: builtin/branch.c:836 +#: builtin/branch.c:845 msgid "" "the '--set-upstream' option is no longer supported. Please use '--track' or " "'--set-upstream-to' instead." @@ -9945,7 +10139,7 @@ msgstr "La création d'un colis requiert un dépôt." msgid "Need a repository to unbundle." msgstr "Le dépaquetage d'un colis requiert un dépôt." -#: builtin/cat-file.c:593 +#: builtin/cat-file.c:594 msgid "" "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" "p | <type> | --textconv | --filters) [--path=<path>] <object>" @@ -9953,7 +10147,7 @@ msgstr "" "git cat-file (-t [--allow-unknow-type] | -s [--allow-unknow-type] | -e | -p " "| <type> | --textconv | --filters) [--path=<chemin>] <objet>" -#: builtin/cat-file.c:594 +#: builtin/cat-file.c:595 msgid "" "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" "filters]" @@ -9961,74 +10155,74 @@ msgstr "" "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" "filters]" -#: builtin/cat-file.c:615 +#: builtin/cat-file.c:616 msgid "only one batch option may be specified" msgstr "une seule option de traitement ne peut être spécifiée à la fois" -#: builtin/cat-file.c:633 +#: builtin/cat-file.c:634 msgid "<type> can be one of: blob, tree, commit, tag" msgstr "<type> peut être : blob, tree, commit ou tag" -#: builtin/cat-file.c:634 +#: builtin/cat-file.c:635 msgid "show object type" msgstr "afficher le type de l'objet" -#: builtin/cat-file.c:635 +#: builtin/cat-file.c:636 msgid "show object size" msgstr "afficher la taille de l'objet" -#: builtin/cat-file.c:637 +#: builtin/cat-file.c:638 msgid "exit with zero when there's no error" msgstr "sortir avec un code d'erreur nul quand il n'y a aucune erreur" -#: builtin/cat-file.c:638 +#: builtin/cat-file.c:639 msgid "pretty-print object's content" msgstr "afficher avec mise en forme le contenu de l'objet" -#: builtin/cat-file.c:640 +#: builtin/cat-file.c:641 msgid "for blob objects, run textconv on object's content" msgstr "pour les objets blob, lancer textconv sur le contenu de l'objet" -#: builtin/cat-file.c:642 +#: builtin/cat-file.c:643 msgid "for blob objects, run filters on object's content" msgstr "pour les objets blob, lancer les filtres sur le contenu de l'objet" -#: builtin/cat-file.c:643 git-submodule.sh:936 +#: builtin/cat-file.c:644 git-submodule.sh:936 msgid "blob" msgstr "blob" -#: builtin/cat-file.c:644 +#: builtin/cat-file.c:645 msgid "use a specific path for --textconv/--filters" msgstr "utiliser un chemin spécifique pour --textconv/--filters" -#: builtin/cat-file.c:646 +#: builtin/cat-file.c:647 msgid "allow -s and -t to work with broken/corrupt objects" msgstr "autoriser -s et -t à travailler sur des objets cassés/corrompus" -#: builtin/cat-file.c:647 +#: builtin/cat-file.c:648 msgid "buffer --batch output" msgstr "bufferiser la sortie de --batch" -#: builtin/cat-file.c:649 +#: builtin/cat-file.c:650 msgid "show info and content of objects fed from the standard input" msgstr "" "afficher l'information et le contenu des objets passés en entrée standard" -#: builtin/cat-file.c:653 +#: builtin/cat-file.c:654 msgid "show info about objects fed from the standard input" msgstr "afficher l'information des objets passés en entrée standard" -#: builtin/cat-file.c:657 +#: builtin/cat-file.c:658 msgid "follow in-tree symlinks (used with --batch or --batch-check)" msgstr "" "suivre les liens symbolique internes à la copie de travail (utilisé avec --" "batch ou --batch-check)" -#: builtin/cat-file.c:659 +#: builtin/cat-file.c:660 msgid "show all objects with --batch or --batch-check" msgstr "montrer tous les objets avec --batch ou --batch-check" -#: builtin/cat-file.c:661 +#: builtin/cat-file.c:662 msgid "do not order --batch-all-objects output" msgstr "ne pas ordonner la sortie de --batch-all-objects" @@ -10057,8 +10251,8 @@ msgid "terminate input and output records by a NUL character" msgstr "" "terminer les enregistrements en entrée et en sortie par un caractère NUL" -#: builtin/check-ignore.c:21 builtin/checkout.c:1355 builtin/gc.c:538 -#: builtin/worktree.c:499 +#: builtin/check-ignore.c:21 builtin/checkout.c:1433 builtin/gc.c:538 +#: builtin/worktree.c:507 msgid "suppress progress reporting" msgstr "supprimer l'état d'avancement" @@ -10150,9 +10344,9 @@ msgid "write the content to temporary files" msgstr "écrire le contenu dans des fichiers temporaires" #: builtin/checkout-index.c:178 builtin/column.c:31 -#: builtin/submodule--helper.c:1372 builtin/submodule--helper.c:1375 -#: builtin/submodule--helper.c:1383 builtin/submodule--helper.c:1856 -#: builtin/worktree.c:672 +#: builtin/submodule--helper.c:1373 builtin/submodule--helper.c:1376 +#: builtin/submodule--helper.c:1384 builtin/submodule--helper.c:1857 +#: builtin/worktree.c:680 msgid "string" msgstr "chaîne" @@ -10164,93 +10358,116 @@ msgstr "lors de la création de fichiers, préfixer par <chaîne>" msgid "copy out the files from named stage" msgstr "copier les fichiers depuis l'index nommé" -#: builtin/checkout.c:32 +#: builtin/checkout.c:31 msgid "git checkout [<options>] <branch>" msgstr "git checkout [<options>] <branche>" -#: builtin/checkout.c:33 +#: builtin/checkout.c:32 msgid "git checkout [<options>] [<branch>] -- <file>..." msgstr "git checkout [<options>] [<branche>] -- <fichier>..." -#: builtin/checkout.c:151 builtin/checkout.c:190 +#: builtin/checkout.c:37 +msgid "git switch [<options>] [<branch>]" +msgstr "git switch [<options>] <branche>" + +#: builtin/checkout.c:42 +msgid "git restore [<options>] [--source=<branch>] <file>..." +msgstr "git restore [<options>] [--source=<branche>] <fichier>..." + +#: builtin/checkout.c:172 builtin/checkout.c:211 #, c-format msgid "path '%s' does not have our version" msgstr "le chemin '%s' n'a pas notre version" -#: builtin/checkout.c:153 builtin/checkout.c:192 +#: builtin/checkout.c:174 builtin/checkout.c:213 #, c-format msgid "path '%s' does not have their version" msgstr "le chemin '%s' n'a pas leur version" -#: builtin/checkout.c:169 +#: builtin/checkout.c:190 #, c-format msgid "path '%s' does not have all necessary versions" msgstr "le chemin '%s' n'a aucune des versions nécessaires" -#: builtin/checkout.c:219 +#: builtin/checkout.c:240 #, c-format msgid "path '%s' does not have necessary versions" msgstr "le chemin '%s' n'a pas les versions nécessaires" -#: builtin/checkout.c:237 +#: builtin/checkout.c:258 #, c-format msgid "path '%s': cannot merge" msgstr "chemin '%s' : impossible de fusionner" -#: builtin/checkout.c:253 +#: builtin/checkout.c:274 #, c-format msgid "Unable to add merge result for '%s'" msgstr "Impossible d'ajouter le résultat de fusion pour '%s'" -#: builtin/checkout.c:331 builtin/checkout.c:334 builtin/checkout.c:337 -#: builtin/checkout.c:340 +#: builtin/checkout.c:374 +#, c-format +msgid "Recreated %d merge conflict" +msgid_plural "Recreated %d merge conflicts" +msgstr[0] "%d conflit du fusion recréé" +msgstr[1] "%d conflits du fusion recréés" + +#: builtin/checkout.c:379 +#, c-format +msgid "Updated %d path from %s" +msgid_plural "Updated %d paths from %s" +msgstr[0] "%d chemin mis à jour depuis %s" +msgstr[1] "%d chemins mis à jour depuis %s" + +#: builtin/checkout.c:386 +#, c-format +msgid "Updated %d path from the index" +msgid_plural "Updated %d paths from the index" +msgstr[0] "%d chemin mis à jour depuis l'index" +msgstr[1] "%d chemins mis à jour depuis l'index" + +#: builtin/checkout.c:409 builtin/checkout.c:412 builtin/checkout.c:415 +#: builtin/checkout.c:419 #, c-format msgid "'%s' cannot be used with updating paths" msgstr "'%s' ne peut pas être utilisé avec des mises à jour de chemins" -#: builtin/checkout.c:343 builtin/checkout.c:346 +#: builtin/checkout.c:422 builtin/checkout.c:425 #, c-format msgid "'%s' cannot be used with %s" msgstr "'%s' ne peut pas être utilisé avec %s" -#: builtin/checkout.c:349 +#: builtin/checkout.c:429 #, c-format msgid "Cannot update paths and switch to branch '%s' at the same time." msgstr "" "Impossible de mettre à jour les chemins et basculer sur la branche '%s' en " "même temps." -#: builtin/checkout.c:396 builtin/checkout.c:403 +#: builtin/checkout.c:433 #, c-format -msgid "path '%s' is unmerged" -msgstr "le chemin '%s' n'est pas fusionné" +msgid "neither '%s' or '%s' is specified" +msgstr "ni '%s', ni '%s' spécifié" -#: builtin/checkout.c:442 +#: builtin/checkout.c:437 #, c-format -msgid "Recreated %d merge conflict" -msgid_plural "Recreated %d merge conflicts" -msgstr[0] "%d conflit du fusion recréé" -msgstr[1] "%d conflits du fusion recréés" +msgid "'%s' must be used when '%s' is not specified" +msgstr "'%s' ne peut pas être utilisé quand '%s' n'est pas spécifié" -#: builtin/checkout.c:447 +#: builtin/checkout.c:442 builtin/checkout.c:447 #, c-format -msgid "Updated %d path from %s" -msgid_plural "Updated %d paths from %s" -msgstr[0] "%d chemin mis à jour depuis %s" -msgstr[1] "%d chemins mis à jour depuis %s" +msgid "'%s' or '%s' cannot be used with %s" +msgstr "'%s' ou '%s' ne peut pas être utilisé avec %s" -#: builtin/checkout.c:454 +#: builtin/checkout.c:506 builtin/checkout.c:513 #, c-format -msgid "Updated %d path from the index" -msgid_plural "Updated %d paths from the index" -msgstr[0] "%d chemin mis à jour depuis l'index" -msgstr[1] "%d chemins mis à jour depuis l'index" +msgid "path '%s' is unmerged" +msgstr "le chemin '%s' n'est pas fusionné" -#: builtin/checkout.c:695 +#: builtin/checkout.c:679 msgid "you need to resolve your current index first" msgstr "vous devez d'abord résoudre votre index courant" -#: builtin/checkout.c:744 +#: builtin/checkout.c:729 #, c-format msgid "" "cannot continue with staged changes in the following files:\n" @@ -10260,56 +10477,56 @@ msgstr "" "suivants :\n" "%s" -#: builtin/checkout.c:751 +#: builtin/checkout.c:736 #, c-format msgid "staged changes in the following files may be lost: %s" msgstr "" "les modifications indexées dans les fichiers suivants seraient perdues : %s" -#: builtin/checkout.c:848 +#: builtin/checkout.c:833 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "Impossible de faire un reflog pour '%s' : %s\n" -#: builtin/checkout.c:890 +#: builtin/checkout.c:875 msgid "HEAD is now at" msgstr "HEAD est maintenant sur" -#: builtin/checkout.c:894 builtin/clone.c:701 +#: builtin/checkout.c:879 builtin/clone.c:714 msgid "unable to update HEAD" msgstr "impossible de mettre à jour HEAD" -#: builtin/checkout.c:898 +#: builtin/checkout.c:883 #, c-format msgid "Reset branch '%s'\n" msgstr "Remise à zéro de la branche '%s'\n" -#: builtin/checkout.c:901 +#: builtin/checkout.c:886 #, c-format msgid "Already on '%s'\n" msgstr "Déjà sur '%s'\n" -#: builtin/checkout.c:905 +#: builtin/checkout.c:890 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "Basculement et remise à zéro de la branche '%s'\n" -#: builtin/checkout.c:907 builtin/checkout.c:1283 +#: builtin/checkout.c:892 builtin/checkout.c:1289 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "Basculement sur la nouvelle branche '%s'\n" -#: builtin/checkout.c:909 +#: builtin/checkout.c:894 #, c-format msgid "Switched to branch '%s'\n" msgstr "Basculement sur la branche '%s'\n" -#: builtin/checkout.c:960 +#: builtin/checkout.c:945 #, c-format msgid " ... and %d more.\n" msgstr " ... et %d en plus.\n" -#: builtin/checkout.c:966 +#: builtin/checkout.c:951 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -10332,7 +10549,7 @@ msgstr[1] "" "\n" "%s\n" -#: builtin/checkout.c:985 +#: builtin/checkout.c:970 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -10361,24 +10578,28 @@ msgstr[1] "" "git branch <nouvelle-branche> %s\n" "\n" -#: builtin/checkout.c:1017 +#: builtin/checkout.c:1005 msgid "internal error in revision walk" msgstr "erreur interne lors du parcours des révisions" -#: builtin/checkout.c:1021 +#: builtin/checkout.c:1009 msgid "Previous HEAD position was" msgstr "La position précédente de HEAD était sur" -#: builtin/checkout.c:1052 builtin/checkout.c:1278 +#: builtin/checkout.c:1049 builtin/checkout.c:1284 msgid "You are on a branch yet to be born" msgstr "Vous êtes sur une branche qui doit encore naître" -#: builtin/checkout.c:1173 +#: builtin/checkout.c:1176 +msgid "only one reference expected" +msgstr "une seule référence attendue" + +#: builtin/checkout.c:1193 #, c-format msgid "only one reference expected, %d given." msgstr "une seule référence attendue, %d fournies." -#: builtin/checkout.c:1209 +#: builtin/checkout.c:1230 #, c-format msgid "" "'%s' could be both a local file and a tracking branch.\n" @@ -10387,153 +10608,209 @@ msgstr "" "'%s' pourrait être un fichier local ou un branche de suivi.\n" "Veuillez utiliser -- (et --no-guess en facultatif) pour les distinguer" -#: builtin/checkout.c:1222 builtin/worktree.c:290 builtin/worktree.c:448 +#: builtin/checkout.c:1243 builtin/worktree.c:291 builtin/worktree.c:456 #, c-format msgid "invalid reference: %s" msgstr "référence invalide : %s" -#: builtin/checkout.c:1251 +#: builtin/checkout.c:1256 builtin/checkout.c:1618 #, c-format msgid "reference is not a tree: %s" msgstr "la référence n'est pas un arbre : %s" -#: builtin/checkout.c:1292 +#: builtin/checkout.c:1303 +#, c-format +msgid "a branch is expected, got tag '%s'" +msgstr "branche attendue, mais étiquette '%s' reçue" + +#: builtin/checkout.c:1305 +#, c-format +msgid "a branch is expected, got remote branch '%s'" +msgstr "une branche est attendue, mais une branche distante '%s' a été reçue" + +#: builtin/checkout.c:1306 builtin/checkout.c:1314 +#, c-format +msgid "a branch is expected, got '%s'" +msgstr "une branche est attendue, mais '%s' a été reçue" + +#: builtin/checkout.c:1309 +#, c-format +msgid "a branch is expected, got commit '%s'" +msgstr "une branche est attendue, mais un commit '%s' a été reçu" + +#: builtin/checkout.c:1325 +msgid "" +"cannot switch branch while merging\n" +"Consider \"git merge --quit\" or \"git worktree add\"." +msgstr "" +"impossible de basculer de branche pendant une fusion\n" +"Envisagez \"git merge --quit\" ou \"git worktree add\"." + +#: builtin/checkout.c:1329 +msgid "" +"cannot switch branch in the middle of an am session\n" +"Consider \"git am --quit\" or \"git worktree add\"." +msgstr "" +"impossible de basculer de branche pendant une session am\n" +"Envisagez \"git am --quit\" ou \"git worktree add\"." + +#: builtin/checkout.c:1333 +msgid "" +"cannot switch branch while rebasing\n" +"Consider \"git rebase --quit\" or \"git worktree add\"." +msgstr "" +"impossible de basculer de branche pendant un rebasage\n" +"Envisagez \"git rebase --quit\" ou \"git worktree add\"." + +#: builtin/checkout.c:1337 +msgid "" +"cannot switch branch while cherry-picking\n" +"Consider \"git cherry-pick --quit\" or \"git worktree add\"." +msgstr "" +"impossible de basculer de branche pendant un picorage\n" +"Envisagez \"git cherry-pick --quit\" ou \"git worktree add\"." + +#: builtin/checkout.c:1341 +msgid "" +"cannot switch branch while reverting\n" +"Consider \"git revert --quit\" or \"git worktree add\"." +msgstr "" +"impossible de basculer de branche pendant un retour\n" +"Envisagez \"git revert --quit\" ou \"git worktree add\"." + +#: builtin/checkout.c:1345 +msgid "you are switching branch while bisecting" +msgstr "Vous basculez de branche en cours de bissection" + +#: builtin/checkout.c:1352 msgid "paths cannot be used with switching branches" msgstr "impossible d'utiliser des chemins avec un basculement de branches" -#: builtin/checkout.c:1295 builtin/checkout.c:1299 builtin/checkout.c:1303 +#: builtin/checkout.c:1355 builtin/checkout.c:1359 builtin/checkout.c:1363 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "'%s' ne peut pas être utilisé avec un basculement de branches" -#: builtin/checkout.c:1307 builtin/checkout.c:1310 builtin/checkout.c:1315 -#: builtin/checkout.c:1318 +#: builtin/checkout.c:1367 builtin/checkout.c:1370 builtin/checkout.c:1373 +#: builtin/checkout.c:1378 builtin/checkout.c:1383 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "'%s' ne peut pas être utilisé avec '%s'" -#: builtin/checkout.c:1323 +#: builtin/checkout.c:1380 +#, c-format +msgid "'%s' cannot take <start-point>" +msgstr "'%s' n'accepte pas <point-de-départ>" + +#: builtin/checkout.c:1388 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "Impossible de basculer de branche vers '%s' qui n'est pas un commit" -#: builtin/checkout.c:1356 builtin/checkout.c:1358 builtin/clone.c:118 -#: builtin/remote.c:169 builtin/remote.c:171 builtin/worktree.c:492 -#: builtin/worktree.c:494 -msgid "branch" -msgstr "branche" +#: builtin/checkout.c:1395 +msgid "missing branch or commit argument" +msgstr "argument de branche ou de commit manquant" -#: builtin/checkout.c:1357 -msgid "create and checkout a new branch" -msgstr "créer et extraire une nouvelle branche" +#: builtin/checkout.c:1437 builtin/clone.c:91 builtin/fetch.c:151 +#: builtin/merge.c:285 builtin/pull.c:137 builtin/push.c:575 +#: builtin/send-pack.c:174 +msgid "force progress reporting" +msgstr "forcer l'affichage de l'état d'avancement" -#: builtin/checkout.c:1359 -msgid "create/reset and checkout a branch" -msgstr "créer/réinitialiser et extraire une branche" +#: builtin/checkout.c:1438 +msgid "perform a 3-way merge with the new branch" +msgstr "effectuer une fusion à 3 points avec la nouvelle branche" -#: builtin/checkout.c:1360 -msgid "create reflog for new branch" -msgstr "créer un reflog pour une nouvelle branche" +#: builtin/checkout.c:1439 builtin/log.c:1617 parse-options.h:318 +msgid "style" +msgstr "style" -#: builtin/checkout.c:1361 builtin/worktree.c:496 +#: builtin/checkout.c:1440 +msgid "conflict style (merge or diff3)" +msgstr "style de conflit (merge (fusion) ou diff3)" + +#: builtin/checkout.c:1452 builtin/worktree.c:504 msgid "detach HEAD at named commit" msgstr "détacher la HEAD au commit nommé" -#: builtin/checkout.c:1362 +#: builtin/checkout.c:1453 msgid "set upstream info for new branch" msgstr "paramétrer les coordonnées de branche amont pour une nouvelle branche" -#: builtin/checkout.c:1364 +#: builtin/checkout.c:1455 +msgid "force checkout (throw away local modifications)" +msgstr "forcer l'extraction (laisser tomber les modifications locales)" + +#: builtin/checkout.c:1457 msgid "new-branch" msgstr "nouvelle branche" -#: builtin/checkout.c:1364 +#: builtin/checkout.c:1457 msgid "new unparented branch" msgstr "nouvelle branche sans parent" -#: builtin/checkout.c:1366 -msgid "checkout our version for unmerged files" -msgstr "extraire notre version pour les fichiers non fusionnés" - -#: builtin/checkout.c:1369 -msgid "checkout their version for unmerged files" -msgstr "extraire leur version pour les fichiers non fusionnés" - -#: builtin/checkout.c:1371 -msgid "force checkout (throw away local modifications)" -msgstr "forcer l'extraction (laisser tomber les modifications locales)" - -#: builtin/checkout.c:1373 -msgid "perform a 3-way merge with the new branch" -msgstr "effectuer une fusion à 3 points avec la nouvelle branche" - -#: builtin/checkout.c:1375 builtin/merge.c:284 +#: builtin/checkout.c:1459 builtin/merge.c:288 msgid "update ignored files (default)" msgstr "mettre à jour les fichiers ignorés (par défaut)" -#: builtin/checkout.c:1377 builtin/log.c:1594 parse-options.h:317 -msgid "style" -msgstr "style" - -#: builtin/checkout.c:1378 -msgid "conflict style (merge or diff3)" -msgstr "style de conflit (merge (fusion) ou diff3)" - -#: builtin/checkout.c:1381 -msgid "do not limit pathspecs to sparse entries only" -msgstr "ne pas limiter les spécificateurs de chemins aux seuls éléments creux" - -#: builtin/checkout.c:1383 -msgid "do not second guess 'git checkout <no-such-branch>'" -msgstr "ne pas essayer d'interpréter 'git checkout <branche-inexistante>'" - -#: builtin/checkout.c:1385 +#: builtin/checkout.c:1462 msgid "do not check if another worktree is holding the given ref" msgstr "" "ne pas vérifier si une autre copie de travail contient le référence fournie" -#: builtin/checkout.c:1389 builtin/clone.c:88 builtin/fetch.c:141 -#: builtin/merge.c:281 builtin/pull.c:136 builtin/push.c:575 -#: builtin/send-pack.c:174 -msgid "force progress reporting" -msgstr "forcer l'affichage de l'état d'avancement" +#: builtin/checkout.c:1475 +msgid "checkout our version for unmerged files" +msgstr "extraire notre version pour les fichiers non fusionnés" -#: builtin/checkout.c:1390 -msgid "use overlay mode (default)" -msgstr "utiliser le mode de superposition (défaut)" +#: builtin/checkout.c:1478 +msgid "checkout their version for unmerged files" +msgstr "extraire leur version pour les fichiers non fusionnés" + +#: builtin/checkout.c:1482 +msgid "do not limit pathspecs to sparse entries only" +msgstr "ne pas limiter les spécificateurs de chemins aux seuls éléments creux" -#: builtin/checkout.c:1422 +#: builtin/checkout.c:1533 msgid "-b, -B and --orphan are mutually exclusive" msgstr "-b, -B et --orphan sont mutuellement exclusifs" -#: builtin/checkout.c:1425 +#: builtin/checkout.c:1536 msgid "-p and --overlay are mutually exclusive" msgstr "-p et --overlay sont mutuellement exclusifs" -#: builtin/checkout.c:1442 +#: builtin/checkout.c:1573 msgid "--track needs a branch name" msgstr "--track requiert un nom de branche" -#: builtin/checkout.c:1447 +#: builtin/checkout.c:1578 msgid "missing branch name; try -b" msgstr "nom de branche manquant ; essayez -b" -#: builtin/checkout.c:1484 +#: builtin/checkout.c:1611 +#, c-format +msgid "could not resolve %s" +msgstr "impossible de résoudre %s" + +#: builtin/checkout.c:1623 +msgid "you must specify path(s) to restore" +msgstr "Vous devez spécifier un ou des chemins à restaurer" + +#: builtin/checkout.c:1631 msgid "invalid path specification" msgstr "spécification de chemin invalide" -#: builtin/checkout.c:1491 +#: builtin/checkout.c:1638 #, c-format msgid "'%s' is not a commit and a branch '%s' cannot be created from it" msgstr "" "'%s' n'est pas un commit et une branche '%s' ne peut pas en être créée depuis" -#: builtin/checkout.c:1495 +#: builtin/checkout.c:1642 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "git checkout: --detach n'accepte pas un argument de chemin '%s'" -#: builtin/checkout.c:1499 +#: builtin/checkout.c:1646 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -10541,7 +10818,7 @@ msgstr "" "git checkout: --ours/--theirs, --force et --merge sont incompatibles lors\n" "de l'extraction de l'index." -#: builtin/checkout.c:1519 +#: builtin/checkout.c:1666 #, c-format msgid "" "'%s' matched more than one remote tracking branch.\n" @@ -10570,6 +10847,69 @@ msgstr "" "ambigu, vous pouvez positionner checkout.defaultRemote=origin dans\n" "votre config." +#: builtin/checkout.c:1691 builtin/checkout.c:1693 builtin/checkout.c:1733 +#: builtin/checkout.c:1735 builtin/clone.c:121 builtin/remote.c:169 +#: builtin/remote.c:171 builtin/worktree.c:500 builtin/worktree.c:502 +msgid "branch" +msgstr "branche" + +#: builtin/checkout.c:1692 +msgid "create and checkout a new branch" +msgstr "créer et extraire une nouvelle branche" + +#: builtin/checkout.c:1694 +msgid "create/reset and checkout a branch" +msgstr "créer/réinitialiser et extraire une branche" + +#: builtin/checkout.c:1695 +msgid "create reflog for new branch" +msgstr "créer un reflog pour une nouvelle branche" + +#: builtin/checkout.c:1697 +msgid "second guess 'git checkout <no-such-branch>' (default)" +msgstr "" +"essayer d'interpréter 'git checkout <branche-inexistante>' (par défaut)" + +#: builtin/checkout.c:1698 +msgid "use overlay mode (default)" +msgstr "utiliser le mode de superposition (défaut)" + +#: builtin/checkout.c:1734 +msgid "create and switch to a new branch" +msgstr "créer et basculer sur une nouvelle branche" + +#: builtin/checkout.c:1736 +msgid "create/reset and switch to a branch" +msgstr "créer/réinitialiser et basculer sur une branche" + +#: builtin/checkout.c:1738 +msgid "second guess 'git switch <no-such-branch>'" +msgstr "interpréter 'git switch <branche-inexistante>'" + +#: builtin/checkout.c:1740 +msgid "throw away local modifications" +msgstr "laisser tomber les modifications locales" + +#: builtin/checkout.c:1772 +msgid "which tree-ish to checkout from" +msgstr "de quel <arbre-esque> faire l'extraction" + +#: builtin/checkout.c:1774 +msgid "restore the index" +msgstr "restaurer l'index" + +#: builtin/checkout.c:1776 +msgid "restore the working tree (default)" +msgstr "restaurer l'arbre de travail (par défaut)" + +#: builtin/checkout.c:1778 +msgid "ignore unmerged entries" +msgstr "ignorer les entrées non-fusionnées" + +#: builtin/checkout.c:1779 +msgid "use overlay mode" +msgstr "utiliser le mode de superposition" + #: builtin/clean.c:28 msgid "" "git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..." @@ -10601,7 +10941,12 @@ msgstr "Ignorerait le dépôt %s\n" msgid "failed to remove %s" msgstr "échec de la suppression de %s" -#: builtin/clean.c:299 git-add--interactive.perl:579 +#: builtin/clean.c:37 +#, c-format +msgid "could not lstat %s\n" +msgstr "lstat de %s impossible\n" + +#: builtin/clean.c:300 git-add--interactive.perl:593 #, c-format msgid "" "Prompt help:\n" @@ -10614,7 +10959,7 @@ msgstr "" "foo - sélectionner un élément par un préfixe unique\n" " - (vide) ne rien sélectionner\n" -#: builtin/clean.c:303 git-add--interactive.perl:588 +#: builtin/clean.c:304 git-add--interactive.perl:602 #, c-format msgid "" "Prompt help:\n" @@ -10635,38 +10980,38 @@ msgstr "" "* - choisir tous les éléments\n" " - (vide) terminer la sélection\n" -#: builtin/clean.c:519 git-add--interactive.perl:554 -#: git-add--interactive.perl:559 +#: builtin/clean.c:520 git-add--interactive.perl:568 +#: git-add--interactive.perl:573 #, c-format, perl-format msgid "Huh (%s)?\n" msgstr "Hein (%s) ?\n" -#: builtin/clean.c:661 +#: builtin/clean.c:662 #, c-format msgid "Input ignore patterns>> " msgstr "Entrez les motifs à ignorer>> " -#: builtin/clean.c:698 +#: builtin/clean.c:699 #, c-format msgid "WARNING: Cannot find items matched by: %s" msgstr "ATTENTION : Impossible de trouver les éléments correspondant à : %s" -#: builtin/clean.c:719 +#: builtin/clean.c:720 msgid "Select items to delete" msgstr "Sélectionner les éléments à supprimer" #. TRANSLATORS: Make sure to keep [y/N] as is -#: builtin/clean.c:760 +#: builtin/clean.c:761 #, c-format msgid "Remove %s [y/N]? " msgstr "Supprimer %s [y/N] ? " -#: builtin/clean.c:785 git-add--interactive.perl:1717 +#: builtin/clean.c:786 git-add--interactive.perl:1763 #, c-format msgid "Bye.\n" msgstr "Au revoir.\n" -#: builtin/clean.c:793 +#: builtin/clean.c:794 msgid "" "clean - start cleaning\n" "filter by pattern - exclude items from deletion\n" @@ -10684,64 +11029,64 @@ msgstr "" "help - cet écran\n" "? - aide pour la sélection en ligne" -#: builtin/clean.c:820 git-add--interactive.perl:1793 +#: builtin/clean.c:821 git-add--interactive.perl:1849 msgid "*** Commands ***" msgstr "*** Commandes ***" -#: builtin/clean.c:821 git-add--interactive.perl:1790 +#: builtin/clean.c:822 git-add--interactive.perl:1846 msgid "What now" msgstr "Et maintenant ?" -#: builtin/clean.c:829 +#: builtin/clean.c:830 msgid "Would remove the following item:" msgid_plural "Would remove the following items:" msgstr[0] "Supprimerait l'élément suivant :" msgstr[1] "Supprimerait les éléments suivants :" -#: builtin/clean.c:845 +#: builtin/clean.c:846 msgid "No more files to clean, exiting." msgstr "Plus de fichier à nettoyer, sortie." -#: builtin/clean.c:907 +#: builtin/clean.c:908 msgid "do not print names of files removed" msgstr "ne pas afficher les noms des fichiers supprimés" -#: builtin/clean.c:909 +#: builtin/clean.c:910 msgid "force" msgstr "forcer" -#: builtin/clean.c:910 +#: builtin/clean.c:911 msgid "interactive cleaning" msgstr "nettoyage interactif" -#: builtin/clean.c:912 +#: builtin/clean.c:913 msgid "remove whole directories" msgstr "supprimer les répertoires entiers" -#: builtin/clean.c:913 builtin/describe.c:546 builtin/describe.c:548 -#: builtin/grep.c:897 builtin/log.c:171 builtin/log.c:173 -#: builtin/ls-files.c:557 builtin/name-rev.c:417 builtin/name-rev.c:419 +#: builtin/clean.c:914 builtin/describe.c:546 builtin/describe.c:548 +#: builtin/grep.c:899 builtin/log.c:176 builtin/log.c:178 +#: builtin/ls-files.c:557 builtin/name-rev.c:413 builtin/name-rev.c:415 #: builtin/show-ref.c:179 msgid "pattern" msgstr "motif" -#: builtin/clean.c:914 +#: builtin/clean.c:915 msgid "add <pattern> to ignore rules" msgstr "ajouter <motif> aux règles ignore" -#: builtin/clean.c:915 +#: builtin/clean.c:916 msgid "remove ignored files, too" msgstr "supprimer les fichiers ignorés, aussi" -#: builtin/clean.c:917 +#: builtin/clean.c:918 msgid "remove only ignored files" msgstr "supprimer seulement les fichiers ignorés" -#: builtin/clean.c:935 +#: builtin/clean.c:936 msgid "-x and -X cannot be used together" msgstr "-x et -X ne peuvent pas être utilisés ensemble" -#: builtin/clean.c:939 +#: builtin/clean.c:940 msgid "" "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " "clean" @@ -10749,7 +11094,7 @@ msgstr "" "clean.requireForce positionné à true et ni -i, -n ou -f fourni ; refus de " "nettoyer" -#: builtin/clean.c:942 +#: builtin/clean.c:943 msgid "" "clean.requireForce defaults to true and neither -i, -n, nor -f given; " "refusing to clean" @@ -10757,159 +11102,164 @@ msgstr "" "clean.requireForce à true par défaut et ni -i, -n ou -f fourni ; refus de " "nettoyer" -#: builtin/clone.c:44 +#: builtin/clone.c:46 msgid "git clone [<options>] [--] <repo> [<dir>]" msgstr "git clone [<options>] [--] <dépôt> [<répertoire>]" -#: builtin/clone.c:90 +#: builtin/clone.c:93 msgid "don't create a checkout" msgstr "ne pas créer d'extraction" -#: builtin/clone.c:91 builtin/clone.c:93 builtin/init-db.c:489 +#: builtin/clone.c:94 builtin/clone.c:96 builtin/init-db.c:489 msgid "create a bare repository" msgstr "créer un dépôt nu" -#: builtin/clone.c:95 +#: builtin/clone.c:98 msgid "create a mirror repository (implies bare)" msgstr "créer un dépôt miroir (implique dépôt nu)" -#: builtin/clone.c:97 +#: builtin/clone.c:100 msgid "to clone from a local repository" msgstr "pour cloner depuis un dépôt local" -#: builtin/clone.c:99 +#: builtin/clone.c:102 msgid "don't use local hardlinks, always copy" msgstr "ne pas utiliser de liens durs locaux, toujours copier" -#: builtin/clone.c:101 +#: builtin/clone.c:104 msgid "setup as shared repository" msgstr "régler comme dépôt partagé" -#: builtin/clone.c:104 +#: builtin/clone.c:107 msgid "pathspec" msgstr "spécificateur de chemin" -#: builtin/clone.c:104 +#: builtin/clone.c:107 msgid "initialize submodules in the clone" msgstr "initialiser les sous-modules dans le clone" -#: builtin/clone.c:107 +#: builtin/clone.c:110 msgid "number of submodules cloned in parallel" msgstr "nombre de sous-modules clonés en parallèle" -#: builtin/clone.c:108 builtin/init-db.c:486 +#: builtin/clone.c:111 builtin/init-db.c:486 msgid "template-directory" msgstr "répertoire-modèle" -#: builtin/clone.c:109 builtin/init-db.c:487 +#: builtin/clone.c:112 builtin/init-db.c:487 msgid "directory from which templates will be used" msgstr "répertoire depuis lequel les modèles vont être utilisés" -#: builtin/clone.c:111 builtin/clone.c:113 builtin/submodule--helper.c:1379 -#: builtin/submodule--helper.c:1859 +#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1380 +#: builtin/submodule--helper.c:1860 msgid "reference repository" msgstr "dépôt de référence" -#: builtin/clone.c:115 builtin/submodule--helper.c:1381 -#: builtin/submodule--helper.c:1861 +#: builtin/clone.c:118 builtin/submodule--helper.c:1382 +#: builtin/submodule--helper.c:1862 msgid "use --reference only while cloning" msgstr "utiliser seulement --reference pour cloner" -#: builtin/clone.c:116 builtin/column.c:27 builtin/merge-file.c:46 -#: builtin/pack-objects.c:3306 builtin/repack.c:329 +#: builtin/clone.c:119 builtin/column.c:27 builtin/merge-file.c:46 +#: builtin/pack-objects.c:3314 builtin/repack.c:319 msgid "name" msgstr "nom" -#: builtin/clone.c:117 +#: builtin/clone.c:120 msgid "use <name> instead of 'origin' to track upstream" msgstr "utiliser <nom> au lieu de 'origin' pour suivre la branche amont" -#: builtin/clone.c:119 +#: builtin/clone.c:122 msgid "checkout <branch> instead of the remote's HEAD" msgstr "extraire <branche> au lieu de la HEAD du répertoire distant" -#: builtin/clone.c:121 +#: builtin/clone.c:124 msgid "path to git-upload-pack on the remote" msgstr "chemin vers git-upload-pack sur le serveur distant" -#: builtin/clone.c:122 builtin/fetch.c:142 builtin/grep.c:836 -#: builtin/pull.c:225 +#: builtin/clone.c:125 builtin/fetch.c:152 builtin/grep.c:838 +#: builtin/pull.c:226 msgid "depth" msgstr "profondeur" -#: builtin/clone.c:123 +#: builtin/clone.c:126 msgid "create a shallow clone of that depth" msgstr "créer un clone superficiel de cette profondeur" -#: builtin/clone.c:124 builtin/fetch.c:144 builtin/pack-objects.c:3295 +#: builtin/clone.c:127 builtin/fetch.c:154 builtin/pack-objects.c:3303 msgid "time" msgstr "heure" -#: builtin/clone.c:125 +#: builtin/clone.c:128 msgid "create a shallow clone since a specific time" msgstr "créer un clone superficiel depuis une date spécifique" -#: builtin/clone.c:126 builtin/fetch.c:146 builtin/fetch.c:169 -#: builtin/rebase.c:1389 +#: builtin/clone.c:129 builtin/fetch.c:156 builtin/fetch.c:179 +#: builtin/rebase.c:1395 msgid "revision" msgstr "révision" -#: builtin/clone.c:127 builtin/fetch.c:147 +#: builtin/clone.c:130 builtin/fetch.c:157 msgid "deepen history of shallow clone, excluding rev" msgstr "" "approfondir l'historique d'un clone superficiel en excluant une révision" -#: builtin/clone.c:129 +#: builtin/clone.c:132 msgid "clone only one branch, HEAD or --branch" msgstr "cloner seulement une branche, HEAD ou --branch" -#: builtin/clone.c:131 +#: builtin/clone.c:134 msgid "don't clone any tags, and make later fetches not to follow them" msgstr "" "ne pas cloner les tags et indiquer aux récupérations futures de ne pas le " "faire" -#: builtin/clone.c:133 +#: builtin/clone.c:136 msgid "any cloned submodules will be shallow" msgstr "tous les sous-modules clonés seront superficiels" -#: builtin/clone.c:134 builtin/init-db.c:495 +#: builtin/clone.c:137 builtin/init-db.c:495 msgid "gitdir" msgstr "gitdir" -#: builtin/clone.c:135 builtin/init-db.c:496 +#: builtin/clone.c:138 builtin/init-db.c:496 msgid "separate git dir from working tree" msgstr "séparer le répertoire git de la copie de travail" -#: builtin/clone.c:136 +#: builtin/clone.c:139 msgid "key=value" msgstr "clé=valeur" -#: builtin/clone.c:137 +#: builtin/clone.c:140 msgid "set config inside the new repository" msgstr "régler la configuration dans le nouveau dépôt" -#: builtin/clone.c:139 builtin/fetch.c:164 builtin/ls-remote.c:76 +#: builtin/clone.c:142 builtin/fetch.c:174 builtin/ls-remote.c:76 #: builtin/push.c:585 builtin/send-pack.c:172 msgid "server-specific" msgstr "spécifique au serveur" -#: builtin/clone.c:139 builtin/fetch.c:164 builtin/ls-remote.c:76 +#: builtin/clone.c:142 builtin/fetch.c:174 builtin/ls-remote.c:76 #: builtin/push.c:585 builtin/send-pack.c:173 msgid "option to transmit" msgstr "option à transmettre" -#: builtin/clone.c:140 builtin/fetch.c:165 builtin/pull.c:238 +#: builtin/clone.c:143 builtin/fetch.c:175 builtin/pull.c:239 #: builtin/push.c:586 msgid "use IPv4 addresses only" msgstr "n'utiliser que des adresses IPv4" -#: builtin/clone.c:142 builtin/fetch.c:167 builtin/pull.c:241 +#: builtin/clone.c:145 builtin/fetch.c:177 builtin/pull.c:242 #: builtin/push.c:588 msgid "use IPv6 addresses only" msgstr "n'utiliser que des adresses IPv6" -#: builtin/clone.c:280 +#: builtin/clone.c:149 +msgid "any cloned submodules will use their remote-tracking branch" +msgstr "" +"tous les sous-modules clonés utiliseront leur branche de suivi à distance" + +#: builtin/clone.c:285 msgid "" "No directory name could be guessed.\n" "Please specify a directory on the command line" @@ -10917,148 +11267,148 @@ msgstr "" "Aucun nom de répertoire n'a pu être deviné\n" "Veuillez spécifier un répertoire dans la ligne de commande" -#: builtin/clone.c:333 +#: builtin/clone.c:338 #, c-format msgid "info: Could not add alternate for '%s': %s\n" msgstr "info : impossible d'ajouter une alternative pour '%s' : %s\n" -#: builtin/clone.c:405 -#, c-format -msgid "failed to open '%s'" -msgstr "échec à l'ouverture de '%s'" - -#: builtin/clone.c:413 +#: builtin/clone.c:411 #, c-format msgid "%s exists and is not a directory" msgstr "%s existe et n'est pas un répertoire" -#: builtin/clone.c:427 +#: builtin/clone.c:428 #, c-format -msgid "failed to stat %s\n" -msgstr "échec du stat de %s\n" +msgid "failed to start iterator over '%s'" +msgstr "échec du démarrage un itérateur sur '%s'" -#: builtin/clone.c:444 +#: builtin/clone.c:453 #, c-format msgid "failed to unlink '%s'" msgstr "échec pour délier '%s'" -#: builtin/clone.c:449 +#: builtin/clone.c:458 #, c-format msgid "failed to create link '%s'" msgstr "échec de la création du lien '%s'" -#: builtin/clone.c:453 +#: builtin/clone.c:462 #, c-format msgid "failed to copy file to '%s'" msgstr "échec de la copie vers '%s'" -#: builtin/clone.c:479 +#: builtin/clone.c:467 +#, c-format +msgid "failed to iterate over '%s'" +msgstr "échec de l'itération sur '%s'" + +#: builtin/clone.c:492 #, c-format msgid "done.\n" msgstr "fait.\n" -#: builtin/clone.c:493 +#: builtin/clone.c:506 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" -"and retry the checkout with 'git checkout -f HEAD'\n" +"and retry with 'git restore --source=HEAD :/'\n" msgstr "" "Le clone a réussi, mais l'extraction a échoué.\n" "Vous pouvez inspecter ce qui a été extrait avec 'git status'\n" -"et réessayer l'extraction avec 'git checkout -f HEAD'\n" +"et réessayer avec 'git restore --source=HEAD :/'\n" -#: builtin/clone.c:570 +#: builtin/clone.c:583 #, c-format msgid "Could not find remote branch %s to clone." msgstr "Impossible de trouver la branche distante '%s' à cloner." -#: builtin/clone.c:689 +#: builtin/clone.c:702 #, c-format msgid "unable to update %s" msgstr "impossible de mettre à jour %s" -#: builtin/clone.c:739 +#: builtin/clone.c:752 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "" "la HEAD distante réfère à une référence non existante, impossible de " "l'extraire.\n" -#: builtin/clone.c:770 +#: builtin/clone.c:783 msgid "unable to checkout working tree" msgstr "impossible d'extraire la copie de travail" -#: builtin/clone.c:815 +#: builtin/clone.c:833 msgid "unable to write parameters to config file" msgstr "impossible d'écrire les paramètres dans le fichier de configuration" -#: builtin/clone.c:878 +#: builtin/clone.c:896 msgid "cannot repack to clean up" msgstr "impossible de remballer pour nettoyer" -#: builtin/clone.c:880 +#: builtin/clone.c:898 msgid "cannot unlink temporary alternates file" msgstr "impossible de délier le fichier temporaire alternates" -#: builtin/clone.c:920 builtin/receive-pack.c:1952 +#: builtin/clone.c:938 builtin/receive-pack.c:1950 msgid "Too many arguments." msgstr "Trop d'arguments." -#: builtin/clone.c:924 +#: builtin/clone.c:942 msgid "You must specify a repository to clone." msgstr "Vous devez spécifier un dépôt à cloner." -#: builtin/clone.c:937 +#: builtin/clone.c:955 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "les options --bare et --origin %s sont incompatibles." -#: builtin/clone.c:940 +#: builtin/clone.c:958 msgid "--bare and --separate-git-dir are incompatible." msgstr "--bare et --separate-git-dir sont incompatibles." -#: builtin/clone.c:953 +#: builtin/clone.c:971 #, c-format msgid "repository '%s' does not exist" msgstr "le dépôt '%s' n'existe pas" -#: builtin/clone.c:959 builtin/fetch.c:1610 +#: builtin/clone.c:977 builtin/fetch.c:1660 #, c-format msgid "depth %s is not a positive number" msgstr "la profondeur %s n'est pas un entier positif" -#: builtin/clone.c:969 +#: builtin/clone.c:987 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "" "le chemin de destination '%s' existe déjà et n'est pas un répertoire vide." -#: builtin/clone.c:979 +#: builtin/clone.c:997 #, c-format msgid "working tree '%s' already exists." msgstr "la copie de travail '%s' existe déjà." -#: builtin/clone.c:994 builtin/clone.c:1015 builtin/difftool.c:264 -#: builtin/worktree.c:296 builtin/worktree.c:328 +#: builtin/clone.c:1012 builtin/clone.c:1033 builtin/difftool.c:264 +#: builtin/worktree.c:303 builtin/worktree.c:335 #, c-format msgid "could not create leading directories of '%s'" msgstr "impossible de créer les répertoires de premier niveau dans '%s'" -#: builtin/clone.c:999 +#: builtin/clone.c:1017 #, c-format msgid "could not create work tree dir '%s'" msgstr "impossible de créer le répertoire de la copie de travail '%s'" -#: builtin/clone.c:1019 +#: builtin/clone.c:1037 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "Clonage dans le dépôt nu '%s'\n" -#: builtin/clone.c:1021 +#: builtin/clone.c:1039 #, c-format msgid "Cloning into '%s'...\n" msgstr "Clonage dans '%s'...\n" -#: builtin/clone.c:1045 +#: builtin/clone.c:1063 msgid "" "clone --recursive is not compatible with both --reference and --reference-if-" "able" @@ -11066,41 +11416,41 @@ msgstr "" "clone --recursive n'est pas compatible avec à la fois --reference et --" "reference-if-able" -#: builtin/clone.c:1106 +#: builtin/clone.c:1124 msgid "--depth is ignored in local clones; use file:// instead." msgstr "" "--depth est ignoré dans les clones locaux : utilisez plutôt \"file://\"." -#: builtin/clone.c:1108 +#: builtin/clone.c:1126 msgid "--shallow-since is ignored in local clones; use file:// instead." msgstr "" "--shallow-since est ignoré dans les clones locaux : utilisez plutôt \"file://" "\"." -#: builtin/clone.c:1110 +#: builtin/clone.c:1128 msgid "--shallow-exclude is ignored in local clones; use file:// instead." msgstr "" "--shallow-exclude est ignoré dans les clones locaux : utilisez plutôt " "\"file://\"." -#: builtin/clone.c:1112 +#: builtin/clone.c:1130 msgid "--filter is ignored in local clones; use file:// instead." msgstr "--filter est ignoré dans les clones locaux ; utilisez plutôt file:// ." -#: builtin/clone.c:1115 +#: builtin/clone.c:1133 msgid "source repository is shallow, ignoring --local" msgstr "le dépôt source est superficiel, option --local ignorée" -#: builtin/clone.c:1120 +#: builtin/clone.c:1138 msgid "--local is ignored" msgstr "--local est ignoré" -#: builtin/clone.c:1197 builtin/clone.c:1205 +#: builtin/clone.c:1215 builtin/clone.c:1223 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "La branche distante %s n'a pas été trouvée dans le dépôt amont %s" -#: builtin/clone.c:1208 +#: builtin/clone.c:1226 msgid "You appear to have cloned an empty repository." msgstr "Vous semblez avoir cloné un dépôt vide." @@ -11149,7 +11499,7 @@ msgstr "" msgid "duplicate parent %s ignored" msgstr "le parent dupliqué %s est ignoré" -#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:520 +#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:525 #, c-format msgid "not a valid object name %s" msgstr "nom d'objet invalide %s" @@ -11177,13 +11527,13 @@ msgstr "parent" msgid "id of a parent commit object" msgstr "id d'un objet commit parent" -#: builtin/commit-tree.c:114 builtin/commit.c:1480 builtin/merge.c:268 -#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1473 -#: builtin/tag.c:406 +#: builtin/commit-tree.c:114 builtin/commit.c:1500 builtin/merge.c:270 +#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1460 +#: builtin/tag.c:412 msgid "message" msgstr "message" -#: builtin/commit-tree.c:115 builtin/commit.c:1480 +#: builtin/commit-tree.c:115 builtin/commit.c:1500 msgid "commit message" msgstr "message de validation" @@ -11191,8 +11541,8 @@ msgstr "message de validation" msgid "read commit log message from file" msgstr "lire le message de validation depuis un fichier" -#: builtin/commit-tree.c:121 builtin/commit.c:1492 builtin/merge.c:283 -#: builtin/pull.c:193 builtin/revert.c:117 +#: builtin/commit-tree.c:121 builtin/commit.c:1512 builtin/merge.c:287 +#: builtin/pull.c:194 builtin/revert.c:118 msgid "GPG sign commit" msgstr "signer la validation avec GPG" @@ -11239,80 +11589,86 @@ msgstr "" "\n" #: builtin/commit.c:63 -msgid "Otherwise, please use 'git reset'\n" -msgstr "Sinon, veuillez utiliser 'git reset'\n" +msgid "Otherwise, please use 'git cherry-pick --skip'\n" +msgstr "Sinon, veuillez utiliser 'git cherry-pick --skip'\n" #: builtin/commit.c:66 msgid "" +"and then use:\n" +"\n" +" git cherry-pick --continue\n" +"\n" +"to resume cherry-picking the remaining commits.\n" "If you wish to skip this commit, use:\n" "\n" -" git reset\n" +" git cherry-pick --skip\n" "\n" -"Then \"git cherry-pick --continue\" will resume cherry-picking\n" -"the remaining commits.\n" msgstr "" -"Si vous souhaitez sauter ce commit, utilisez :\n" +"utilisez ensuite :\n" "\n" -" git reset\n" +" git cherry-pick --continue\n" +"\n" +"pour continuer le picorage des commits restants.\n" +"Si vous souhaitez sauter ce commit, utilisez :\n" +"\n" +" git cherry-pick --skipped\n" "\n" -"Puis \"git cherry-pick --continue\" continuera le picorage \n" -"des commits restants.\n" -#: builtin/commit.c:312 +#: builtin/commit.c:315 msgid "failed to unpack HEAD tree object" msgstr "échec du dépaquetage de l'objet arbre HEAD" -#: builtin/commit.c:353 +#: builtin/commit.c:356 msgid "unable to create temporary index" msgstr "impossible de créer l'index temporaire" -#: builtin/commit.c:359 +#: builtin/commit.c:362 msgid "interactive add failed" msgstr "échec de l'ajout interactif" -#: builtin/commit.c:373 +#: builtin/commit.c:376 msgid "unable to update temporary index" msgstr "impossible de mettre à jour l'index temporaire" -#: builtin/commit.c:375 +#: builtin/commit.c:378 msgid "Failed to update main cache tree" msgstr "Impossible de mettre à jour l'arbre de cache principal" -#: builtin/commit.c:400 builtin/commit.c:423 builtin/commit.c:469 +#: builtin/commit.c:403 builtin/commit.c:426 builtin/commit.c:472 msgid "unable to write new_index file" msgstr "impossible d'écrire le fichier new_index" -#: builtin/commit.c:452 +#: builtin/commit.c:455 msgid "cannot do a partial commit during a merge." msgstr "impossible de faire une validation partielle pendant une fusion." -#: builtin/commit.c:454 +#: builtin/commit.c:457 msgid "cannot do a partial commit during a cherry-pick." msgstr "impossible de faire une validation partielle pendant un picorage." -#: builtin/commit.c:462 +#: builtin/commit.c:465 msgid "cannot read the index" msgstr "impossible de lire l'index" -#: builtin/commit.c:481 +#: builtin/commit.c:484 msgid "unable to write temporary index file" msgstr "impossible d'écrire le fichier d'index temporaire" -#: builtin/commit.c:579 +#: builtin/commit.c:582 #, c-format msgid "commit '%s' lacks author header" msgstr "entête d'auteur manquant dans le commit '%s'" -#: builtin/commit.c:581 +#: builtin/commit.c:584 #, c-format msgid "commit '%s' has malformed author line" msgstr "le commit '%s' a une ligne d'auteur malformée" -#: builtin/commit.c:600 +#: builtin/commit.c:603 msgid "malformed --author parameter" msgstr "paramètre --author mal formé" -#: builtin/commit.c:653 +#: builtin/commit.c:656 msgid "" "unable to select a comment character that is not used\n" "in the current commit message" @@ -11320,38 +11676,38 @@ msgstr "" "impossible de sélectionner un caractère de commentaire\n" "qui n'est pas utilisé dans le message de validation actuel" -#: builtin/commit.c:691 builtin/commit.c:724 builtin/commit.c:1069 +#: builtin/commit.c:694 builtin/commit.c:727 builtin/commit.c:1072 #, c-format msgid "could not lookup commit %s" msgstr "impossible de rechercher le commit %s" -#: builtin/commit.c:703 builtin/shortlog.c:319 +#: builtin/commit.c:706 builtin/shortlog.c:319 #, c-format msgid "(reading log message from standard input)\n" msgstr "(lecture du message de journal depuis l'entrée standard)\n" -#: builtin/commit.c:705 +#: builtin/commit.c:708 msgid "could not read log from standard input" msgstr "impossible de lire le journal depuis l'entrée standard" -#: builtin/commit.c:709 +#: builtin/commit.c:712 #, c-format msgid "could not read log file '%s'" msgstr "impossible de lire le fichier de journal '%s'" -#: builtin/commit.c:740 builtin/commit.c:756 +#: builtin/commit.c:743 builtin/commit.c:759 msgid "could not read SQUASH_MSG" msgstr "impossible de lire SQUASH_MSG" -#: builtin/commit.c:747 +#: builtin/commit.c:750 msgid "could not read MERGE_MSG" msgstr "impossible de lire MERGE_MSG" -#: builtin/commit.c:807 +#: builtin/commit.c:810 msgid "could not write commit template" msgstr "impossible d'écrire le modèle de commit" -#: builtin/commit.c:826 +#: builtin/commit.c:829 #, c-format msgid "" "\n" @@ -11366,7 +11722,7 @@ msgstr "" "\t%s\n" "et essayez à nouveau.\n" -#: builtin/commit.c:831 +#: builtin/commit.c:834 #, c-format msgid "" "\n" @@ -11381,7 +11737,7 @@ msgstr "" "\t%s\n" "et essayez à nouveau.\n" -#: builtin/commit.c:844 +#: builtin/commit.c:847 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -11391,7 +11747,7 @@ msgstr "" "commençant par '%c' seront ignorées, et un message vide abandonne la " "validation.\n" -#: builtin/commit.c:852 +#: builtin/commit.c:855 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -11402,148 +11758,148 @@ msgstr "" "commençant par '%c' seront conservées ; vous pouvez les supprimer vous-même\n" "si vous le souhaitez. Un message vide abandonne la validation.\n" -#: builtin/commit.c:869 +#: builtin/commit.c:872 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "%sAuteur : %.*s <%.*s>" -#: builtin/commit.c:877 +#: builtin/commit.c:880 #, c-format msgid "%sDate: %s" msgstr "%sDate : %s" -#: builtin/commit.c:884 +#: builtin/commit.c:887 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "%sValidateur : %.*s <%.*s>" -#: builtin/commit.c:902 +#: builtin/commit.c:905 msgid "Cannot read index" msgstr "Impossible de lire l'index" -#: builtin/commit.c:969 +#: builtin/commit.c:972 msgid "Error building trees" msgstr "Erreur lors de la construction des arbres" -#: builtin/commit.c:983 builtin/tag.c:269 +#: builtin/commit.c:986 builtin/tag.c:275 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "Veuillez fournir le message en utilisant l'option -m ou -F.\n" -#: builtin/commit.c:1027 +#: builtin/commit.c:1030 #, c-format msgid "--author '%s' is not 'Name <email>' and matches no existing author" msgstr "" "--author '%s' n'est pas de la forme 'Nom <email>' ni ne correspond à aucun " "auteur existant" -#: builtin/commit.c:1041 +#: builtin/commit.c:1044 #, c-format msgid "Invalid ignored mode '%s'" msgstr "Mode de fichier ignoré invalide '%s'" -#: builtin/commit.c:1059 builtin/commit.c:1284 +#: builtin/commit.c:1062 builtin/commit.c:1304 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "Mode de fichier non suivi invalide '%s'" -#: builtin/commit.c:1097 +#: builtin/commit.c:1102 msgid "--long and -z are incompatible" msgstr "--long et -z sont incompatibles" -#: builtin/commit.c:1130 +#: builtin/commit.c:1146 msgid "Using both --reset-author and --author does not make sense" msgstr "L'utilisation simultanée de --reset-author et --author n'a pas de sens" -#: builtin/commit.c:1139 +#: builtin/commit.c:1155 msgid "You have nothing to amend." msgstr "Il n'y a rien à corriger." -#: builtin/commit.c:1142 +#: builtin/commit.c:1158 msgid "You are in the middle of a merge -- cannot amend." msgstr "Vous êtes en pleine fusion -- impossible de corriger (amend)." -#: builtin/commit.c:1144 +#: builtin/commit.c:1160 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "Vous êtes en plein picorage -- impossible de corriger (amend)." -#: builtin/commit.c:1147 +#: builtin/commit.c:1163 msgid "Options --squash and --fixup cannot be used together" msgstr "Les options --squash et --fixup ne peuvent pas être utilisées ensemble" -#: builtin/commit.c:1157 +#: builtin/commit.c:1173 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "Une seule option parmi -c/-C/-F/--fixup peut être utilisée." -#: builtin/commit.c:1159 +#: builtin/commit.c:1175 msgid "Option -m cannot be combined with -c/-C/-F." msgstr "L'option -m ne peut pas être combinée avec -c/-C/-F." -#: builtin/commit.c:1167 +#: builtin/commit.c:1183 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "--reset-author ne peut être utilisé qu'avec -C, -c ou --amend." -#: builtin/commit.c:1184 +#: builtin/commit.c:1200 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "" "Une seule option parmi --include/--only/--all/--interactive/--patch peut " "être utilisée." -#: builtin/commit.c:1186 +#: builtin/commit.c:1202 msgid "No paths with --include/--only does not make sense." msgstr "Aucun chemin avec les options --include/--only n'a pas de sens." -#: builtin/commit.c:1192 +#: builtin/commit.c:1208 #, c-format msgid "paths '%s ...' with -a does not make sense" msgstr "des chemins '%s ...' avec l'option -a n'a pas de sens" -#: builtin/commit.c:1319 builtin/commit.c:1503 +#: builtin/commit.c:1339 builtin/commit.c:1523 msgid "show status concisely" msgstr "afficher l'état avec concision" -#: builtin/commit.c:1321 builtin/commit.c:1505 +#: builtin/commit.c:1341 builtin/commit.c:1525 msgid "show branch information" msgstr "afficher l'information de branche" -#: builtin/commit.c:1323 +#: builtin/commit.c:1343 msgid "show stash information" msgstr "afficher l'information de remisage" -#: builtin/commit.c:1325 builtin/commit.c:1507 +#: builtin/commit.c:1345 builtin/commit.c:1527 msgid "compute full ahead/behind values" msgstr "calcule les valeurs complètes en avance/en retard" -#: builtin/commit.c:1327 +#: builtin/commit.c:1347 msgid "version" msgstr "version" -#: builtin/commit.c:1327 builtin/commit.c:1509 builtin/push.c:561 -#: builtin/worktree.c:643 +#: builtin/commit.c:1347 builtin/commit.c:1529 builtin/push.c:561 +#: builtin/worktree.c:651 msgid "machine-readable output" msgstr "sortie pour traitement automatique" -#: builtin/commit.c:1330 builtin/commit.c:1511 +#: builtin/commit.c:1350 builtin/commit.c:1531 msgid "show status in long format (default)" msgstr "afficher l'état en format long (par défaut)" -#: builtin/commit.c:1333 builtin/commit.c:1514 +#: builtin/commit.c:1353 builtin/commit.c:1534 msgid "terminate entries with NUL" msgstr "terminer les éléments par NUL" -#: builtin/commit.c:1335 builtin/commit.c:1339 builtin/commit.c:1517 -#: builtin/fast-export.c:1085 builtin/fast-export.c:1088 builtin/rebase.c:1465 -#: parse-options.h:331 +#: builtin/commit.c:1355 builtin/commit.c:1359 builtin/commit.c:1537 +#: builtin/fast-export.c:1125 builtin/fast-export.c:1128 +#: builtin/fast-export.c:1131 builtin/rebase.c:1471 parse-options.h:332 msgid "mode" msgstr "mode" -#: builtin/commit.c:1336 builtin/commit.c:1517 +#: builtin/commit.c:1356 builtin/commit.c:1537 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "" "afficher les fichiers non suivis, \"mode\" facultatif : all (tous), normal, " "no. (Défaut : all)" -#: builtin/commit.c:1340 +#: builtin/commit.c:1360 msgid "" "show ignored files, optional modes: traditional, matching, no. (Default: " "traditional)" @@ -11551,11 +11907,11 @@ msgstr "" "afficher les fichiers ignorés, \"mode\" facultatif : traditional " "(traditionnel), matching (correspondant), no. (Défaut : traditional)" -#: builtin/commit.c:1342 parse-options.h:179 +#: builtin/commit.c:1362 parse-options.h:179 msgid "when" msgstr "quand" -#: builtin/commit.c:1343 +#: builtin/commit.c:1363 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" @@ -11563,238 +11919,256 @@ msgstr "" "ignorer les modifications dans les sous-modules, \"quand\" facultatif : all " "(tous), dirty (sale), untracked (non suivi). (Défaut : all)" -#: builtin/commit.c:1345 +#: builtin/commit.c:1365 msgid "list untracked files in columns" msgstr "afficher les fichiers non suivis en colonnes" -#: builtin/commit.c:1346 +#: builtin/commit.c:1366 msgid "do not detect renames" msgstr "ne pas détecter les renommages" -#: builtin/commit.c:1348 +#: builtin/commit.c:1368 msgid "detect renames, optionally set similarity index" msgstr "" "détecter les renommages, en spécifiant optionnellement le facteur de " "similarité" -#: builtin/commit.c:1368 +#: builtin/commit.c:1388 msgid "Unsupported combination of ignored and untracked-files arguments" msgstr "" "Combinaison non supportée d'arguments sur les fichiers ignorés et non-suivis" -#: builtin/commit.c:1473 +#: builtin/commit.c:1493 msgid "suppress summary after successful commit" msgstr "supprimer le résumé après une validation réussie" -#: builtin/commit.c:1474 +#: builtin/commit.c:1494 msgid "show diff in commit message template" msgstr "afficher les diff dans le modèle de message de validation" -#: builtin/commit.c:1476 +#: builtin/commit.c:1496 msgid "Commit message options" msgstr "Options du message de validation" -#: builtin/commit.c:1477 builtin/merge.c:272 builtin/tag.c:408 +#: builtin/commit.c:1497 builtin/merge.c:274 builtin/tag.c:414 msgid "read message from file" msgstr "lire le message depuis un fichier" -#: builtin/commit.c:1478 +#: builtin/commit.c:1498 msgid "author" msgstr "auteur" -#: builtin/commit.c:1478 +#: builtin/commit.c:1498 msgid "override author for commit" msgstr "remplacer l'auteur pour la validation" -#: builtin/commit.c:1479 builtin/gc.c:539 +#: builtin/commit.c:1499 builtin/gc.c:539 msgid "date" msgstr "date" -#: builtin/commit.c:1479 +#: builtin/commit.c:1499 msgid "override date for commit" msgstr "remplacer la date pour la validation" -#: builtin/commit.c:1481 builtin/commit.c:1482 builtin/commit.c:1483 -#: builtin/commit.c:1484 parse-options.h:323 ref-filter.h:92 +#: builtin/commit.c:1501 builtin/commit.c:1502 builtin/commit.c:1503 +#: builtin/commit.c:1504 parse-options.h:324 ref-filter.h:92 msgid "commit" msgstr "commit" -#: builtin/commit.c:1481 +#: builtin/commit.c:1501 msgid "reuse and edit message from specified commit" msgstr "réutiliser et éditer le message du commit spécifié" -#: builtin/commit.c:1482 +#: builtin/commit.c:1502 msgid "reuse message from specified commit" msgstr "réutiliser le message du commit spécifié" -#: builtin/commit.c:1483 +#: builtin/commit.c:1503 msgid "use autosquash formatted message to fixup specified commit" msgstr "" "utiliser un message au format autosquash pour corriger le commit spécifié" -#: builtin/commit.c:1484 +#: builtin/commit.c:1504 msgid "use autosquash formatted message to squash specified commit" msgstr "" "utiliser un message au format autosquash pour compresser le commit spécifié" -#: builtin/commit.c:1485 +#: builtin/commit.c:1505 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "" "à présent je suis l'auteur de la validation (utilisé avec -C/-c/--amend)" -#: builtin/commit.c:1486 builtin/log.c:1541 builtin/merge.c:285 -#: builtin/pull.c:162 builtin/revert.c:109 +#: builtin/commit.c:1506 builtin/log.c:1564 builtin/merge.c:289 +#: builtin/pull.c:163 builtin/revert.c:110 msgid "add Signed-off-by:" msgstr "ajouter une entrée Signed-off-by :" -#: builtin/commit.c:1487 +#: builtin/commit.c:1507 msgid "use specified template file" msgstr "utiliser le fichier de modèle spécifié" -#: builtin/commit.c:1488 +#: builtin/commit.c:1508 msgid "force edit of commit" msgstr "forcer l'édition du commit" -#: builtin/commit.c:1490 +#: builtin/commit.c:1510 msgid "include status in commit message template" msgstr "inclure l'état dans le modèle de message de validation" -#: builtin/commit.c:1495 +#: builtin/commit.c:1515 msgid "Commit contents options" msgstr "Valider les options des contenus" -#: builtin/commit.c:1496 +#: builtin/commit.c:1516 msgid "commit all changed files" msgstr "valider tous les fichiers modifiés" -#: builtin/commit.c:1497 +#: builtin/commit.c:1517 msgid "add specified files to index for commit" msgstr "ajouter les fichiers spécifiés à l'index pour la validation" -#: builtin/commit.c:1498 +#: builtin/commit.c:1518 msgid "interactively add files" msgstr "ajouter des fichiers en mode interactif" -#: builtin/commit.c:1499 +#: builtin/commit.c:1519 msgid "interactively add changes" msgstr "ajouter les modifications en mode interactif" -#: builtin/commit.c:1500 +#: builtin/commit.c:1520 msgid "commit only specified files" msgstr "valider seulement les fichiers spécifiés" -#: builtin/commit.c:1501 +#: builtin/commit.c:1521 msgid "bypass pre-commit and commit-msg hooks" msgstr "éviter d'utiliser les crochets pre-commit et commit-msg" -#: builtin/commit.c:1502 +#: builtin/commit.c:1522 msgid "show what would be committed" msgstr "afficher ce qui serait validé" -#: builtin/commit.c:1515 +#: builtin/commit.c:1535 msgid "amend previous commit" msgstr "corriger la validation précédente" -#: builtin/commit.c:1516 +#: builtin/commit.c:1536 msgid "bypass post-rewrite hook" msgstr "éviter d'utiliser le crochet post-rewrite" -#: builtin/commit.c:1521 +#: builtin/commit.c:1541 msgid "ok to record an empty change" msgstr "accepter d'enregistrer une modification vide" -#: builtin/commit.c:1523 +#: builtin/commit.c:1543 msgid "ok to record a change with an empty message" msgstr "accepter d'enregistrer une modification avec un message vide" -#: builtin/commit.c:1596 +#: builtin/commit.c:1616 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "Fichier MERGE_HEAD corrompu (%s)" -#: builtin/commit.c:1603 +#: builtin/commit.c:1623 msgid "could not read MERGE_MODE" msgstr "impossible de lire MERGE_MODE" -#: builtin/commit.c:1622 +#: builtin/commit.c:1642 #, c-format msgid "could not read commit message: %s" msgstr "impossible de lire le message de validation : %s" -#: builtin/commit.c:1629 +#: builtin/commit.c:1649 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "Abandon de la validation dû à un message de validation vide.\n" -#: builtin/commit.c:1634 +#: builtin/commit.c:1654 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "Abandon de la validation ; vous n'avez pas édité le message\n" -#: builtin/commit.c:1668 +#: builtin/commit.c:1688 msgid "" "repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" -"not exceeded, and then \"git reset HEAD\" to recover." +"not exceeded, and then \"git restore --staged :/\" to recover." msgstr "" "le dépôt a été mis à jour, mais impossible d'écrire le fichier\n" "new_index. Vérifiez que le disque n'est pas plein ou que le quota\n" -"n'a pas été dépassé, puis lancez \"git reset HEAD\" pour réparer." +"n'a pas été dépassé, puis lancez \"git restore --staged :/\" pour réparer." -#: builtin/commit-graph.c:10 +#: builtin/commit-graph.c:11 msgid "git commit-graph [--object-dir <objdir>]" msgstr "git commit-graph [--object-dir <objdir>]" -#: builtin/commit-graph.c:11 builtin/commit-graph.c:23 +#: builtin/commit-graph.c:12 builtin/commit-graph.c:24 msgid "git commit-graph read [--object-dir <objdir>]" msgstr "git commit-graph read [--object-dir <objdir>]" -#: builtin/commit-graph.c:12 builtin/commit-graph.c:18 -msgid "git commit-graph verify [--object-dir <objdir>]" -msgstr "git commit-graph verify [--object-dir <objdir>]" +#: builtin/commit-graph.c:13 builtin/commit-graph.c:19 +msgid "git commit-graph verify [--object-dir <objdir>] [--shallow]" +msgstr "git commit-graph verify [--object-dir <objdir>] [--shallow]" -#: builtin/commit-graph.c:13 builtin/commit-graph.c:28 +#: builtin/commit-graph.c:14 builtin/commit-graph.c:29 msgid "" -"git commit-graph write [--object-dir <objdir>] [--append] [--reachable|--" -"stdin-packs|--stdin-commits]" +"git commit-graph write [--object-dir <objdir>] [--append|--split] [--" +"reachable|--stdin-packs|--stdin-commits] <split options>" msgstr "" -"git commit-graph write [--object-dir <objdir>] [--append] [--reachable|--" -"stdin-packs|--stdin-commits]" +"git commit-graph write [--object-dir <objdir>] [--append|--split] [--" +"reachable|--stdin-packs|--stdin-commits] <options de division>" -#: builtin/commit-graph.c:51 builtin/commit-graph.c:89 -#: builtin/commit-graph.c:147 builtin/commit-graph.c:205 builtin/fetch.c:153 -#: builtin/log.c:1561 +#: builtin/commit-graph.c:54 builtin/commit-graph.c:100 +#: builtin/commit-graph.c:161 builtin/commit-graph.c:237 builtin/fetch.c:163 +#: builtin/log.c:1584 msgid "dir" msgstr "répertoire" -#: builtin/commit-graph.c:52 builtin/commit-graph.c:90 -#: builtin/commit-graph.c:148 builtin/commit-graph.c:206 +#: builtin/commit-graph.c:55 builtin/commit-graph.c:101 +#: builtin/commit-graph.c:162 builtin/commit-graph.c:238 msgid "The object directory to store the graph" msgstr "Le répertoire d'objet où stocker le graphe" -#: builtin/commit-graph.c:68 builtin/commit-graph.c:105 +#: builtin/commit-graph.c:57 +msgid "if the commit-graph is split, only verify the tip file" +msgstr "" +"si le graphe de commit est divisé, vérifier seulement le fichier sommet" + +#: builtin/commit-graph.c:73 builtin/commit-graph.c:116 #, c-format msgid "Could not open commit-graph '%s'" msgstr "impossible d'ouvrir le graphe de commit '%s'" -#: builtin/commit-graph.c:150 +#: builtin/commit-graph.c:164 msgid "start walk at all refs" msgstr "commencer le parcours à toutes les réfs" -#: builtin/commit-graph.c:152 +#: builtin/commit-graph.c:166 msgid "scan pack-indexes listed by stdin for commits" msgstr "scanner les index compactés listés sur stdin à la recherche de commits" -#: builtin/commit-graph.c:154 +#: builtin/commit-graph.c:168 msgid "start walk at commits listed by stdin" msgstr "commencer le parcours aux commits listés sur stdin" -#: builtin/commit-graph.c:156 +#: builtin/commit-graph.c:170 msgid "include all commits already in the commit-graph file" msgstr "" "inclure tous les commits déjà présents dans le fichier de graphe de commits" -#: builtin/commit-graph.c:165 +#: builtin/commit-graph.c:172 +msgid "allow writing an incremental commit-graph file" +msgstr "permettre d'écrire un fichier incrémental de graphe de commit" + +#: builtin/commit-graph.c:174 builtin/commit-graph.c:178 +msgid "maximum number of commits in a non-base split commit-graph" +msgstr "" +"le nombre maximum de commits dans un graphe de commit divisé pas de base" + +#: builtin/commit-graph.c:176 +msgid "maximum ratio between two levels of a split commit-graph" +msgstr "rapport maximum entre deux niveaux d'un graphe de commit divisé" + +#: builtin/commit-graph.c:191 msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs" msgstr "utilisez un seul parmi --reachable, --stdin-commits ou --stdin-packs" @@ -11802,7 +12176,7 @@ msgstr "utilisez un seul parmi --reachable, --stdin-commits ou --stdin-packs" msgid "git config [<options>]" msgstr "git config [<options>]" -#: builtin/config.c:103 +#: builtin/config.c:103 builtin/env--helper.c:23 #, c-format msgid "unrecognized --type argument, %s" msgstr "argument --type non reconnu, %s" @@ -11908,7 +12282,7 @@ msgstr "trouver le réglage de la couleur : slot [stdout-est-tty]" msgid "Type" msgstr "Type" -#: builtin/config.c:147 +#: builtin/config.c:147 builtin/env--helper.c:38 msgid "value is given this type" msgstr "ce type est assigné à la valeur" @@ -11954,7 +12328,7 @@ msgstr "" "afficher l'origine de la configuration (fichier, entrée standard, blob, " "ligne de commande)" -#: builtin/config.c:158 +#: builtin/config.c:158 builtin/env--helper.c:40 msgid "value" msgstr "valeur" @@ -12254,7 +12628,7 @@ msgstr "ne considérer que les étiquettes correspondant à <motif>" msgid "do not consider tags matching <pattern>" msgstr "ne pas considérer les étiquettes correspondant à <motif>" -#: builtin/describe.c:551 builtin/name-rev.c:426 +#: builtin/describe.c:551 builtin/name-rev.c:422 msgid "show abbreviated commit object as fallback" msgstr "afficher les objets commits abrégés en dernier recours" @@ -12430,162 +12804,201 @@ msgstr "pas d'<outil> spécifié pour --tool=<outil>" msgid "no <cmd> given for --extcmd=<cmd>" msgstr "pas de <commande> spécifié pour --extcmd=<commande>" +#: builtin/env--helper.c:6 +msgid "git env--helper --type=[bool|ulong] <options> <env-var>" +msgstr "git env--helper --type=[bool|ulong] <options> <var d'env>" + +#: builtin/env--helper.c:37 builtin/hash-object.c:98 +msgid "type" +msgstr "type" + +#: builtin/env--helper.c:41 +msgid "default for git_env_*(...) to fall back on" +msgstr "valeur par défaut pour git_env_*(...) en cas d'absence" + +#: builtin/env--helper.c:43 +msgid "be quiet only use git_env_*() value as exit code" +msgstr "" +"mode silencieux n'utilisant la valeur de git_env_*() que pour le code de " +"sortie" + +#: builtin/env--helper.c:62 +#, c-format +msgid "option `--default' expects a boolean value with `--type=bool`, not `%s`" +msgstr "" +"l'option `--default` attend une valeur booléenne avec `--type=bool`, pas `%s`" + +#: builtin/env--helper.c:77 +#, c-format +msgid "" +"option `--default' expects an unsigned long value with `--type=ulong`, not `" +"%s`" +msgstr "" +"l'option `--default` attend une valeur entier long non signé avec `--" +"type=ulong`, pas `%s`" + #: builtin/fast-export.c:29 msgid "git fast-export [rev-list-opts]" msgstr "git fast-export [options-de-liste-de-révisions]" -#: builtin/fast-export.c:1084 +#: builtin/fast-export.c:1124 msgid "show progress after <n> objects" msgstr "afficher la progression après <n> objets" -#: builtin/fast-export.c:1086 +#: builtin/fast-export.c:1126 msgid "select handling of signed tags" msgstr "sélectionner la gestion des étiquettes signées" -#: builtin/fast-export.c:1089 +#: builtin/fast-export.c:1129 msgid "select handling of tags that tag filtered objects" msgstr "" "sélectionner la gestion des étiquettes qui pointent sur des objets filtrés" -#: builtin/fast-export.c:1092 +#: builtin/fast-export.c:1132 +msgid "select handling of commit messages in an alternate encoding" +msgstr "" +"sélectionner la gestion des messages de validation dans un encodage " +"alternatif" + +#: builtin/fast-export.c:1135 msgid "Dump marks to this file" msgstr "Enregistrer les marques dans ce fichier" -#: builtin/fast-export.c:1094 +#: builtin/fast-export.c:1137 msgid "Import marks from this file" msgstr "importer les marques depuis ce fichier" -#: builtin/fast-export.c:1096 +#: builtin/fast-export.c:1139 msgid "Fake a tagger when tags lack one" msgstr "falsifier un auteur d'étiquette si l'étiquette n'en présente pas" -#: builtin/fast-export.c:1098 +#: builtin/fast-export.c:1141 msgid "Output full tree for each commit" msgstr "Afficher l'arbre complet pour chaque commit" -#: builtin/fast-export.c:1100 +#: builtin/fast-export.c:1143 msgid "Use the done feature to terminate the stream" msgstr "Utiliser la fonction \"done\" pour terminer le flux" -#: builtin/fast-export.c:1101 +#: builtin/fast-export.c:1144 msgid "Skip output of blob data" msgstr "Sauter l'affichage de données de blob" -#: builtin/fast-export.c:1102 builtin/log.c:1609 +#: builtin/fast-export.c:1145 builtin/log.c:1632 msgid "refspec" msgstr "spécificateur de référence" -#: builtin/fast-export.c:1103 +#: builtin/fast-export.c:1146 msgid "Apply refspec to exported refs" msgstr "Appliquer le spécificateur de référence aux références exportées" -#: builtin/fast-export.c:1104 +#: builtin/fast-export.c:1147 msgid "anonymize output" msgstr "anonymise la sortie" -#: builtin/fast-export.c:1106 +#: builtin/fast-export.c:1149 msgid "Reference parents which are not in fast-export stream by object id" msgstr "" "les parents références qui ne sont pas dans le flux d'export rapide par id " "d'objet" -#: builtin/fast-export.c:1108 +#: builtin/fast-export.c:1151 msgid "Show original object ids of blobs/commits" msgstr "Afficher les ids d'objet originaux des blobs/commits" -#: builtin/fetch.c:28 +#: builtin/fetch.c:30 msgid "git fetch [<options>] [<repository> [<refspec>...]]" msgstr "git fetch [<options>] [<dépôt> [<spécification-de-référence>...]]" -#: builtin/fetch.c:29 +#: builtin/fetch.c:31 msgid "git fetch [<options>] <group>" msgstr "git fetch [<options>] <groupe>" -#: builtin/fetch.c:30 +#: builtin/fetch.c:32 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" msgstr "git fetch --multiple [<options>] [(<dépôt> | <groupe>)...]" -#: builtin/fetch.c:31 +#: builtin/fetch.c:33 msgid "git fetch --all [<options>]" msgstr "git fetch --all [<options>]" -#: builtin/fetch.c:115 builtin/pull.c:202 +#: builtin/fetch.c:125 builtin/pull.c:203 msgid "fetch from all remotes" msgstr "récupérer depuis tous les dépôts distants" -#: builtin/fetch.c:117 builtin/pull.c:205 +#: builtin/fetch.c:127 builtin/pull.c:206 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "ajouter à .git/FETCH_HEAD au lieu de l'écraser" -#: builtin/fetch.c:119 builtin/pull.c:208 +#: builtin/fetch.c:129 builtin/pull.c:209 msgid "path to upload pack on remote end" msgstr "chemin vers lequel télécharger le paquet sur le poste distant" -#: builtin/fetch.c:120 +#: builtin/fetch.c:130 msgid "force overwrite of local reference" msgstr "forcer l'écrasement de la branche locale" -#: builtin/fetch.c:122 +#: builtin/fetch.c:132 msgid "fetch from multiple remotes" msgstr "récupérer depuis plusieurs dépôts distants" -#: builtin/fetch.c:124 builtin/pull.c:212 +#: builtin/fetch.c:134 builtin/pull.c:213 msgid "fetch all tags and associated objects" msgstr "récupérer toutes les étiquettes et leurs objets associés" -#: builtin/fetch.c:126 +#: builtin/fetch.c:136 msgid "do not fetch all tags (--no-tags)" msgstr "ne pas récupérer toutes les étiquettes (--no-tags)" -#: builtin/fetch.c:128 +#: builtin/fetch.c:138 msgid "number of submodules fetched in parallel" msgstr "nombre de sous-modules récupérés en parallèle" -#: builtin/fetch.c:130 builtin/pull.c:215 +#: builtin/fetch.c:140 builtin/pull.c:216 msgid "prune remote-tracking branches no longer on remote" msgstr "" "éliminer les branches de suivi distant si la branche n'existe plus dans le " "dépôt distant" -#: builtin/fetch.c:132 +#: builtin/fetch.c:142 msgid "prune local tags no longer on remote and clobber changed tags" msgstr "" "éliminer les étiquettes locales qui ont disparu du dépôt distant et qui " "encombrent les étiquettes modifiées" -#: builtin/fetch.c:133 builtin/fetch.c:156 builtin/pull.c:139 +#: builtin/fetch.c:143 builtin/fetch.c:166 builtin/pull.c:140 msgid "on-demand" msgstr "à la demande" -#: builtin/fetch.c:134 +#: builtin/fetch.c:144 msgid "control recursive fetching of submodules" msgstr "contrôler la récupération récursive dans les sous-modules" -#: builtin/fetch.c:138 builtin/pull.c:223 +#: builtin/fetch.c:148 builtin/pull.c:224 msgid "keep downloaded pack" msgstr "conserver le paquet téléchargé" -#: builtin/fetch.c:140 +#: builtin/fetch.c:150 msgid "allow updating of HEAD ref" msgstr "permettre la mise à jour de la référence HEAD" -#: builtin/fetch.c:143 builtin/fetch.c:149 builtin/pull.c:226 +#: builtin/fetch.c:153 builtin/fetch.c:159 builtin/pull.c:227 msgid "deepen history of shallow clone" msgstr "approfondir l'historique d'un clone superficiel" -#: builtin/fetch.c:145 +#: builtin/fetch.c:155 msgid "deepen history of shallow repository based on time" msgstr "approfondir l'historique d'un clone superficiel en fonction d'une date" -#: builtin/fetch.c:151 builtin/pull.c:229 +#: builtin/fetch.c:161 builtin/pull.c:230 msgid "convert to a complete repository" msgstr "convertir en un dépôt complet" -#: builtin/fetch.c:154 +#: builtin/fetch.c:164 msgid "prepend this to submodule path output" msgstr "préfixer ceci à la sortie du chemin du sous-module" -#: builtin/fetch.c:157 +#: builtin/fetch.c:167 msgid "" "default for recursive fetching of submodules (lower priority than config " "files)" @@ -12593,99 +13006,129 @@ msgstr "" "par défaut pour la récupération récursive de sous-modules (priorité plus " "basse que les fichiers de config)" -#: builtin/fetch.c:161 builtin/pull.c:232 +#: builtin/fetch.c:171 builtin/pull.c:233 msgid "accept refs that update .git/shallow" msgstr "accepter les références qui mettent à jour .git/shallow" -#: builtin/fetch.c:162 builtin/pull.c:234 +#: builtin/fetch.c:172 builtin/pull.c:235 msgid "refmap" msgstr "correspondance de référence" -#: builtin/fetch.c:163 builtin/pull.c:235 +#: builtin/fetch.c:173 builtin/pull.c:236 msgid "specify fetch refmap" msgstr "spécifier une correspondance de référence pour la récupération" -#: builtin/fetch.c:170 +#: builtin/fetch.c:180 msgid "report that we have only objects reachable from this object" msgstr "rapporte que nous n'avons que des objets joignables depuis cet objet" -#: builtin/fetch.c:469 +#: builtin/fetch.c:183 +msgid "run 'gc --auto' after fetching" +msgstr "lancer 'gc --auto' après la récupération" + +#: builtin/fetch.c:185 builtin/pull.c:245 +msgid "check for forced-updates on all updated branches" +msgstr "vérifier les mises à jour forcées sur toutes les branches mises à jour" + +#: builtin/fetch.c:491 msgid "Couldn't find remote ref HEAD" msgstr "impossible de trouver la référence HEAD distante" -#: builtin/fetch.c:608 +#: builtin/fetch.c:630 #, c-format msgid "configuration fetch.output contains invalid value %s" msgstr "" "le paramètre de configuration fetch.output contient une valeur invalide %s" -#: builtin/fetch.c:705 +#: builtin/fetch.c:728 #, c-format msgid "object %s not found" msgstr "objet %s non trouvé" -#: builtin/fetch.c:709 +#: builtin/fetch.c:732 msgid "[up to date]" msgstr "[à jour]" -#: builtin/fetch.c:722 builtin/fetch.c:738 builtin/fetch.c:801 +#: builtin/fetch.c:745 builtin/fetch.c:761 builtin/fetch.c:833 msgid "[rejected]" msgstr "[rejeté]" -#: builtin/fetch.c:723 +#: builtin/fetch.c:746 msgid "can't fetch in current branch" msgstr "impossible de récupérer dans la branche actuelle" -#: builtin/fetch.c:733 +#: builtin/fetch.c:756 msgid "[tag update]" msgstr "[mise à jour de l'étiquette]" -#: builtin/fetch.c:734 builtin/fetch.c:771 builtin/fetch.c:784 -#: builtin/fetch.c:796 +#: builtin/fetch.c:757 builtin/fetch.c:794 builtin/fetch.c:816 +#: builtin/fetch.c:828 msgid "unable to update local ref" msgstr "impossible de mettre à jour la référence locale" -#: builtin/fetch.c:738 +#: builtin/fetch.c:761 msgid "would clobber existing tag" msgstr "écraserait l'étiquette existante" -#: builtin/fetch.c:760 +#: builtin/fetch.c:783 msgid "[new tag]" msgstr "[nouvelle étiquette]" -#: builtin/fetch.c:763 +#: builtin/fetch.c:786 msgid "[new branch]" msgstr "[nouvelle branche]" -#: builtin/fetch.c:766 +#: builtin/fetch.c:789 msgid "[new ref]" msgstr "[nouvelle référence]" -#: builtin/fetch.c:796 +#: builtin/fetch.c:828 msgid "forced update" msgstr "mise à jour forcée" -#: builtin/fetch.c:801 +#: builtin/fetch.c:833 msgid "non-fast-forward" msgstr "pas en avance rapide" -#: builtin/fetch.c:847 +#: builtin/fetch.c:854 +msgid "" +"Fetch normally indicates which branches had a forced update,\n" +"but that check has been disabled. To re-enable, use '--show-forced-updates'\n" +"flag or run 'git config fetch.showForcedUpdates true'." +msgstr "" +"Fetch indique normalement quelles branches ont subi une mise à jour forcée,\n" +"mais ceci a été désactivé. Pour ré-activer, utilisez le drapeau\n" +"'--show-forced-update' ou lancez 'git config fetch.showForcedUpdates true'." + +#: builtin/fetch.c:858 +#, c-format +msgid "" +"It took %.2f seconds to check forced updates. You can use\n" +"'--no-show-forced-updates' or run 'git config fetch.showForcedUpdates " +"false'\n" +" to avoid this check.\n" +msgstr "" +"%.2f secondes ont été nécessaires pour vérifier les mises à jour forcées.\n" +"Vous pouvez utiliser '--no-show-forced-update' ou lancer\n" +"'git config fetch.showForcedUpdates false' pour éviter ceci.\n" + +#: builtin/fetch.c:888 #, c-format msgid "%s did not send all necessary objects\n" msgstr "%s n'a pas envoyé tous les objets nécessaires\n" -#: builtin/fetch.c:868 +#: builtin/fetch.c:909 #, c-format msgid "reject %s because shallow roots are not allowed to be updated" msgstr "" "%s rejeté parce que les racines superficielles ne sont pas mises à jour" -#: builtin/fetch.c:959 builtin/fetch.c:1081 +#: builtin/fetch.c:1000 builtin/fetch.c:1131 #, c-format msgid "From %.*s\n" msgstr "Depuis %.*s\n" -#: builtin/fetch.c:970 +#: builtin/fetch.c:1011 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -12694,50 +13137,50 @@ msgstr "" "des références locales n'ont pas pu être mises à jour ; essayez de lancer\n" " 'git remote prune %s' pour supprimer des branches anciennes en conflit" -#: builtin/fetch.c:1051 +#: builtin/fetch.c:1101 #, c-format msgid " (%s will become dangling)" msgstr " (%s sera en suspens)" -#: builtin/fetch.c:1052 +#: builtin/fetch.c:1102 #, c-format msgid " (%s has become dangling)" msgstr " (%s est devenu en suspens)" -#: builtin/fetch.c:1084 +#: builtin/fetch.c:1134 msgid "[deleted]" msgstr "[supprimé]" -#: builtin/fetch.c:1085 builtin/remote.c:1036 +#: builtin/fetch.c:1135 builtin/remote.c:1036 msgid "(none)" msgstr "(aucun(e))" -#: builtin/fetch.c:1108 +#: builtin/fetch.c:1158 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "Refus de récupérer dans la branche courant %s d'un dépôt non nu" -#: builtin/fetch.c:1127 +#: builtin/fetch.c:1177 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "La valeur \"%2$s\" de l'option \"%1$s\" est invalide pour %3$s" -#: builtin/fetch.c:1130 +#: builtin/fetch.c:1180 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "L'option \"%s\" est ignorée pour %s\n" -#: builtin/fetch.c:1434 +#: builtin/fetch.c:1484 #, c-format msgid "Fetching %s\n" msgstr "Récupération de %s\n" -#: builtin/fetch.c:1436 builtin/remote.c:100 +#: builtin/fetch.c:1486 builtin/remote.c:100 #, c-format msgid "Could not fetch %s" msgstr "Impossible de récupérer %s" -#: builtin/fetch.c:1482 +#: builtin/fetch.c:1532 msgid "" "--filter can only be used with the remote configured in extensions." "partialClone" @@ -12745,7 +13188,7 @@ msgstr "" "--filter ne peut être utilisé qu'avec le dépôt distant configuré dans " "extensions.partialClone" -#: builtin/fetch.c:1506 +#: builtin/fetch.c:1556 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." @@ -12753,46 +13196,46 @@ msgstr "" "Aucun dépôt distant spécifié. Veuillez spécifier une URL ou un nom\n" "distant depuis lesquels les nouvelles révisions devraient être récupérées." -#: builtin/fetch.c:1543 +#: builtin/fetch.c:1593 msgid "You need to specify a tag name." msgstr "Vous devez spécifier un nom d'étiquette." -#: builtin/fetch.c:1594 +#: builtin/fetch.c:1644 msgid "Negative depth in --deepen is not supported" msgstr "Une profondeur négative dans --deepen n'est pas supportée" -#: builtin/fetch.c:1596 +#: builtin/fetch.c:1646 msgid "--deepen and --depth are mutually exclusive" msgstr "--deepen et --depth sont mutuellement exclusifs" -#: builtin/fetch.c:1601 +#: builtin/fetch.c:1651 msgid "--depth and --unshallow cannot be used together" msgstr "--depth et --unshallow ne peuvent pas être utilisés ensemble" -#: builtin/fetch.c:1603 +#: builtin/fetch.c:1653 msgid "--unshallow on a complete repository does not make sense" msgstr "--unshallow sur un dépôt complet n'a pas de sens" -#: builtin/fetch.c:1619 +#: builtin/fetch.c:1669 msgid "fetch --all does not take a repository argument" msgstr "fetch --all n'accepte pas d'argument de dépôt" -#: builtin/fetch.c:1621 +#: builtin/fetch.c:1671 msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all n'a pas de sens avec des spécifications de référence" -#: builtin/fetch.c:1630 +#: builtin/fetch.c:1680 #, c-format msgid "No such remote or remote group: %s" msgstr "distant ou groupe distant inexistant : %s" -#: builtin/fetch.c:1637 +#: builtin/fetch.c:1687 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "" "La récupération d'un groupe et les spécifications de référence n'ont pas de " "sens" -#: builtin/fetch.c:1653 +#: builtin/fetch.c:1703 msgid "" "--filter can only be used with the remote configured in extensions." "partialclone" @@ -12862,7 +13305,7 @@ msgstr "échapper les champs réservés pour compatibilité avec Tcl" msgid "show only <n> matched refs" msgstr "n'afficher que <n> références correspondant" -#: builtin/for-each-ref.c:39 builtin/tag.c:433 +#: builtin/for-each-ref.c:39 builtin/tag.c:439 msgid "respect format colors" msgstr "respecter les couleurs de formatage" @@ -13030,7 +13473,7 @@ msgstr "Vérification des répertoires d'objet" msgid "Checking %s link" msgstr "Vérification du lien %s" -#: builtin/fsck.c:705 builtin/index-pack.c:841 +#: builtin/fsck.c:705 builtin/index-pack.c:842 #, c-format msgid "invalid %s" msgstr "%s invalide" @@ -13116,7 +13559,7 @@ msgstr "afficher la progression" msgid "show verbose names for reachable objects" msgstr "afficher les noms étendus pour les objets inaccessibles" -#: builtin/fsck.c:859 builtin/index-pack.c:224 +#: builtin/fsck.c:859 builtin/index-pack.c:225 msgid "Checking objects" msgstr "Vérification des objets" @@ -13149,7 +13592,7 @@ msgstr "échec de l'analyse de '%s' valeur '%s'" msgid "cannot stat '%s'" msgstr "impossible de faire un stat de '%s'" -#: builtin/gc.c:485 builtin/notes.c:240 builtin/tag.c:519 +#: builtin/gc.c:485 builtin/notes.c:240 builtin/tag.c:529 #, c-format msgid "cannot read '%s'" msgstr "impossible de lire '%s'" @@ -13227,7 +13670,7 @@ msgstr "" "un ramasse-miettes est déjà en cours sur la machine '%s' pid %<PRIuMAX> " "(utilisez --force si ce n'est pas le cas)" -#: builtin/gc.c:693 +#: builtin/gc.c:695 msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "" @@ -13252,266 +13695,266 @@ msgstr "nombre de fils spécifié invalide (%d) pour %s" #. variable for tweaking threads, currently #. grep.threads #. -#: builtin/grep.c:287 builtin/index-pack.c:1514 builtin/index-pack.c:1705 -#: builtin/pack-objects.c:2720 +#: builtin/grep.c:287 builtin/index-pack.c:1534 builtin/index-pack.c:1727 +#: builtin/pack-objects.c:2728 #, c-format msgid "no threads support, ignoring %s" msgstr "pas de support des fils, ignore %s" -#: builtin/grep.c:466 builtin/grep.c:590 builtin/grep.c:631 +#: builtin/grep.c:467 builtin/grep.c:591 builtin/grep.c:633 #, c-format msgid "unable to read tree (%s)" msgstr "impossible de lire l'arbre (%s)" -#: builtin/grep.c:646 +#: builtin/grep.c:648 #, c-format msgid "unable to grep from object of type %s" msgstr "impossible de faire un grep sur un objet de type %s" -#: builtin/grep.c:712 +#: builtin/grep.c:714 #, c-format msgid "switch `%c' expects a numerical value" msgstr "l'option '%c' attend une valeur numérique" -#: builtin/grep.c:811 +#: builtin/grep.c:813 msgid "search in index instead of in the work tree" msgstr "rechercher dans l'index plutôt que dans la copie de travail" -#: builtin/grep.c:813 +#: builtin/grep.c:815 msgid "find in contents not managed by git" msgstr "rechercher dans les contenus non gérés par git" -#: builtin/grep.c:815 +#: builtin/grep.c:817 msgid "search in both tracked and untracked files" msgstr "rechercher dans les fichiers suivis et non-suivis" -#: builtin/grep.c:817 +#: builtin/grep.c:819 msgid "ignore files specified via '.gitignore'" msgstr "ignorer les fichiers spécifiés via '.gitignore'" -#: builtin/grep.c:819 +#: builtin/grep.c:821 msgid "recursively search in each submodule" msgstr "rechercher récursivement dans chaque sous-module" -#: builtin/grep.c:822 +#: builtin/grep.c:824 msgid "show non-matching lines" msgstr "afficher les lignes qui ne correspondent pas" -#: builtin/grep.c:824 +#: builtin/grep.c:826 msgid "case insensitive matching" msgstr "correspondance insensible à la casse" -#: builtin/grep.c:826 +#: builtin/grep.c:828 msgid "match patterns only at word boundaries" msgstr "rechercher les motifs aux séparateurs de mots" -#: builtin/grep.c:828 +#: builtin/grep.c:830 msgid "process binary files as text" msgstr "traiter les fichiers binaires comme texte" -#: builtin/grep.c:830 +#: builtin/grep.c:832 msgid "don't match patterns in binary files" msgstr "ne pas chercher les motifs dans les fichiers binaires" -#: builtin/grep.c:833 +#: builtin/grep.c:835 msgid "process binary files with textconv filters" msgstr "traiter les fichiers binaires avec les filtres textconv" -#: builtin/grep.c:835 +#: builtin/grep.c:837 msgid "search in subdirectories (default)" msgstr "rechercher dans les sous-répertoires (défaut)" -#: builtin/grep.c:837 +#: builtin/grep.c:839 msgid "descend at most <depth> levels" msgstr "descendre au plus de <profondeur> dans l'arborescence" -#: builtin/grep.c:841 +#: builtin/grep.c:843 msgid "use extended POSIX regular expressions" msgstr "utiliser des expressions régulières étendues POSIX" -#: builtin/grep.c:844 +#: builtin/grep.c:846 msgid "use basic POSIX regular expressions (default)" msgstr "utiliser des expressions régulières basiques POSIX (par défaut)" -#: builtin/grep.c:847 +#: builtin/grep.c:849 msgid "interpret patterns as fixed strings" msgstr "interpréter les motifs comme de chaînes fixes" -#: builtin/grep.c:850 +#: builtin/grep.c:852 msgid "use Perl-compatible regular expressions" msgstr "utiliser des expressions régulières compatibles avec Perl" -#: builtin/grep.c:853 +#: builtin/grep.c:855 msgid "show line numbers" msgstr "afficher les numéros de ligne" -#: builtin/grep.c:854 +#: builtin/grep.c:856 msgid "show column number of first match" msgstr "afficher le numéro de colonne de la première correspondance" -#: builtin/grep.c:855 +#: builtin/grep.c:857 msgid "don't show filenames" msgstr "ne pas pas afficher les noms de fichier" -#: builtin/grep.c:856 +#: builtin/grep.c:858 msgid "show filenames" msgstr "afficher les noms de fichier" -#: builtin/grep.c:858 +#: builtin/grep.c:860 msgid "show filenames relative to top directory" msgstr "afficher les noms de fichiers relativement au répertoire de base" -#: builtin/grep.c:860 +#: builtin/grep.c:862 msgid "show only filenames instead of matching lines" msgstr "n'afficher que les noms de fichiers au lieu des lignes correspondant" -#: builtin/grep.c:862 +#: builtin/grep.c:864 msgid "synonym for --files-with-matches" msgstr "synonyme pour --files-with-matches" -#: builtin/grep.c:865 +#: builtin/grep.c:867 msgid "show only the names of files without match" msgstr "n'afficher que les noms des fichiers sans correspondance" -#: builtin/grep.c:867 +#: builtin/grep.c:869 msgid "print NUL after filenames" msgstr "imprimer une caractère NUL après le noms de fichier" -#: builtin/grep.c:870 +#: builtin/grep.c:872 msgid "show only matching parts of a line" msgstr "n'afficher que les parties correspondantes d'une ligne" -#: builtin/grep.c:872 +#: builtin/grep.c:874 msgid "show the number of matches instead of matching lines" msgstr "afficher le nombre de correspondances au lieu des lignes correspondant" -#: builtin/grep.c:873 +#: builtin/grep.c:875 msgid "highlight matches" msgstr "mettre en évidence les correspondances" -#: builtin/grep.c:875 +#: builtin/grep.c:877 msgid "print empty line between matches from different files" msgstr "" "imprimer une ligne vide entre les correspondances de fichiers différents" -#: builtin/grep.c:877 +#: builtin/grep.c:879 msgid "show filename only once above matches from same file" msgstr "" "afficher le nom de fichier une fois au dessus des correspondances du même " "fichier" -#: builtin/grep.c:880 +#: builtin/grep.c:882 msgid "show <n> context lines before and after matches" msgstr "afficher <n> lignes de contexte avant et après les correspondances" -#: builtin/grep.c:883 +#: builtin/grep.c:885 msgid "show <n> context lines before matches" msgstr "afficher <n> lignes de contexte avant les correspondances" -#: builtin/grep.c:885 +#: builtin/grep.c:887 msgid "show <n> context lines after matches" msgstr "afficher <n> lignes de contexte après les correspondances" -#: builtin/grep.c:887 +#: builtin/grep.c:889 msgid "use <n> worker threads" msgstr "utiliser <n> fils de travail" -#: builtin/grep.c:888 +#: builtin/grep.c:890 msgid "shortcut for -C NUM" msgstr "raccourci pour -C NUM" -#: builtin/grep.c:891 +#: builtin/grep.c:893 msgid "show a line with the function name before matches" msgstr "" "afficher une ligne avec le nom de la fonction avant les correspondances" -#: builtin/grep.c:893 +#: builtin/grep.c:895 msgid "show the surrounding function" msgstr "afficher la fonction contenante" -#: builtin/grep.c:896 +#: builtin/grep.c:898 msgid "read patterns from file" msgstr "lire les motifs depuis fichier" -#: builtin/grep.c:898 +#: builtin/grep.c:900 msgid "match <pattern>" msgstr "rechercher <motif>" -#: builtin/grep.c:900 +#: builtin/grep.c:902 msgid "combine patterns specified with -e" msgstr "combiner les motifs spécifiés par -e" -#: builtin/grep.c:912 +#: builtin/grep.c:914 msgid "indicate hit with exit status without output" msgstr "" "indiquer des correspondances avec le code de sortie mais sans rien afficher" -#: builtin/grep.c:914 +#: builtin/grep.c:916 msgid "show only matches from files that match all patterns" msgstr "" "n'afficher que les correspondances de fichiers qui correspondent à tous les " "motifs" -#: builtin/grep.c:916 +#: builtin/grep.c:918 msgid "show parse tree for grep expression" msgstr "afficher l'arbre d'analyse pour le motif grep" -#: builtin/grep.c:920 +#: builtin/grep.c:922 msgid "pager" msgstr "pagineur" -#: builtin/grep.c:920 +#: builtin/grep.c:922 msgid "show matching files in the pager" msgstr "afficher les fichiers correspondant dans le pagineur" -#: builtin/grep.c:924 +#: builtin/grep.c:926 msgid "allow calling of grep(1) (ignored by this build)" msgstr "permettre l'appel de grep(1) (ignoré par ce build)" -#: builtin/grep.c:988 +#: builtin/grep.c:990 msgid "no pattern given" msgstr "aucun motif fourni" -#: builtin/grep.c:1024 +#: builtin/grep.c:1026 msgid "--no-index or --untracked cannot be used with revs" msgstr "" "--no-index ou --untracked ne peuvent pas être utilisés avec des révisions" -#: builtin/grep.c:1032 +#: builtin/grep.c:1034 #, c-format msgid "unable to resolve revision: %s" msgstr "impossible de résoudre la révision : %s" -#: builtin/grep.c:1063 +#: builtin/grep.c:1065 msgid "invalid option combination, ignoring --threads" msgstr "option de combinaison invalide, ignore --threads" -#: builtin/grep.c:1066 builtin/pack-objects.c:3403 +#: builtin/grep.c:1068 builtin/pack-objects.c:3416 msgid "no threads support, ignoring --threads" msgstr "pas de support des fils, ignore --threads" -#: builtin/grep.c:1069 builtin/index-pack.c:1511 builtin/pack-objects.c:2717 +#: builtin/grep.c:1071 builtin/index-pack.c:1531 builtin/pack-objects.c:2725 #, c-format msgid "invalid number of threads specified (%d)" msgstr "nombre de fils spécifié invalide (%d)" -#: builtin/grep.c:1092 +#: builtin/grep.c:1094 msgid "--open-files-in-pager only works on the worktree" msgstr "--open-files-in-pager ne fonctionne que sur la copie de travail" -#: builtin/grep.c:1115 +#: builtin/grep.c:1117 msgid "option not supported with --recurse-submodules" msgstr "option non supportée avec --recurse-submodules" -#: builtin/grep.c:1121 +#: builtin/grep.c:1123 msgid "--cached or --untracked cannot be used with --no-index" msgstr "--cached ou --untracked ne peuvent pas être utilisés avec --no-index" -#: builtin/grep.c:1127 +#: builtin/grep.c:1129 msgid "--[no-]exclude-standard cannot be used for tracked contents" msgstr "--[no-]exclude-standard ne peut pas être utilisé avec du contenu suivi" -#: builtin/grep.c:1135 +#: builtin/grep.c:1137 msgid "both --cached and trees are given" msgstr "--cached et des arbres sont fournis en même temps" @@ -13528,10 +13971,6 @@ msgid "git hash-object --stdin-paths" msgstr "git hash-object --stdin-paths" #: builtin/hash-object.c:98 -msgid "type" -msgstr "type" - -#: builtin/hash-object.c:98 msgid "object type" msgstr "type d'objet" @@ -13648,12 +14087,12 @@ msgstr "aucun visualiseur de manuel n'a pris en charge la demande" msgid "no info viewer handled the request" msgstr "aucun visualiseur de 'info' n'a pris en charge la demande" -#: builtin/help.c:434 builtin/help.c:445 git.c:335 +#: builtin/help.c:434 builtin/help.c:445 git.c:336 #, c-format msgid "'%s' is aliased to '%s'" msgstr "'%s' est un alias de '%s'" -#: builtin/help.c:448 git.c:364 +#: builtin/help.c:448 git.c:365 #, c-format msgid "bad alias.%s string: %s" msgstr "Mauvais chaîne alias.%s : %s" @@ -13667,291 +14106,286 @@ msgstr "usage : %s%s" msgid "'git help config' for more information" msgstr "'git help config' pour plus d'information" -#: builtin/index-pack.c:184 +#: builtin/index-pack.c:185 #, c-format msgid "object type mismatch at %s" msgstr "type d'objet non correspondant à %s" -#: builtin/index-pack.c:204 +#: builtin/index-pack.c:205 #, c-format msgid "did not receive expected object %s" msgstr "objet attendu non reçu %s" -#: builtin/index-pack.c:207 +#: builtin/index-pack.c:208 #, c-format msgid "object %s: expected type %s, found %s" msgstr "objet %s : type attendu %s, reçu %s" -#: builtin/index-pack.c:257 +#: builtin/index-pack.c:258 #, c-format msgid "cannot fill %d byte" msgid_plural "cannot fill %d bytes" msgstr[0] "impossible de remplir %d octet" msgstr[1] "impossible de remplir %d octets" -#: builtin/index-pack.c:267 +#: builtin/index-pack.c:268 msgid "early EOF" msgstr "fin de fichier prématurée" -#: builtin/index-pack.c:268 +#: builtin/index-pack.c:269 msgid "read error on input" msgstr "erreur de lecture sur l'entrée" -#: builtin/index-pack.c:280 +#: builtin/index-pack.c:281 msgid "used more bytes than were available" msgstr "plus d'octets utilisés que disponibles" -#: builtin/index-pack.c:287 builtin/pack-objects.c:600 +#: builtin/index-pack.c:288 builtin/pack-objects.c:604 msgid "pack too large for current definition of off_t" msgstr "le paquet est trop grand pour la définition actuelle de off_t" -#: builtin/index-pack.c:290 builtin/unpack-objects.c:94 +#: builtin/index-pack.c:291 builtin/unpack-objects.c:94 msgid "pack exceeds maximum allowed size" msgstr "le paquet dépasse la taille maximale permise" -#: builtin/index-pack.c:305 builtin/repack.c:250 -#, c-format -msgid "unable to create '%s'" -msgstr "impossible de créer '%s'" - -#: builtin/index-pack.c:311 +#: builtin/index-pack.c:312 #, c-format msgid "cannot open packfile '%s'" msgstr "impossible d'ouvrir le fichier paquet '%s'" -#: builtin/index-pack.c:325 +#: builtin/index-pack.c:326 msgid "pack signature mismatch" msgstr "la signature du paquet ne correspond pas" -#: builtin/index-pack.c:327 +#: builtin/index-pack.c:328 #, c-format msgid "pack version %<PRIu32> unsupported" msgstr "la version de paquet %<PRIu32> non supportée" -#: builtin/index-pack.c:345 +#: builtin/index-pack.c:346 #, c-format msgid "pack has bad object at offset %<PRIuMAX>: %s" msgstr "le paquet a un mauvais objet à l'offset %<PRIuMAX> : %s" -#: builtin/index-pack.c:465 +#: builtin/index-pack.c:466 #, c-format msgid "inflate returned %d" msgstr "la décompression (inflate) a retourné %d" -#: builtin/index-pack.c:514 +#: builtin/index-pack.c:515 msgid "offset value overflow for delta base object" msgstr "dépassement de la valeur d'offset pour l'objet delta de base" -#: builtin/index-pack.c:522 +#: builtin/index-pack.c:523 msgid "delta base offset is out of bound" msgstr "l'objet delta de base est hors limite" -#: builtin/index-pack.c:530 +#: builtin/index-pack.c:531 #, c-format msgid "unknown object type %d" msgstr "type d'objet inconnu %d" -#: builtin/index-pack.c:561 +#: builtin/index-pack.c:562 msgid "cannot pread pack file" msgstr "impossible de lire (pread) le fichier paquet" -#: builtin/index-pack.c:563 +#: builtin/index-pack.c:564 #, c-format msgid "premature end of pack file, %<PRIuMAX> byte missing" msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing" msgstr[0] "fin prématurée du fichier paquet, %<PRIuMAX> octet lu" msgstr[1] "fin prématurée du fichier paquet, %<PRIuMAX> octets lus" -#: builtin/index-pack.c:589 +#: builtin/index-pack.c:590 msgid "serious inflate inconsistency" msgstr "grave incohérence dans la décompression (inflate)" -#: builtin/index-pack.c:734 builtin/index-pack.c:740 builtin/index-pack.c:763 -#: builtin/index-pack.c:802 builtin/index-pack.c:811 +#: builtin/index-pack.c:735 builtin/index-pack.c:741 builtin/index-pack.c:764 +#: builtin/index-pack.c:803 builtin/index-pack.c:812 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "COLLISION SHA1 TROUVÉE AVEC %s !" -#: builtin/index-pack.c:737 builtin/pack-objects.c:153 -#: builtin/pack-objects.c:213 builtin/pack-objects.c:307 +#: builtin/index-pack.c:738 builtin/pack-objects.c:157 +#: builtin/pack-objects.c:217 builtin/pack-objects.c:311 #, c-format msgid "unable to read %s" msgstr "impossible de lire %s" -#: builtin/index-pack.c:800 +#: builtin/index-pack.c:801 #, c-format msgid "cannot read existing object info %s" msgstr "impossible de lire l'information existante de l'objet %s" -#: builtin/index-pack.c:808 +#: builtin/index-pack.c:809 #, c-format msgid "cannot read existing object %s" msgstr "impossible de lire l'objet existant %s" -#: builtin/index-pack.c:822 +#: builtin/index-pack.c:823 #, c-format msgid "invalid blob object %s" msgstr "objet blob invalide %s" -#: builtin/index-pack.c:825 builtin/index-pack.c:844 +#: builtin/index-pack.c:826 builtin/index-pack.c:845 msgid "fsck error in packed object" msgstr "erreur de fsck dans l'objet empaqueté" -#: builtin/index-pack.c:846 +#: builtin/index-pack.c:847 #, c-format msgid "Not all child objects of %s are reachable" msgstr "Tous les objets enfants de %s ne sont pas accessibles" -#: builtin/index-pack.c:918 builtin/index-pack.c:949 +#: builtin/index-pack.c:919 builtin/index-pack.c:950 msgid "failed to apply delta" msgstr "échec d'application du delta" -#: builtin/index-pack.c:1117 +#: builtin/index-pack.c:1118 msgid "Receiving objects" msgstr "Réception d'objets" -#: builtin/index-pack.c:1117 +#: builtin/index-pack.c:1118 msgid "Indexing objects" msgstr "Indexation d'objets" -#: builtin/index-pack.c:1151 +#: builtin/index-pack.c:1152 msgid "pack is corrupted (SHA1 mismatch)" msgstr "le paquet est corrompu (SHA1 ne correspond pas)" -#: builtin/index-pack.c:1156 +#: builtin/index-pack.c:1157 msgid "cannot fstat packfile" msgstr "impossible d'obtenir le statut (fstat) du fichier paquet" -#: builtin/index-pack.c:1159 +#: builtin/index-pack.c:1160 msgid "pack has junk at the end" msgstr "le paquet est invalide à la fin" -#: builtin/index-pack.c:1171 +#: builtin/index-pack.c:1172 msgid "confusion beyond insanity in parse_pack_objects()" msgstr "confusion extrême dans parse_pack_objects()" -#: builtin/index-pack.c:1194 +#: builtin/index-pack.c:1195 msgid "Resolving deltas" msgstr "Résolution des deltas" -#: builtin/index-pack.c:1204 builtin/pack-objects.c:2489 +#: builtin/index-pack.c:1205 builtin/pack-objects.c:2497 #, c-format msgid "unable to create thread: %s" msgstr "impossible de créer le fil : %s" -#: builtin/index-pack.c:1245 +#: builtin/index-pack.c:1246 msgid "confusion beyond insanity" msgstr "confusion extrême" -#: builtin/index-pack.c:1251 +#: builtin/index-pack.c:1252 #, c-format msgid "completed with %d local object" msgid_plural "completed with %d local objects" msgstr[0] "complété avec %d objet local" msgstr[1] "complété avec %d objets locaux" -#: builtin/index-pack.c:1263 +#: builtin/index-pack.c:1264 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "" "Somme de contrôle de fin inattendue pour %s (corruption sur le disque ?)" -#: builtin/index-pack.c:1267 +#: builtin/index-pack.c:1268 #, c-format msgid "pack has %d unresolved delta" msgid_plural "pack has %d unresolved deltas" msgstr[0] "le paquet a %d delta non résolu" msgstr[1] "le paquet a %d deltas non résolus" -#: builtin/index-pack.c:1291 +#: builtin/index-pack.c:1292 #, c-format msgid "unable to deflate appended object (%d)" msgstr "impossible de compresser l'objet ajouté (%d)" -#: builtin/index-pack.c:1368 +#: builtin/index-pack.c:1388 #, c-format msgid "local object %s is corrupt" msgstr "l'objet local %s est corrompu" -#: builtin/index-pack.c:1382 +#: builtin/index-pack.c:1402 #, c-format msgid "packfile name '%s' does not end with '.pack'" msgstr "le nom de fichier paquet '%s' ne se termine pas par '.pack'" -#: builtin/index-pack.c:1407 +#: builtin/index-pack.c:1427 #, c-format msgid "cannot write %s file '%s'" msgstr "impossible d'écrire le fichier %s '%s'" -#: builtin/index-pack.c:1415 +#: builtin/index-pack.c:1435 #, c-format msgid "cannot close written %s file '%s'" msgstr "impossible de fermer le fichier %s écrit '%s'" -#: builtin/index-pack.c:1439 +#: builtin/index-pack.c:1459 msgid "error while closing pack file" msgstr "erreur en fermeture du fichier paquet" -#: builtin/index-pack.c:1453 +#: builtin/index-pack.c:1473 msgid "cannot store pack file" msgstr "impossible de stocker le fichier paquet" -#: builtin/index-pack.c:1461 +#: builtin/index-pack.c:1481 msgid "cannot store index file" msgstr "impossible de stocker le fichier d'index" -#: builtin/index-pack.c:1505 builtin/pack-objects.c:2728 +#: builtin/index-pack.c:1525 builtin/pack-objects.c:2736 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "mauvais pack.indexversion=%<PRIu32>" -#: builtin/index-pack.c:1573 +#: builtin/index-pack.c:1593 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "Impossible d'ouvrir le fichier paquet existant '%s'" -#: builtin/index-pack.c:1575 +#: builtin/index-pack.c:1595 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "Impossible d'ouvrir le fichier paquet d'index existant pour '%s'" -#: builtin/index-pack.c:1623 +#: builtin/index-pack.c:1643 #, c-format msgid "non delta: %d object" msgid_plural "non delta: %d objects" msgstr[0] "pas un delta : %d objet" msgstr[1] "pas un delta : %d objets" -#: builtin/index-pack.c:1630 +#: builtin/index-pack.c:1650 #, c-format msgid "chain length = %d: %lu object" msgid_plural "chain length = %d: %lu objects" msgstr[0] "longueur chaînée = %d : %lu objet" msgstr[1] "longueur chaînée = %d : %lu objets" -#: builtin/index-pack.c:1667 +#: builtin/index-pack.c:1689 msgid "Cannot come back to cwd" msgstr "Impossible de revenir au répertoire de travail courant" -#: builtin/index-pack.c:1716 builtin/index-pack.c:1719 -#: builtin/index-pack.c:1735 builtin/index-pack.c:1739 +#: builtin/index-pack.c:1738 builtin/index-pack.c:1741 +#: builtin/index-pack.c:1757 builtin/index-pack.c:1761 #, c-format msgid "bad %s" msgstr "mauvais %s" -#: builtin/index-pack.c:1755 +#: builtin/index-pack.c:1777 msgid "--fix-thin cannot be used without --stdin" msgstr "--fix-thin ne peut pas être utilisé sans --stdin" -#: builtin/index-pack.c:1757 +#: builtin/index-pack.c:1779 msgid "--stdin requires a git repository" msgstr "--stdin requiert un dépôt git" -#: builtin/index-pack.c:1763 +#: builtin/index-pack.c:1785 msgid "--verify with no packfile name given" msgstr "--verify sans nom de fichier paquet donné" -#: builtin/index-pack.c:1811 builtin/unpack-objects.c:580 +#: builtin/index-pack.c:1833 builtin/unpack-objects.c:580 msgid "fsck error in pack objects" msgstr "erreur de fsck dans les objets paquets" @@ -14046,17 +14480,17 @@ msgstr "permissions" msgid "specify that the git repository is to be shared amongst several users" msgstr "spécifier que le dépôt git sera partagé entre plusieurs utilisateurs" -#: builtin/init-db.c:526 builtin/init-db.c:531 +#: builtin/init-db.c:529 builtin/init-db.c:534 #, c-format msgid "cannot mkdir %s" msgstr "impossible de créer le répertoire (mkdir) %s" -#: builtin/init-db.c:535 +#: builtin/init-db.c:538 #, c-format msgid "cannot chdir to %s" msgstr "impossible de se déplacer vers le répertoire (chdir) %s" -#: builtin/init-db.c:556 +#: builtin/init-db.c:559 #, c-format msgid "" "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" @@ -14065,12 +14499,12 @@ msgstr "" "%s (ou --work-tree=<répertoire>) n'est pas autorisé sans spécifier %s (ou --" "git-dir=<répertoire>)" -#: builtin/init-db.c:584 +#: builtin/init-db.c:587 #, c-format msgid "Cannot access work tree '%s'" msgstr "Impossible d'accéder à l'arbre de travail '%s'" -#: builtin/interpret-trailers.c:15 +#: builtin/interpret-trailers.c:16 msgid "" "git interpret-trailers [--in-place] [--trim-empty] [(--trailer " "<token>[(=|:)<value>])...] [<file>...]" @@ -14078,59 +14512,59 @@ msgstr "" "git interpret-trailers [--in-place] [--trim-empty] [(--trailer " "<symbole>[(=|:)<valeur>])...] [<fichier>...]" -#: builtin/interpret-trailers.c:94 +#: builtin/interpret-trailers.c:95 msgid "edit files in place" msgstr "éditer les fichiers sur place" -#: builtin/interpret-trailers.c:95 +#: builtin/interpret-trailers.c:96 msgid "trim empty trailers" msgstr "éliminer les lignes de fin vides" -#: builtin/interpret-trailers.c:98 +#: builtin/interpret-trailers.c:99 msgid "where to place the new trailer" msgstr "où placer les nouvelles lignes terminales" -#: builtin/interpret-trailers.c:100 +#: builtin/interpret-trailers.c:101 msgid "action if trailer already exists" msgstr "action si les lignes terminales existent déjà" -#: builtin/interpret-trailers.c:102 +#: builtin/interpret-trailers.c:103 msgid "action if trailer is missing" msgstr "action si les lignes terminales manquent" -#: builtin/interpret-trailers.c:104 +#: builtin/interpret-trailers.c:105 msgid "output only the trailers" msgstr "éliminer les lignes terminales vides" -#: builtin/interpret-trailers.c:105 +#: builtin/interpret-trailers.c:106 msgid "do not apply config rules" msgstr "ne pas appliquer les règles de la configuration" -#: builtin/interpret-trailers.c:106 +#: builtin/interpret-trailers.c:107 msgid "join whitespace-continued values" msgstr "joindre les valeurs continuées avec des caractères blancs" -#: builtin/interpret-trailers.c:107 +#: builtin/interpret-trailers.c:108 msgid "set parsing options" msgstr "paramètres d'analyse" -#: builtin/interpret-trailers.c:109 +#: builtin/interpret-trailers.c:110 msgid "do not treat --- specially" msgstr "ne pas traiter spécialement ---" -#: builtin/interpret-trailers.c:110 +#: builtin/interpret-trailers.c:111 msgid "trailer" msgstr "ligne de fin" -#: builtin/interpret-trailers.c:111 +#: builtin/interpret-trailers.c:112 msgid "trailer(s) to add" msgstr "ligne(s) de fin à ajouter" -#: builtin/interpret-trailers.c:120 +#: builtin/interpret-trailers.c:123 msgid "--trailer with --only-input does not make sense" msgstr "--trailer n'a aucune signification avec --only-input" -#: builtin/interpret-trailers.c:130 +#: builtin/interpret-trailers.c:133 msgid "no input file given for in-place editing" msgstr "aucun fichier en entrée pour l'éditon sur place" @@ -14142,115 +14576,115 @@ msgstr "git log [<options>] [<plage de révisions>] [[--] <chemin>...]" msgid "git show [<options>] <object>..." msgstr "git show [<options>] <objet>..." -#: builtin/log.c:104 +#: builtin/log.c:109 #, c-format msgid "invalid --decorate option: %s" msgstr "option --decorate invalide : %s" -#: builtin/log.c:168 +#: builtin/log.c:173 msgid "show source" msgstr "afficher la source" -#: builtin/log.c:169 +#: builtin/log.c:174 msgid "Use mail map file" msgstr "Utiliser le fichier de correspondance de mail" -#: builtin/log.c:171 +#: builtin/log.c:176 msgid "only decorate refs that match <pattern>" msgstr "décorer seulement les références correspondant à <motif>" -#: builtin/log.c:173 +#: builtin/log.c:178 msgid "do not decorate refs that match <pattern>" msgstr "ne pas décorer les références correspondant à <motif>" -#: builtin/log.c:174 +#: builtin/log.c:179 msgid "decorate options" msgstr "décorer les options" -#: builtin/log.c:177 +#: builtin/log.c:182 msgid "Process line range n,m in file, counting from 1" msgstr "" "Traiter seulement l'intervalle de lignes n,m du fichier en commençant le " "compte à 1" -#: builtin/log.c:275 +#: builtin/log.c:280 #, c-format msgid "Final output: %d %s\n" msgstr "Sortie finale : %d %s\n" -#: builtin/log.c:529 +#: builtin/log.c:534 #, c-format msgid "git show %s: bad file" msgstr "git show %s : fichier incorrect" -#: builtin/log.c:544 builtin/log.c:638 +#: builtin/log.c:549 builtin/log.c:643 #, c-format msgid "could not read object %s" msgstr "impossible de lire l'objet %s" -#: builtin/log.c:663 +#: builtin/log.c:668 #, c-format msgid "unknown type: %d" msgstr "type inconnu : %d" -#: builtin/log.c:784 +#: builtin/log.c:791 msgid "format.headers without value" msgstr "format.headers sans valeur" -#: builtin/log.c:885 +#: builtin/log.c:908 msgid "name of output directory is too long" msgstr "le nom du répertoire de sortie est trop long" -#: builtin/log.c:901 +#: builtin/log.c:924 #, c-format msgid "cannot open patch file %s" msgstr "impossible d'ouvrir le fichier correctif %s" -#: builtin/log.c:918 +#: builtin/log.c:941 msgid "need exactly one range" msgstr "exactement une plage nécessaire" -#: builtin/log.c:928 +#: builtin/log.c:951 msgid "not a range" msgstr "ceci n'est pas une plage" -#: builtin/log.c:1051 +#: builtin/log.c:1074 msgid "cover letter needs email format" msgstr "la lettre de motivation doit être au format courriel" -#: builtin/log.c:1057 +#: builtin/log.c:1080 msgid "failed to create cover-letter file" msgstr "échec de création du fichier de lettre de motivation" -#: builtin/log.c:1136 +#: builtin/log.c:1159 #, c-format msgid "insane in-reply-to: %s" msgstr "in-reply-to aberrant : %s" -#: builtin/log.c:1163 +#: builtin/log.c:1186 msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "git format-patch [<options>] [<depuis> | <plage de révisions>]" -#: builtin/log.c:1221 +#: builtin/log.c:1244 msgid "two output directories?" msgstr "deux répertoires de sortie ?" -#: builtin/log.c:1332 builtin/log.c:2076 builtin/log.c:2078 builtin/log.c:2090 +#: builtin/log.c:1355 builtin/log.c:2099 builtin/log.c:2101 builtin/log.c:2113 #, c-format msgid "unknown commit %s" msgstr "commit inconnu %s" -#: builtin/log.c:1342 builtin/replace.c:58 builtin/replace.c:207 +#: builtin/log.c:1365 builtin/replace.c:58 builtin/replace.c:207 #: builtin/replace.c:210 #, c-format msgid "failed to resolve '%s' as a valid ref" msgstr "échec à résoudre '%s' comme une référence valide" -#: builtin/log.c:1347 +#: builtin/log.c:1370 msgid "could not find exact merge base" msgstr "impossible de trouver la base de fusion exacte" -#: builtin/log.c:1351 +#: builtin/log.c:1374 msgid "" "failed to get upstream, if you want to record base commit automatically,\n" "please use git branch --set-upstream-to to track a remote branch.\n" @@ -14263,279 +14697,275 @@ msgstr "" "Ou vous pouvez spécifier le commit de base par --base=<id-du-commit-de-base> " "manuellement" -#: builtin/log.c:1371 +#: builtin/log.c:1394 msgid "failed to find exact merge base" msgstr "échec à trouver la base de fusion exacte" -#: builtin/log.c:1382 +#: builtin/log.c:1405 msgid "base commit should be the ancestor of revision list" msgstr "le commit de base devrait être l'ancêtre de la liste de révisions" -#: builtin/log.c:1386 +#: builtin/log.c:1409 msgid "base commit shouldn't be in revision list" msgstr "le commit de base ne devrait pas faire partie de la liste de révisions" -#: builtin/log.c:1439 +#: builtin/log.c:1462 msgid "cannot get patch id" msgstr "impossible d'obtenir l'id du patch" -#: builtin/log.c:1491 +#: builtin/log.c:1514 msgid "failed to infer range-diff ranges" msgstr "échec d'inférence d'intervalles de différence d'intervalles" -#: builtin/log.c:1536 +#: builtin/log.c:1559 msgid "use [PATCH n/m] even with a single patch" msgstr "utiliser [PATCH n/m] même avec un patch unique" -#: builtin/log.c:1539 +#: builtin/log.c:1562 msgid "use [PATCH] even with multiple patches" msgstr "utiliser [PATCH] même avec des patchs multiples" -#: builtin/log.c:1543 +#: builtin/log.c:1566 msgid "print patches to standard out" msgstr "afficher les patchs sur la sortie standard" -#: builtin/log.c:1545 +#: builtin/log.c:1568 msgid "generate a cover letter" msgstr "générer une lettre de motivation" -#: builtin/log.c:1547 +#: builtin/log.c:1570 msgid "use simple number sequence for output file names" msgstr "" "utiliser une séquence simple de nombres pour les nom des fichiers de sortie" -#: builtin/log.c:1548 +#: builtin/log.c:1571 msgid "sfx" msgstr "sfx" -#: builtin/log.c:1549 +#: builtin/log.c:1572 msgid "use <sfx> instead of '.patch'" msgstr "utiliser <sfx> au lieu de '.patch'" -#: builtin/log.c:1551 +#: builtin/log.c:1574 msgid "start numbering patches at <n> instead of 1" msgstr "démarrer la numérotation des patchs à <n> au lieu de 1" -#: builtin/log.c:1553 +#: builtin/log.c:1576 msgid "mark the series as Nth re-roll" msgstr "marquer la série comme une Nième réédition" -#: builtin/log.c:1555 +#: builtin/log.c:1578 msgid "Use [RFC PATCH] instead of [PATCH]" msgstr "utiliser [RFC PATCH] au lieu de [PATCH]" -#: builtin/log.c:1558 +#: builtin/log.c:1581 msgid "Use [<prefix>] instead of [PATCH]" msgstr "utiliser [<préfixe>] au lieu de [PATCH]" -#: builtin/log.c:1561 +#: builtin/log.c:1584 msgid "store resulting files in <dir>" msgstr "stocker les fichiers résultats dans <répertoire>" -#: builtin/log.c:1564 +#: builtin/log.c:1587 msgid "don't strip/add [PATCH]" msgstr "ne pas retirer/ajouter [PATCH]" -#: builtin/log.c:1567 +#: builtin/log.c:1590 msgid "don't output binary diffs" msgstr "ne pas imprimer les diffs binaires" -#: builtin/log.c:1569 +#: builtin/log.c:1592 msgid "output all-zero hash in From header" msgstr "écrire une empreinte à zéro dans l'entête From" -#: builtin/log.c:1571 +#: builtin/log.c:1594 msgid "don't include a patch matching a commit upstream" msgstr "ne pas inclure un patch correspondant à un commit amont" -#: builtin/log.c:1573 +#: builtin/log.c:1596 msgid "show patch format instead of default (patch + stat)" msgstr "afficher le format du patch au lieu du défaut (patch + stat)" -#: builtin/log.c:1575 +#: builtin/log.c:1598 msgid "Messaging" msgstr "Communication" -#: builtin/log.c:1576 +#: builtin/log.c:1599 msgid "header" msgstr "en-tête" -#: builtin/log.c:1577 +#: builtin/log.c:1600 msgid "add email header" msgstr "ajouter l'en-tête de courriel" -#: builtin/log.c:1578 builtin/log.c:1580 +#: builtin/log.c:1601 builtin/log.c:1603 msgid "email" msgstr "courriel" -#: builtin/log.c:1578 +#: builtin/log.c:1601 msgid "add To: header" msgstr "ajouter l'en-tête \"To:\"" -#: builtin/log.c:1580 +#: builtin/log.c:1603 msgid "add Cc: header" msgstr "ajouter l'en-tête \"Cc:\"" -#: builtin/log.c:1582 +#: builtin/log.c:1605 msgid "ident" msgstr "ident" -#: builtin/log.c:1583 +#: builtin/log.c:1606 msgid "set From address to <ident> (or committer ident if absent)" msgstr "" "renseigner l'adresse From à <ident> (ou à l'ident du validateur si absent)" -#: builtin/log.c:1585 +#: builtin/log.c:1608 msgid "message-id" msgstr "id-message" -#: builtin/log.c:1586 +#: builtin/log.c:1609 msgid "make first mail a reply to <message-id>" msgstr "répondre dans le premier message à <id-message>" -#: builtin/log.c:1587 builtin/log.c:1590 +#: builtin/log.c:1610 builtin/log.c:1613 msgid "boundary" msgstr "limite" -#: builtin/log.c:1588 +#: builtin/log.c:1611 msgid "attach the patch" msgstr "attacher le patch" -#: builtin/log.c:1591 +#: builtin/log.c:1614 msgid "inline the patch" msgstr "patch à l'intérieur" -#: builtin/log.c:1595 +#: builtin/log.c:1618 msgid "enable message threading, styles: shallow, deep" msgstr "" "activer l'enfilage de message, styles : shallow (superficiel), deep (profond)" -#: builtin/log.c:1597 +#: builtin/log.c:1620 msgid "signature" msgstr "signature" -#: builtin/log.c:1598 +#: builtin/log.c:1621 msgid "add a signature" msgstr "ajouter une signature" -#: builtin/log.c:1599 +#: builtin/log.c:1622 msgid "base-commit" msgstr "commit-de-base" -#: builtin/log.c:1600 +#: builtin/log.c:1623 msgid "add prerequisite tree info to the patch series" msgstr "Ajouter un arbre prérequis à la série de patchs" -#: builtin/log.c:1602 +#: builtin/log.c:1625 msgid "add a signature from a file" msgstr "ajouter une signature depuis un fichier" -#: builtin/log.c:1603 +#: builtin/log.c:1626 msgid "don't print the patch filenames" msgstr "ne pas afficher les noms de fichiers des patchs" -#: builtin/log.c:1605 +#: builtin/log.c:1628 msgid "show progress while generating patches" msgstr "" "afficher la barre de progression durant la phase de génération des patchs" -#: builtin/log.c:1606 -msgid "rev" -msgstr "rév" - -#: builtin/log.c:1607 +#: builtin/log.c:1630 msgid "show changes against <rev> in cover letter or single patch" msgstr "" "afficher les modifications par rapport à <rév> dans la première page ou une " "rustine" -#: builtin/log.c:1610 +#: builtin/log.c:1633 msgid "show changes against <refspec> in cover letter or single patch" msgstr "" "afficher les modifications par rapport à <refspec> dans la première page ou " "une rustine" -#: builtin/log.c:1612 +#: builtin/log.c:1635 msgid "percentage by which creation is weighted" msgstr "pourcentage par lequel la création est pondérée" -#: builtin/log.c:1687 +#: builtin/log.c:1710 #, c-format msgid "invalid ident line: %s" msgstr "ligne d'identification invalide : %s" -#: builtin/log.c:1702 +#: builtin/log.c:1725 msgid "-n and -k are mutually exclusive" msgstr "-n et -k sont mutuellement exclusifs" -#: builtin/log.c:1704 +#: builtin/log.c:1727 msgid "--subject-prefix/--rfc and -k are mutually exclusive" msgstr "--subject-prefix/--rfc et -k sont mutuellement exclusifs" -#: builtin/log.c:1712 +#: builtin/log.c:1735 msgid "--name-only does not make sense" msgstr "--name-only n'a pas de sens" -#: builtin/log.c:1714 +#: builtin/log.c:1737 msgid "--name-status does not make sense" msgstr "--name-status n'a pas de sens" -#: builtin/log.c:1716 +#: builtin/log.c:1739 msgid "--check does not make sense" msgstr "--check n'a pas de sens" -#: builtin/log.c:1748 +#: builtin/log.c:1771 msgid "standard output, or directory, which one?" msgstr "sortie standard, ou répertoire, lequel ?" -#: builtin/log.c:1837 +#: builtin/log.c:1860 msgid "--interdiff requires --cover-letter or single patch" msgstr "--interdiff requiert --cover-letter ou une rustine unique" -#: builtin/log.c:1841 +#: builtin/log.c:1864 msgid "Interdiff:" msgstr "Interdiff :" -#: builtin/log.c:1842 +#: builtin/log.c:1865 #, c-format msgid "Interdiff against v%d:" msgstr "Interdiff contre v%d :" -#: builtin/log.c:1848 +#: builtin/log.c:1871 msgid "--creation-factor requires --range-diff" msgstr "--creation-factor requiert --range-diff" -#: builtin/log.c:1852 +#: builtin/log.c:1875 msgid "--range-diff requires --cover-letter or single patch" msgstr "--range-diff requiert --cover-letter ou une rustine unique" -#: builtin/log.c:1860 +#: builtin/log.c:1883 msgid "Range-diff:" msgstr "Diff-intervalle :" -#: builtin/log.c:1861 +#: builtin/log.c:1884 #, c-format msgid "Range-diff against v%d:" msgstr "Diff-intervalle contre v%d :" -#: builtin/log.c:1872 +#: builtin/log.c:1895 #, c-format msgid "unable to read signature file '%s'" msgstr "lecture du fichier de signature '%s' impossible" -#: builtin/log.c:1908 +#: builtin/log.c:1931 msgid "Generating patches" msgstr "Génération des patchs" -#: builtin/log.c:1952 +#: builtin/log.c:1975 msgid "failed to create output files" msgstr "échec de création des fichiers en sortie" -#: builtin/log.c:2011 +#: builtin/log.c:2034 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [<branche_amont> [<head> [<limite>]]]" -#: builtin/log.c:2065 +#: builtin/log.c:2088 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" @@ -14664,7 +15094,7 @@ msgstr "" msgid "do not print remote URL" msgstr "ne pas afficher les URL distantes" -#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1458 +#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1464 msgid "exec" msgstr "exécutable" @@ -14741,190 +15171,194 @@ msgstr "" msgid "empty mbox: '%s'" msgstr "mbox vide : '%s'" -#: builtin/merge.c:54 +#: builtin/merge.c:55 msgid "git merge [<options>] [<commit>...]" msgstr "git merge [<options>] [<commit>...]" -#: builtin/merge.c:55 +#: builtin/merge.c:56 msgid "git merge --abort" msgstr "git merge --abort" -#: builtin/merge.c:56 +#: builtin/merge.c:57 msgid "git merge --continue" msgstr "git merge --continue" -#: builtin/merge.c:116 +#: builtin/merge.c:118 msgid "switch `m' requires a value" msgstr "le commutateur `m' a besoin d'une valeur" -#: builtin/merge.c:139 +#: builtin/merge.c:141 #, c-format msgid "option `%s' requires a value" msgstr "le commutateur '%s' a besoin d'une valeur" -#: builtin/merge.c:185 +#: builtin/merge.c:187 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "Impossible de trouver la stratégie de fusion '%s'.\n" -#: builtin/merge.c:186 +#: builtin/merge.c:188 #, c-format msgid "Available strategies are:" msgstr "Les stratégies disponibles sont :" -#: builtin/merge.c:191 +#: builtin/merge.c:193 #, c-format msgid "Available custom strategies are:" msgstr "Les stratégies personnalisées sont :" -#: builtin/merge.c:242 builtin/pull.c:150 +#: builtin/merge.c:244 builtin/pull.c:151 msgid "do not show a diffstat at the end of the merge" msgstr "ne pas afficher un diffstat à la fin de la fusion" -#: builtin/merge.c:245 builtin/pull.c:153 +#: builtin/merge.c:247 builtin/pull.c:154 msgid "show a diffstat at the end of the merge" msgstr "afficher un diffstat à la fin de la fusion" -#: builtin/merge.c:246 builtin/pull.c:156 +#: builtin/merge.c:248 builtin/pull.c:157 msgid "(synonym to --stat)" msgstr "(synonyme de --stat)" -#: builtin/merge.c:248 builtin/pull.c:159 +#: builtin/merge.c:250 builtin/pull.c:160 msgid "add (at most <n>) entries from shortlog to merge commit message" msgstr "" "ajouter (au plus <n>) éléments du journal court au message de validation de " "la fusion" -#: builtin/merge.c:251 builtin/pull.c:165 +#: builtin/merge.c:253 builtin/pull.c:166 msgid "create a single commit instead of doing a merge" msgstr "créer une validation unique au lieu de faire une fusion" -#: builtin/merge.c:253 builtin/pull.c:168 +#: builtin/merge.c:255 builtin/pull.c:169 msgid "perform a commit if the merge succeeds (default)" msgstr "effectuer une validation si la fusion réussit (défaut)" -#: builtin/merge.c:255 builtin/pull.c:171 +#: builtin/merge.c:257 builtin/pull.c:172 msgid "edit message before committing" msgstr "éditer le message avant la validation" -#: builtin/merge.c:257 +#: builtin/merge.c:259 msgid "allow fast-forward (default)" msgstr "autoriser l'avance rapide (défaut)" -#: builtin/merge.c:259 builtin/pull.c:178 +#: builtin/merge.c:261 builtin/pull.c:179 msgid "abort if fast-forward is not possible" msgstr "abandonner si l'avance rapide n'est pas possible" -#: builtin/merge.c:263 builtin/pull.c:181 +#: builtin/merge.c:265 builtin/pull.c:182 msgid "verify that the named commit has a valid GPG signature" msgstr "vérifier que le commit nommé a une signature GPG valide" -#: builtin/merge.c:264 builtin/notes.c:787 builtin/pull.c:185 -#: builtin/rebase.c:492 builtin/rebase.c:1471 builtin/revert.c:113 +#: builtin/merge.c:266 builtin/notes.c:787 builtin/pull.c:186 +#: builtin/rebase.c:492 builtin/rebase.c:1477 builtin/revert.c:114 msgid "strategy" msgstr "stratégie" -#: builtin/merge.c:265 builtin/pull.c:186 +#: builtin/merge.c:267 builtin/pull.c:187 msgid "merge strategy to use" msgstr "stratégie de fusion à utiliser" -#: builtin/merge.c:266 builtin/pull.c:189 +#: builtin/merge.c:268 builtin/pull.c:190 msgid "option=value" msgstr "option=valeur" -#: builtin/merge.c:267 builtin/pull.c:190 +#: builtin/merge.c:269 builtin/pull.c:191 msgid "option for selected merge strategy" msgstr "option pour la stratégie de fusion sélectionnée" -#: builtin/merge.c:269 +#: builtin/merge.c:271 msgid "merge commit message (for a non-fast-forward merge)" msgstr "" "message de validation de la fusion (pour une fusion sans avance rapide)" -#: builtin/merge.c:276 +#: builtin/merge.c:278 msgid "abort the current in-progress merge" msgstr "abandonner la fusion en cours" -#: builtin/merge.c:278 +#: builtin/merge.c:280 +msgid "--abort but leave index and working tree alone" +msgstr "--abort mais laisser l'index et l'arbre de travail inchangés" + +#: builtin/merge.c:282 msgid "continue the current in-progress merge" msgstr "continuer la fusion en cours" -#: builtin/merge.c:280 builtin/pull.c:197 +#: builtin/merge.c:284 builtin/pull.c:198 msgid "allow merging unrelated histories" msgstr "permettre la fusion d'historiques sans rapport" -#: builtin/merge.c:286 +#: builtin/merge.c:290 msgid "verify commit-msg hook" msgstr "vérifier le crochet commit-msg" -#: builtin/merge.c:311 +#: builtin/merge.c:307 msgid "could not run stash." msgstr "impossible de lancer le remisage." -#: builtin/merge.c:316 +#: builtin/merge.c:312 msgid "stash failed" msgstr "échec du remisage" -#: builtin/merge.c:321 +#: builtin/merge.c:317 #, c-format msgid "not a valid object: %s" msgstr "pas un objet valide : %s" -#: builtin/merge.c:343 builtin/merge.c:360 +#: builtin/merge.c:339 builtin/merge.c:356 msgid "read-tree failed" msgstr "read-tree a échoué" -#: builtin/merge.c:390 +#: builtin/merge.c:386 msgid " (nothing to squash)" msgstr " (rien à compresser)" -#: builtin/merge.c:401 +#: builtin/merge.c:397 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "Validation compressée -- HEAD non mise à jour\n" -#: builtin/merge.c:451 +#: builtin/merge.c:447 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "Pas de message de fusion -- pas de mise à jour de HEAD\n" -#: builtin/merge.c:502 +#: builtin/merge.c:498 #, c-format msgid "'%s' does not point to a commit" msgstr "'%s' ne pointe pas sur un commit" -#: builtin/merge.c:589 +#: builtin/merge.c:585 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "Mauvaise chaîne branch.%s.mergeoptions : %s" -#: builtin/merge.c:712 +#: builtin/merge.c:708 msgid "Not handling anything other than two heads merge." msgstr "Impossible de gérer autre chose que la fusion de deux têtes." -#: builtin/merge.c:726 +#: builtin/merge.c:722 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "Options inconnue pour merge-recursive : -X%s" -#: builtin/merge.c:741 +#: builtin/merge.c:737 #, c-format msgid "unable to write %s" msgstr "impossible d'écrire %s" -#: builtin/merge.c:793 +#: builtin/merge.c:789 #, c-format msgid "Could not read from '%s'" msgstr "Impossible de lire depuis '%s'" -#: builtin/merge.c:802 +#: builtin/merge.c:798 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "" "Pas de validation de la fusion ; utilisez 'git commit' pour terminer la " "fusion.\n" -#: builtin/merge.c:808 +#: builtin/merge.c:804 msgid "" "Please enter a commit message to explain why this merge is necessary,\n" "especially if it merges an updated upstream into a topic branch.\n" @@ -14936,11 +15370,11 @@ msgstr "" "branche de sujet.\n" "\n" -#: builtin/merge.c:813 +#: builtin/merge.c:809 msgid "An empty message aborts the commit.\n" msgstr "Un message vide abandonne la validation.\n" -#: builtin/merge.c:816 +#: builtin/merge.c:812 #, c-format msgid "" "Lines starting with '%c' will be ignored, and an empty message aborts\n" @@ -14949,70 +15383,74 @@ msgstr "" "Les lignes commençant par '%c' seront ignorées, et un message vide\n" "abandonne la validation.\n" -#: builtin/merge.c:857 +#: builtin/merge.c:853 msgid "Empty commit message." msgstr "Message de validation vide." -#: builtin/merge.c:876 +#: builtin/merge.c:872 #, c-format msgid "Wonderful.\n" msgstr "Merveilleux.\n" -#: builtin/merge.c:936 +#: builtin/merge.c:933 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "" "La fusion automatique a échoué ; réglez les conflits et validez le " "résultat.\n" -#: builtin/merge.c:975 +#: builtin/merge.c:972 msgid "No current branch." msgstr "Pas de branche courante." -#: builtin/merge.c:977 +#: builtin/merge.c:974 msgid "No remote for the current branch." msgstr "Pas de branche distante pour la branche courante." -#: builtin/merge.c:979 +#: builtin/merge.c:976 msgid "No default upstream defined for the current branch." msgstr "Pas de branche amont par défaut définie pour la branche courante." -#: builtin/merge.c:984 +#: builtin/merge.c:981 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "Pas de branche de suivi pour %s depuis %s" -#: builtin/merge.c:1041 +#: builtin/merge.c:1038 #, c-format msgid "Bad value '%s' in environment '%s'" msgstr "Mauvaise valeur '%s' dans l'environnement '%s'" -#: builtin/merge.c:1144 +#: builtin/merge.c:1141 #, c-format msgid "not something we can merge in %s: %s" msgstr "pas possible de fusionner ceci dans %s : %s" -#: builtin/merge.c:1178 +#: builtin/merge.c:1175 msgid "not something we can merge" msgstr "pas possible de fusionner ceci" -#: builtin/merge.c:1281 +#: builtin/merge.c:1278 msgid "--abort expects no arguments" msgstr "--abort n'accepte pas d'argument" -#: builtin/merge.c:1285 +#: builtin/merge.c:1282 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "Il n'y a pas de fusion à abandonner (MERGE_HEAD manquant)." -#: builtin/merge.c:1297 +#: builtin/merge.c:1291 +msgid "--quit expects no arguments" +msgstr "--quit n'accepte pas d'argument" + +#: builtin/merge.c:1304 msgid "--continue expects no arguments" msgstr "--continue ne supporte aucun argument" -#: builtin/merge.c:1301 +#: builtin/merge.c:1308 msgid "There is no merge in progress (MERGE_HEAD missing)." msgstr "Il n'y a pas de fusion en cours (MERGE_HEAD manquant)." -#: builtin/merge.c:1317 +#: builtin/merge.c:1324 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." @@ -15020,7 +15458,7 @@ msgstr "" "Vous n'avez pas terminé votre fusion (MERGE_HEAD existe).\n" "Veuillez valider vos modifications avant de pouvoir fusionner." -#: builtin/merge.c:1324 +#: builtin/merge.c:1331 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." @@ -15028,94 +15466,98 @@ msgstr "" "Vous n'avez pas terminé votre picorage (CHERRY_PICK_HEAD existe).\n" "Veuillez valider vos modifications avant de pouvoir fusionner." -#: builtin/merge.c:1327 +#: builtin/merge.c:1334 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "Vous n'avez pas terminé votre picorage (CHERRY_PICK_HEAD existe)." -#: builtin/merge.c:1341 +#: builtin/merge.c:1348 msgid "You cannot combine --squash with --no-ff." msgstr "Vous ne pouvez pas combiner --squash avec --no-ff." -#: builtin/merge.c:1349 +#: builtin/merge.c:1350 +msgid "You cannot combine --squash with --commit." +msgstr "Vous ne pouvez pas combiner --squash avec --commit." + +#: builtin/merge.c:1366 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "" "Pas de validation spécifiée et merge.defaultToUpstream n'est pas défini." -#: builtin/merge.c:1366 +#: builtin/merge.c:1383 msgid "Squash commit into empty head not supported yet" msgstr "La validation compressée vers une tête vide n'est pas encore supportée" -#: builtin/merge.c:1368 +#: builtin/merge.c:1385 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "Une validation sans avance rapide n'a pas de sens dans une tête vide" -#: builtin/merge.c:1373 +#: builtin/merge.c:1390 #, c-format msgid "%s - not something we can merge" msgstr "%s - pas possible de fusionner ceci" -#: builtin/merge.c:1375 +#: builtin/merge.c:1392 msgid "Can merge only exactly one commit into empty head" msgstr "" "Possible de fusionner exactement une seule validation dans une tête vide" -#: builtin/merge.c:1454 +#: builtin/merge.c:1471 msgid "refusing to merge unrelated histories" msgstr "refus de fusionner des historiques sans relation" -#: builtin/merge.c:1463 +#: builtin/merge.c:1480 msgid "Already up to date." msgstr "Déjà à jour." -#: builtin/merge.c:1473 +#: builtin/merge.c:1490 #, c-format msgid "Updating %s..%s\n" msgstr "Mise à jour %s..%s\n" -#: builtin/merge.c:1515 +#: builtin/merge.c:1532 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "Essai de fusion vraiment triviale dans l'index...\n" -#: builtin/merge.c:1522 +#: builtin/merge.c:1539 #, c-format msgid "Nope.\n" msgstr "Non.\n" -#: builtin/merge.c:1547 +#: builtin/merge.c:1564 msgid "Already up to date. Yeeah!" msgstr "Déjà à jour. Ouais !" -#: builtin/merge.c:1553 +#: builtin/merge.c:1570 msgid "Not possible to fast-forward, aborting." msgstr "Pas possible d'avancer rapidement, abandon." -#: builtin/merge.c:1576 builtin/merge.c:1655 +#: builtin/merge.c:1593 builtin/merge.c:1658 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "Retour de l'arbre à l'original...\n" -#: builtin/merge.c:1580 +#: builtin/merge.c:1597 #, c-format msgid "Trying merge strategy %s...\n" msgstr "Essai de la stratégie de fusion %s...\n" -#: builtin/merge.c:1646 +#: builtin/merge.c:1649 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "Aucune stratégie de fusion n'a pris en charge la fusion.\n" -#: builtin/merge.c:1648 +#: builtin/merge.c:1651 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "La fusion avec la stratégie %s a échoué.\n" -#: builtin/merge.c:1657 +#: builtin/merge.c:1660 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "Utilisation de %s pour préparer la résolution à la main.\n" -#: builtin/merge.c:1669 +#: builtin/merge.c:1672 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" @@ -15249,23 +15691,39 @@ msgid "allow creation of more than one tree" msgstr "autoriser la création de plus d'un arbre" #: builtin/multi-pack-index.c:9 -msgid "git multi-pack-index [--object-dir=<dir>] (write|verify)" -msgstr "git multi-pack-index [--object-dir=<dir>] (write|verify)" +msgid "" +"git multi-pack-index [--object-dir=<dir>] (write|verify|expire|repack --" +"batch-size=<size>)" +msgstr "" +"git multi-pack-index [--object-dir=<dir>] (write|verify|expire|repack --" +"batch-size=<taille>)" -#: builtin/multi-pack-index.c:22 +#: builtin/multi-pack-index.c:23 msgid "object directory containing set of packfile and pack-index pairs" msgstr "" "répertoire objet contenant un ensemble de paires de fichiers paquet et " "d'index de paquet" -#: builtin/multi-pack-index.c:40 builtin/prune-packed.c:67 +#: builtin/multi-pack-index.c:25 +msgid "" +"during repack, collect pack-files of smaller size into a batch that is " +"larger than this size" +msgstr "" +"pendant le repaquetage, collecter les fichiers paquet de plus petite taille " +"dans un lot plus grand que cette taille" + +#: builtin/multi-pack-index.c:43 builtin/prune-packed.c:67 msgid "too many arguments" msgstr "trop d'arguments" -#: builtin/multi-pack-index.c:51 +#: builtin/multi-pack-index.c:52 +msgid "--batch-size option is only for 'repack' subcommand" +msgstr "l'option --batch-size ne sert que pour la sous-commande 'repack'" + +#: builtin/multi-pack-index.c:61 #, c-format -msgid "unrecognized verb: %s" -msgstr "verbe non reconnu : %s" +msgid "unrecognized subcommand: %s" +msgstr "sous-commande non reconnue : %s" #: builtin/mv.c:18 msgid "git mv [<options>] <source>... <destination>" @@ -15356,53 +15814,53 @@ msgstr "%s, source=%s, destination=%s" msgid "Renaming %s to %s\n" msgstr "Renommage de %s en %s\n" -#: builtin/mv.c:277 builtin/remote.c:717 builtin/repack.c:516 +#: builtin/mv.c:277 builtin/remote.c:717 builtin/repack.c:510 #, c-format msgid "renaming '%s' failed" msgstr "le renommage de '%s' a échoué" -#: builtin/name-rev.c:355 +#: builtin/name-rev.c:352 msgid "git name-rev [<options>] <commit>..." msgstr "git name-rev [<options>] <validation>..." -#: builtin/name-rev.c:356 +#: builtin/name-rev.c:353 msgid "git name-rev [<options>] --all" msgstr "git name-rev [<options>] --all" -#: builtin/name-rev.c:357 +#: builtin/name-rev.c:354 msgid "git name-rev [<options>] --stdin" msgstr "git name-rev [<options>] --stdin" -#: builtin/name-rev.c:415 +#: builtin/name-rev.c:411 msgid "print only names (no SHA-1)" msgstr "afficher seulement les noms (pas de SHA-1)" -#: builtin/name-rev.c:416 +#: builtin/name-rev.c:412 msgid "only use tags to name the commits" msgstr "utiliser seulement les étiquettes pour nommer les validations" -#: builtin/name-rev.c:418 +#: builtin/name-rev.c:414 msgid "only use refs matching <pattern>" msgstr "utiliser seulement les références correspondant à <motif>" -#: builtin/name-rev.c:420 +#: builtin/name-rev.c:416 msgid "ignore refs matching <pattern>" msgstr "ignorer les références correspondant à <motif>" -#: builtin/name-rev.c:422 +#: builtin/name-rev.c:418 msgid "list all commits reachable from all refs" msgstr "" "afficher toutes les validations accessibles depuis toutes les références" -#: builtin/name-rev.c:423 +#: builtin/name-rev.c:419 msgid "read from stdin" msgstr "lire depuis l'entrée standard" -#: builtin/name-rev.c:424 +#: builtin/name-rev.c:420 msgid "allow to print `undefined` names (default)" msgstr "autoriser l'affichage des noms `non définis` (par défaut)" -#: builtin/name-rev.c:430 +#: builtin/name-rev.c:426 msgid "dereference tags in the input (internal use)" msgstr "déréférencer les étiquettes en entrée (usage interne)" @@ -15549,7 +16007,7 @@ msgstr "impossible d'écrire l'objet note" msgid "the note contents have been left in %s" msgstr "le contenu de la note a été laissé dans %s" -#: builtin/notes.c:242 builtin/tag.c:522 +#: builtin/notes.c:242 builtin/tag.c:532 #, c-format msgid "could not open or read '%s'" msgstr "impossible d'ouvrir ou lire '%s'" @@ -15783,7 +16241,7 @@ msgstr "" "validez le résultat avec 'git notes merges --commit', ou abandonnez la " "fusion avec 'git notes merge --abort'.\n" -#: builtin/notes.c:897 builtin/tag.c:535 +#: builtin/notes.c:897 builtin/tag.c:545 #, c-format msgid "Failed to resolve '%s' as a valid ref." msgstr "Impossible de résoudre '%s' comme une référence valide." @@ -15818,7 +16276,7 @@ msgstr "références-notes" msgid "use notes from <notes-ref>" msgstr "utiliser les notes depuis <références-notes>" -#: builtin/notes.c:1034 builtin/stash.c:1611 +#: builtin/notes.c:1034 builtin/stash.c:1598 #, c-format msgid "unknown subcommand: %s" msgstr "sous-commande inconnue : %s" @@ -15837,129 +16295,129 @@ msgstr "" "git pack-objects [options...] base-name [< <liste-références> | < <liste-" "objets>]" -#: builtin/pack-objects.c:424 +#: builtin/pack-objects.c:428 #, c-format msgid "bad packed object CRC for %s" msgstr "mauvais CRC d'objet empaqueté pour %s" -#: builtin/pack-objects.c:435 +#: builtin/pack-objects.c:439 #, c-format msgid "corrupt packed object for %s" msgstr "objet empaqueté corrompu pour %s" -#: builtin/pack-objects.c:566 +#: builtin/pack-objects.c:570 #, c-format msgid "recursive delta detected for object %s" msgstr "delta récursif détecté pour l'objet %s" -#: builtin/pack-objects.c:777 +#: builtin/pack-objects.c:781 #, c-format msgid "ordered %u objects, expected %<PRIu32>" msgstr "%u objets commandés, %<PRIu32> attendus" -#: builtin/pack-objects.c:790 +#: builtin/pack-objects.c:794 #, c-format msgid "packfile is invalid: %s" msgstr "le fichier packet est invalide : %s" -#: builtin/pack-objects.c:794 +#: builtin/pack-objects.c:798 #, c-format msgid "unable to open packfile for reuse: %s" msgstr "ouverture du fichier paquet pour réutilisation impossible : %s" -#: builtin/pack-objects.c:798 +#: builtin/pack-objects.c:802 msgid "unable to seek in reused packfile" msgstr "impossible de rechercher (seek) dans le fichier paquet réutilisé" -#: builtin/pack-objects.c:809 +#: builtin/pack-objects.c:813 msgid "unable to read from reused packfile" msgstr "lecture du fichier de paquet réutilisé impossible" -#: builtin/pack-objects.c:837 +#: builtin/pack-objects.c:841 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit" msgstr "" "désactivation de l'écriture en bitmap, les fichiers paquets sont scindés à " "cause de pack.packSizeLimit" -#: builtin/pack-objects.c:850 +#: builtin/pack-objects.c:854 msgid "Writing objects" msgstr "Écriture des objets" -#: builtin/pack-objects.c:912 builtin/update-index.c:89 +#: builtin/pack-objects.c:917 builtin/update-index.c:89 #, c-format msgid "failed to stat %s" msgstr "échec du stat de %s" -#: builtin/pack-objects.c:965 +#: builtin/pack-objects.c:970 #, c-format msgid "wrote %<PRIu32> objects while expecting %<PRIu32>" msgstr "%<PRIu32> objets écrits, %<PRIu32> attendus" -#: builtin/pack-objects.c:1161 +#: builtin/pack-objects.c:1166 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "" "désactivation de l'écriture en bitmap car certains objets ne sont pas " "compressés" -#: builtin/pack-objects.c:1589 +#: builtin/pack-objects.c:1597 #, c-format msgid "delta base offset overflow in pack for %s" msgstr "dépassement de décalage de base de delta pour %s" -#: builtin/pack-objects.c:1598 +#: builtin/pack-objects.c:1606 #, c-format msgid "delta base offset out of bound for %s" msgstr "décalage de base de delta est hors limite pour %s" -#: builtin/pack-objects.c:1867 +#: builtin/pack-objects.c:1875 msgid "Counting objects" msgstr "Décompte des objets" -#: builtin/pack-objects.c:1997 +#: builtin/pack-objects.c:2005 #, c-format msgid "unable to get size of %s" msgstr "impossible de récupérer la taille de %s" -#: builtin/pack-objects.c:2012 +#: builtin/pack-objects.c:2020 #, c-format msgid "unable to parse object header of %s" msgstr "impossible d'analyser l'entête d'objet de %s" -#: builtin/pack-objects.c:2082 builtin/pack-objects.c:2098 -#: builtin/pack-objects.c:2108 +#: builtin/pack-objects.c:2090 builtin/pack-objects.c:2106 +#: builtin/pack-objects.c:2116 #, c-format msgid "object %s cannot be read" msgstr "l'objet %s ne peut être lu" -#: builtin/pack-objects.c:2085 builtin/pack-objects.c:2112 +#: builtin/pack-objects.c:2093 builtin/pack-objects.c:2120 #, c-format msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)" msgstr "" "objet %s longueur de l'objet inconsistante (%<PRIuMAX> contre %<PRIuMAX>)" -#: builtin/pack-objects.c:2122 +#: builtin/pack-objects.c:2130 msgid "suboptimal pack - out of memory" msgstr "paquet sous-optimal - mémoire insuffisante" -#: builtin/pack-objects.c:2448 +#: builtin/pack-objects.c:2456 #, c-format msgid "Delta compression using up to %d threads" msgstr "Compression par delta en utilisant jusqu'à %d fils d'exécution" -#: builtin/pack-objects.c:2580 +#: builtin/pack-objects.c:2588 #, c-format msgid "unable to pack objects reachable from tag %s" msgstr "impossible d'empaqueter les objets joignables depuis l'étiquette %s" -#: builtin/pack-objects.c:2667 +#: builtin/pack-objects.c:2675 msgid "Compressing objects" msgstr "Compression des objets" -#: builtin/pack-objects.c:2673 +#: builtin/pack-objects.c:2681 msgid "inconsistency with delta count" msgstr "inconsistance dans le compte de delta" -#: builtin/pack-objects.c:2754 +#: builtin/pack-objects.c:2762 #, c-format msgid "" "expected edge object ID, got garbage:\n" @@ -15968,7 +16426,7 @@ msgstr "" "ID d'objet de bord attendu, reçu des données illisibles :\n" "%s" -#: builtin/pack-objects.c:2760 +#: builtin/pack-objects.c:2768 #, c-format msgid "" "expected object ID, got garbage:\n" @@ -15977,248 +16435,252 @@ msgstr "" "ID d'objet attendu, reçu des données illisibles :\n" "%s" -#: builtin/pack-objects.c:2858 +#: builtin/pack-objects.c:2866 msgid "invalid value for --missing" msgstr "valeur invalide pour --missing" -#: builtin/pack-objects.c:2917 builtin/pack-objects.c:3025 +#: builtin/pack-objects.c:2925 builtin/pack-objects.c:3033 msgid "cannot open pack index" msgstr "impossible d'ouvrir l'index de paquet" -#: builtin/pack-objects.c:2948 +#: builtin/pack-objects.c:2956 #, c-format msgid "loose object at %s could not be examined" msgstr "l'objet libre à %s n'a pas pu être examiné" -#: builtin/pack-objects.c:3033 +#: builtin/pack-objects.c:3041 msgid "unable to force loose object" msgstr "impossible de forcer l'objet libre" -#: builtin/pack-objects.c:3125 +#: builtin/pack-objects.c:3133 #, c-format msgid "not a rev '%s'" msgstr "'%s' n'est pas une révision" -#: builtin/pack-objects.c:3128 +#: builtin/pack-objects.c:3136 #, c-format msgid "bad revision '%s'" msgstr "mauvaise révision '%s'" -#: builtin/pack-objects.c:3153 +#: builtin/pack-objects.c:3161 msgid "unable to add recent objects" msgstr "impossible d'ajouter les objets récents" -#: builtin/pack-objects.c:3206 +#: builtin/pack-objects.c:3214 #, c-format msgid "unsupported index version %s" msgstr "version d'index non supportée %s" -#: builtin/pack-objects.c:3210 +#: builtin/pack-objects.c:3218 #, c-format msgid "bad index version '%s'" msgstr "mauvaise version d'index '%s'" -#: builtin/pack-objects.c:3240 +#: builtin/pack-objects.c:3248 msgid "do not show progress meter" msgstr "ne pas afficher la barre de progression" -#: builtin/pack-objects.c:3242 +#: builtin/pack-objects.c:3250 msgid "show progress meter" msgstr "afficher la barre de progression" -#: builtin/pack-objects.c:3244 +#: builtin/pack-objects.c:3252 msgid "show progress meter during object writing phase" msgstr "afficher la barre de progression durant la phase d'écrite des objets" -#: builtin/pack-objects.c:3247 +#: builtin/pack-objects.c:3255 msgid "similar to --all-progress when progress meter is shown" msgstr "similaire à --all-progress quand la barre de progression est affichée" -#: builtin/pack-objects.c:3248 +#: builtin/pack-objects.c:3256 msgid "<version>[,<offset>]" msgstr "<version>[,<décalage>]" -#: builtin/pack-objects.c:3249 +#: builtin/pack-objects.c:3257 msgid "write the pack index file in the specified idx format version" msgstr "" "écrire le fichier d'index du paquet dans le format d'index de version " "spécifié" -#: builtin/pack-objects.c:3252 +#: builtin/pack-objects.c:3260 msgid "maximum size of each output pack file" msgstr "taille maximum de chaque fichier paquet en sortie" -#: builtin/pack-objects.c:3254 +#: builtin/pack-objects.c:3262 msgid "ignore borrowed objects from alternate object store" msgstr "ignorer les objets empruntés à un autre magasin d'objets" -#: builtin/pack-objects.c:3256 +#: builtin/pack-objects.c:3264 msgid "ignore packed objects" msgstr "ignorer les objets empaquetés" -#: builtin/pack-objects.c:3258 +#: builtin/pack-objects.c:3266 msgid "limit pack window by objects" msgstr "limiter la fenêtre d'empaquetage par objets" -#: builtin/pack-objects.c:3260 +#: builtin/pack-objects.c:3268 msgid "limit pack window by memory in addition to object limit" msgstr "" "limiter la fenêtre d'empaquetage par mémoire en plus de la limite d'objets" -#: builtin/pack-objects.c:3262 +#: builtin/pack-objects.c:3270 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "" "longueur maximum de la chaîne de delta autorisée dans le paquet résultant" -#: builtin/pack-objects.c:3264 +#: builtin/pack-objects.c:3272 msgid "reuse existing deltas" msgstr "réutiliser les deltas existants" -#: builtin/pack-objects.c:3266 +#: builtin/pack-objects.c:3274 msgid "reuse existing objects" msgstr "réutiliser les objets existants" -#: builtin/pack-objects.c:3268 +#: builtin/pack-objects.c:3276 msgid "use OFS_DELTA objects" msgstr "utiliser les objets OFS_DELTA" -#: builtin/pack-objects.c:3270 +#: builtin/pack-objects.c:3278 msgid "use threads when searching for best delta matches" msgstr "" "utiliser des fils lors de la recherche pour une meilleure correspondance des " "deltas" -#: builtin/pack-objects.c:3272 +#: builtin/pack-objects.c:3280 msgid "do not create an empty pack output" msgstr "ne pas créer un paquet vide" -#: builtin/pack-objects.c:3274 +#: builtin/pack-objects.c:3282 msgid "read revision arguments from standard input" msgstr "lire les paramètres de révision depuis l'entrée standard" -#: builtin/pack-objects.c:3276 +#: builtin/pack-objects.c:3284 msgid "limit the objects to those that are not yet packed" msgstr "limiter les objets à ceux qui ne sont pas encore empaquetés" -#: builtin/pack-objects.c:3279 +#: builtin/pack-objects.c:3287 msgid "include objects reachable from any reference" msgstr "inclure les objets accessibles depuis toute référence" -#: builtin/pack-objects.c:3282 +#: builtin/pack-objects.c:3290 msgid "include objects referred by reflog entries" msgstr "inclure les objets référencés par les éléments de reflog" -#: builtin/pack-objects.c:3285 +#: builtin/pack-objects.c:3293 msgid "include objects referred to by the index" msgstr "inclure les objets référencés par l'index" -#: builtin/pack-objects.c:3288 +#: builtin/pack-objects.c:3296 msgid "output pack to stdout" msgstr "afficher l'empaquetage sur la sortie standard" -#: builtin/pack-objects.c:3290 +#: builtin/pack-objects.c:3298 msgid "include tag objects that refer to objects to be packed" msgstr "inclure les objets d'étiquettes qui réfèrent à des objets à empaqueter" -#: builtin/pack-objects.c:3292 +#: builtin/pack-objects.c:3300 msgid "keep unreachable objects" msgstr "garder les objets inaccessibles" -#: builtin/pack-objects.c:3294 +#: builtin/pack-objects.c:3302 msgid "pack loose unreachable objects" msgstr "empaqueter les objets inaccessibles détachés" -#: builtin/pack-objects.c:3296 +#: builtin/pack-objects.c:3304 msgid "unpack unreachable objects newer than <time>" msgstr "dépaqueter les objets inaccessibles plus récents que <heure>" -#: builtin/pack-objects.c:3299 +#: builtin/pack-objects.c:3307 msgid "use the sparse reachability algorithm" msgstr "utiliser l'algorithme de joignabilité creuse" -#: builtin/pack-objects.c:3301 +#: builtin/pack-objects.c:3309 msgid "create thin packs" msgstr "créer des paquets légers" -#: builtin/pack-objects.c:3303 +#: builtin/pack-objects.c:3311 msgid "create packs suitable for shallow fetches" msgstr "créer des paquets permettant des récupérations superficielles" -#: builtin/pack-objects.c:3305 +#: builtin/pack-objects.c:3313 msgid "ignore packs that have companion .keep file" msgstr "ignorer les paquets qui ont un fichier .keep" -#: builtin/pack-objects.c:3307 +#: builtin/pack-objects.c:3315 msgid "ignore this pack" msgstr "ignorer ce paquet" -#: builtin/pack-objects.c:3309 +#: builtin/pack-objects.c:3317 msgid "pack compression level" msgstr "niveau de compression du paquet" -#: builtin/pack-objects.c:3311 +#: builtin/pack-objects.c:3319 msgid "do not hide commits by grafts" msgstr "ne pas cacher les validations par greffes" -#: builtin/pack-objects.c:3313 +#: builtin/pack-objects.c:3321 msgid "use a bitmap index if available to speed up counting objects" msgstr "" "utiliser un index en bitmap si disponible pour accélerer le décompte des " "objets" -#: builtin/pack-objects.c:3315 +#: builtin/pack-objects.c:3323 msgid "write a bitmap index together with the pack index" msgstr "écrire un index en bitmap associé à l'index de paquet" -#: builtin/pack-objects.c:3318 +#: builtin/pack-objects.c:3327 +msgid "write a bitmap index if possible" +msgstr "écrire un index de bitmap si possible" + +#: builtin/pack-objects.c:3331 msgid "handling for missing objects" msgstr "gestion des objets manquants" -#: builtin/pack-objects.c:3321 +#: builtin/pack-objects.c:3334 msgid "do not pack objects in promisor packfiles" msgstr "ne pas empaqueter les objets dans les fichiers paquets prometteurs" -#: builtin/pack-objects.c:3323 +#: builtin/pack-objects.c:3336 msgid "respect islands during delta compression" msgstr "respecter les îlots pendant la compression des deltas" -#: builtin/pack-objects.c:3348 +#: builtin/pack-objects.c:3361 #, c-format msgid "delta chain depth %d is too deep, forcing %d" msgstr "la profondeur %d de chaîne de delta est trop grande, forcée à %d" -#: builtin/pack-objects.c:3353 +#: builtin/pack-objects.c:3366 #, c-format msgid "pack.deltaCacheLimit is too high, forcing %d" msgstr "pack.deltaCacheLimit est trop grand, forcé à %d" -#: builtin/pack-objects.c:3407 +#: builtin/pack-objects.c:3420 msgid "--max-pack-size cannot be used to build a pack for transfer" msgstr "" "--max-pack-size ne peut pas être utilisé pour construire un paquet à " "transférer" -#: builtin/pack-objects.c:3409 +#: builtin/pack-objects.c:3422 msgid "minimum pack size limit is 1 MiB" msgstr "la taille limite minimale d'un paquet est 1 MiB" -#: builtin/pack-objects.c:3414 +#: builtin/pack-objects.c:3427 msgid "--thin cannot be used to build an indexable pack" msgstr "--thin ne peut pas être utilisé pour construire un paquet indexable" -#: builtin/pack-objects.c:3417 +#: builtin/pack-objects.c:3430 msgid "--keep-unreachable and --unpack-unreachable are incompatible" msgstr "--keep-unreachable et --unpack-unreachable sont incompatibles" -#: builtin/pack-objects.c:3423 +#: builtin/pack-objects.c:3436 msgid "cannot use --filter without --stdout" msgstr "impossible d'utiliser --filter sans --stdout" -#: builtin/pack-objects.c:3484 +#: builtin/pack-objects.c:3497 msgid "Enumerating objects" msgstr "Énumération des objets" -#: builtin/pack-objects.c:3514 +#: builtin/pack-objects.c:3527 #, c-format msgid "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>)" msgstr "" @@ -16273,44 +16735,44 @@ msgstr "Valeur invalide pour %s : %s" msgid "git pull [<options>] [<repository> [<refspec>...]]" msgstr "git pull [<options>] [<dépôt> [<spécification-de-référence>...]]" -#: builtin/pull.c:140 +#: builtin/pull.c:141 msgid "control for recursive fetching of submodules" msgstr "contrôler la récupération récursive dans les sous-modules" -#: builtin/pull.c:144 +#: builtin/pull.c:145 msgid "Options related to merging" msgstr "Options relatives à la fusion" -#: builtin/pull.c:147 +#: builtin/pull.c:148 msgid "incorporate changes by rebasing rather than merging" msgstr "incorporer les modifications en rebasant plutôt qu'en fusionnant" -#: builtin/pull.c:175 builtin/rebase.c:447 builtin/revert.c:125 +#: builtin/pull.c:176 builtin/rebase.c:447 builtin/revert.c:126 msgid "allow fast-forward" msgstr "autoriser l'avance rapide" -#: builtin/pull.c:184 +#: builtin/pull.c:185 msgid "automatically stash/stash pop before and after rebase" msgstr "remiser avant et réappliquer après le rebasage automatiquement" -#: builtin/pull.c:200 +#: builtin/pull.c:201 msgid "Options related to fetching" msgstr "Options relatives au rapatriement" -#: builtin/pull.c:210 +#: builtin/pull.c:211 msgid "force overwrite of local branch" msgstr "forcer l'écrasement de la branche locale" -#: builtin/pull.c:218 +#: builtin/pull.c:219 msgid "number of submodules pulled in parallel" msgstr "nombre de sous-modules tirés en parallèle" -#: builtin/pull.c:313 +#: builtin/pull.c:316 #, c-format msgid "Invalid value for pull.ff: %s" msgstr "Valeur invalide pour pull.ff : %s" -#: builtin/pull.c:430 +#: builtin/pull.c:433 msgid "" "There is no candidate for rebasing against among the refs that you just " "fetched." @@ -16318,14 +16780,14 @@ msgstr "" "Il n'y a pas de candidate sur laquelle rebaser parmi les références que vous " "venez de récupérer." -#: builtin/pull.c:432 +#: builtin/pull.c:435 msgid "" "There are no candidates for merging among the refs that you just fetched." msgstr "" "Il n'y a pas de candidate avec laquelle fusionner parmi les références que " "vous venez de récupérer." -#: builtin/pull.c:433 +#: builtin/pull.c:436 msgid "" "Generally this means that you provided a wildcard refspec which had no\n" "matches on the remote end." @@ -16333,7 +16795,7 @@ msgstr "" "Généralement, cela signifie que vous avez indiqué un spécificateur\n" "de référence joker qui n'a pas eu de correspondance sur le serveur distant." -#: builtin/pull.c:436 +#: builtin/pull.c:439 #, c-format msgid "" "You asked to pull from the remote '%s', but did not specify\n" @@ -16345,44 +16807,44 @@ msgstr "" "configuration\n" "pour la branche actuelle, vous devez spécifier la branche avec la commande." -#: builtin/pull.c:441 builtin/rebase.c:1321 git-parse-remote.sh:73 +#: builtin/pull.c:444 builtin/rebase.c:1326 git-parse-remote.sh:73 msgid "You are not currently on a branch." msgstr "Vous n'êtes actuellement sur aucune branche." -#: builtin/pull.c:443 builtin/pull.c:458 git-parse-remote.sh:79 +#: builtin/pull.c:446 builtin/pull.c:461 git-parse-remote.sh:79 msgid "Please specify which branch you want to rebase against." msgstr "Veuillez spécifier sur quelle branche vous souhaiter rebaser." -#: builtin/pull.c:445 builtin/pull.c:460 git-parse-remote.sh:82 +#: builtin/pull.c:448 builtin/pull.c:463 git-parse-remote.sh:82 msgid "Please specify which branch you want to merge with." msgstr "Veuillez spécifier une branche avec laquelle fusionner." -#: builtin/pull.c:446 builtin/pull.c:461 +#: builtin/pull.c:449 builtin/pull.c:464 msgid "See git-pull(1) for details." msgstr "Référez-vous à git-pull(1) pour de plus amples détails." -#: builtin/pull.c:448 builtin/pull.c:454 builtin/pull.c:463 -#: builtin/rebase.c:1327 git-parse-remote.sh:64 +#: builtin/pull.c:451 builtin/pull.c:457 builtin/pull.c:466 +#: builtin/rebase.c:1332 git-parse-remote.sh:64 msgid "<remote>" msgstr "<distant>" -#: builtin/pull.c:448 builtin/pull.c:463 builtin/pull.c:468 +#: builtin/pull.c:451 builtin/pull.c:466 builtin/pull.c:471 #: git-parse-remote.sh:65 msgid "<branch>" msgstr "<branche>" -#: builtin/pull.c:456 builtin/rebase.c:1319 git-parse-remote.sh:75 +#: builtin/pull.c:459 builtin/rebase.c:1324 git-parse-remote.sh:75 msgid "There is no tracking information for the current branch." msgstr "Pas d'information de suivi distant pour la branche actuelle." -#: builtin/pull.c:465 git-parse-remote.sh:95 +#: builtin/pull.c:468 git-parse-remote.sh:95 msgid "" "If you wish to set tracking information for this branch you can do so with:" msgstr "" "Si vous souhaitez indiquer l'information de suivi distant pour cette " "branche, vous pouvez le faire avec :" -#: builtin/pull.c:470 +#: builtin/pull.c:473 #, c-format msgid "" "Your configuration specifies to merge with the ref '%s'\n" @@ -16392,34 +16854,34 @@ msgstr "" "'%s'\n" "du serveur distant, mais cette référence n'a pas été récupérée." -#: builtin/pull.c:574 +#: builtin/pull.c:581 #, c-format msgid "unable to access commit %s" msgstr "impossible d'accéder le commit %s" -#: builtin/pull.c:854 +#: builtin/pull.c:861 msgid "ignoring --verify-signatures for rebase" msgstr "--verify-signatures est ignoré pour un rebasage" -#: builtin/pull.c:909 +#: builtin/pull.c:916 msgid "--[no-]autostash option is only valid with --rebase." msgstr "l'option --[no-]autostash n'est valide qu'avec --rebase." -#: builtin/pull.c:917 +#: builtin/pull.c:924 msgid "Updating an unborn branch with changes added to the index." msgstr "" "Mise à jour d'une branche non encore créée avec les changements ajoutés dans " "l'index." -#: builtin/pull.c:921 +#: builtin/pull.c:928 msgid "pull with rebase" msgstr "tirer avec un rebasage" -#: builtin/pull.c:922 +#: builtin/pull.c:929 msgid "please commit or stash them." msgstr "veuillez les valider ou les remiser." -#: builtin/pull.c:947 +#: builtin/pull.c:954 #, c-format msgid "" "fetch updated the current branch head.\n" @@ -16430,7 +16892,7 @@ msgstr "" "avance rapide de votre copie de travail\n" "depuis le commit %s." -#: builtin/pull.c:953 +#: builtin/pull.c:960 #, c-format msgid "" "Cannot fast-forward your working tree.\n" @@ -16447,15 +16909,15 @@ msgstr "" "$ git reset --hard\n" "pour régénérer." -#: builtin/pull.c:968 +#: builtin/pull.c:975 msgid "Cannot merge multiple branches into empty head." msgstr "Impossible de fusionner de multiples branches sur une tête vide." -#: builtin/pull.c:972 +#: builtin/pull.c:979 msgid "Cannot rebase onto multiple branches." msgstr "Impossible de rebaser sur de multiples branches." -#: builtin/pull.c:979 +#: builtin/pull.c:986 msgid "cannot rebase with locally recorded submodule modifications" msgstr "" "impossible de rebaser avec des modifications de sous-modules enregistrées " @@ -16939,7 +17401,7 @@ msgstr "git rebase--interactive [<options>]" msgid "keep empty commits" msgstr "garder les validations vides" -#: builtin/rebase.c:451 builtin/revert.c:127 +#: builtin/rebase.c:451 builtin/revert.c:128 msgid "allow commits with empty messages" msgstr "autoriser les validations avec des messages vides" @@ -16959,7 +17421,7 @@ msgstr "déplacer les commits qui commencent par squash!/fixup!" msgid "sign commits" msgstr "signer les commits" -#: builtin/rebase.c:459 builtin/rebase.c:1397 +#: builtin/rebase.c:459 builtin/rebase.c:1403 msgid "display a diffstat of what changed upstream" msgstr "afficher un diffstat de ce qui a changé en amont" @@ -17067,7 +17529,7 @@ msgstr "cmd" msgid "the command to run" msgstr "la commande à lancer" -#: builtin/rebase.c:502 builtin/rebase.c:1480 +#: builtin/rebase.c:502 builtin/rebase.c:1486 msgid "automatically re-schedule any `exec` that fails" msgstr "re-planifier automatiquement tout `exec` qui échoue" @@ -17075,7 +17537,7 @@ msgstr "re-planifier automatiquement tout `exec` qui échoue" msgid "--[no-]rebase-cousins has no effect without --rebase-merges" msgstr "--[no-]rebase-cousins n'a aucun effet sans --rebase-merges" -#: builtin/rebase.c:534 builtin/rebase.c:1787 +#: builtin/rebase.c:534 #, c-format msgid "%s requires an interactive rebase" msgstr "%s requiert un rebasage interactif" @@ -17105,11 +17567,11 @@ msgstr "Impossible de lire '%s'" msgid "Cannot store %s" msgstr "Impossible de stocker %s" -#: builtin/rebase.c:817 +#: builtin/rebase.c:827 msgid "could not determine HEAD revision" msgstr "impossible de déterminer la révision HEAD" -#: builtin/rebase.c:940 +#: builtin/rebase.c:950 git-rebase--preserve-merges.sh:81 msgid "" "Resolve all conflicts manually, mark them as resolved with\n" "\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n" @@ -17123,7 +17585,7 @@ msgstr "" "arrêter\n" "et revenir à l'état antérieur à la commande, lancez \"git rebase --abort\"." -#: builtin/rebase.c:1021 +#: builtin/rebase.c:1031 #, c-format msgid "" "\n" @@ -17142,7 +17604,7 @@ msgstr "" "\n" "Résultat, git ne peut pas les rebaser." -#: builtin/rebase.c:1313 +#: builtin/rebase.c:1318 #, c-format msgid "" "%s\n" @@ -17159,7 +17621,7 @@ msgstr "" " git rebase '<branche>'\n" "\n" -#: builtin/rebase.c:1329 +#: builtin/rebase.c:1334 #, c-format msgid "" "If you wish to set tracking information for this branch you can do so with:\n" @@ -17173,127 +17635,127 @@ msgstr "" " git branch --set-upstream-to=%s/<branche> %s\n" "\n" -#: builtin/rebase.c:1359 +#: builtin/rebase.c:1364 msgid "exec commands cannot contain newlines" msgstr "les commandes exec ne peut pas contenir de retour à la ligne" -#: builtin/rebase.c:1363 +#: builtin/rebase.c:1368 msgid "empty exec command" msgstr "commande exec vide" -#: builtin/rebase.c:1390 +#: builtin/rebase.c:1396 msgid "rebase onto given branch instead of upstream" msgstr "rebaser sur la branche %s au lieu de la branche amont" -#: builtin/rebase.c:1392 +#: builtin/rebase.c:1398 msgid "allow pre-rebase hook to run" msgstr "permettre le lancement du crochet pre-rebase" -#: builtin/rebase.c:1394 +#: builtin/rebase.c:1400 msgid "be quiet. implies --no-stat" msgstr "être silencieux. implique --no-stat" -#: builtin/rebase.c:1400 +#: builtin/rebase.c:1406 msgid "do not show diffstat of what changed upstream" msgstr "ne pas afficher un diffstat de ce qui a changé en amont" -#: builtin/rebase.c:1403 +#: builtin/rebase.c:1409 msgid "add a Signed-off-by: line to each commit" msgstr "ajouter une ligne Signed-off-by à chaque message de validation" -#: builtin/rebase.c:1405 builtin/rebase.c:1409 builtin/rebase.c:1411 +#: builtin/rebase.c:1411 builtin/rebase.c:1415 builtin/rebase.c:1417 msgid "passed to 'git am'" msgstr "passé à 'git am'" -#: builtin/rebase.c:1413 builtin/rebase.c:1415 +#: builtin/rebase.c:1419 builtin/rebase.c:1421 msgid "passed to 'git apply'" msgstr "passé jusqu'à git-apply" -#: builtin/rebase.c:1417 builtin/rebase.c:1420 +#: builtin/rebase.c:1423 builtin/rebase.c:1426 msgid "cherry-pick all commits, even if unchanged" msgstr "picorer tous les commits, même sans modifiant" -#: builtin/rebase.c:1422 +#: builtin/rebase.c:1428 msgid "continue" msgstr "continuer" -#: builtin/rebase.c:1425 +#: builtin/rebase.c:1431 msgid "skip current patch and continue" msgstr "sauter le patch courant et continuer" -#: builtin/rebase.c:1427 +#: builtin/rebase.c:1433 msgid "abort and check out the original branch" msgstr "abandonner et extraire la branche d'origine" -#: builtin/rebase.c:1430 +#: builtin/rebase.c:1436 msgid "abort but keep HEAD where it is" msgstr "abandonne mais garde HEAD où il est" -#: builtin/rebase.c:1431 +#: builtin/rebase.c:1437 msgid "edit the todo list during an interactive rebase" msgstr "éditer la liste à faire lors d'un rebasage interactif" -#: builtin/rebase.c:1434 +#: builtin/rebase.c:1440 msgid "show the patch file being applied or merged" msgstr "afficher le patch en cours d'application ou de fusion" -#: builtin/rebase.c:1437 +#: builtin/rebase.c:1443 msgid "use merging strategies to rebase" msgstr "utiliser des stratégies de fusion pour rebaser" -#: builtin/rebase.c:1441 +#: builtin/rebase.c:1447 msgid "let the user edit the list of commits to rebase" msgstr "laisser l'utilisateur éditer la liste des commits à rebaser" -#: builtin/rebase.c:1445 +#: builtin/rebase.c:1451 msgid "(DEPRECATED) try to recreate merges instead of ignoring them" msgstr "(DÉCONSEILLÉ) essayer de recréer les fusions au lieu de les ignorer" -#: builtin/rebase.c:1449 +#: builtin/rebase.c:1455 msgid "preserve empty commits during rebase" msgstr "préserver les validations vides pendant le rebasage" -#: builtin/rebase.c:1451 +#: builtin/rebase.c:1457 msgid "move commits that begin with squash!/fixup! under -i" msgstr "déplace les commits qui commencent par squash!/fixup! sous -i" -#: builtin/rebase.c:1457 +#: builtin/rebase.c:1463 msgid "automatically stash/stash pop before and after" msgstr "remiser et réappliquer automatiquement avant et après" -#: builtin/rebase.c:1459 +#: builtin/rebase.c:1465 msgid "add exec lines after each commit of the editable list" msgstr "ajouter les lignes exec après chaque commit de la liste éditable" -#: builtin/rebase.c:1463 +#: builtin/rebase.c:1469 msgid "allow rebasing commits with empty messages" msgstr "autoriser les commits de rebasage avec des messages vides" -#: builtin/rebase.c:1466 +#: builtin/rebase.c:1472 msgid "try to rebase merges instead of skipping them" msgstr "essayer de rebaser les fusions au lieu de les garder" -#: builtin/rebase.c:1469 +#: builtin/rebase.c:1475 msgid "use 'merge-base --fork-point' to refine upstream" msgstr "utiliser 'merge-base --fork-point' pour raffiner l'amont" -#: builtin/rebase.c:1471 +#: builtin/rebase.c:1477 msgid "use the given merge strategy" msgstr "utiliser la stratégie de fusion indiquée" -#: builtin/rebase.c:1473 builtin/revert.c:114 +#: builtin/rebase.c:1479 builtin/revert.c:115 msgid "option" msgstr "option" -#: builtin/rebase.c:1474 +#: builtin/rebase.c:1480 msgid "pass the argument through to the merge strategy" msgstr "passer les arguments jusqu'à la stratégie de fusion" -#: builtin/rebase.c:1477 +#: builtin/rebase.c:1483 msgid "rebase all reachable commits up to the root(s)" msgstr "rebaser tous les objets inatteignables depuis les racines" -#: builtin/rebase.c:1498 +#: builtin/rebase.c:1500 msgid "" "the rebase.useBuiltin support has been removed!\n" "See its entry in 'git help config' for details." @@ -17301,32 +17763,32 @@ msgstr "" "les support de rebase.useBuiltin a été supprimé !\n" "Voir son entrée dans 'git help config' pour plus de détails." -#: builtin/rebase.c:1504 +#: builtin/rebase.c:1506 msgid "It looks like 'git am' is in progress. Cannot rebase." msgstr "Il semble que 'git-am' soit en cours. Impossible de rebaser." -#: builtin/rebase.c:1545 +#: builtin/rebase.c:1547 msgid "" "git rebase --preserve-merges is deprecated. Use --rebase-merges instead." msgstr "" "git rebase --preserve-merges est déconseillé. Utilisez --rebase-merges à la " "place." -#: builtin/rebase.c:1549 +#: builtin/rebase.c:1551 msgid "No rebase in progress?" msgstr "Pas de rebasage en cours ?" -#: builtin/rebase.c:1553 +#: builtin/rebase.c:1555 msgid "The --edit-todo action can only be used during interactive rebase." msgstr "" "L'action --edit-todo peut seulement être utilisée lors d'un rebasage " "interactif." -#: builtin/rebase.c:1576 +#: builtin/rebase.c:1578 msgid "Cannot read HEAD" msgstr "Impossible de lire HEAD" -#: builtin/rebase.c:1588 +#: builtin/rebase.c:1590 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" @@ -17334,21 +17796,16 @@ msgstr "" "Vous devez éditer tous les conflits de fusion et\n" "les marquer comme résolus avec git add" -#: builtin/rebase.c:1607 +#: builtin/rebase.c:1609 msgid "could not discard worktree changes" msgstr "Impossible de supprimer les changements de l'arbre de travail" -#: builtin/rebase.c:1626 +#: builtin/rebase.c:1628 #, c-format msgid "could not move back to %s" msgstr "Impossible de revenir à %s" -#: builtin/rebase.c:1637 builtin/rm.c:369 -#, c-format -msgid "could not remove '%s'" -msgstr "impossible de supprimer '%s'" - -#: builtin/rebase.c:1663 +#: builtin/rebase.c:1673 #, c-format msgid "" "It seems that there is already a %s directory, and\n" @@ -17370,172 +17827,176 @@ msgstr "" "chose\n" "d'important ici.\n" -#: builtin/rebase.c:1684 +#: builtin/rebase.c:1694 msgid "switch `C' expects a numerical value" msgstr "l'option `C' attend un valeur numérique" -#: builtin/rebase.c:1725 +#: builtin/rebase.c:1735 #, c-format msgid "Unknown mode: %s" msgstr "mode inconnu : %s" -#: builtin/rebase.c:1747 +#: builtin/rebase.c:1757 msgid "--strategy requires --merge or --interactive" msgstr "--strategy requiert --merge ou --interactive" -#: builtin/rebase.c:1796 +#: builtin/rebase.c:1797 +msgid "--reschedule-failed-exec requires --exec or --interactive" +msgstr "--reschedule-failed-exec requiert --exec ou --interactive" + +#: builtin/rebase.c:1809 msgid "cannot combine am options with either interactive or merge options" msgstr "" "impossible de combiner les options am avec l'options interactive ou merge" -#: builtin/rebase.c:1815 +#: builtin/rebase.c:1828 msgid "cannot combine '--preserve-merges' with '--rebase-merges'" msgstr "impossible de combiner '--preserve-merges' avec '--rebase-merges'" -#: builtin/rebase.c:1819 +#: builtin/rebase.c:1832 msgid "" "error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'" msgstr "" "erreur : impossible de combiner '--preserve-merges' avec '--reschedule-" "failed-exec'" -#: builtin/rebase.c:1825 +#: builtin/rebase.c:1838 msgid "cannot combine '--rebase-merges' with '--strategy-option'" msgstr "impossible de combiner '--rebase-merges' avec '--strategy-option'" -#: builtin/rebase.c:1828 +#: builtin/rebase.c:1841 msgid "cannot combine '--rebase-merges' with '--strategy'" msgstr "impossible de combiner '--rebase-merges' avec '--strategy'" -#: builtin/rebase.c:1852 +#: builtin/rebase.c:1865 #, c-format msgid "invalid upstream '%s'" msgstr "amont invalide '%s'" -#: builtin/rebase.c:1858 +#: builtin/rebase.c:1871 msgid "Could not create new root commit" msgstr "Impossible de créer un nouveau commit racine" -#: builtin/rebase.c:1876 +#: builtin/rebase.c:1889 #, c-format msgid "'%s': need exactly one merge base" msgstr "'%s': exactement une base de fusion nécessaire" -#: builtin/rebase.c:1883 +#: builtin/rebase.c:1896 #, c-format msgid "Does not point to a valid commit '%s'" msgstr "ne pointe pas sur une validation valide : '%s'" -#: builtin/rebase.c:1908 +#: builtin/rebase.c:1921 #, c-format msgid "fatal: no such branch/commit '%s'" msgstr "fatal : pas de branche ou commit '%s'" -#: builtin/rebase.c:1916 builtin/submodule--helper.c:38 -#: builtin/submodule--helper.c:1933 +#: builtin/rebase.c:1929 builtin/submodule--helper.c:38 +#: builtin/submodule--helper.c:1934 #, c-format msgid "No such ref: %s" msgstr "Référence inexistante : %s" -#: builtin/rebase.c:1927 +#: builtin/rebase.c:1940 msgid "Could not resolve HEAD to a revision" msgstr "Impossible de résoudre le commit HEAD vers un révision" -#: builtin/rebase.c:1968 +#: builtin/rebase.c:1981 msgid "Cannot autostash" msgstr "Autoremisage impossible" -#: builtin/rebase.c:1971 +#: builtin/rebase.c:1984 #, c-format msgid "Unexpected stash response: '%s'" msgstr "réponse de remisage inattendue : '%s'" -#: builtin/rebase.c:1977 +#: builtin/rebase.c:1990 #, c-format msgid "Could not create directory for '%s'" msgstr "Impossible de créer le répertoire pour '%s'" -#: builtin/rebase.c:1980 +#: builtin/rebase.c:1993 #, c-format msgid "Created autostash: %s\n" msgstr "Autoremisage créé : %s\n" -#: builtin/rebase.c:1983 +#: builtin/rebase.c:1996 msgid "could not reset --hard" msgstr "impossible de réinitialiser --hard" -#: builtin/rebase.c:1984 builtin/reset.c:114 +#: builtin/rebase.c:1997 builtin/reset.c:114 #, c-format msgid "HEAD is now at %s" msgstr "HEAD est maintenant à %s" -#: builtin/rebase.c:2000 +#: builtin/rebase.c:2013 msgid "Please commit or stash them." msgstr "Veuillez les valider ou les remiser." -#: builtin/rebase.c:2027 +#: builtin/rebase.c:2040 #, c-format msgid "could not parse '%s'" msgstr "impossible d'analyser '%s'" -#: builtin/rebase.c:2040 +#: builtin/rebase.c:2053 #, c-format msgid "could not switch to %s" msgstr "Impossible de basculer vers %s" -#: builtin/rebase.c:2051 +#: builtin/rebase.c:2064 msgid "HEAD is up to date." msgstr "HEAD est à jour." -#: builtin/rebase.c:2053 +#: builtin/rebase.c:2066 #, c-format msgid "Current branch %s is up to date.\n" msgstr "La branche courante %s est à jour.\n" -#: builtin/rebase.c:2061 +#: builtin/rebase.c:2074 msgid "HEAD is up to date, rebase forced." msgstr "HEAD est à jour, rebasage forcé." -#: builtin/rebase.c:2063 +#: builtin/rebase.c:2076 #, c-format msgid "Current branch %s is up to date, rebase forced.\n" msgstr "La branche courante %s est à jour, rebasage forcé.\n" -#: builtin/rebase.c:2071 +#: builtin/rebase.c:2084 msgid "The pre-rebase hook refused to rebase." msgstr "Le crochet pre-rebase a refusé de rebaser." -#: builtin/rebase.c:2078 +#: builtin/rebase.c:2091 #, c-format msgid "Changes to %s:\n" msgstr "Changements vers %s :\n" -#: builtin/rebase.c:2081 +#: builtin/rebase.c:2094 #, c-format msgid "Changes from %s to %s:\n" msgstr "Changements de %s sur %s :\n" -#: builtin/rebase.c:2106 +#: builtin/rebase.c:2119 #, c-format msgid "First, rewinding head to replay your work on top of it...\n" msgstr "" "Rembobinage préalable de head pour pouvoir rejouer votre travail par-" "dessus...\n" -#: builtin/rebase.c:2115 +#: builtin/rebase.c:2128 msgid "Could not detach HEAD" msgstr "Impossible de détacher HEAD" -#: builtin/rebase.c:2124 +#: builtin/rebase.c:2137 #, c-format msgid "Fast-forwarded %s to %s.\n" msgstr "Avance rapide de %s sur %s.\n" -#: builtin/receive-pack.c:33 +#: builtin/receive-pack.c:32 msgid "git receive-pack <git-dir>" msgstr "git receive-pack <répertoire-git>" -#: builtin/receive-pack.c:833 +#: builtin/receive-pack.c:832 msgid "" "By default, updating the current branch in a non-bare repository\n" "is denied, because it will make the index and work tree inconsistent\n" @@ -17565,7 +18026,7 @@ msgstr "" "Pour éliminer ce message et conserver le comportement par défaut,\n" "réglez « receive.denyCurrentBranch » à 'refuse'." -#: builtin/receive-pack.c:853 +#: builtin/receive-pack.c:852 msgid "" "By default, deleting the current branch is denied, because the next\n" "'git clone' won't result in any file checked out, causing confusion.\n" @@ -17585,11 +18046,11 @@ msgstr "" "\n" "Pour éliminer ce message, réglez-le à 'refuse'." -#: builtin/receive-pack.c:1940 +#: builtin/receive-pack.c:1938 msgid "quiet" msgstr "quiet" -#: builtin/receive-pack.c:1954 +#: builtin/receive-pack.c:1952 msgid "You must specify a directory." msgstr "Vous devez spécifier un répertoire." @@ -18184,117 +18645,117 @@ msgstr "" "Utilisez\n" "--no-write-bitmap-index ou désactivez le paramètre pack.writebitmaps." -#: builtin/repack.c:200 +#: builtin/repack.c:190 msgid "could not start pack-objects to repack promisor objects" msgstr "" "ne pas démarrer pack-objects pour ré-empaqueter les objects de prometteur" -#: builtin/repack.c:239 builtin/repack.c:414 +#: builtin/repack.c:229 builtin/repack.c:408 msgid "repack: Expecting full hex object ID lines only from pack-objects." msgstr "" "repack : attente de lignes d'Id d'objets en hexa complet seulement depuis " "les objects de paquet." -#: builtin/repack.c:256 +#: builtin/repack.c:246 msgid "could not finish pack-objects to repack promisor objects" msgstr "" "impossible de terminer pack-objects pour ré-empaqueter les objets de " "prometteur" -#: builtin/repack.c:294 +#: builtin/repack.c:284 msgid "pack everything in a single pack" msgstr "empaqueter tout dans un seul paquet" -#: builtin/repack.c:296 +#: builtin/repack.c:286 msgid "same as -a, and turn unreachable objects loose" msgstr "identique à -a et transformer les objets inaccessibles en suspens" -#: builtin/repack.c:299 +#: builtin/repack.c:289 msgid "remove redundant packs, and run git-prune-packed" msgstr "supprimer les paquets redondants et lancer git-prune-packed" -#: builtin/repack.c:301 +#: builtin/repack.c:291 msgid "pass --no-reuse-delta to git-pack-objects" msgstr "passer --no-reuse-delta à git-pack-objects" -#: builtin/repack.c:303 +#: builtin/repack.c:293 msgid "pass --no-reuse-object to git-pack-objects" msgstr "passer --no-reuse-object à git-pack-objects" -#: builtin/repack.c:305 +#: builtin/repack.c:295 msgid "do not run git-update-server-info" msgstr "ne pas lancer git update-server-info" -#: builtin/repack.c:308 +#: builtin/repack.c:298 msgid "pass --local to git-pack-objects" msgstr "passer --local à git-pack-objects" -#: builtin/repack.c:310 +#: builtin/repack.c:300 msgid "write bitmap index" msgstr "écrire un index en bitmap" -#: builtin/repack.c:312 +#: builtin/repack.c:302 msgid "pass --delta-islands to git-pack-objects" msgstr "passer --delta-islands à git-pack-objects" -#: builtin/repack.c:313 +#: builtin/repack.c:303 msgid "approxidate" msgstr "date approximative" -#: builtin/repack.c:314 +#: builtin/repack.c:304 msgid "with -A, do not loosen objects older than this" msgstr "avec -A, ne pas suspendre les objets plus vieux que celui-ci" -#: builtin/repack.c:316 +#: builtin/repack.c:306 msgid "with -a, repack unreachable objects" msgstr "avec -a, repaquétiser les objets inaccessibles" -#: builtin/repack.c:318 +#: builtin/repack.c:308 msgid "size of the window used for delta compression" msgstr "taille de la fenêtre utilisée pour la compression des deltas" -#: builtin/repack.c:319 builtin/repack.c:325 +#: builtin/repack.c:309 builtin/repack.c:315 msgid "bytes" msgstr "octets" -#: builtin/repack.c:320 +#: builtin/repack.c:310 msgid "same as the above, but limit memory size instead of entries count" msgstr "" "idem ci-dessus, mais limiter la taille mémoire au lieu du nombre d'éléments" -#: builtin/repack.c:322 +#: builtin/repack.c:312 msgid "limits the maximum delta depth" msgstr "limite la profondeur maximale des deltas" -#: builtin/repack.c:324 +#: builtin/repack.c:314 msgid "limits the maximum number of threads" msgstr "limite le nombre maximal de fils" -#: builtin/repack.c:326 +#: builtin/repack.c:316 msgid "maximum size of each packfile" msgstr "taille maximum de chaque fichier paquet" -#: builtin/repack.c:328 +#: builtin/repack.c:318 msgid "repack objects in packs marked with .keep" msgstr "réempaqueter les objets dans des paquets marqués avec .keep" -#: builtin/repack.c:330 +#: builtin/repack.c:320 msgid "do not repack this pack" msgstr "ne pas rempaqueter ce paquet" -#: builtin/repack.c:340 +#: builtin/repack.c:330 msgid "cannot delete packs in a precious-objects repo" msgstr "impossible de supprimer les paquets dans un dépôt d'objets précieux" -#: builtin/repack.c:344 +#: builtin/repack.c:334 msgid "--keep-unreachable and -A are incompatible" msgstr "--keep-unreachable et -A sont incompatibles" -#: builtin/repack.c:423 +#: builtin/repack.c:417 msgid "Nothing new to pack." msgstr "Rien de neuf à empaqueter." -#: builtin/repack.c:484 +#: builtin/repack.c:478 #, c-format msgid "" "WARNING: Some packs in use have been renamed by\n" @@ -18313,7 +18774,7 @@ msgstr "" "ALERTE : aussi échoué.\n" "ALERTE : Veuillez les renommer manuellement dans %s :\n" -#: builtin/repack.c:532 +#: builtin/repack.c:526 #, c-format msgid "failed to remove '%s'" msgstr "échec de la suppression de '%s'" @@ -18725,24 +19186,24 @@ msgstr "Impossible de réinitialiser le fichier d'index à la révision '%s'." msgid "Could not write new index file." msgstr "Impossible d'écrire le nouveau fichier d'index." -#: builtin/rev-list.c:405 +#: builtin/rev-list.c:412 msgid "cannot combine --exclude-promisor-objects and --missing" msgstr "impossible de combiner --exclude-promisor-objects et --missing" -#: builtin/rev-list.c:466 +#: builtin/rev-list.c:473 msgid "object filtering requires --objects" msgstr "le filtrage d'objet exige --objects" -#: builtin/rev-list.c:469 +#: builtin/rev-list.c:476 #, c-format msgid "invalid sparse value '%s'" msgstr "valeur invalide de 'sparse' '%s'" -#: builtin/rev-list.c:510 +#: builtin/rev-list.c:527 msgid "rev-list does not support display of notes" msgstr "rev-list ne supporte l'affichage des notes" -#: builtin/rev-list.c:513 +#: builtin/rev-list.c:530 msgid "cannot combine --use-bitmap-index with object filtering" msgstr "impossible de combiner --use-bitmap-index avec le filtrage d'objet" @@ -18815,47 +19276,51 @@ msgstr "reprendre le retour ou picorage" msgid "cancel revert or cherry-pick sequence" msgstr "annuler le retour ou picorage" -#: builtin/revert.c:106 +#: builtin/revert.c:105 +msgid "skip current commit and continue" +msgstr "sauter le commit courant et continuer" + +#: builtin/revert.c:107 msgid "don't automatically commit" msgstr "ne pas valider automatiquement" -#: builtin/revert.c:107 +#: builtin/revert.c:108 msgid "edit the commit message" msgstr "éditer le message de validation" -#: builtin/revert.c:110 +#: builtin/revert.c:111 msgid "parent-number" msgstr "numéro-de-parent" -#: builtin/revert.c:111 +#: builtin/revert.c:112 msgid "select mainline parent" msgstr "sélectionner le parent principal" -#: builtin/revert.c:113 +#: builtin/revert.c:114 msgid "merge strategy" msgstr "stratégie de fusion" -#: builtin/revert.c:115 +#: builtin/revert.c:116 msgid "option for merge strategy" msgstr "option pour la stratégie de fusion" -#: builtin/revert.c:124 +#: builtin/revert.c:125 msgid "append commit name" msgstr "ajouter le nom de validation" -#: builtin/revert.c:126 +#: builtin/revert.c:127 msgid "preserve initially empty commits" msgstr "préserver les validations vides initialement" -#: builtin/revert.c:128 +#: builtin/revert.c:129 msgid "keep redundant, empty commits" msgstr "garder les validations redondantes, vides" -#: builtin/revert.c:227 +#: builtin/revert.c:232 msgid "revert failed" msgstr "revert a échoué" -#: builtin/revert.c:240 +#: builtin/revert.c:245 msgid "cherry-pick failed" msgstr "le picorage a échoué" @@ -19031,117 +19496,117 @@ msgid_plural "ignoring %s; cannot handle more than %d refs" msgstr[0] "%s ignoré; impossible de gérer plus de %d référence" msgstr[1] "%s ignoré; impossible de gérer plus de %d références" -#: builtin/show-branch.c:549 +#: builtin/show-branch.c:548 #, c-format msgid "no matching refs with %s" msgstr "aucune référence correspond à %s" -#: builtin/show-branch.c:646 +#: builtin/show-branch.c:645 msgid "show remote-tracking and local branches" msgstr "afficher les branches de suivi distantes et les branches locales" -#: builtin/show-branch.c:648 +#: builtin/show-branch.c:647 msgid "show remote-tracking branches" msgstr "afficher les branches de suivi distantes" -#: builtin/show-branch.c:650 +#: builtin/show-branch.c:649 msgid "color '*!+-' corresponding to the branch" msgstr "couleur '*!+-' correspondant à la branche" -#: builtin/show-branch.c:652 +#: builtin/show-branch.c:651 msgid "show <n> more commits after the common ancestor" msgstr "afficher <n> validations de plus après l'ancêtre commun" -#: builtin/show-branch.c:654 +#: builtin/show-branch.c:653 msgid "synonym to more=-1" msgstr "synonyme de more=-1" -#: builtin/show-branch.c:655 +#: builtin/show-branch.c:654 msgid "suppress naming strings" msgstr "supprimer les chaînes de nommage" -#: builtin/show-branch.c:657 +#: builtin/show-branch.c:656 msgid "include the current branch" msgstr "inclure la branche courante" -#: builtin/show-branch.c:659 +#: builtin/show-branch.c:658 msgid "name commits with their object names" msgstr "nommer les validations avec leurs noms d'objet" -#: builtin/show-branch.c:661 +#: builtin/show-branch.c:660 msgid "show possible merge bases" msgstr "afficher les bases possibles de fusion" -#: builtin/show-branch.c:663 +#: builtin/show-branch.c:662 msgid "show refs unreachable from any other ref" msgstr "afficher les références inaccessibles depuis toute autre référence" -#: builtin/show-branch.c:665 +#: builtin/show-branch.c:664 msgid "show commits in topological order" msgstr "afficher les validations dans l'ordre topologique" -#: builtin/show-branch.c:668 +#: builtin/show-branch.c:667 msgid "show only commits not on the first branch" msgstr "" "afficher seulement les validations qui ne sont pas sur la première branche" -#: builtin/show-branch.c:670 +#: builtin/show-branch.c:669 msgid "show merges reachable from only one tip" msgstr "afficher les fusions accessibles depuis une seule pointe" -#: builtin/show-branch.c:672 +#: builtin/show-branch.c:671 msgid "topologically sort, maintaining date order where possible" msgstr "tri topologique, maintenant l'ordre par date si possible" -#: builtin/show-branch.c:675 +#: builtin/show-branch.c:674 msgid "<n>[,<base>]" msgstr "<n>[,<base>]" -#: builtin/show-branch.c:676 +#: builtin/show-branch.c:675 msgid "show <n> most recent ref-log entries starting at base" msgstr "" "afficher les <n> plus récents éléments de ref-log en commençant à la base" -#: builtin/show-branch.c:712 +#: builtin/show-branch.c:711 msgid "" "--reflog is incompatible with --all, --remotes, --independent or --merge-base" msgstr "" "--reflog est incompatible avec --all, --remotes, --independant et --merge-" "base" -#: builtin/show-branch.c:736 +#: builtin/show-branch.c:735 msgid "no branches given, and HEAD is not valid" msgstr "aucune branche spécifiée, et HEAD est invalide" -#: builtin/show-branch.c:739 +#: builtin/show-branch.c:738 msgid "--reflog option needs one branch name" msgstr "--reflog requiert un nom de branche" -#: builtin/show-branch.c:742 +#: builtin/show-branch.c:741 #, c-format msgid "only %d entry can be shown at one time." msgid_plural "only %d entries can be shown at one time." msgstr[0] "%d entrée seulement ne peut être montrée en même temps." msgstr[1] "%d entrées seulement ne peuvent être montrée en même temps." -#: builtin/show-branch.c:746 +#: builtin/show-branch.c:745 #, c-format msgid "no such ref %s" msgstr "référence inexistante %s" -#: builtin/show-branch.c:832 +#: builtin/show-branch.c:831 #, c-format msgid "cannot handle more than %d rev." msgid_plural "cannot handle more than %d revs." msgstr[0] "impossible de gérer plus de %d révision." msgstr[1] "impossible de gérer plus de %d révisions." -#: builtin/show-branch.c:836 +#: builtin/show-branch.c:835 #, c-format msgid "'%s' is not a valid ref." msgstr "'%s' n'est pas une référence valide." -#: builtin/show-branch.c:839 +#: builtin/show-branch.c:838 #, c-format msgid "cannot find commit %s (%s)" msgstr "impossible de trouver le commit %s (%s)" @@ -19330,95 +19795,95 @@ msgstr "" msgid "No branch name specified" msgstr "Aucune branche spécifiée" -#: builtin/stash.c:789 builtin/stash.c:826 +#: builtin/stash.c:790 builtin/stash.c:827 #, c-format msgid "Cannot update %s with %s" msgstr "Impossible de mettre à jour %s avec %s" -#: builtin/stash.c:807 builtin/stash.c:1474 builtin/stash.c:1510 +#: builtin/stash.c:808 builtin/stash.c:1461 builtin/stash.c:1497 msgid "stash message" msgstr "message pour le remisage" -#: builtin/stash.c:817 +#: builtin/stash.c:818 msgid "\"git stash store\" requires one <commit> argument" msgstr "\"git stash store\" exige un argument <commit>" -#: builtin/stash.c:1039 git-legacy-stash.sh:217 +#: builtin/stash.c:1040 git-legacy-stash.sh:217 msgid "No changes selected" msgstr "Aucun changement sélectionné" -#: builtin/stash.c:1135 git-legacy-stash.sh:150 +#: builtin/stash.c:1136 git-legacy-stash.sh:150 msgid "You do not have the initial commit yet" msgstr "Vous n'avez pas encore la validation initiale" -#: builtin/stash.c:1162 git-legacy-stash.sh:165 +#: builtin/stash.c:1163 git-legacy-stash.sh:165 msgid "Cannot save the current index state" msgstr "Impossible de sauver l'état courant de l'index" -#: builtin/stash.c:1171 git-legacy-stash.sh:180 +#: builtin/stash.c:1172 git-legacy-stash.sh:180 msgid "Cannot save the untracked files" msgstr "Impossible de sauver les fichiers non-suivis" -#: builtin/stash.c:1182 builtin/stash.c:1191 git-legacy-stash.sh:200 +#: builtin/stash.c:1183 builtin/stash.c:1192 git-legacy-stash.sh:200 #: git-legacy-stash.sh:213 msgid "Cannot save the current worktree state" msgstr "Impossible de sauver l'état courant de la copie de travail" -#: builtin/stash.c:1219 git-legacy-stash.sh:233 +#: builtin/stash.c:1220 git-legacy-stash.sh:233 msgid "Cannot record working tree state" msgstr "Impossible d'enregistrer l'état de la copie de travail" -#: builtin/stash.c:1268 git-legacy-stash.sh:337 +#: builtin/stash.c:1269 git-legacy-stash.sh:337 msgid "Can't use --patch and --include-untracked or --all at the same time" msgstr "" "Impossible d'utiliser --patch et --include-untracked ou --all en même temps" -#: builtin/stash.c:1284 +#: builtin/stash.c:1285 msgid "Did you forget to 'git add'?" msgstr "Vous avez sûrement oublié 'git add' ?" -#: builtin/stash.c:1299 git-legacy-stash.sh:345 +#: builtin/stash.c:1300 git-legacy-stash.sh:345 msgid "No local changes to save" msgstr "Pas de modifications locales à sauver" -#: builtin/stash.c:1306 git-legacy-stash.sh:350 +#: builtin/stash.c:1307 git-legacy-stash.sh:350 msgid "Cannot initialize stash" msgstr "Impossible d'initialiser le remisage" -#: builtin/stash.c:1321 git-legacy-stash.sh:354 +#: builtin/stash.c:1322 git-legacy-stash.sh:354 msgid "Cannot save the current status" msgstr "Impossible de sauver l'état courant" -#: builtin/stash.c:1326 +#: builtin/stash.c:1327 #, c-format msgid "Saved working directory and index state %s" msgstr "Arbre de travail et état de l'index sauvegardés dans %s" -#: builtin/stash.c:1430 git-legacy-stash.sh:384 +#: builtin/stash.c:1417 git-legacy-stash.sh:384 msgid "Cannot remove worktree changes" msgstr "Impossible de supprimer les changements de la copie de travail" -#: builtin/stash.c:1465 builtin/stash.c:1501 +#: builtin/stash.c:1452 builtin/stash.c:1488 msgid "keep index" msgstr "conserver l'index" -#: builtin/stash.c:1467 builtin/stash.c:1503 +#: builtin/stash.c:1454 builtin/stash.c:1490 msgid "stash in patch mode" msgstr "remiser une mode rustine" -#: builtin/stash.c:1468 builtin/stash.c:1504 +#: builtin/stash.c:1455 builtin/stash.c:1491 msgid "quiet mode" msgstr "mode silencieux" -#: builtin/stash.c:1470 builtin/stash.c:1506 +#: builtin/stash.c:1457 builtin/stash.c:1493 msgid "include untracked files in stash" msgstr "inclure les fichiers non suivis dans la remise" -#: builtin/stash.c:1472 builtin/stash.c:1508 +#: builtin/stash.c:1459 builtin/stash.c:1495 msgid "include ignore files" msgstr "inclure les fichiers ignorés" -#: builtin/stash.c:1568 +#: builtin/stash.c:1555 #, c-format msgid "could not exec %s" msgstr "impossible d'exécuter %s" @@ -19441,7 +19906,7 @@ msgstr "" msgid "prepend comment character and space to each line" msgstr "ajouter devant chaque ligne le caractère de commentaire et un espace" -#: builtin/submodule--helper.c:45 builtin/submodule--helper.c:1942 +#: builtin/submodule--helper.c:45 builtin/submodule--helper.c:1943 #, c-format msgid "Expecting a full ref name, got %s" msgstr "Nom de référence complet attendu, %s obtenu" @@ -19455,7 +19920,7 @@ msgstr "submodule--helper print-default-remote n'accepte aucun argument" msgid "cannot strip one component off url '%s'" msgstr "impossible de supprimer un composant de l'URL '%s'" -#: builtin/submodule--helper.c:408 builtin/submodule--helper.c:1367 +#: builtin/submodule--helper.c:408 builtin/submodule--helper.c:1368 msgid "alternative anchor for relative paths" msgstr "ancre alternative pour les chemins relatifs" @@ -19463,8 +19928,8 @@ msgstr "ancre alternative pour les chemins relatifs" msgid "git submodule--helper list [--prefix=<path>] [<path>...]" msgstr "git submodule--helper list [--prefix=<chemin>] [<chemin>...]" -#: builtin/submodule--helper.c:470 builtin/submodule--helper.c:627 -#: builtin/submodule--helper.c:650 +#: builtin/submodule--helper.c:470 builtin/submodule--helper.c:628 +#: builtin/submodule--helper.c:651 #, c-format msgid "No url found for submodule path '%s' in .gitmodules" msgstr "URL non trouvée pour le chemin de sous-module '%s' dans .gitmodules" @@ -19483,7 +19948,7 @@ msgstr "" "run_command a retourné un statut non-nul pour %s\n" "." -#: builtin/submodule--helper.c:546 +#: builtin/submodule--helper.c:547 #, c-format msgid "" "run_command returned non-zero status while recursing in the nested " @@ -19494,20 +19959,20 @@ msgstr "" "modules inclus de %s\n" "." -#: builtin/submodule--helper.c:562 +#: builtin/submodule--helper.c:563 msgid "Suppress output of entering each submodule command" msgstr "" "Supprimer la sortie lors de l'entrée dans chaque commande de sous-module" -#: builtin/submodule--helper.c:564 builtin/submodule--helper.c:1049 +#: builtin/submodule--helper.c:565 builtin/submodule--helper.c:1050 msgid "Recurse into nested submodules" msgstr "Parcourir récursivement les sous-modules" -#: builtin/submodule--helper.c:569 +#: builtin/submodule--helper.c:570 msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>" msgstr "git submodule--helper foreach [--quiet] [--recursive] [--] <commande>" -#: builtin/submodule--helper.c:596 +#: builtin/submodule--helper.c:597 #, c-format msgid "" "could not look up configuration '%s'. Assuming this repository is its own " @@ -19516,60 +19981,60 @@ msgstr "" "impossible de trouver la configuration '%s'. Ce dépôt est considéré comme " "son propre amont d'autorité." -#: builtin/submodule--helper.c:664 +#: builtin/submodule--helper.c:665 #, c-format msgid "Failed to register url for submodule path '%s'" msgstr "Échec d'enregistrement de l'URL pour le chemin de sous-module '%s'" -#: builtin/submodule--helper.c:668 +#: builtin/submodule--helper.c:669 #, c-format msgid "Submodule '%s' (%s) registered for path '%s'\n" msgstr "Sous-module '%s' (%s) enregistré pour le chemin '%s'\n" -#: builtin/submodule--helper.c:678 +#: builtin/submodule--helper.c:679 #, c-format msgid "warning: command update mode suggested for submodule '%s'\n" msgstr "" "attention : nous vous suggérons de spécifier une commande de mode de mise à " "jour pour le sous-module '%s'\n" -#: builtin/submodule--helper.c:685 +#: builtin/submodule--helper.c:686 #, c-format msgid "Failed to register update mode for submodule path '%s'" msgstr "" "Échec d'enregistrement du mode de mise à jour pour le chemin de sous-module " "'%s'" -#: builtin/submodule--helper.c:707 +#: builtin/submodule--helper.c:708 msgid "Suppress output for initializing a submodule" msgstr "Supprimer la sortie lors de l'initialisation d'un sous-module" -#: builtin/submodule--helper.c:712 +#: builtin/submodule--helper.c:713 msgid "git submodule--helper init [<options>] [<path>]" msgstr "git submodule--helper init [<options>] [<chemin>]" -#: builtin/submodule--helper.c:784 builtin/submodule--helper.c:910 +#: builtin/submodule--helper.c:785 builtin/submodule--helper.c:911 #, c-format msgid "no submodule mapping found in .gitmodules for path '%s'" msgstr "" "Pas de mise en correspondance du sous-module trouvé dans .gitmodules pour le " "chemin '%s'" -#: builtin/submodule--helper.c:823 +#: builtin/submodule--helper.c:824 #, c-format msgid "could not resolve HEAD ref inside the submodule '%s'" msgstr "impossible de résoudre HEAD dans le sous-module '%s'" -#: builtin/submodule--helper.c:850 builtin/submodule--helper.c:1019 +#: builtin/submodule--helper.c:851 builtin/submodule--helper.c:1020 #, c-format msgid "failed to recurse into submodule '%s'" msgstr "récursion impossible dans le sous-module '%s'" -#: builtin/submodule--helper.c:874 builtin/submodule--helper.c:1185 +#: builtin/submodule--helper.c:875 builtin/submodule--helper.c:1186 msgid "Suppress submodule status output" msgstr "supprimer la sortie d'état du sous-module" -#: builtin/submodule--helper.c:875 +#: builtin/submodule--helper.c:876 msgid "" "Use commit stored in the index instead of the one stored in the submodule " "HEAD" @@ -19577,48 +20042,48 @@ msgstr "" "Utiliser le commit stocké dans l'index au lieu de celui stocké dans la HEAD " "du sous-module" -#: builtin/submodule--helper.c:876 +#: builtin/submodule--helper.c:877 msgid "recurse into nested submodules" msgstr "parcourir récursivement les sous-modules" -#: builtin/submodule--helper.c:881 +#: builtin/submodule--helper.c:882 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]" msgstr "git submodule status [--quiet] [--cached] [--recursive] [<chemin>...]" -#: builtin/submodule--helper.c:905 +#: builtin/submodule--helper.c:906 msgid "git submodule--helper name <path>" msgstr "git submodule--helper <nom> <chemin>" -#: builtin/submodule--helper.c:969 +#: builtin/submodule--helper.c:970 #, c-format msgid "Synchronizing submodule url for '%s'\n" msgstr "Synchronisation de l'URL sous-module pour '%s'\n" -#: builtin/submodule--helper.c:975 +#: builtin/submodule--helper.c:976 #, c-format msgid "failed to register url for submodule path '%s'" msgstr "échec d'enregistrement de l'URL pour le chemin de sous-module '%s'" -#: builtin/submodule--helper.c:989 +#: builtin/submodule--helper.c:990 #, c-format msgid "failed to get the default remote for submodule '%s'" msgstr "échec d'obtention du dépôt distant par défaut pour le sous-module '%s'" -#: builtin/submodule--helper.c:1000 +#: builtin/submodule--helper.c:1001 #, c-format msgid "failed to update remote for submodule '%s'" msgstr "échec de mise à jour du dépôt distant pour le sous-module '%s'" -#: builtin/submodule--helper.c:1047 +#: builtin/submodule--helper.c:1048 msgid "Suppress output of synchronizing submodule url" msgstr "" "Supprimer la sortie lors de la synchronisation de l'URL d'un sous-module" -#: builtin/submodule--helper.c:1054 +#: builtin/submodule--helper.c:1055 msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]" msgstr "git submodule--helper sync [--quiet] [--recursive] [<chemin>]" -#: builtin/submodule--helper.c:1108 +#: builtin/submodule--helper.c:1109 #, c-format msgid "" "Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you " @@ -19628,7 +20093,7 @@ msgstr "" "'rm -rf' si vous voulez vraiment le supprimer en incluant tout son " "historique)" -#: builtin/submodule--helper.c:1120 +#: builtin/submodule--helper.c:1121 #, c-format msgid "" "Submodule work tree '%s' contains local modifications; use '-f' to discard " @@ -19637,84 +20102,84 @@ msgstr "" "L'arbre de travail du sous-module '%s' contient des modifications locales ; " "utilisez '-f' pour les annuler" -#: builtin/submodule--helper.c:1128 +#: builtin/submodule--helper.c:1129 #, c-format msgid "Cleared directory '%s'\n" msgstr "Répertoire '%s' nettoyé\n" -#: builtin/submodule--helper.c:1130 +#: builtin/submodule--helper.c:1131 #, c-format msgid "Could not remove submodule work tree '%s'\n" msgstr "Impossible de supprimer l'arbre de travail du sous-module '%s'\n" -#: builtin/submodule--helper.c:1141 +#: builtin/submodule--helper.c:1142 #, c-format msgid "could not create empty submodule directory %s" msgstr "impossible de créer le répertoire vide du sous-module %s" -#: builtin/submodule--helper.c:1157 +#: builtin/submodule--helper.c:1158 #, c-format msgid "Submodule '%s' (%s) unregistered for path '%s'\n" msgstr "Sous-module '%s' (%s) non enregistré pour le chemin '%s'\n" -#: builtin/submodule--helper.c:1186 +#: builtin/submodule--helper.c:1187 msgid "Remove submodule working trees even if they contain local changes" msgstr "" "Éliminer les arbres de travail des sous-modules même s'ils contiennent des " "modifications locales" -#: builtin/submodule--helper.c:1187 +#: builtin/submodule--helper.c:1188 msgid "Unregister all submodules" msgstr "Désenregistrer tous les sous-modules" -#: builtin/submodule--helper.c:1192 +#: builtin/submodule--helper.c:1193 msgid "" "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]" msgstr "" "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<chemin>...]]" -#: builtin/submodule--helper.c:1206 +#: builtin/submodule--helper.c:1207 msgid "Use '--all' if you really want to deinitialize all submodules" msgstr "" "Utilisez '--all' si vous voulez vraiment réinitialiser tous les sous-modules" -#: builtin/submodule--helper.c:1301 builtin/submodule--helper.c:1304 +#: builtin/submodule--helper.c:1302 builtin/submodule--helper.c:1305 #, c-format msgid "submodule '%s' cannot add alternate: %s" msgstr "le sous-module '%s' ne peut pas ajouter d'alternative : %s" -#: builtin/submodule--helper.c:1340 +#: builtin/submodule--helper.c:1341 #, c-format msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized" msgstr "" "La valeur '%s' pour submodule.alternateErrorStrategy n'est pas reconnue" -#: builtin/submodule--helper.c:1347 +#: builtin/submodule--helper.c:1348 #, c-format msgid "Value '%s' for submodule.alternateLocation is not recognized" msgstr "La valeur '%s' pour submodule.alternateLocation n'est pas reconnue" -#: builtin/submodule--helper.c:1370 +#: builtin/submodule--helper.c:1371 msgid "where the new submodule will be cloned to" msgstr "emplacement où le sous-module sera cloné" -#: builtin/submodule--helper.c:1373 +#: builtin/submodule--helper.c:1374 msgid "name of the new submodule" msgstr "nom du nouveau sous-module" -#: builtin/submodule--helper.c:1376 +#: builtin/submodule--helper.c:1377 msgid "url where to clone the submodule from" msgstr "URL depuis laquelle cloner le sous-module" -#: builtin/submodule--helper.c:1384 +#: builtin/submodule--helper.c:1385 msgid "depth for shallow clones" msgstr "profondeur de l'historique des clones superficiels" -#: builtin/submodule--helper.c:1387 builtin/submodule--helper.c:1871 +#: builtin/submodule--helper.c:1388 builtin/submodule--helper.c:1872 msgid "force cloning progress" msgstr "forcer l'affichage de la progression du clonage" -#: builtin/submodule--helper.c:1392 +#: builtin/submodule--helper.c:1393 msgid "" "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " "<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>" @@ -19722,94 +20187,94 @@ msgstr "" "git submodule--helper clone [--prefix=<chemin>] [--quiet] [--reference " "<dépôt>] [--name <nom>] [--depth <profondeur>] --url <url> --path <chemin>" -#: builtin/submodule--helper.c:1423 +#: builtin/submodule--helper.c:1424 #, c-format msgid "clone of '%s' into submodule path '%s' failed" msgstr "Le clonage de '%s' dans le chemin de sous-module '%s' a échoué" -#: builtin/submodule--helper.c:1437 +#: builtin/submodule--helper.c:1438 #, c-format msgid "could not get submodule directory for '%s'" msgstr "impossible de créer le répertoire de sous-module pour '%s'" -#: builtin/submodule--helper.c:1473 +#: builtin/submodule--helper.c:1474 #, c-format msgid "Invalid update mode '%s' for submodule path '%s'" msgstr "mode de mise à jour '%s' invalide pour le chemin de sous-module '%s'" -#: builtin/submodule--helper.c:1477 +#: builtin/submodule--helper.c:1478 #, c-format msgid "Invalid update mode '%s' configured for submodule path '%s'" msgstr "" "Mode de mise à jour '%s'invalide configuré pour le chemin de sous-module '%s'" -#: builtin/submodule--helper.c:1570 +#: builtin/submodule--helper.c:1571 #, c-format msgid "Submodule path '%s' not initialized" msgstr "Le chemin de sous-module '%s' n'est pas initialisé" -#: builtin/submodule--helper.c:1574 +#: builtin/submodule--helper.c:1575 msgid "Maybe you want to use 'update --init'?" msgstr "Vous voudriez sûrement utiliser 'update --init' ?" -#: builtin/submodule--helper.c:1604 +#: builtin/submodule--helper.c:1605 #, c-format msgid "Skipping unmerged submodule %s" msgstr "Sous-module non fusionné %s non traité" -#: builtin/submodule--helper.c:1633 +#: builtin/submodule--helper.c:1634 #, c-format msgid "Skipping submodule '%s'" msgstr "Sous-module '%s' non traité" -#: builtin/submodule--helper.c:1777 +#: builtin/submodule--helper.c:1778 #, c-format msgid "Failed to clone '%s'. Retry scheduled" msgstr "Impossible de cloner '%s'. Réessai prévu" -#: builtin/submodule--helper.c:1788 +#: builtin/submodule--helper.c:1789 #, c-format msgid "Failed to clone '%s' a second time, aborting" msgstr "Impossible de cloner '%s' pour la seconde fois, abandon" -#: builtin/submodule--helper.c:1850 builtin/submodule--helper.c:2092 +#: builtin/submodule--helper.c:1851 builtin/submodule--helper.c:2093 msgid "path into the working tree" msgstr "chemin dans la copie de travail" -#: builtin/submodule--helper.c:1853 +#: builtin/submodule--helper.c:1854 msgid "path into the working tree, across nested submodule boundaries" msgstr "" "chemin dans la copie de travail, traversant les frontières de sous-modules" -#: builtin/submodule--helper.c:1857 +#: builtin/submodule--helper.c:1858 msgid "rebase, merge, checkout or none" msgstr "valeurs possibles : rebase, merge, checkout ou none" -#: builtin/submodule--helper.c:1863 +#: builtin/submodule--helper.c:1864 msgid "Create a shallow clone truncated to the specified number of revisions" msgstr "Créer un clone superficiel tronqué au nombre de révisions spécifié" -#: builtin/submodule--helper.c:1866 +#: builtin/submodule--helper.c:1867 msgid "parallel jobs" msgstr "jobs parallèles" -#: builtin/submodule--helper.c:1868 +#: builtin/submodule--helper.c:1869 msgid "whether the initial clone should follow the shallow recommendation" msgstr "spécifie si le clonage initial doit être aussi superficiel" -#: builtin/submodule--helper.c:1869 +#: builtin/submodule--helper.c:1870 msgid "don't print cloning progress" msgstr "ne pas afficher la progression du clonage" -#: builtin/submodule--helper.c:1876 +#: builtin/submodule--helper.c:1877 msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]" msgstr "git submodule--helper update_clone [--prefix=<chemin>] [<chemin>...]" -#: builtin/submodule--helper.c:1889 +#: builtin/submodule--helper.c:1890 msgid "bad value for update parameter" msgstr "valeur invalide pour la mise à jour du paramètre" -#: builtin/submodule--helper.c:1937 +#: builtin/submodule--helper.c:1938 #, c-format msgid "" "Submodule (%s) branch configured to inherit branch from superproject, but " @@ -19818,16 +20283,16 @@ msgstr "" "la branche du sous-module %s est configurée pour hériter de la branche du " "superprojet, mais le superprojet n'est sur aucune branche" -#: builtin/submodule--helper.c:2060 +#: builtin/submodule--helper.c:2061 #, c-format msgid "could not get a repository handle for submodule '%s'" msgstr "impossible de trouver une poignée de dépôt pour le sous-module '%s'" -#: builtin/submodule--helper.c:2093 +#: builtin/submodule--helper.c:2094 msgid "recurse into submodules" msgstr "parcourir récursivement les sous-modules" -#: builtin/submodule--helper.c:2099 +#: builtin/submodule--helper.c:2100 msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]" msgstr "git submodule--helper embed-git-dir [<options>] [<chemin>...]" @@ -19857,7 +20322,7 @@ msgid "please make sure that the .gitmodules file is in the working tree" msgstr "" "veuillez vous assurer que le fichier .gitmodules est dans l'arbre de travail" -#: builtin/submodule--helper.c:2235 git.c:433 git.c:685 +#: builtin/submodule--helper.c:2235 git.c:434 git.c:684 #, c-format msgid "%s doesn't support --super-prefix" msgstr "%s ne gère pas --super-prefix" @@ -19922,17 +20387,17 @@ msgstr "" msgid "git tag -v [--format=<format>] <tagname>..." msgstr "git tag -v [--format=<format>] <nométiquette>..." -#: builtin/tag.c:88 +#: builtin/tag.c:89 #, c-format msgid "tag '%s' not found." msgstr "étiquette '%s' non trouvée." -#: builtin/tag.c:104 +#: builtin/tag.c:105 #, c-format msgid "Deleted tag '%s' (was %s)\n" msgstr "Étiquette '%s' supprimée (elle était sur %s)\n" -#: builtin/tag.c:134 +#: builtin/tag.c:135 #, c-format msgid "" "\n" @@ -19945,7 +20410,7 @@ msgstr "" " %s\n" "Les lignes commençant par '%c' seront ignorées.\n" -#: builtin/tag.c:138 +#: builtin/tag.c:139 #, c-format msgid "" "\n" @@ -19960,15 +20425,15 @@ msgstr "" "Les lignes commençant par '%c' seront gardées ; vous pouvez les retirer vous-" "même si vous le souhaitez.\n" -#: builtin/tag.c:192 +#: builtin/tag.c:198 msgid "unable to sign the tag" msgstr "impossible de signer l'étiquette" -#: builtin/tag.c:194 +#: builtin/tag.c:200 msgid "unable to write tag file" msgstr "impossible d'écrire le fichier d'étiquettes" -#: builtin/tag.c:210 +#: builtin/tag.c:216 #, c-format msgid "" "You have created a nested tag. The object referred to by your new tag is\n" @@ -19983,139 +20448,139 @@ msgstr "" "\n" "\tgit tag -f %s %s^{}" -#: builtin/tag.c:226 +#: builtin/tag.c:232 msgid "bad object type." msgstr "mauvais type d'objet." -#: builtin/tag.c:278 +#: builtin/tag.c:284 msgid "no tag message?" msgstr "pas de message pour l'étiquette ?" -#: builtin/tag.c:285 +#: builtin/tag.c:291 #, c-format msgid "The tag message has been left in %s\n" msgstr "Le message pour l'étiquette a été laissé dans %s\n" -#: builtin/tag.c:396 +#: builtin/tag.c:402 msgid "list tag names" msgstr "afficher les noms des étiquettes" -#: builtin/tag.c:398 +#: builtin/tag.c:404 msgid "print <n> lines of each tag message" msgstr "affiche <n> lignes de chaque message d'étiquette" -#: builtin/tag.c:400 +#: builtin/tag.c:406 msgid "delete tags" msgstr "supprimer des étiquettes" -#: builtin/tag.c:401 +#: builtin/tag.c:407 msgid "verify tags" msgstr "vérifier des étiquettes" -#: builtin/tag.c:403 +#: builtin/tag.c:409 msgid "Tag creation options" msgstr "Options de création de l'étiquette" -#: builtin/tag.c:405 +#: builtin/tag.c:411 msgid "annotated tag, needs a message" msgstr "étiquette annotée, nécessite un message" -#: builtin/tag.c:407 +#: builtin/tag.c:413 msgid "tag message" msgstr "message pour l'étiquette" -#: builtin/tag.c:409 +#: builtin/tag.c:415 msgid "force edit of tag message" msgstr "forcer l'édition du message d'étiquetage" -#: builtin/tag.c:410 +#: builtin/tag.c:416 msgid "annotated and GPG-signed tag" msgstr "étiquette annotée et signée avec GPG" -#: builtin/tag.c:413 +#: builtin/tag.c:419 msgid "use another key to sign the tag" msgstr "utiliser une autre clé pour signer l'étiquette" -#: builtin/tag.c:414 +#: builtin/tag.c:420 msgid "replace the tag if exists" msgstr "remplacer l'étiquette si elle existe" -#: builtin/tag.c:415 builtin/update-ref.c:369 +#: builtin/tag.c:421 builtin/update-ref.c:369 msgid "create a reflog" msgstr "créer un reflog" -#: builtin/tag.c:417 +#: builtin/tag.c:423 msgid "Tag listing options" msgstr "Options d'affichage des étiquettes" -#: builtin/tag.c:418 +#: builtin/tag.c:424 msgid "show tag list in columns" msgstr "afficher la liste des étiquettes sous forme de colonnes" -#: builtin/tag.c:419 builtin/tag.c:421 +#: builtin/tag.c:425 builtin/tag.c:427 msgid "print only tags that contain the commit" msgstr "afficher seulement les étiquettes qui contiennent la validation" -#: builtin/tag.c:420 builtin/tag.c:422 +#: builtin/tag.c:426 builtin/tag.c:428 msgid "print only tags that don't contain the commit" msgstr "afficher seulement les étiquettes qui ne contiennent pas la validation" -#: builtin/tag.c:423 +#: builtin/tag.c:429 msgid "print only tags that are merged" msgstr "afficher seulement les étiquettes qui sont fusionnées" -#: builtin/tag.c:424 +#: builtin/tag.c:430 msgid "print only tags that are not merged" msgstr "afficher seulement les étiquettes qui ne sont pas fusionnées" -#: builtin/tag.c:428 +#: builtin/tag.c:434 msgid "print only tags of the object" msgstr "afficher seulement les étiquettes de l'objet" -#: builtin/tag.c:472 +#: builtin/tag.c:482 msgid "--column and -n are incompatible" msgstr "--column et -n sont incompatibles" -#: builtin/tag.c:494 +#: builtin/tag.c:504 msgid "-n option is only allowed in list mode" msgstr "l'option -n est autorisée seulement en mode de liste" -#: builtin/tag.c:496 +#: builtin/tag.c:506 msgid "--contains option is only allowed in list mode" msgstr "l'option --contains est autorisée seulement en mode de liste" -#: builtin/tag.c:498 +#: builtin/tag.c:508 msgid "--no-contains option is only allowed in list mode" msgstr "l'option --contains est autorisée seulement en mode liste" -#: builtin/tag.c:500 +#: builtin/tag.c:510 msgid "--points-at option is only allowed in list mode" msgstr "l'option --points-at est autorisée seulement en mode liste" -#: builtin/tag.c:502 +#: builtin/tag.c:512 msgid "--merged and --no-merged options are only allowed in list mode" msgstr "" "les options --merged et --no-merged ne sont autorisées qu'en mode liste" -#: builtin/tag.c:513 +#: builtin/tag.c:523 msgid "only one -F or -m option is allowed." msgstr "une seule option -F ou -m est autorisée." -#: builtin/tag.c:532 +#: builtin/tag.c:542 msgid "too many params" msgstr "trop de paramètres" -#: builtin/tag.c:538 +#: builtin/tag.c:548 #, c-format msgid "'%s' is not a valid tag name." msgstr "'%s' n'est pas un nom d'étiquette valide." -#: builtin/tag.c:543 +#: builtin/tag.c:553 #, c-format msgid "tag '%s' already exists" msgstr "l'étiquette '%s' existe déjà" -#: builtin/tag.c:574 +#: builtin/tag.c:584 #, c-format msgid "Updated tag '%s' (was %s)\n" msgstr "Étiquette '%s' mise à jour (elle était sur %s)\n" @@ -20449,15 +20914,15 @@ msgstr "" msgid "interrupt transfer after <n> seconds of inactivity" msgstr "interrompre le transfert après <n> secondes d'inactivité" -#: builtin/verify-commit.c:20 +#: builtin/verify-commit.c:19 msgid "git verify-commit [-v | --verbose] <commit>..." msgstr "git verify-commit [-v | --verbose] <commit>..." -#: builtin/verify-commit.c:76 +#: builtin/verify-commit.c:68 msgid "print commit contents" msgstr "afficher le contenu du commit" -#: builtin/verify-commit.c:77 builtin/verify-tag.c:38 +#: builtin/verify-commit.c:69 builtin/verify-tag.c:37 msgid "print raw gpg status output" msgstr "afficher les messages bruts de gpg" @@ -20473,11 +20938,11 @@ msgstr "verbeux" msgid "show statistics only" msgstr "afficher seulement les statistiques" -#: builtin/verify-tag.c:19 +#: builtin/verify-tag.c:18 msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..." msgstr "git verify-tag [-v | --verbose] [--format=<format>] <étiquette>..." -#: builtin/verify-tag.c:37 +#: builtin/verify-tag.c:36 msgid "print tag contents" msgstr "afficher le contenu de l'étiquette" @@ -20509,7 +20974,7 @@ msgstr "git worktree remove [<options>] <arbre-de-travail>" msgid "git worktree unlock <path>" msgstr "git worktree unlock <chemin>" -#: builtin/worktree.c:61 builtin/worktree.c:891 +#: builtin/worktree.c:61 builtin/worktree.c:899 #, c-format msgid "failed to delete '%s'" msgstr "échec de la suppression de '%s'" @@ -20588,129 +21053,129 @@ msgstr "" "'%s' est un arbre de travail manquant mais déjà enregistré ;\n" "utilisez 'add -f' pour passer outre, ou 'prune' ou 'remove' pour corriger" -#: builtin/worktree.c:302 +#: builtin/worktree.c:309 #, c-format msgid "could not create directory of '%s'" msgstr "impossible de créer le répertoire de '%s'" -#: builtin/worktree.c:432 builtin/worktree.c:438 +#: builtin/worktree.c:440 builtin/worktree.c:446 #, c-format msgid "Preparing worktree (new branch '%s')" msgstr "Préparation de l'arbre de travail (nouvelle branche '%s')" -#: builtin/worktree.c:434 +#: builtin/worktree.c:442 #, c-format msgid "Preparing worktree (resetting branch '%s'; was at %s)" msgstr "" "Préparation de l'arbre de travail (réinitialisation de la branche '%s' ; " "précédemment sur %s)" -#: builtin/worktree.c:443 +#: builtin/worktree.c:451 #, c-format msgid "Preparing worktree (checking out '%s')" msgstr "Préparation de l'arbre de travail (extraction de '%s')" -#: builtin/worktree.c:449 +#: builtin/worktree.c:457 #, c-format msgid "Preparing worktree (detached HEAD %s)" msgstr "Préparation de l'arbre de travail (HEAD détachée %s)" -#: builtin/worktree.c:490 +#: builtin/worktree.c:498 msgid "checkout <branch> even if already checked out in other worktree" msgstr "" "extraire la <branche> même si elle est déjà extraite dans une autre copie de " "travail" -#: builtin/worktree.c:493 +#: builtin/worktree.c:501 msgid "create a new branch" msgstr "créer une nouvelle branche" -#: builtin/worktree.c:495 +#: builtin/worktree.c:503 msgid "create or reset a branch" msgstr "créer ou réinitialiser une branche" -#: builtin/worktree.c:497 +#: builtin/worktree.c:505 msgid "populate the new working tree" msgstr "remplissage de la nouvelle copie de travail" -#: builtin/worktree.c:498 +#: builtin/worktree.c:506 msgid "keep the new working tree locked" msgstr "conserver le verrou sur le nouvel arbre de travail" -#: builtin/worktree.c:501 +#: builtin/worktree.c:509 msgid "set up tracking mode (see git-branch(1))" msgstr "régler le mode de suivi (voir git-branch(1))" -#: builtin/worktree.c:504 +#: builtin/worktree.c:512 msgid "try to match the new branch name with a remote-tracking branch" msgstr "essayer de nommer la nouvelle branche comme la branche amont" -#: builtin/worktree.c:512 +#: builtin/worktree.c:520 msgid "-b, -B, and --detach are mutually exclusive" msgstr "-b, -B et --detach sont mutuellement exclusifs" -#: builtin/worktree.c:573 +#: builtin/worktree.c:581 msgid "--[no-]track can only be used if a new branch is created" msgstr "" "--[no-]track ne peut être utilisé qu'à la création d'une nouvelle branche" -#: builtin/worktree.c:673 +#: builtin/worktree.c:681 msgid "reason for locking" msgstr "raison du verrouillage" -#: builtin/worktree.c:685 builtin/worktree.c:718 builtin/worktree.c:792 -#: builtin/worktree.c:919 +#: builtin/worktree.c:693 builtin/worktree.c:726 builtin/worktree.c:800 +#: builtin/worktree.c:927 #, c-format msgid "'%s' is not a working tree" msgstr "'%s' n'est pas une copie de travail" -#: builtin/worktree.c:687 builtin/worktree.c:720 +#: builtin/worktree.c:695 builtin/worktree.c:728 msgid "The main working tree cannot be locked or unlocked" msgstr "" "La copie de travail principale ne peut pas être verrouillée ou déverrouillée" -#: builtin/worktree.c:692 +#: builtin/worktree.c:700 #, c-format msgid "'%s' is already locked, reason: %s" msgstr "'%s' est déjà verrouillé, car '%s'" -#: builtin/worktree.c:694 +#: builtin/worktree.c:702 #, c-format msgid "'%s' is already locked" msgstr "'%s' est déjà verrouillé" -#: builtin/worktree.c:722 +#: builtin/worktree.c:730 #, c-format msgid "'%s' is not locked" msgstr "'%s' n'est pas verrouillé" -#: builtin/worktree.c:763 +#: builtin/worktree.c:771 msgid "working trees containing submodules cannot be moved or removed" msgstr "" "les arbres de travail contenant des sous-modules ne peuvent pas être " "déplacés ou supprimés" -#: builtin/worktree.c:771 +#: builtin/worktree.c:779 msgid "force move even if worktree is dirty or locked" msgstr "" "forcer le déplacement même si l'arbre de travail est sale ou verrouillé" -#: builtin/worktree.c:794 builtin/worktree.c:921 +#: builtin/worktree.c:802 builtin/worktree.c:929 #, c-format msgid "'%s' is a main working tree" msgstr "'%s' est un arbre de travail principal" -#: builtin/worktree.c:799 +#: builtin/worktree.c:807 #, c-format msgid "could not figure out destination name from '%s'" msgstr "impossible de trouver le nom de la destination à partir de '%s'" -#: builtin/worktree.c:805 +#: builtin/worktree.c:813 #, c-format msgid "target '%s' already exists" msgstr "la cible '%s' existe déjà" -#: builtin/worktree.c:813 +#: builtin/worktree.c:821 #, c-format msgid "" "cannot move a locked working tree, lock reason: %s\n" @@ -20720,7 +21185,7 @@ msgstr "" "verrouillage : %s\n" "utilisez 'move -f -f' pour outrepasser ou déverrouiller avant" -#: builtin/worktree.c:815 +#: builtin/worktree.c:823 msgid "" "cannot move a locked working tree;\n" "use 'move -f -f' to override or unlock first" @@ -20728,37 +21193,37 @@ msgstr "" "impossible de déplacer un arbre de travail verrouillé;\n" "utilisez 'move -f -f' pour outrepasser ou déverrouiller avant" -#: builtin/worktree.c:818 +#: builtin/worktree.c:826 #, c-format msgid "validation failed, cannot move working tree: %s" msgstr "la validation a échoué, impossible de déplacer l'arbre de travail : %s" -#: builtin/worktree.c:823 +#: builtin/worktree.c:831 #, c-format msgid "failed to move '%s' to '%s'" msgstr "échec au déplacement de '%s' vers '%s'" -#: builtin/worktree.c:871 +#: builtin/worktree.c:879 #, c-format msgid "failed to run 'git status' on '%s'" msgstr "échec du lancement de 'git status' sur '%s'" -#: builtin/worktree.c:875 +#: builtin/worktree.c:883 #, c-format msgid "'%s' is dirty, use --force to delete it" msgstr "'%s' est sale, utilisez --force pour le supprimer" -#: builtin/worktree.c:880 +#: builtin/worktree.c:888 #, c-format msgid "failed to run 'git status' on '%s', code %d" msgstr "impossible de lancer 'git status' sur '%s', code %d" -#: builtin/worktree.c:903 +#: builtin/worktree.c:911 msgid "force removal even if worktree is dirty or locked" msgstr "" "forcer la suppression même si l'arbre de travail est sale ou verrouillé" -#: builtin/worktree.c:926 +#: builtin/worktree.c:934 #, c-format msgid "" "cannot remove a locked working tree, lock reason: %s\n" @@ -20768,7 +21233,7 @@ msgstr "" "verrouillage : %s\n" "utilisez 'move -f -f' pour outrepasser ou déverrouiller avant" -#: builtin/worktree.c:928 +#: builtin/worktree.c:936 msgid "" "cannot remove a locked working tree;\n" "use 'remove -f -f' to override or unlock first" @@ -20776,7 +21241,7 @@ msgstr "" "impossible de supprimer un arbre de travail verrouillé;\n" "utilisez 'move -f -f' pour outrepasser ou déverrouiller avant" -#: builtin/worktree.c:931 +#: builtin/worktree.c:939 #, c-format msgid "validation failed, cannot remove working tree: %s" msgstr "" @@ -20853,53 +21318,55 @@ msgstr "" msgid "" "'git help -a' and 'git help -g' list available subcommands and some\n" "concept guides. See 'git help <command>' or 'git help <concept>'\n" -"to read about a specific subcommand or concept." +"to read about a specific subcommand or concept.\n" +"See 'git help git' for an overview of the system." msgstr "" "'git help -a' et 'git help -g' listent les sous-commandes disponibles et\n" "quelques concepts. Voir 'git help <commande>' ou 'git help <concept>'\n" -"pour en lire plus à propos d'une commande spécifique ou d'un concept." +"pour en lire plus à propos d'une commande spécifique ou d'un concept.\n" +"Voir 'git help git' pour un survol du système." -#: git.c:185 +#: git.c:186 #, c-format msgid "no directory given for --git-dir\n" msgstr "aucun répertoire fourni pour --git-dir\n" -#: git.c:199 +#: git.c:200 #, c-format msgid "no namespace given for --namespace\n" msgstr "aucun espace de nom fournit pour --namespace\n" -#: git.c:213 +#: git.c:214 #, c-format msgid "no directory given for --work-tree\n" msgstr "aucun répertoire fourni pour --work-tree\n" -#: git.c:227 +#: git.c:228 #, c-format msgid "no prefix given for --super-prefix\n" msgstr "aucun préfixe fourni pour --super-prefix\n" -#: git.c:249 +#: git.c:250 #, c-format msgid "-c expects a configuration string\n" msgstr "-c requiert une chaîne de configuration\n" -#: git.c:287 +#: git.c:288 #, c-format msgid "no directory given for -C\n" msgstr "aucun répertoire fourni pour -C\n" -#: git.c:313 +#: git.c:314 #, c-format msgid "unknown option: %s\n" msgstr "option inconnue : %s\n" -#: git.c:359 +#: git.c:360 #, c-format msgid "while expanding alias '%s': '%s'" msgstr "lors de l'expansion de l'alias '%s' : '%s'" -#: git.c:368 +#: git.c:369 #, c-format msgid "" "alias '%s' changes environment variables.\n" @@ -20908,39 +21375,39 @@ msgstr "" "l'alias '%s' modifie les variables d'environnement.\n" "Vous pouvez utiliser '!git' dans l'alias pour le faire" -#: git.c:376 +#: git.c:377 #, c-format msgid "empty alias for %s" msgstr "alias vide pour %s" -#: git.c:379 +#: git.c:380 #, c-format msgid "recursive alias: %s" msgstr "alias recursif : %s" -#: git.c:459 +#: git.c:460 msgid "write failure on standard output" msgstr "échec d'écriture sur la sortie standard" -#: git.c:461 +#: git.c:462 msgid "unknown write failure on standard output" msgstr "échec inconnu d'écriture sur la sortie standard" -#: git.c:463 +#: git.c:464 msgid "close failed on standard output" msgstr "échec de fermeture de la sortie standard" -#: git.c:797 +#: git.c:793 #, c-format msgid "alias loop detected: expansion of '%s' does not terminate:%s" msgstr "boucle d'alias détectée : l'expansion de '%s' ne finit jamais : %s" -#: git.c:847 +#: git.c:843 #, c-format msgid "cannot handle %s as a builtin" msgstr "impossible d'utiliser %s comme une fonction intégrée" -#: git.c:860 +#: git.c:856 #, c-format msgid "" "usage: %s\n" @@ -20949,13 +21416,13 @@ msgstr "" "usage : %s\n" "\n" -#: git.c:880 +#: git.c:876 #, c-format msgid "expansion of alias '%s' failed; '%s' is not a git command\n" msgstr "" "l'expansion de l'alias '%s' a échoué : '%s' n'est pas une commande git\n" -#: git.c:892 +#: git.c:888 #, c-format msgid "failed to run command '%s': %s\n" msgstr "échec au lancement de la commande '%s' : %s\n" @@ -21137,19 +21604,19 @@ msgstr "date-d'expiration" msgid "no-op (backward compatibility)" msgstr "sans action (rétrocompatibilité)" -#: parse-options.h:304 +#: parse-options.h:305 msgid "be more verbose" msgstr "être plus verbeux" -#: parse-options.h:306 +#: parse-options.h:307 msgid "be more quiet" msgstr "être plus silencieux" -#: parse-options.h:312 +#: parse-options.h:313 msgid "use <n> digits to display SHA-1s" msgstr "utiliser <n> chiffres pour afficher les SHA-1s" -#: parse-options.h:331 +#: parse-options.h:332 msgid "how to strip spaces and #comments from message" msgstr "comment éliminer les espaces et les commentaires # du message" @@ -21166,6 +21633,14 @@ msgid "update the index with reused conflict resolution if possible" msgstr "" "met à jour l'index avec les résolutions de conflit réutilisées si possible" +#: wt-status.h:67 +msgid "HEAD detached at " +msgstr "HEAD détachée sur " + +#: wt-status.h:68 +msgid "HEAD detached from " +msgstr "HEAD détachée depuis " + #: command-list.h:50 msgid "Add file contents to the index" msgstr "Ajouter le contenu de fichiers dans l'index" @@ -21613,218 +22088,226 @@ msgid "Reset current HEAD to the specified state" msgstr "Réinitialiser la HEAD courante à l'état spécifié" #: command-list.h:156 +msgid "Restore working tree files" +msgstr "restaurer les fichiers l'arbre de travail" + +#: command-list.h:157 msgid "Revert some existing commits" msgstr "Inverser des commits existants" -#: command-list.h:157 +#: command-list.h:158 msgid "Lists commit objects in reverse chronological order" msgstr "Afficher les objets commit dans l'ordre chronologique inverse" -#: command-list.h:158 +#: command-list.h:159 msgid "Pick out and massage parameters" msgstr "Analyser et préparer les paramètres" -#: command-list.h:159 +#: command-list.h:160 msgid "Remove files from the working tree and from the index" msgstr "Supprimer des fichiers de la copie de travail et de l'index" -#: command-list.h:160 +#: command-list.h:161 msgid "Send a collection of patches as emails" msgstr "Envoyer un ensemble de patchs comme courriels" -#: command-list.h:161 +#: command-list.h:162 msgid "Push objects over Git protocol to another repository" msgstr "Pousser les objets sur un autre dépôt via le protocole Git" -#: command-list.h:162 +#: command-list.h:163 msgid "Restricted login shell for Git-only SSH access" msgstr "shell de login restreint pour un accès SSH vers Git seulement" -#: command-list.h:163 +#: command-list.h:164 msgid "Summarize 'git log' output" msgstr "Résumer la sortie de 'git log'" -#: command-list.h:164 +#: command-list.h:165 msgid "Show various types of objects" msgstr "Afficher différents types d'objets" -#: command-list.h:165 +#: command-list.h:166 msgid "Show branches and their commits" msgstr "Afficher les branches et leurs commits" -#: command-list.h:166 +#: command-list.h:167 msgid "Show packed archive index" msgstr "Afficher l'index de l'archive empaquetée" -#: command-list.h:167 +#: command-list.h:168 msgid "List references in a local repository" msgstr "Lister les références du dépôt local" -#: command-list.h:168 +#: command-list.h:169 msgid "Git's i18n setup code for shell scripts" msgstr "Le code d'initialisation i18n pour les scripts shell" -#: command-list.h:169 +#: command-list.h:170 msgid "Common Git shell script setup code" msgstr "Le code d'initialisation commun aux scripts shell Git" -#: command-list.h:170 +#: command-list.h:171 msgid "Stash the changes in a dirty working directory away" msgstr "Remiser les modifications d'un répertoire de travail sale" -#: command-list.h:171 +#: command-list.h:172 msgid "Add file contents to the staging area" msgstr "Ajouter le contenu de fichiers à l'index" -#: command-list.h:172 +#: command-list.h:173 msgid "Show the working tree status" msgstr "Afficher l'état de la copie de travail" -#: command-list.h:173 +#: command-list.h:174 msgid "Remove unnecessary whitespace" msgstr "Retirer les espaces inutiles" -#: command-list.h:174 +#: command-list.h:175 msgid "Initialize, update or inspect submodules" msgstr "Initialiser, mettre à jour et inspecter les sous-modules" -#: command-list.h:175 +#: command-list.h:176 msgid "Bidirectional operation between a Subversion repository and Git" msgstr "Opération Bidirectionnelles entre un dépôt Subversion et Git" -#: command-list.h:176 +#: command-list.h:177 +msgid "Switch branches" +msgstr "Basculer de branche" + +#: command-list.h:178 msgid "Read, modify and delete symbolic refs" msgstr "Lire, modifier et supprimer les références symboliques" -#: command-list.h:177 +#: command-list.h:179 msgid "Create, list, delete or verify a tag object signed with GPG" msgstr "" "Créer, lister, supprimer ou vérifier un objet d'étiquette signé avec GPG" -#: command-list.h:178 +#: command-list.h:180 msgid "Creates a temporary file with a blob's contents" msgstr "Créer un fichier temporaire avec le contenu d'un blob" -#: command-list.h:179 +#: command-list.h:181 msgid "Unpack objects from a packed archive" msgstr "Dépaqueter les objets depuis une archive empaquetée" -#: command-list.h:180 +#: command-list.h:182 msgid "Register file contents in the working tree to the index" msgstr "Enregistrer le contenu d'un fichier de l'arbre de travail dans l'index" -#: command-list.h:181 +#: command-list.h:183 msgid "Update the object name stored in a ref safely" msgstr "" "Mettre à jour le nom d'objet stocké dans une référence en toute sécurité" -#: command-list.h:182 +#: command-list.h:184 msgid "Update auxiliary info file to help dumb servers" msgstr "" "Mettre à jour le fichier d'informations auxiliaires pour aider les serveurs " "idiots" -#: command-list.h:183 +#: command-list.h:185 msgid "Send archive back to git-archive" msgstr "Renvoyer une archive dans git-archive" -#: command-list.h:184 +#: command-list.h:186 msgid "Send objects packed back to git-fetch-pack" msgstr "Renvoyer des objets empaquetés dans git-fetch-pack" -#: command-list.h:185 +#: command-list.h:187 msgid "Show a Git logical variable" msgstr "Afficher un variable logique de Git" -#: command-list.h:186 +#: command-list.h:188 msgid "Check the GPG signature of commits" msgstr "Vérifier la signature GPG de commits" -#: command-list.h:187 +#: command-list.h:189 msgid "Validate packed Git archive files" msgstr "Valider des fichiers d'archive Git empaquetés" -#: command-list.h:188 +#: command-list.h:190 msgid "Check the GPG signature of tags" msgstr "Vérifier la signature GPG d'étiquettes" -#: command-list.h:189 +#: command-list.h:191 msgid "Git web interface (web frontend to Git repositories)" msgstr "Interface web de Git" -#: command-list.h:190 +#: command-list.h:192 msgid "Show logs with difference each commit introduces" msgstr "Afficher les journaux avec la différence que chaque commit introduit" -#: command-list.h:191 +#: command-list.h:193 msgid "Manage multiple working trees" msgstr "Gère de arbres de travail multiples" -#: command-list.h:192 +#: command-list.h:194 msgid "Create a tree object from the current index" msgstr "Créer un objet arbre depuis l'index courant" -#: command-list.h:193 +#: command-list.h:195 msgid "Defining attributes per path" msgstr "Définition des attributs par chemin" -#: command-list.h:194 +#: command-list.h:196 msgid "Git command-line interface and conventions" msgstr "interface en ligne de commande et conventions de Git" -#: command-list.h:195 +#: command-list.h:197 msgid "A Git core tutorial for developers" msgstr "Tutoriel du cœur de Git pour les développeurs" -#: command-list.h:196 +#: command-list.h:198 msgid "Git for CVS users" msgstr "Git pour les utilisateurs de CVS" -#: command-list.h:197 +#: command-list.h:199 msgid "Tweaking diff output" msgstr "Bidouillage de la sortie diff" -#: command-list.h:198 +#: command-list.h:200 msgid "A useful minimum set of commands for Everyday Git" msgstr "Un ensemble minimal utile des commandes de Git pour tous les jours" -#: command-list.h:199 +#: command-list.h:201 msgid "A Git Glossary" msgstr "Un glossaire Git" -#: command-list.h:200 +#: command-list.h:202 msgid "Hooks used by Git" msgstr "Crochets utilisés par Git" -#: command-list.h:201 +#: command-list.h:203 msgid "Specifies intentionally untracked files to ignore" msgstr "Spécifie les fichiers non-suivis à ignorer intentionnellement" -#: command-list.h:202 +#: command-list.h:204 msgid "Defining submodule properties" msgstr "Définition des propriétés de sous-module" -#: command-list.h:203 +#: command-list.h:205 msgid "Git namespaces" msgstr "Espaces de nom de Git" -#: command-list.h:204 +#: command-list.h:206 msgid "Git Repository Layout" msgstr "Disposition d'un dépôt Git" -#: command-list.h:205 +#: command-list.h:207 msgid "Specifying revisions and ranges for Git" msgstr "Spécification des révisions et portées pour Git" -#: command-list.h:206 +#: command-list.h:208 msgid "A tutorial introduction to Git: part two" msgstr "Une introduction pratique à Git : deuxième partie" -#: command-list.h:207 +#: command-list.h:209 msgid "A tutorial introduction to Git" msgstr "Une introduction pratique à Git" -#: command-list.h:208 +#: command-list.h:210 msgid "An overview of recommended workflows with Git" msgstr "Un aperçu des flux de travail recommandés avec Git" @@ -22245,12 +22728,21 @@ msgstr "" msgid "See git-${cmd}(1) for details." msgstr "Référez-vous à git-${cmd}(1) pour de plus amples détails." -#: git-rebase--preserve-merges.sh:136 +#: git-rebase--preserve-merges.sh:109 +msgid "Applied autostash." +msgstr "Autoremisage appliqué." + +#: git-rebase--preserve-merges.sh:112 +#, sh-format +msgid "Cannot store $stash_sha1" +msgstr "Impossible de stocker $stash_sha1" + +#: git-rebase--preserve-merges.sh:191 #, sh-format msgid "Rebasing ($new_count/$total)" msgstr "Rebasage ($new_count/$total)" -#: git-rebase--preserve-merges.sh:152 +#: git-rebase--preserve-merges.sh:207 msgid "" "\n" "Commands:\n" @@ -22289,7 +22781,7 @@ msgstr "" "\n" "Vous pouvez réordonner ces lignes ; elles sont exécutées de haut en bas.\n" -#: git-rebase--preserve-merges.sh:215 +#: git-rebase--preserve-merges.sh:270 #, sh-format msgid "" "You can amend the commit now, with\n" @@ -22308,83 +22800,83 @@ msgstr "" "\n" "\tgit rebase --continue" -#: git-rebase--preserve-merges.sh:240 +#: git-rebase--preserve-merges.sh:295 #, sh-format msgid "$sha1: not a commit that can be picked" msgstr "$sha1 n'est pas un commit qui peut être picorer" -#: git-rebase--preserve-merges.sh:279 +#: git-rebase--preserve-merges.sh:334 #, sh-format msgid "Invalid commit name: $sha1" msgstr "Nom de commit invalide : $sha1" -#: git-rebase--preserve-merges.sh:309 +#: git-rebase--preserve-merges.sh:364 msgid "Cannot write current commit's replacement sha1" msgstr "Impossible de sauver le sha1 du remplaçant du commit en cours" -#: git-rebase--preserve-merges.sh:360 +#: git-rebase--preserve-merges.sh:415 #, sh-format msgid "Fast-forward to $sha1" msgstr "Avance rapide sur $sha1" -#: git-rebase--preserve-merges.sh:362 +#: git-rebase--preserve-merges.sh:417 #, sh-format msgid "Cannot fast-forward to $sha1" msgstr "Avance rapide impossible sur $sha1" -#: git-rebase--preserve-merges.sh:371 +#: git-rebase--preserve-merges.sh:426 #, sh-format msgid "Cannot move HEAD to $first_parent" msgstr "Impossible de déplacer HEAD sur $first_parent" -#: git-rebase--preserve-merges.sh:376 +#: git-rebase--preserve-merges.sh:431 #, sh-format msgid "Refusing to squash a merge: $sha1" msgstr "Refus d'écraser un commit de fusion: $sha1" -#: git-rebase--preserve-merges.sh:394 +#: git-rebase--preserve-merges.sh:449 #, sh-format msgid "Error redoing merge $sha1" msgstr "Erreur lors de la réapplication de la fusion $sha1" -#: git-rebase--preserve-merges.sh:403 +#: git-rebase--preserve-merges.sh:458 #, sh-format msgid "Could not pick $sha1" msgstr "Impossible de picorer $sha1" -#: git-rebase--preserve-merges.sh:412 +#: git-rebase--preserve-merges.sh:467 #, sh-format msgid "This is the commit message #${n}:" msgstr "Ceci est le ${n}ième message de validation :" -#: git-rebase--preserve-merges.sh:417 +#: git-rebase--preserve-merges.sh:472 #, sh-format msgid "The commit message #${n} will be skipped:" msgstr "Le message de validation ${n} sera ignoré :" -#: git-rebase--preserve-merges.sh:428 +#: git-rebase--preserve-merges.sh:483 #, sh-format msgid "This is a combination of $count commit." msgid_plural "This is a combination of $count commits." msgstr[0] "Ceci est la combinaison de $count commit." msgstr[1] "Ceci est la combinaison de $count commits." -#: git-rebase--preserve-merges.sh:437 +#: git-rebase--preserve-merges.sh:492 #, sh-format msgid "Cannot write $fixup_msg" msgstr "Impossible d'écrire $fixup_msg" -#: git-rebase--preserve-merges.sh:440 +#: git-rebase--preserve-merges.sh:495 msgid "This is a combination of 2 commits." msgstr "Ceci est la combinaison de 2 commits." -#: git-rebase--preserve-merges.sh:481 git-rebase--preserve-merges.sh:524 -#: git-rebase--preserve-merges.sh:527 +#: git-rebase--preserve-merges.sh:536 git-rebase--preserve-merges.sh:579 +#: git-rebase--preserve-merges.sh:582 #, sh-format msgid "Could not apply $sha1... $rest" msgstr "Impossible d'appliquer $sha1... $rest" -#: git-rebase--preserve-merges.sh:556 +#: git-rebase--preserve-merges.sh:611 #, sh-format msgid "" "Could not amend commit after successfully picking $sha1... $rest\n" @@ -22401,31 +22893,31 @@ msgstr "" "le\n" "problème avant de pouvoir reformuler le message du commit." -#: git-rebase--preserve-merges.sh:571 +#: git-rebase--preserve-merges.sh:626 #, sh-format msgid "Stopped at $sha1_abbrev... $rest" msgstr "Arrêté à $sha1_abbrev... $rest" -#: git-rebase--preserve-merges.sh:586 +#: git-rebase--preserve-merges.sh:641 #, sh-format msgid "Cannot '$squash_style' without a previous commit" msgstr "'$squash_style' impossible avec le commit précédent" -#: git-rebase--preserve-merges.sh:628 +#: git-rebase--preserve-merges.sh:683 #, sh-format msgid "Executing: $rest" msgstr "Exécution : $rest" -#: git-rebase--preserve-merges.sh:636 +#: git-rebase--preserve-merges.sh:691 #, sh-format msgid "Execution failed: $rest" msgstr "L'exécution a échoué : $rest" -#: git-rebase--preserve-merges.sh:638 +#: git-rebase--preserve-merges.sh:693 msgid "and made changes to the index and/or the working tree" msgstr "et a mis à jour l'index ou la copie de travail" -#: git-rebase--preserve-merges.sh:640 +#: git-rebase--preserve-merges.sh:695 msgid "" "You can fix the problem, and then run\n" "\n" @@ -22436,7 +22928,7 @@ msgstr "" "git rebase --continue" #. TRANSLATORS: after these lines is a command to be issued by the user -#: git-rebase--preserve-merges.sh:653 +#: git-rebase--preserve-merges.sh:708 #, sh-format msgid "" "Execution succeeded: $rest\n" @@ -22451,25 +22943,25 @@ msgstr "" "\n" "\tgit rebase --continue" -#: git-rebase--preserve-merges.sh:664 +#: git-rebase--preserve-merges.sh:719 #, sh-format msgid "Unknown command: $command $sha1 $rest" msgstr "Commande inconnue : $command $sha1 $rest" -#: git-rebase--preserve-merges.sh:665 +#: git-rebase--preserve-merges.sh:720 msgid "Please fix this using 'git rebase --edit-todo'." msgstr "Veuillez corriger ceci en utilisant 'git rebase --edit-todo'." -#: git-rebase--preserve-merges.sh:700 +#: git-rebase--preserve-merges.sh:755 #, sh-format msgid "Successfully rebased and updated $head_name." msgstr "Rebasage et mise à jour de $head_name avec succès." -#: git-rebase--preserve-merges.sh:757 +#: git-rebase--preserve-merges.sh:812 msgid "Could not remove CHERRY_PICK_HEAD" msgstr "Impossible de supprimer CHERRY_PICK_HEAD" -#: git-rebase--preserve-merges.sh:762 +#: git-rebase--preserve-merges.sh:817 #, sh-format msgid "" "You have staged changes in your working tree.\n" @@ -22500,12 +22992,12 @@ msgstr "" "\n" " git rebase --continue\n" -#: git-rebase--preserve-merges.sh:779 +#: git-rebase--preserve-merges.sh:834 msgid "Error trying to find the author identity to amend commit" msgstr "" "Erreur lors de la recherche de l'identité de l'auteur pour corriger le commit" -#: git-rebase--preserve-merges.sh:784 +#: git-rebase--preserve-merges.sh:839 msgid "" "You have uncommitted changes in your working tree. Please commit them\n" "first and then run 'git rebase --continue' again." @@ -22513,40 +23005,40 @@ msgstr "" "Vous avez des modifications non validées dans votre copie de travail.\n" "Veuillez les valider d'abord, puis relancer 'git rebase --continue'." -#: git-rebase--preserve-merges.sh:789 git-rebase--preserve-merges.sh:793 +#: git-rebase--preserve-merges.sh:844 git-rebase--preserve-merges.sh:848 msgid "Could not commit staged changes." msgstr "impossible de valider les modifications indexées." -#: git-rebase--preserve-merges.sh:824 git-rebase--preserve-merges.sh:910 +#: git-rebase--preserve-merges.sh:879 git-rebase--preserve-merges.sh:965 msgid "Could not execute editor" msgstr "Impossible de lancer l'éditeur" -#: git-rebase--preserve-merges.sh:845 +#: git-rebase--preserve-merges.sh:900 #, sh-format msgid "Could not checkout $switch_to" msgstr "Impossible d'extraire $switch_to" -#: git-rebase--preserve-merges.sh:852 +#: git-rebase--preserve-merges.sh:907 msgid "No HEAD?" msgstr "Pas de HEAD ?" -#: git-rebase--preserve-merges.sh:853 +#: git-rebase--preserve-merges.sh:908 #, sh-format msgid "Could not create temporary $state_dir" msgstr "Impossible de créer un répertoire temporaire $state_dir" -#: git-rebase--preserve-merges.sh:856 +#: git-rebase--preserve-merges.sh:911 msgid "Could not mark as interactive" msgstr "Impossible de marquer comme interactif" -#: git-rebase--preserve-merges.sh:888 +#: git-rebase--preserve-merges.sh:943 #, sh-format msgid "Rebase $shortrevisions onto $shortonto ($todocount command)" msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)" msgstr[0] "Rebasage de $shortrevisions sur $shortonto ($todocount commande)" msgstr[1] "Rebasage de $shortrevisions sur $shortonto ($todocount commandes)" -#: git-rebase--preserve-merges.sh:942 git-rebase--preserve-merges.sh:947 +#: git-rebase--preserve-merges.sh:997 git-rebase--preserve-merges.sh:1002 msgid "Could not init rewritten commits" msgstr "Impossible d'initialiser les commits réécrits" @@ -22618,81 +23110,81 @@ msgid "Unable to determine absolute path of git directory" msgstr "Impossible de déterminer le chemin absolu du répertoire git" #. TRANSLATORS: you can adjust this to align "git add -i" status menu -#: git-add--interactive.perl:196 +#: git-add--interactive.perl:210 #, perl-format msgid "%12s %12s %s" msgstr "%12s %s12s %s" -#: git-add--interactive.perl:197 +#: git-add--interactive.perl:211 msgid "staged" msgstr "indexé" -#: git-add--interactive.perl:197 +#: git-add--interactive.perl:211 msgid "unstaged" msgstr "non-indexé" -#: git-add--interactive.perl:253 git-add--interactive.perl:278 +#: git-add--interactive.perl:267 git-add--interactive.perl:292 msgid "binary" msgstr "binaire" -#: git-add--interactive.perl:262 git-add--interactive.perl:316 +#: git-add--interactive.perl:276 git-add--interactive.perl:330 msgid "nothing" msgstr "rien" -#: git-add--interactive.perl:298 git-add--interactive.perl:313 +#: git-add--interactive.perl:312 git-add--interactive.perl:327 msgid "unchanged" msgstr "inchangé" -#: git-add--interactive.perl:609 +#: git-add--interactive.perl:623 #, perl-format msgid "added %d path\n" msgid_plural "added %d paths\n" msgstr[0] "%d chemin ajouté\n" msgstr[1] "%d chemins ajoutés\n" -#: git-add--interactive.perl:612 +#: git-add--interactive.perl:626 #, perl-format msgid "updated %d path\n" msgid_plural "updated %d paths\n" msgstr[0] "%d chemin mis à jour\n" msgstr[1] "%d chemins mis à jour\n" -#: git-add--interactive.perl:615 +#: git-add--interactive.perl:629 #, perl-format msgid "reverted %d path\n" msgid_plural "reverted %d paths\n" msgstr[0] "%d chemin inversé\n" msgstr[1] "%d chemins inversés\n" -#: git-add--interactive.perl:618 +#: git-add--interactive.perl:632 #, perl-format msgid "touched %d path\n" msgid_plural "touched %d paths\n" msgstr[0] "%d chemin touché\n" msgstr[1] "%d chemins touchés\n" -#: git-add--interactive.perl:627 +#: git-add--interactive.perl:641 msgid "Update" msgstr "Mise à jour" -#: git-add--interactive.perl:639 +#: git-add--interactive.perl:653 msgid "Revert" msgstr "Inverser" -#: git-add--interactive.perl:662 +#: git-add--interactive.perl:676 #, perl-format msgid "note: %s is untracked now.\n" msgstr "note : %s n'est plus suivi à présent.\n" -#: git-add--interactive.perl:673 +#: git-add--interactive.perl:687 msgid "Add untracked" msgstr "Ajouter un fichier non-suivi" -#: git-add--interactive.perl:679 +#: git-add--interactive.perl:693 msgid "No untracked files.\n" msgstr "Aucun Fichier non suivi.\n" -#: git-add--interactive.perl:1033 +#: git-add--interactive.perl:1051 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for staging." @@ -22700,7 +23192,7 @@ msgstr "" "Si le patch s'applique proprement, la section éditée sera\n" "immédiatement marquée comme indexée." -#: git-add--interactive.perl:1036 +#: git-add--interactive.perl:1054 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for stashing." @@ -22708,7 +23200,7 @@ msgstr "" "Si le patch s'applique proprement, la section éditée sera\n" "immédiatement marquée comme remisée." -#: git-add--interactive.perl:1039 +#: git-add--interactive.perl:1057 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for unstaging." @@ -22716,7 +23208,8 @@ msgstr "" "Si le patch s'applique proprement, la section éditée sera\n" "immédiatement marquée comme desindexée." -#: git-add--interactive.perl:1042 git-add--interactive.perl:1051 +#: git-add--interactive.perl:1060 git-add--interactive.perl:1069 +#: git-add--interactive.perl:1075 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for applying." @@ -22724,7 +23217,8 @@ msgstr "" "Si le patch s'applique proprement, la section éditée sera\n" "immédiatement marquée comme appliquée." -#: git-add--interactive.perl:1045 git-add--interactive.perl:1048 +#: git-add--interactive.perl:1063 git-add--interactive.perl:1066 +#: git-add--interactive.perl:1072 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for discarding." @@ -22732,17 +23226,17 @@ msgstr "" "Si le patch s'applique proprement, la section éditée sera\n" "immédiatement marquée comme éliminée." -#: git-add--interactive.perl:1085 +#: git-add--interactive.perl:1109 #, perl-format msgid "failed to open hunk edit file for writing: %s" msgstr "impossible d'ouvrir le fichier d'édition de section en écriture : %s" -#: git-add--interactive.perl:1086 +#: git-add--interactive.perl:1110 msgid "Manual hunk edit mode -- see bottom for a quick guide.\n" msgstr "" "Mode d'édition manuelle de section -- voir ci-dessous pour un guide rapide.\n" -#: git-add--interactive.perl:1092 +#: git-add--interactive.perl:1116 #, perl-format msgid "" "---\n" @@ -22756,7 +23250,7 @@ msgstr "" "Les lignes commençant par %s seront éliminées.\n" #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages. -#: git-add--interactive.perl:1100 +#: git-add--interactive.perl:1124 msgid "" "If it does not apply cleanly, you will be given an opportunity to\n" "edit again. If all lines of the hunk are removed, then the edit is\n" @@ -22766,7 +23260,7 @@ msgstr "" "l'éditer à nouveau. Si toutes les lignes de la section sont supprimées,\n" "alors l'édition sera abandonnée et la section conservée.\n" -#: git-add--interactive.perl:1114 +#: git-add--interactive.perl:1138 #, perl-format msgid "failed to open hunk edit file for reading: %s" msgstr "échec de l'ouverture du fichier d'édition de section en lecture : %s" @@ -22777,14 +23271,14 @@ msgstr "échec de l'ouverture du fichier d'édition de section en lecture : %s" #. Consider translating (saying "no" discards!) as #. (saying "n" for "no" discards!) if the translation #. of the word "no" does not start with n. -#: git-add--interactive.perl:1213 +#: git-add--interactive.perl:1237 msgid "" "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " msgstr "" "Votre section éditée ne s'applique pas. L'éditer à nouveau (\"no\" " "l'élimine !) [y|n] ? " -#: git-add--interactive.perl:1222 +#: git-add--interactive.perl:1246 msgid "" "y - stage this hunk\n" "n - do not stage this hunk\n" @@ -22798,7 +23292,7 @@ msgstr "" "a - indexer cette section et toutes les suivantes de ce fichier\n" "d - ne pas indexer cette section ni les suivantes de ce fichier" -#: git-add--interactive.perl:1228 +#: git-add--interactive.perl:1252 msgid "" "y - stash this hunk\n" "n - do not stash this hunk\n" @@ -22812,7 +23306,7 @@ msgstr "" "a - remiser cette section et toutes les suivantes de ce fichier\n" "d - ne pas remiser cette section ni les suivantes de ce fichier" -#: git-add--interactive.perl:1234 +#: git-add--interactive.perl:1258 msgid "" "y - unstage this hunk\n" "n - do not unstage this hunk\n" @@ -22826,7 +23320,7 @@ msgstr "" "a - désindexer cette section et toutes les suivantes de ce fichier\n" "d - ne pas désindexer cette section ni les suivantes de ce fichier" -#: git-add--interactive.perl:1240 +#: git-add--interactive.perl:1264 msgid "" "y - apply this hunk to index\n" "n - do not apply this hunk to index\n" @@ -22840,7 +23334,7 @@ msgstr "" "a - appliquer cette section et toutes les suivantes de ce fichier\n" "d - ne pas appliquer cette section ni les suivantes de ce fichier" -#: git-add--interactive.perl:1246 +#: git-add--interactive.perl:1270 git-add--interactive.perl:1288 msgid "" "y - discard this hunk from worktree\n" "n - do not discard this hunk from worktree\n" @@ -22854,7 +23348,7 @@ msgstr "" "a - supprimer cette section et toutes les suivantes de ce fichier\n" "d - ne pas supprimer cette section ni les suivantes de ce fichier" -#: git-add--interactive.perl:1252 +#: git-add--interactive.perl:1276 msgid "" "y - discard this hunk from index and worktree\n" "n - do not discard this hunk from index and worktree\n" @@ -22868,7 +23362,7 @@ msgstr "" "a - éliminer cette section et toutes les suivantes de ce fichier\n" "d - ne pas éliminer cette section ni les suivantes de ce fichier" -#: git-add--interactive.perl:1258 +#: git-add--interactive.perl:1282 msgid "" "y - apply this hunk to index and worktree\n" "n - do not apply this hunk to index and worktree\n" @@ -22882,7 +23376,21 @@ msgstr "" "a - appliquer cette section et toutes les suivantes de ce fichier\n" "d - ne pas appliquer cette section ni les suivantes de ce fichier" -#: git-add--interactive.perl:1273 +#: git-add--interactive.perl:1294 +msgid "" +"y - apply this hunk to worktree\n" +"n - do not apply this hunk to worktree\n" +"q - quit; do not apply this hunk or any of the remaining ones\n" +"a - apply this hunk and all later hunks in the file\n" +"d - do not apply this hunk or any of the later hunks in the file" +msgstr "" +"y - appliquer cette section à l'arbre de travail\n" +"n - ne pas appliquer cette section\n" +"q - quitter ; ne pas appliquer cette section ni les autres restantes\n" +"a - appliquer cette section et toutes les suivantes de ce fichier\n" +"d - ne pas appliquer cette section ni les suivantes de ce fichier" + +#: git-add--interactive.perl:1309 msgid "" "g - select a hunk to go to\n" "/ - search for a hunk matching the given regex\n" @@ -22904,218 +23412,234 @@ msgstr "" "e - éditer manuellement la section actuelle\n" "? - afficher l'aide\n" -#: git-add--interactive.perl:1304 +#: git-add--interactive.perl:1340 msgid "The selected hunks do not apply to the index!\n" msgstr "Les sections sélectionnées ne s'applique pas à l'index !\n" -#: git-add--interactive.perl:1305 +#: git-add--interactive.perl:1341 msgid "Apply them to the worktree anyway? " msgstr "Les appliquer quand même à l'arbre de travail ? " -#: git-add--interactive.perl:1308 +#: git-add--interactive.perl:1344 msgid "Nothing was applied.\n" msgstr "Rien n'a été appliqué.\n" -#: git-add--interactive.perl:1319 +#: git-add--interactive.perl:1355 #, perl-format msgid "ignoring unmerged: %s\n" msgstr "fichier non-fusionné ignoré : %s\n" -#: git-add--interactive.perl:1328 +#: git-add--interactive.perl:1364 msgid "Only binary files changed.\n" msgstr "Seuls des fichiers binaires ont changé.\n" -#: git-add--interactive.perl:1330 +#: git-add--interactive.perl:1366 msgid "No changes.\n" msgstr "Aucune modification.\n" -#: git-add--interactive.perl:1338 +#: git-add--interactive.perl:1374 msgid "Patch update" msgstr "Mise à jour par patch" -#: git-add--interactive.perl:1390 +#: git-add--interactive.perl:1426 #, perl-format msgid "Stage mode change [y,n,q,a,d%s,?]? " msgstr "Indexer le changement de mode [y,n,q,a,d%s,?] ? " -#: git-add--interactive.perl:1391 +#: git-add--interactive.perl:1427 #, perl-format msgid "Stage deletion [y,n,q,a,d%s,?]? " msgstr "Indexer la suppression [y,n,q,a,d%s,?] ? " -#: git-add--interactive.perl:1392 +#: git-add--interactive.perl:1428 #, perl-format msgid "Stage this hunk [y,n,q,a,d%s,?]? " msgstr "Indexer cette section [y,n,q,a,d%s,?] ? " -#: git-add--interactive.perl:1395 +#: git-add--interactive.perl:1431 #, perl-format msgid "Stash mode change [y,n,q,a,d%s,?]? " msgstr "Remiser le changement de mode [y,n,q,a,d%s,?] ? " -#: git-add--interactive.perl:1396 +#: git-add--interactive.perl:1432 #, perl-format msgid "Stash deletion [y,n,q,a,d%s,?]? " msgstr "Remiser la suppression [y,n,q,a,d%s,?] ? " -#: git-add--interactive.perl:1397 +#: git-add--interactive.perl:1433 #, perl-format msgid "Stash this hunk [y,n,q,a,d%s,?]? " msgstr "Remiser cette section [y,n,q,a,d%s,?] ? " -#: git-add--interactive.perl:1400 +#: git-add--interactive.perl:1436 #, perl-format msgid "Unstage mode change [y,n,q,a,d%s,?]? " msgstr "Désindexer le changement de mode [y,n,q,a,d%s,?] ? " -#: git-add--interactive.perl:1401 +#: git-add--interactive.perl:1437 #, perl-format msgid "Unstage deletion [y,n,q,a,d%s,?]? " msgstr "Désindexer la suppression [y,n,q,a,d%s,?] ? " -#: git-add--interactive.perl:1402 +#: git-add--interactive.perl:1438 #, perl-format msgid "Unstage this hunk [y,n,q,a,d%s,?]? " msgstr "Désindexer cette section [y,n,q,a,d%s,?] ? " -#: git-add--interactive.perl:1405 +#: git-add--interactive.perl:1441 #, perl-format msgid "Apply mode change to index [y,n,q,a,d%s,?]? " msgstr "Appliquer le changement de mode à l'index [y,n,q,a,d%s,?] ? " -#: git-add--interactive.perl:1406 +#: git-add--interactive.perl:1442 #, perl-format msgid "Apply deletion to index [y,n,q,a,d%s,?]? " msgstr "Appliquer la suppression à l'index [y,n,q,a,d%s,?] ? " -#: git-add--interactive.perl:1407 +#: git-add--interactive.perl:1443 #, perl-format msgid "Apply this hunk to index [y,n,q,a,d%s,?]? " msgstr "Appliquer cette section à l'index [y,n,q,a,d%s,?] ? " -#: git-add--interactive.perl:1410 +#: git-add--interactive.perl:1446 git-add--interactive.perl:1461 #, perl-format msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? " msgstr "Abandonner le changement de mode dans l'arbre [y,n,q,a,d%s,?] ? " -#: git-add--interactive.perl:1411 +#: git-add--interactive.perl:1447 git-add--interactive.perl:1462 #, perl-format msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? " msgstr "Abandonner la suppression dans l'arbre [y,n,q,a,d%s,?] ? " -#: git-add--interactive.perl:1412 +#: git-add--interactive.perl:1448 git-add--interactive.perl:1463 #, perl-format msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? " msgstr "Abandonner cette section dans l'arbre [y,n,q,a,d%s,?] ? " -#: git-add--interactive.perl:1415 +#: git-add--interactive.perl:1451 #, perl-format msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? " msgstr "" "Abandonner le changement de mode dans l'index et l'arbre [y,n,q,a,d%s,?] ? " -#: git-add--interactive.perl:1416 +#: git-add--interactive.perl:1452 #, perl-format msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? " msgstr "Abandonner la suppression de l'index et de l'arbre [y,n,q,a,d%s,?] ? " -#: git-add--interactive.perl:1417 +#: git-add--interactive.perl:1453 #, perl-format msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? " msgstr "" "Supprimer la section dans l'index et l'arbre de travail [y,n,q,a,d%s,?] ? " -#: git-add--interactive.perl:1420 +#: git-add--interactive.perl:1456 #, perl-format msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? " msgstr "" "Appliquer le changement de mode dans l'index et l'arbre de travail [y,n,q,a,d" "%s,?] ? " -#: git-add--interactive.perl:1421 +#: git-add--interactive.perl:1457 #, perl-format msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? " msgstr "" "Appliquer la suppression dans l'index et l'arbre de travail [y,n,q,a,d" "%s,?] ? " -#: git-add--interactive.perl:1422 +#: git-add--interactive.perl:1458 #, perl-format msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? " msgstr "" "Appliquer la section à l'index et l'arbre de travail [y,n,q,a,d%s,?] ? " -#: git-add--interactive.perl:1522 +#: git-add--interactive.perl:1466 +#, perl-format +msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? " +msgstr "" +"Appliquer le changement de mode dans l'arbre de travail [y,n,q,a,d%s,?] ? " + +#: git-add--interactive.perl:1467 +#, perl-format +msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? " +msgstr "Appliquer la suppression dans l'arbre de travail [y,n,q,a,d%s,?] ? " + +#: git-add--interactive.perl:1468 +#, perl-format +msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? " +msgstr "Appliquer la section à l'arbre de travail [y,n,q,a,d%s,?] ? " + +#: git-add--interactive.perl:1568 msgid "No other hunks to goto\n" msgstr "Aucune autre section à atteindre\n" -#: git-add--interactive.perl:1529 +#: git-add--interactive.perl:1575 msgid "go to which hunk (<ret> to see more)? " msgstr "aller à quelle section (<ret> pour voir plus) ? " -#: git-add--interactive.perl:1531 +#: git-add--interactive.perl:1577 msgid "go to which hunk? " msgstr "aller à quelle section ? " -#: git-add--interactive.perl:1540 +#: git-add--interactive.perl:1586 #, perl-format msgid "Invalid number: '%s'\n" msgstr "Nombre invalide : '%s'\n" -#: git-add--interactive.perl:1545 +#: git-add--interactive.perl:1591 #, perl-format msgid "Sorry, only %d hunk available.\n" msgid_plural "Sorry, only %d hunks available.\n" msgstr[0] "Désolé, %d seule section disponible.\n" msgstr[1] "Désolé, Seulement %d sections disponibles.\n" -#: git-add--interactive.perl:1571 +#: git-add--interactive.perl:1617 msgid "No other hunks to search\n" msgstr "aucune autre section à rechercher\n" -#: git-add--interactive.perl:1575 +#: git-add--interactive.perl:1621 msgid "search for regex? " msgstr "rechercher la regex ? " -#: git-add--interactive.perl:1588 +#: git-add--interactive.perl:1634 #, perl-format msgid "Malformed search regexp %s: %s\n" msgstr "Regex de recherche malformée %s : %s\n" -#: git-add--interactive.perl:1598 +#: git-add--interactive.perl:1644 msgid "No hunk matches the given pattern\n" msgstr "Aucune section ne correspond au motif donné\n" -#: git-add--interactive.perl:1610 git-add--interactive.perl:1632 +#: git-add--interactive.perl:1656 git-add--interactive.perl:1678 msgid "No previous hunk\n" msgstr "Pas de section précédente\n" -#: git-add--interactive.perl:1619 git-add--interactive.perl:1638 +#: git-add--interactive.perl:1665 git-add--interactive.perl:1684 msgid "No next hunk\n" msgstr "Pas de section suivante\n" -#: git-add--interactive.perl:1644 +#: git-add--interactive.perl:1690 msgid "Sorry, cannot split this hunk\n" msgstr "Désolé, impossible de découper cette section\n" -#: git-add--interactive.perl:1650 +#: git-add--interactive.perl:1696 #, perl-format msgid "Split into %d hunk.\n" msgid_plural "Split into %d hunks.\n" msgstr[0] "Découpée en %d section.\n" msgstr[1] "Découpée en %d sections.\n" -#: git-add--interactive.perl:1660 +#: git-add--interactive.perl:1706 msgid "Sorry, cannot edit this hunk\n" msgstr "Désolé, impossible d'éditer cette section\n" -#: git-add--interactive.perl:1706 +#: git-add--interactive.perl:1752 msgid "Review diff" msgstr "Réviser la différence" #. TRANSLATORS: please do not translate the command names #. 'status', 'update', 'revert', etc. -#: git-add--interactive.perl:1725 +#: git-add--interactive.perl:1771 msgid "" "status - show paths with changes\n" "update - add working tree state to the staged set of changes\n" @@ -23133,18 +23657,19 @@ msgstr "" "diff - visualiser les diff entre HEAD et l'index\n" "add untracked - ajouter les fichiers non-suivis aux modifications à indexer\n" -#: git-add--interactive.perl:1742 git-add--interactive.perl:1747 -#: git-add--interactive.perl:1750 git-add--interactive.perl:1757 -#: git-add--interactive.perl:1761 git-add--interactive.perl:1767 +#: git-add--interactive.perl:1788 git-add--interactive.perl:1793 +#: git-add--interactive.perl:1796 git-add--interactive.perl:1803 +#: git-add--interactive.perl:1806 git-add--interactive.perl:1813 +#: git-add--interactive.perl:1817 git-add--interactive.perl:1823 msgid "missing --" msgstr "-- manquant" -#: git-add--interactive.perl:1763 +#: git-add--interactive.perl:1819 #, perl-format msgid "unknown --patch mode: %s" msgstr "mode de --patch inconnu : %s" -#: git-add--interactive.perl:1769 git-add--interactive.perl:1775 +#: git-add--interactive.perl:1825 git-add--interactive.perl:1831 #, perl-format msgid "invalid argument %s, expecting --" msgstr "argument invalide %s, -- attendu" @@ -23158,31 +23683,31 @@ msgstr "" msgid "local time offset greater than or equal to 24 hours\n" msgstr "le décalage de temps local est plus grand ou égal à 24 heures\n" -#: git-send-email.perl:219 git-send-email.perl:225 +#: git-send-email.perl:223 git-send-email.perl:229 msgid "the editor exited uncleanly, aborting everything" msgstr "l'éditeur est sorti en erreur, abandon total" -#: git-send-email.perl:302 +#: git-send-email.perl:310 #, perl-format msgid "" "'%s' contains an intermediate version of the email you were composing.\n" msgstr "" "'%s' contient une version intermédiaire du courriel que vous composiez.\n" -#: git-send-email.perl:307 +#: git-send-email.perl:315 #, perl-format msgid "'%s.final' contains the composed email.\n" msgstr "'%s.final' contient le courriel composé.\n" -#: git-send-email.perl:326 +#: git-send-email.perl:408 msgid "--dump-aliases incompatible with other options\n" msgstr "--dump-aliases est incompatible avec d'autres options\n" -#: git-send-email.perl:395 git-send-email.perl:656 +#: git-send-email.perl:481 git-send-email.perl:683 msgid "Cannot run git format-patch from outside a repository\n" msgstr "Lancement de git format-patch impossible à l'extérieur d'un dépôt\n" -#: git-send-email.perl:398 +#: git-send-email.perl:484 msgid "" "`batch-size` and `relogin` must be specified together (via command-line or " "configuration option)\n" @@ -23190,39 +23715,39 @@ msgstr "" "`batch-size` et `relogin` doivent être spécifiés ensembles (via la ligne de " "commande ou des options de configuration)\n" -#: git-send-email.perl:470 +#: git-send-email.perl:497 #, perl-format msgid "Unknown --suppress-cc field: '%s'\n" msgstr "Champ de --suppress-cc inconnu : '%s'\n" -#: git-send-email.perl:501 +#: git-send-email.perl:528 #, perl-format msgid "Unknown --confirm setting: '%s'\n" msgstr "Paramètre de --confirm inconnu : '%s'\n" -#: git-send-email.perl:529 +#: git-send-email.perl:556 #, perl-format msgid "warning: sendmail alias with quotes is not supported: %s\n" msgstr "" "attention : les guillemets ne sont pas supportés dans alias sendmail : %s\n" -#: git-send-email.perl:531 +#: git-send-email.perl:558 #, perl-format msgid "warning: `:include:` not supported: %s\n" msgstr "attention : `:include:` n'est pas supporté : %s\n" -#: git-send-email.perl:533 +#: git-send-email.perl:560 #, perl-format msgid "warning: `/file` or `|pipe` redirection not supported: %s\n" msgstr "" "attention : les redirections `/file` ou `|pipe` ne sont pas supportées : %s\n" -#: git-send-email.perl:538 +#: git-send-email.perl:565 #, perl-format msgid "warning: sendmail line is not recognized: %s\n" msgstr "attention : ligne sendmail non reconnue : %s\n" -#: git-send-email.perl:622 +#: git-send-email.perl:649 #, perl-format msgid "" "File '%s' exists but it could also be the range of commits\n" @@ -23237,12 +23762,12 @@ msgstr "" " * en indiquant \"./%s\" si vous désignez un fichier, ou\n" " * en fournissant l'option --format-patch pour une plage.\n" -#: git-send-email.perl:643 +#: git-send-email.perl:670 #, perl-format msgid "Failed to opendir %s: %s" msgstr "Échec à l'ouverture du répertoire %s : %s" -#: git-send-email.perl:667 +#: git-send-email.perl:694 #, perl-format msgid "" "fatal: %s: %s\n" @@ -23251,7 +23776,7 @@ msgstr "" "fatal : %s : %s\n" "attention : aucun patch envoyé\n" -#: git-send-email.perl:678 +#: git-send-email.perl:705 msgid "" "\n" "No patch files specified!\n" @@ -23261,17 +23786,17 @@ msgstr "" "Aucun fichier patch spécifié !\n" "\n" -#: git-send-email.perl:691 +#: git-send-email.perl:718 #, perl-format msgid "No subject line in %s?" msgstr "Ligne de sujet non trouvée dans %s ?" -#: git-send-email.perl:701 +#: git-send-email.perl:728 #, perl-format msgid "Failed to open for writing %s: %s" msgstr "Impossible d'ouvrir %s en écriture : %s" -#: git-send-email.perl:712 +#: git-send-email.perl:739 msgid "" "Lines beginning in \"GIT:\" will be removed.\n" "Consider including an overall diffstat or table of contents\n" @@ -23285,27 +23810,27 @@ msgstr "" "\n" "Effacez le corps si vous ne souhaitez pas envoyer un résumé.\n" -#: git-send-email.perl:736 +#: git-send-email.perl:763 #, perl-format msgid "Failed to open %s: %s" msgstr "Échec à l'ouverture de %s : %s" -#: git-send-email.perl:753 +#: git-send-email.perl:780 #, perl-format msgid "Failed to open %s.final: %s" msgstr "Échec à l'ouverture de %s.final : %s" -#: git-send-email.perl:796 +#: git-send-email.perl:823 msgid "Summary email is empty, skipping it\n" msgstr "Le courriel de résumé étant vide, il a été ignoré\n" #. TRANSLATORS: please keep [y/N] as is. -#: git-send-email.perl:831 +#: git-send-email.perl:858 #, perl-format msgid "Are you sure you want to use <%s> [y/N]? " msgstr "Êtes-vous sur de vouloir utiliser <%s> [y/N] ? " -#: git-send-email.perl:886 +#: git-send-email.perl:913 msgid "" "The following files are 8bit, but do not declare a Content-Transfer-" "Encoding.\n" @@ -23313,11 +23838,11 @@ msgstr "" "Les fichiers suivants sont 8bit mais ne déclarent pas de champs Content-" "Transfer-Encoding.\n" -#: git-send-email.perl:891 +#: git-send-email.perl:918 msgid "Which 8bit encoding should I declare [UTF-8]? " msgstr "Quel encodage 8bit doit être déclaré [UTF8] ? " -#: git-send-email.perl:899 +#: git-send-email.perl:926 #, perl-format msgid "" "Refusing to send because the patch\n" @@ -23330,22 +23855,22 @@ msgstr "" "a un sujet modèle '*** SUBJECT HERE ***'. Passez --force is vous souhaitez " "vraiment envoyer.\n" -#: git-send-email.perl:918 +#: git-send-email.perl:945 msgid "To whom should the emails be sent (if anyone)?" msgstr "À qui les courriels doivent-ils être envoyés (s'il y en a) ?" -#: git-send-email.perl:936 +#: git-send-email.perl:963 #, perl-format msgid "fatal: alias '%s' expands to itself\n" msgstr "fatal : l'alias '%s' se développe en lui-même\n" -#: git-send-email.perl:948 +#: git-send-email.perl:975 msgid "Message-ID to be used as In-Reply-To for the first email (if any)? " msgstr "" "Message-ID à utiliser comme In-Reply-To pour le premier courriel (s'il y en " "a) ? " -#: git-send-email.perl:1006 git-send-email.perl:1014 +#: git-send-email.perl:1033 git-send-email.perl:1041 #, perl-format msgid "error: unable to extract a valid address from: %s\n" msgstr "erreur : impossible d'extraire une adresse valide depuis : %s\n" @@ -23353,16 +23878,16 @@ msgstr "erreur : impossible d'extraire une adresse valide depuis : %s\n" #. TRANSLATORS: Make sure to include [q] [d] [e] in your #. translation. The program will only accept English input #. at this point. -#: git-send-email.perl:1018 +#: git-send-email.perl:1045 msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): " msgstr "Que faire de cette adresse ? ([q]uitter|[d]élaisser|[e]diter): " -#: git-send-email.perl:1335 +#: git-send-email.perl:1362 #, perl-format msgid "CA path \"%s\" does not exist" msgstr "le chemin vers la CA \"%s\" n'existe pas" -#: git-send-email.perl:1418 +#: git-send-email.perl:1445 msgid "" " The Cc list above has been expanded by additional\n" " addresses found in the patch commit message. By default\n" @@ -23389,130 +23914,130 @@ msgstr "" #. TRANSLATORS: Make sure to include [y] [n] [e] [q] [a] in your #. translation. The program will only accept English input #. at this point. -#: git-send-email.perl:1433 +#: git-send-email.perl:1460 msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): " msgstr "Envoyer ce courriel ? ([y]es|[n]o|[e]dit|[q]uit|[a]ll) : " -#: git-send-email.perl:1436 +#: git-send-email.perl:1463 msgid "Send this email reply required" msgstr "Une réponse est nécessaire" -#: git-send-email.perl:1464 +#: git-send-email.perl:1491 msgid "The required SMTP server is not properly defined." msgstr "Le serveur SMTP nécessaire n'est pas défini correctement." -#: git-send-email.perl:1511 +#: git-send-email.perl:1538 #, perl-format msgid "Server does not support STARTTLS! %s" msgstr "Le serveur ne supporte pas STARTTLS ! %s" -#: git-send-email.perl:1516 git-send-email.perl:1520 +#: git-send-email.perl:1543 git-send-email.perl:1547 #, perl-format msgid "STARTTLS failed! %s" msgstr "échec de STARTTLS ! %s" -#: git-send-email.perl:1529 +#: git-send-email.perl:1556 msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug." msgstr "" "Impossible d'initialiser SMTP. Vérifiez la configuration et utilisez --smtp-" "debug." -#: git-send-email.perl:1547 +#: git-send-email.perl:1574 #, perl-format msgid "Failed to send %s\n" msgstr "échec de l'envoi de %s\n" -#: git-send-email.perl:1550 +#: git-send-email.perl:1577 #, perl-format msgid "Dry-Sent %s\n" msgstr "Envoi simulé de %s\n" -#: git-send-email.perl:1550 +#: git-send-email.perl:1577 #, perl-format msgid "Sent %s\n" msgstr "%s envoyé\n" -#: git-send-email.perl:1552 +#: git-send-email.perl:1579 msgid "Dry-OK. Log says:\n" msgstr "Simulation OK. Le journal indique :\n" -#: git-send-email.perl:1552 +#: git-send-email.perl:1579 msgid "OK. Log says:\n" msgstr "OK. Le journal indique :\n" -#: git-send-email.perl:1564 +#: git-send-email.perl:1591 msgid "Result: " msgstr "Résultat : " -#: git-send-email.perl:1567 +#: git-send-email.perl:1594 msgid "Result: OK\n" msgstr "Résultat : OK\n" -#: git-send-email.perl:1585 +#: git-send-email.perl:1612 #, perl-format msgid "can't open file %s" msgstr "impossible d'ouvrir le fichier %s" -#: git-send-email.perl:1632 git-send-email.perl:1652 +#: git-send-email.perl:1659 git-send-email.perl:1679 #, perl-format msgid "(mbox) Adding cc: %s from line '%s'\n" msgstr "(mbox) Ajout de cc: %s depuis la ligne '%s'\n" -#: git-send-email.perl:1638 +#: git-send-email.perl:1665 #, perl-format msgid "(mbox) Adding to: %s from line '%s'\n" msgstr "(mbox) Ajout de to: %s depuis la ligne '%s'\n" -#: git-send-email.perl:1691 +#: git-send-email.perl:1718 #, perl-format msgid "(non-mbox) Adding cc: %s from line '%s'\n" msgstr "(non-mbox) Ajout de cc: %s depuis la ligne '%s'\n" -#: git-send-email.perl:1726 +#: git-send-email.perl:1753 #, perl-format msgid "(body) Adding cc: %s from line '%s'\n" msgstr "(corps) Ajout de cc: %s depuis la ligne '%s'\n" -#: git-send-email.perl:1837 +#: git-send-email.perl:1864 #, perl-format msgid "(%s) Could not execute '%s'" msgstr "(%s) Impossible d'exécuter '%s'" -#: git-send-email.perl:1844 +#: git-send-email.perl:1871 #, perl-format msgid "(%s) Adding %s: %s from: '%s'\n" msgstr "(%s) Ajout de %s : %s depuis : '%s'\n" -#: git-send-email.perl:1848 +#: git-send-email.perl:1875 #, perl-format msgid "(%s) failed to close pipe to '%s'" msgstr "(%s) échec de la fermeture du pipe vers '%s'" -#: git-send-email.perl:1878 +#: git-send-email.perl:1905 msgid "cannot send message as 7bit" msgstr "impossible d'envoyer un message comme 7bit" -#: git-send-email.perl:1886 +#: git-send-email.perl:1913 msgid "invalid transfer encoding" msgstr "codage de transfert invalide" -#: git-send-email.perl:1927 git-send-email.perl:1979 git-send-email.perl:1989 +#: git-send-email.perl:1954 git-send-email.perl:2006 git-send-email.perl:2016 #, perl-format msgid "unable to open %s: %s\n" msgstr "impossible d'ouvrir %s :%s\n" -#: git-send-email.perl:1930 +#: git-send-email.perl:1957 #, perl-format msgid "%s: patch contains a line longer than 998 characters" msgstr "%s : le patch contient une ligne plus longue que 998 caractères" -#: git-send-email.perl:1947 +#: git-send-email.perl:1974 #, perl-format msgid "Skipping %s with backup suffix '%s'.\n" msgstr "%s sauté avec un suffix de sauvegarde '%s'.\n" #. TRANSLATORS: please keep "[y|N]" as is. -#: git-send-email.perl:1951 +#: git-send-email.perl:1978 #, perl-format msgid "Do you really want to send %s? [y|N]: " msgstr "Souhaitez-vous réellement envoyer %s ?[y|N] : " |