summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--po/es.po7030
1 files changed, 3696 insertions, 3334 deletions
diff --git a/po/es.po b/po/es.po
index 4a94ee9..97bd3e2 100644
--- a/po/es.po
+++ b/po/es.po
@@ -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: 2020-03-11 15:26+0800\n"
-"PO-Revision-Date: 2020-03-11 23:18-0500\n"
+"POT-Creation-Date: 2020-05-15 09:11+0800\n"
+"PO-Revision-Date: 2020-05-17 18:49-0500\n"
"Last-Translator: christopher.diaz.riv@gmail.com\n"
"Language-Team: CodeLabora <codelabora@gmail.com>\n"
"Language: es\n"
@@ -23,9 +23,9 @@ msgstr ""
msgid "Huh (%s)?"
msgstr "¿Ahh (%s)?"
-#: add-interactive.c:521 add-interactive.c:822 sequencer.c:3124
-#: sequencer.c:3562 builtin/rebase.c:875 builtin/rebase.c:1687
-#: builtin/rebase.c:2086 builtin/rebase.c:2130
+#: add-interactive.c:521 add-interactive.c:822 reset.c:65 sequencer.c:3142
+#: sequencer.c:3581 sequencer.c:3723 builtin/rebase.c:1518
+#: builtin/rebase.c:1919
msgid "could not read index"
msgstr "no se pudo leer índice"
@@ -53,8 +53,7 @@ msgstr "Actualizar"
msgid "could not stage '%s'"
msgstr "no se pudo poner en stage '%s'"
-#: add-interactive.c:695 add-interactive.c:884 sequencer.c:3317
-#: builtin/rebase.c:899
+#: add-interactive.c:695 add-interactive.c:884 reset.c:89 sequencer.c:3336
msgid "could not write index"
msgstr "no se pudo escribir índice"
@@ -70,8 +69,8 @@ msgstr[1] "actualizadas %d rutas\n"
msgid "note: %s is untracked now.\n"
msgstr "nota: %s no es rastreado ahora.\n"
-#: add-interactive.c:721 apply.c:4110 builtin/checkout.c:281
-#: builtin/reset.c:144
+#: add-interactive.c:721 apply.c:4110 builtin/checkout.c:294
+#: builtin/reset.c:145
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr "make_cache_entry falló para la ruta '%s'"
@@ -195,11 +194,11 @@ msgstr "selecciona un objeto numerado"
msgid "(empty) select nothing"
msgstr "(vacío) selecciona nada"
-#: add-interactive.c:1083 builtin/clean.c:822 git-add--interactive.perl:1851
+#: add-interactive.c:1083 builtin/clean.c:816 git-add--interactive.perl:1851
msgid "*** Commands ***"
msgstr "*** Comandos ***"
-#: add-interactive.c:1084 builtin/clean.c:823 git-add--interactive.perl:1848
+#: add-interactive.c:1084 builtin/clean.c:817 git-add--interactive.perl:1848
msgid "What now"
msgstr "Ahora que"
@@ -211,12 +210,13 @@ msgstr "rastreado"
msgid "unstaged"
msgstr "no rastreado"
-#: add-interactive.c:1136 apply.c:4967 apply.c:4970 builtin/am.c:2251
-#: builtin/am.c:2254 builtin/clone.c:123 builtin/fetch.c:144
-#: builtin/merge.c:274 builtin/pull.c:189 builtin/submodule--helper.c:409
+#: add-interactive.c:1136 apply.c:4967 apply.c:4970 builtin/am.c:2250
+#: builtin/am.c:2253 builtin/clone.c:123 builtin/fetch.c:145
+#: builtin/merge.c:276 builtin/pull.c:190 builtin/submodule--helper.c:409
#: builtin/submodule--helper.c:1394 builtin/submodule--helper.c:1397
#: builtin/submodule--helper.c:1902 builtin/submodule--helper.c:1905
-#: builtin/submodule--helper.c:2148 git-add--interactive.perl:213
+#: builtin/submodule--helper.c:2148 bugreport.c:129
+#: git-add--interactive.perl:213
msgid "path"
msgstr "ruta"
@@ -224,27 +224,27 @@ msgstr "ruta"
msgid "could not refresh index"
msgstr "no se pudo refrescar el index"
-#: add-interactive.c:1157 builtin/clean.c:787 git-add--interactive.perl:1765
+#: add-interactive.c:1157 builtin/clean.c:781 git-add--interactive.perl:1765
#, c-format
msgid "Bye.\n"
msgstr "Adiós.\n"
-#: add-patch.c:33 git-add--interactive.perl:1428
+#: add-patch.c:34 git-add--interactive.perl:1428
#, c-format, perl-format
msgid "Stage mode change [y,n,q,a,d%s,?]? "
msgstr "¿Cambio de modo de stage [y,n,q,a,d%s,?]? "
-#: add-patch.c:34 git-add--interactive.perl:1429
+#: add-patch.c:35 git-add--interactive.perl:1429
#, c-format, perl-format
msgid "Stage deletion [y,n,q,a,d%s,?]? "
msgstr "¿Aplicar stage al borrado [y,n,q,a,d%s,?]? "
-#: add-patch.c:35 git-add--interactive.perl:1430
+#: add-patch.c:36 git-add--interactive.perl:1430
#, c-format, perl-format
msgid "Stage this hunk [y,n,q,a,d%s,?]? "
msgstr "¿Aplicar stage a este hunk [y,n,q,a,d%s,?]? "
-#: add-patch.c:37
+#: add-patch.c:38
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be marked for "
"staging."
@@ -252,7 +252,7 @@ msgstr ""
"Si el parche aplica limpiamente, el hunk editado sera marcado inmediatamente "
"para el área de stage."
-#: add-patch.c:40
+#: add-patch.c:41
msgid ""
"y - stage this hunk\n"
"n - do not stage this hunk\n"
@@ -267,22 +267,22 @@ msgstr ""
"d - no aplicar stage a este hunk o a ninguno de los posteriores en este "
"archivo\n"
-#: add-patch.c:54 git-add--interactive.perl:1433
+#: add-patch.c:55 git-add--interactive.perl:1433
#, c-format, 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,?]? "
-#: add-patch.c:55 git-add--interactive.perl:1434
+#: add-patch.c:56 git-add--interactive.perl:1434
#, c-format, perl-format
msgid "Stash deletion [y,n,q,a,d%s,?]? "
msgstr "¿Aplicar stash al borrado [y,n,q,a,d%s,?]? "
-#: add-patch.c:56 git-add--interactive.perl:1435
+#: add-patch.c:57 git-add--interactive.perl:1435
#, c-format, perl-format
msgid "Stash this hunk [y,n,q,a,d%s,?]? "
msgstr "¿Aplicar stash a este hunk [y,n,q,a,d%s,?]? "
-#: add-patch.c:58
+#: add-patch.c:59
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be marked for "
"stashing."
@@ -290,7 +290,7 @@ msgstr ""
"Si el parche aplica limpiamente, el hunk editado sera marcado inmediatamente "
"para aplicar stash."
-#: add-patch.c:61
+#: add-patch.c:62
msgid ""
"y - stash this hunk\n"
"n - do not stash this hunk\n"
@@ -304,22 +304,22 @@ 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\n"
-#: add-patch.c:77 git-add--interactive.perl:1438
+#: add-patch.c:78 git-add--interactive.perl:1438
#, c-format, 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,?]? "
-#: add-patch.c:78 git-add--interactive.perl:1439
+#: add-patch.c:79 git-add--interactive.perl:1439
#, c-format, perl-format
msgid "Unstage deletion [y,n,q,a,d%s,?]? "
msgstr "¿Sacar borrado del stage [y,n,q,a,d%s,?]? "
-#: add-patch.c:79 git-add--interactive.perl:1440
+#: add-patch.c:80 git-add--interactive.perl:1440
#, c-format, perl-format
msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
msgstr "¿Sacar este hunk del stage [y,n,q,a,d%s,?]? "
-#: add-patch.c:81
+#: add-patch.c:82
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be marked for "
"unstaging."
@@ -327,7 +327,7 @@ msgstr ""
"Si el parche aplica limpiamente, el hunk editado sera marcado inmediatamente "
"para sacar del área de stage."
-#: add-patch.c:84
+#: add-patch.c:85
msgid ""
"y - unstage this hunk\n"
"n - do not unstage this hunk\n"
@@ -342,22 +342,22 @@ msgstr ""
"d - no sacar del area de stage este hunk o ninguno de los posteriores en el "
"archivo\n"
-#: add-patch.c:99 git-add--interactive.perl:1443
+#: add-patch.c:100 git-add--interactive.perl:1443
#, c-format, 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,?]? "
-#: add-patch.c:100 git-add--interactive.perl:1444
+#: add-patch.c:101 git-add--interactive.perl:1444
#, c-format, perl-format
msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
msgstr "¿Aplicar borrado al índice [y,n,q,a,d%s,?]? "
-#: add-patch.c:101 git-add--interactive.perl:1445
+#: add-patch.c:102 git-add--interactive.perl:1445
#, c-format, 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,?]? "
-#: add-patch.c:103 add-patch.c:168 add-patch.c:211
+#: add-patch.c:104 add-patch.c:169 add-patch.c:212
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be marked for "
"applying."
@@ -365,7 +365,7 @@ msgstr ""
"Si el parche aplica de forma limpia, el hunk editado sera marcado "
"inmediatamente para aplicar."
-#: add-patch.c:106
+#: add-patch.c:107
msgid ""
"y - apply this hunk to index\n"
"n - do not apply this hunk to index\n"
@@ -379,25 +379,25 @@ 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\n"
-#: add-patch.c:121 git-add--interactive.perl:1448
+#: add-patch.c:122 git-add--interactive.perl:1448
#: git-add--interactive.perl:1463
#, c-format, 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,?]? "
-#: add-patch.c:122 git-add--interactive.perl:1449
+#: add-patch.c:123 git-add--interactive.perl:1449
#: git-add--interactive.perl:1464
#, c-format, 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,?]? "
-#: add-patch.c:123 git-add--interactive.perl:1450
+#: add-patch.c:124 git-add--interactive.perl:1450
#: git-add--interactive.perl:1465
#, c-format, 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,?]? "
-#: add-patch.c:125 add-patch.c:147 add-patch.c:190
+#: add-patch.c:126 add-patch.c:148 add-patch.c:191
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be marked for "
"discarding."
@@ -405,7 +405,7 @@ msgstr ""
"Si el parche aplica de forma limpia, el hunk editado sera marcado "
"inmediatamente para descarte."
-#: add-patch.c:128 add-patch.c:193
+#: add-patch.c:129 add-patch.c:194
msgid ""
"y - discard this hunk from worktree\n"
"n - do not discard this hunk from worktree\n"
@@ -419,24 +419,24 @@ 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\n"
-#: add-patch.c:143 add-patch.c:186 git-add--interactive.perl:1453
+#: add-patch.c:144 add-patch.c:187 git-add--interactive.perl:1453
#, c-format, 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,?]? "
-#: add-patch.c:144 add-patch.c:187 git-add--interactive.perl:1454
+#: add-patch.c:145 add-patch.c:188 git-add--interactive.perl:1454
#, c-format, 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,?]? "
-#: add-patch.c:145 add-patch.c:188 git-add--interactive.perl:1455
+#: add-patch.c:146 add-patch.c:189 git-add--interactive.perl:1455
#, c-format, 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,?]? "
-#: add-patch.c:150
+#: add-patch.c:151
msgid ""
"y - discard this hunk from index and worktree\n"
"n - do not discard this hunk from index and worktree\n"
@@ -450,24 +450,24 @@ msgstr ""
"a - descartar este hunk y todos los posteriores en este archivo\n"
"d - no descartar este hunk o ninguno posterior en el archivo\n"
-#: add-patch.c:164 add-patch.c:207 git-add--interactive.perl:1458
+#: add-patch.c:165 add-patch.c:208 git-add--interactive.perl:1458
#, c-format, 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,?]? "
-#: add-patch.c:165 add-patch.c:208 git-add--interactive.perl:1459
+#: add-patch.c:166 add-patch.c:209 git-add--interactive.perl:1459
#, c-format, 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,?]? "
-#: add-patch.c:166 add-patch.c:209 git-add--interactive.perl:1460
+#: add-patch.c:167 add-patch.c:210 git-add--interactive.perl:1460
#, c-format, 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,?]? "
-#: add-patch.c:171
+#: add-patch.c:172
msgid ""
"y - apply this hunk to index and worktree\n"
"n - do not apply this hunk to index and worktree\n"
@@ -481,7 +481,7 @@ 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\n"
-#: add-patch.c:214
+#: add-patch.c:215
msgid ""
"y - apply this hunk to worktree\n"
"n - do not apply this hunk to worktree\n"
@@ -495,34 +495,34 @@ 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\n"
-#: add-patch.c:318
+#: add-patch.c:319
#, c-format
msgid "could not parse hunk header '%.*s'"
msgstr "no se puede analizar hunk header '%.*s'"
-#: add-patch.c:337 add-patch.c:341
+#: add-patch.c:338 add-patch.c:342
#, c-format
msgid "could not parse colored hunk header '%.*s'"
msgstr "no se puede analizar hunk header '%.*s'"
-#: add-patch.c:395
+#: add-patch.c:396
msgid "could not parse diff"
msgstr "no se puede analizar diff"
-#: add-patch.c:414
+#: add-patch.c:415
msgid "could not parse colored diff"
msgstr "no se pudo analizar diff a colores"
-#: add-patch.c:428
+#: add-patch.c:429
#, c-format
msgid "failed to run '%s'"
msgstr "falló al ejecutar '%s'"
-#: add-patch.c:587
+#: add-patch.c:588
msgid "mismatched output from interactive.diffFilter"
msgstr "output de interactive.diffFilter no concuerda"
-#: add-patch.c:588
+#: add-patch.c:589
msgid ""
"Your filter must maintain a one-to-one correspondence\n"
"between its input and output lines."
@@ -530,7 +530,7 @@ msgstr ""
"Tu filtro tiene que mantener correspondencia de uno a uno\n"
"entre las líneas de entrada y salida."
-#: add-patch.c:761
+#: add-patch.c:762
#, c-format
msgid ""
"expected context line #%d in\n"
@@ -539,7 +539,7 @@ msgstr ""
"se esperaba línea de contexto #%d en\n"
"%.*s"
-#: add-patch.c:776
+#: add-patch.c:777
#, c-format
msgid ""
"hunks do not overlap:\n"
@@ -552,11 +552,11 @@ msgstr ""
"\tno acaba con:\n"
"%.*s"
-#: add-patch.c:1052 git-add--interactive.perl:1112
+#: add-patch.c:1053 git-add--interactive.perl:1112
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"
-#: add-patch.c:1056
+#: add-patch.c:1057
#, c-format
msgid ""
"---\n"
@@ -570,7 +570,7 @@ msgstr ""
"Lineas comenzando con %c serán eliminadas.\n"
#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
-#: add-patch.c:1070 git-add--interactive.perl:1126
+#: add-patch.c:1071 git-add--interactive.perl:1126
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"
@@ -580,11 +580,11 @@ msgstr ""
"editar nuevamente. Si todas las líneas del hunk son eliminadas, entonces \n"
"la edición es abortada y el hunk queda sin cambios.\n"
-#: add-patch.c:1103
+#: add-patch.c:1104
msgid "could not parse hunk header"
msgstr "no se puede analizar hunk header"
-#: add-patch.c:1148
+#: add-patch.c:1149
msgid "'git apply --cached' failed"
msgstr "falló 'git apply --cached'"
@@ -707,38 +707,47 @@ msgstr "Perdón, no se puede editar este pedazo"
msgid "'git apply' failed"
msgstr "falló 'git apply'"
-#: advice.c:115
+#: advice.c:140
+#, c-format
+msgid ""
+"\n"
+"Disable this message with \"git config advice.%s false\""
+msgstr ""
+"\n"
+"Desactivar este mensaje con \"git config advice.%s false\""
+
+#: advice.c:156
#, c-format
msgid "%shint: %.*s%s\n"
msgstr "%sayuda: %.*s%s\n"
-#: advice.c:168
+#: advice.c:247
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:170
+#: advice.c:249
msgid "Committing is not possible because you have unmerged files."
msgstr "No es posible realizar un commit porque tienes archivos sin fusionar."
-#: advice.c:172
+#: advice.c:251
msgid "Merging is not possible because you have unmerged files."
msgstr "No es posible hacer merge porque tienes archivos sin fusionar."
-#: advice.c:174
+#: advice.c:253
msgid "Pulling is not possible because you have unmerged files."
msgstr "No es posible hacer pull porque tienes archivos sin fusionar."
-#: advice.c:176
+#: advice.c:255
msgid "Reverting is not possible because you have unmerged files."
msgstr "No es posible revertir porque tienes archivos sin fusionar."
-#: advice.c:178
+#: advice.c:257
#, 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:186
+#: advice.c:265
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."
@@ -746,23 +755,23 @@ 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:194
+#: advice.c:273
msgid "Exiting because of an unresolved conflict."
msgstr "Saliendo porque existe un conflicto sin resolver."
-#: advice.c:199 builtin/merge.c:1335
+#: advice.c:278 builtin/merge.c:1353
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr "No has concluido tu fusión (MERGE_HEAD existe)."
-#: advice.c:201
+#: advice.c:280
msgid "Please, commit your changes before merging."
msgstr "Por favor, realiza un commit antes de fusionar."
-#: advice.c:202
+#: advice.c:281
msgid "Exiting because of unfinished merge."
msgstr "Saliendo por una fusión inconclusa."
-#: advice.c:208
+#: advice.c:287
#, c-format
msgid ""
"Note: switching to '%s'.\n"
@@ -1062,7 +1071,7 @@ msgstr "el parche falló: %s:%ld"
msgid "cannot checkout %s"
msgstr "no se puede hacer checkout a %s"
-#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:61 setup.c:298
+#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:61 setup.c:308
#, c-format
msgid "failed to read %s"
msgstr "no se pudo leer %s"
@@ -1260,7 +1269,7 @@ msgstr[1] "Aplicando parche %%s con %d rechazos..."
msgid "truncating .rej filename to %.*s.rej"
msgstr "truncando el nombre de archivo .rej a %.*s.rej"
-#: apply.c:4561 builtin/fetch.c:901 builtin/fetch.c:1201
+#: apply.c:4561 builtin/fetch.c:902 builtin/fetch.c:1195
#, c-format
msgid "cannot open %s"
msgstr "no se puede abrir %s"
@@ -1328,7 +1337,7 @@ msgstr "no aplicar cambios que concuerden con la ruta suministrada"
msgid "apply changes matching the given path"
msgstr "aplicar cambios que concuerden con la ruta suministrada"
-#: apply.c:4973 builtin/am.c:2260
+#: apply.c:4973 builtin/am.c:2259
msgid "num"
msgstr "num"
@@ -1385,7 +1394,7 @@ 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:5005 builtin/checkout-index.c:173 builtin/ls-files.c:524
+#: apply.c:5005 builtin/checkout-index.c:173 builtin/ls-files.c:525
msgid "paths are separated with NUL character"
msgstr "rutas están separadas con un carácter NULL"
@@ -1393,9 +1402,9 @@ msgstr "rutas están separadas con un carácter NULL"
msgid "ensure at least <n> lines of context match"
msgstr "asegurar que al menos concuerden <n> líneas del contexto concuerden"
-#: apply.c:5008 builtin/am.c:2239 builtin/interpret-trailers.c:98
+#: apply.c:5008 builtin/am.c:2238 builtin/interpret-trailers.c:98
#: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102
-#: builtin/pack-objects.c:3457 builtin/rebase.c:1508
+#: builtin/pack-objects.c:3458 builtin/rebase.c:1332
msgid "action"
msgstr "acción"
@@ -1427,8 +1436,8 @@ msgid "allow overlapping hunks"
msgstr "permitir solapamiento de hunks"
#: apply.c:5025 builtin/add.c:323 builtin/check-ignore.c:22
-#: builtin/commit.c:1360 builtin/count-objects.c:98 builtin/fsck.c:774
-#: builtin/log.c:2166 builtin/mv.c:123 builtin/read-tree.c:128
+#: builtin/commit.c:1366 builtin/count-objects.c:98 builtin/fsck.c:774
+#: builtin/log.c:2186 builtin/mv.c:123 builtin/read-tree.c:128
msgid "be verbose"
msgstr "ser verboso"
@@ -1442,7 +1451,7 @@ msgstr ""
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:5032 builtin/am.c:2248
+#: apply.c:5032 builtin/am.c:2247
msgid "root"
msgstr "raíz"
@@ -1450,6 +1459,55 @@ msgstr "raíz"
msgid "prepend <root> to all filenames"
msgstr "anteponer <root> a todos los nombres de archivos"
+#: archive-tar.c:125 archive-zip.c:351
+#, c-format
+msgid "cannot stream blob %s"
+msgstr "no se puede transmitir el blob %s"
+
+#: archive-tar.c:266 archive-zip.c:369
+#, c-format
+msgid "unsupported file mode: 0%o (SHA1: %s)"
+msgstr "modo de archivo no soportado: 0%o (SHA1: %s)"
+
+#: archive-tar.c:293 archive-zip.c:359
+#, c-format
+msgid "cannot read %s"
+msgstr "no se puede leer %s"
+
+#: archive-tar.c:465
+#, c-format
+msgid "unable to start '%s' filter"
+msgstr "no se puede comenzar filtro '%s'"
+
+#: archive-tar.c:468
+msgid "unable to redirect descriptor"
+msgstr "incapaz de redirigir descriptor"
+
+#: archive-tar.c:475
+#, c-format
+msgid "'%s' filter reported error"
+msgstr "filtro '%s' reportó un error"
+
+#: archive-zip.c:319
+#, c-format
+msgid "path is not valid UTF-8: %s"
+msgstr "ruta no válida UTF-8: %s"
+
+#: archive-zip.c:323
+#, c-format
+msgid "path too long (%d chars, SHA1: %s): %s"
+msgstr "ruta muy larga (%d chars, SHA1: %s): %s"
+
+#: archive-zip.c:480 builtin/pack-objects.c:232 builtin/pack-objects.c:235
+#, c-format
+msgid "deflate error (%d)"
+msgstr "error al desinflar (%d)"
+
+#: archive-zip.c:615
+#, c-format
+msgid "timestamp too large for this system: %<PRIuMAX>"
+msgstr "timestamp muy largo para este sistema: %<PRIuMAX>"
+
#: archive.c:14
msgid "git archive [<options>] <tree-ish> [<path>...]"
msgstr "git archive [<opciones>] <parte-del-árbol> [<ruta>...]"
@@ -1469,172 +1527,123 @@ msgstr ""
msgid "git archive --remote <repo> [--exec <cmd>] --list"
msgstr "git archive --remote <repo> [--exec <comando>] --list"
-#: archive.c:372 builtin/add.c:181 builtin/add.c:588 builtin/rm.c:315
+#: archive.c:377 builtin/add.c:181 builtin/add.c:588 builtin/rm.c:315
#, c-format
msgid "pathspec '%s' did not match any files"
msgstr "ruta especificada '%s' no concordó con ninguna carpeta"
-#: archive.c:396
+#: archive.c:401
#, c-format
msgid "no such ref: %.*s"
msgstr "no existe el ref: %.*s"
-#: archive.c:401
+#: archive.c:407
#, c-format
msgid "not a valid object name: %s"
msgstr "nombre de objeto no válido: %s"
-#: archive.c:414
+#: archive.c:420
#, c-format
msgid "not a tree object: %s"
msgstr "no es un objeto tree: %s"
-#: archive.c:426
+#: archive.c:432
msgid "current working directory is untracked"
msgstr "directorio de trabajo actual no rastreado"
-#: archive.c:457
+#: archive.c:464
msgid "fmt"
msgstr "fmt"
-#: archive.c:457
+#: archive.c:464
msgid "archive format"
msgstr "formato del archivo"
-#: archive.c:458 builtin/log.c:1653
+#: archive.c:465 builtin/log.c:1674
msgid "prefix"
msgstr "prefijo"
-#: archive.c:459
+#: archive.c:466
msgid "prepend prefix to each pathname in the archive"
msgstr "anteponer prefijo a cada ruta en el archivo"
-#: archive.c:460 builtin/blame.c:861 builtin/blame.c:865 builtin/blame.c:866
+#: archive.c:467 builtin/blame.c:861 builtin/blame.c:865 builtin/blame.c:866
#: builtin/commit-tree.c:117 builtin/config.c:130 builtin/fast-export.c:1162
-#: builtin/fast-export.c:1164 builtin/fast-export.c:1168 builtin/grep.c:887
-#: builtin/hash-object.c:105 builtin/ls-files.c:560 builtin/ls-files.c:563
+#: builtin/fast-export.c:1164 builtin/fast-export.c:1168 builtin/grep.c:907
+#: builtin/hash-object.c:105 builtin/ls-files.c:561 builtin/ls-files.c:564
#: builtin/notes.c:412 builtin/notes.c:578 builtin/read-tree.c:123
#: parse-options.h:190
msgid "file"
msgstr "carpeta"
-#: archive.c:461 builtin/archive.c:90
+#: archive.c:468 builtin/archive.c:90
msgid "write the archive to this file"
msgstr "escribe el archivo en esta carpeta"
-#: archive.c:463
+#: archive.c:470
msgid "read .gitattributes in working directory"
msgstr "leer .gitattributes en el directorio de trabajo"
-#: archive.c:464
+#: archive.c:471
msgid "report archived files on stderr"
msgstr "reportar archivos archivados por stderr"
-#: archive.c:465
+#: archive.c:472
msgid "store only"
msgstr "solo guardar"
-#: archive.c:466
+#: archive.c:473
msgid "compress faster"
msgstr "comprimir más rápido"
-#: archive.c:474
+#: archive.c:481
msgid "compress better"
msgstr "comprimir mejor"
-#: archive.c:477
+#: archive.c:484
msgid "list supported archive formats"
msgstr "listar los formatos de carpeta soportados"
-#: archive.c:479 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116
+#: archive.c:486 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116
#: builtin/submodule--helper.c:1406 builtin/submodule--helper.c:1911
msgid "repo"
msgstr "repo"
-#: archive.c:480 builtin/archive.c:92
+#: archive.c:487 builtin/archive.c:92
msgid "retrieve the archive from remote repository <repo>"
msgstr "obtener la carpeta del repositorio remoto <repo>"
-#: archive.c:481 builtin/archive.c:93 builtin/difftool.c:715
+#: archive.c:488 builtin/archive.c:93 builtin/difftool.c:715
#: builtin/notes.c:498
msgid "command"
msgstr "comando"
-#: archive.c:482 builtin/archive.c:94
+#: archive.c:489 builtin/archive.c:94
msgid "path to the remote git-upload-archive command"
msgstr "ruta para el comando git-upload-archivo remoto"
-#: archive.c:489
+#: archive.c:496
msgid "Unexpected option --remote"
msgstr "Opción inesperada --remote"
-#: archive.c:491
+#: archive.c:498
msgid "Option --exec can only be used together with --remote"
msgstr "Opción --exec solo puede ser utilizada con --remote"
-#: archive.c:493
+#: archive.c:500
msgid "Unexpected option --output"
msgstr "Opción inesperada --output"
-#: archive.c:515
+#: archive.c:522
#, c-format
msgid "Unknown archive format '%s'"
msgstr "Formato de carpeta desconocido '%s'"
-#: archive.c:522
+#: archive.c:529
#, c-format
msgid "Argument not supported for format '%s': -%d"
msgstr "Argumento no soportado para formato '%s': -%d"
-#: archive-tar.c:125 archive-zip.c:351
-#, c-format
-msgid "cannot stream blob %s"
-msgstr "no se puede transmitir el blob %s"
-
-#: archive-tar.c:266 archive-zip.c:369
-#, c-format
-msgid "unsupported file mode: 0%o (SHA1: %s)"
-msgstr "modo de archivo no soportado: 0%o (SHA1: %s)"
-
-#: archive-tar.c:293 archive-zip.c:359
-#, c-format
-msgid "cannot read %s"
-msgstr "no se puede leer %s"
-
-#: archive-tar.c:465
-#, c-format
-msgid "unable to start '%s' filter"
-msgstr "no se puede comenzar filtro '%s'"
-
-#: archive-tar.c:468
-msgid "unable to redirect descriptor"
-msgstr "incapaz de redirigir descriptor"
-
-#: archive-tar.c:475
-#, c-format
-msgid "'%s' filter reported error"
-msgstr "filtro '%s' reportó un error"
-
-#: archive-zip.c:319
-#, c-format
-msgid "path is not valid UTF-8: %s"
-msgstr "ruta no válida UTF-8: %s"
-
-#: archive-zip.c:323
-#, c-format
-msgid "path too long (%d chars, SHA1: %s): %s"
-msgstr "ruta muy larga (%d chars, SHA1: %s): %s"
-
-#: archive-zip.c:480 builtin/pack-objects.c:231 builtin/pack-objects.c:234
-#, c-format
-msgid "deflate error (%d)"
-msgstr "error al desinflar (%d)"
-
-#: archive-zip.c:615
-#, c-format
-msgid "timestamp too large for this system: %<PRIuMAX>"
-msgstr "timestamp muy largo para este sistema: %<PRIuMAX>"
-
#: attr.c:212
#, c-format
msgid "%.*s is not a valid attribute name"
@@ -1727,12 +1736,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:920 builtin/notes.c:177 builtin/tag.c:254
+#: bisect.c:920 builtin/notes.c:177 builtin/tag.c:255
#, c-format
msgid "could not create file '%s'"
msgstr "no se pudo crear el archivo '%s'"
-#: bisect.c:966 builtin/merge.c:149
+#: bisect.c:966 builtin/merge.c:151
#, c-format
msgid "could not read file '%s'"
msgstr "no se pudo leer el archivo '%s'"
@@ -1772,40 +1781,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:2700
+#: blame.c:2777
msgid "--contents and --reverse do not blend well."
msgstr "--contents y --reverse no se mezclan bien."
-#: blame.c:2714
+#: blame.c:2791
msgid "cannot use --contents with final commit object name"
msgstr "no se puede usar --contents con el nombre de objeto commit final"
-#: blame.c:2735
+#: blame.c:2812
msgid "--reverse and --first-parent together require specified latest commit"
msgstr ""
"--reverse y --first-parent juntos requieren especificar el último commit"
-#: blame.c:2744 bundle.c:167 ref-filter.c:2203 remote.c:1942 sequencer.c:2006
-#: sequencer.c:4358 submodule.c:847 builtin/commit.c:1045 builtin/log.c:388
-#: builtin/log.c:991 builtin/log.c:1520 builtin/log.c:1925 builtin/log.c:2215
-#: builtin/merge.c:412 builtin/pack-objects.c:3275 builtin/pack-objects.c:3290
+#: blame.c:2821 bundle.c:167 ref-filter.c:2200 remote.c:1924 sequencer.c:2018
+#: sequencer.c:4466 submodule.c:847 builtin/commit.c:1047 builtin/log.c:405
+#: builtin/log.c:1012 builtin/log.c:1541 builtin/log.c:1945 builtin/log.c:2235
+#: builtin/merge.c:415 builtin/pack-objects.c:3276 builtin/pack-objects.c:3291
#: builtin/shortlog.c:192
msgid "revision walk setup failed"
msgstr "falló la configuración del camino de revisión"
-#: blame.c:2762
+#: blame.c:2839
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:2773
+#: blame.c:2850
#, c-format
msgid "no such path %s in %s"
msgstr "no hay una ruta %s en %s"
-#: blame.c:2784
+#: blame.c:2861
#, c-format
msgid "cannot read blob %s for path %s"
msgstr "no se puede leer el blob %s para la ruta %s"
@@ -1949,12 +1958,12 @@ msgstr "Nombre de objeto ambiguo: '%s'."
msgid "Not a valid branch point: '%s'."
msgstr "Punto de rama no válido: '%s'."
-#: branch.c:364
+#: branch.c:365
#, c-format
msgid "'%s' is already checked out at '%s'"
msgstr "'%s' ya ha sido marcado en '%s'"
-#: branch.c:387
+#: branch.c:388
#, c-format
msgid "HEAD of working tree %s is not updated"
msgstr "HEAD del árbol de trabajo %s no está actualizada"
@@ -1969,8 +1978,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:2258 sequencer.c:3016
-#: builtin/commit.c:815
+#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2270 sequencer.c:3034
+#: builtin/commit.c:814
#, c-format
msgid "could not open '%s'"
msgstr "no se pudo abrir '%s'"
@@ -2022,7 +2031,7 @@ msgstr "rev-list murió"
msgid "ref '%s' is excluded by the rev-list options"
msgstr "referencia '%s' es excluida por las opciones de rev-list"
-#: bundle.c:461 builtin/log.c:203 builtin/log.c:1814 builtin/shortlog.c:306
+#: bundle.c:461 builtin/log.c:208 builtin/log.c:1834 builtin/shortlog.c:306
#, c-format
msgid "unrecognized argument: %s"
msgstr "argumento no reconocido: %s"
@@ -2045,333 +2054,349 @@ msgstr "index-pack murió"
msgid "invalid color value: %.*s"
msgstr "color inválido: %.*s"
-#: commit.c:51 sequencer.c:2719 builtin/am.c:359 builtin/am.c:403
-#: builtin/am.c:1371 builtin/am.c:2014 builtin/replace.c:457
-#, c-format
-msgid "could not parse %s"
-msgstr "no se puede analizar %s"
-
-#: commit.c:53
-#, c-format
-msgid "%s %s is not a commit!"
-msgstr "¡%s %s no es un commit!"
-
-#: commit.c:193
-msgid ""
-"Support for <GIT_DIR>/info/grafts is deprecated\n"
-"and will be removed in a future Git version.\n"
-"\n"
-"Please use \"git replace --convert-graft-file\"\n"
-"to convert the grafts into replace refs.\n"
-"\n"
-"Turn this message off by running\n"
-"\"git config advice.graftFileDeprecated false\""
-msgstr ""
-"El soporte para <GIT_DIR>/info/grafts ha sido deprecado\n"
-"y será eliminado en una versión futura de Git.\n"
-"\n"
-"Por favor use \"git replace --convert-graft-file\"\n"
-"para convertir los grafts en refs.\n"
-"\n"
-"Apapa este mensaje ejecutando\n"
-"\"git config advice.graftFileDeprecated false\""
-
-#: commit.c:1153
-#, 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:1157
-#, 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:1160
-#, c-format
-msgid "Commit %s does not have a GPG signature."
-msgstr "Commit %s no tiene una firma GPG."
-
-#: commit.c:1163
-#, 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:1417
-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 quieras enmendarlo después de arreglar el mensaje, o arreglar la\n"
-"variable de configuración i18n.commitencoding para la codificación que usa "
-"tu proyecto.\n"
-
-#: commit-graph.c:122
+#: commit-graph.c:183
msgid "commit-graph file is too small"
msgstr "archivo commit-graph es muy pequeño"
-#: commit-graph.c:189
+#: commit-graph.c:248
#, 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:196
+#: commit-graph.c:255
#, 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:203
+#: commit-graph.c:262
#, 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:226
+#: commit-graph.c:284
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:237
+#: commit-graph.c:294
#, c-format
msgid "commit-graph improper chunk offset %08x%08x"
msgstr "offset del chunk de commit-graph inapropiado %08x%08x"
-#: commit-graph.c:280
+#: commit-graph.c:362
#, 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:343
+#: commit-graph.c:436
msgid "commit-graph has no base graphs chunk"
msgstr "commit-graph no tiene una chunk base de graphs"
-#: commit-graph.c:353
+#: commit-graph.c:446
msgid "commit-graph chain does not match"
msgstr "cadena commit-graph no concuerda"
-#: commit-graph.c:401
+#: commit-graph.c:494
#, 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:425
+#: commit-graph.c:518
msgid "unable to find all commit-graph files"
msgstr "no es posible encontrar los archivos commit-graph"
-#: commit-graph.c:558 commit-graph.c:618
+#: commit-graph.c:651 commit-graph.c:711
msgid "invalid commit position. commit-graph is likely corrupt"
msgstr "posición de commit inválida. commit-graph está probablemente corrupto"
-#: commit-graph.c:579
+#: commit-graph.c:672
#, c-format
msgid "could not find commit %s"
msgstr "no se pudo encontrar commit %s"
-#: commit-graph.c:852 builtin/am.c:1292
+#: commit-graph.c:948 builtin/am.c:1292
#, c-format
msgid "unable to parse commit %s"
msgstr "no es posible analizar el commit %s"
-#: commit-graph.c:1011 builtin/pack-objects.c:2782
+#: commit-graph.c:1096
+msgid "Writing changed paths Bloom filters index"
+msgstr "Escribiendo cambios de ruta del índice de filtros Bloom"
+
+#: commit-graph.c:1121
+msgid "Writing changed paths Bloom filters data"
+msgstr "Escribiendo cambios de ruta de datos de filtros Bloom"
+
+#: commit-graph.c:1160 builtin/pack-objects.c:2783
#, c-format
msgid "unable to get type of object %s"
msgstr "incapaz de obtener el tipo de objeto: %s"
-#: commit-graph.c:1043
+#: commit-graph.c:1196
msgid "Loading known commits in commit graph"
msgstr "Cargando commits conocidos en commit graph"
-#: commit-graph.c:1060
+#: commit-graph.c:1213
msgid "Expanding reachable commits in commit graph"
msgstr "Expandiendo commits alcanzables en commit graph"
-#: commit-graph.c:1079
+#: commit-graph.c:1233
msgid "Clearing commit marks in commit graph"
msgstr "Limpiando marcas de commits en commit graph"
-#: commit-graph.c:1098
+#: commit-graph.c:1252
msgid "Computing commit graph generation numbers"
msgstr "Calculando números de generación de commit graph"
-#: commit-graph.c:1173
+#: commit-graph.c:1300
+msgid "Computing commit changed paths Bloom filters"
+msgstr "Calculando números de generación de commit graph"
+
+#: commit-graph.c:1359
#, 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:1186
+#: commit-graph.c:1372
#, c-format
msgid "error adding pack %s"
msgstr "error agregando pack %s"
-#: commit-graph.c:1190
+#: commit-graph.c:1376
#, c-format
msgid "error opening index for %s"
msgstr "error abriendo index para %s"
-#: commit-graph.c:1214
+#: commit-graph.c:1405
#, 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:1234
+#: commit-graph.c:1426
#, c-format
msgid "invalid commit object id: %s"
msgstr "id de objeto commit: %s inválido"
-#: commit-graph.c:1249
+#: commit-graph.c:1442
msgid "Finding commits for commit graph among packed objects"
msgstr "Encontrando commits para commit graph entre los objetos empaquetados"
-#: commit-graph.c:1264
+#: commit-graph.c:1457
msgid "Counting distinct commits in commit graph"
msgstr "Contando commits distintos en commit graph"
-#: commit-graph.c:1294
+#: commit-graph.c:1489
msgid "Finding extra edges in commit graph"
msgstr "Encontrando esquinas extra en commit graph"
-#: commit-graph.c:1340
+#: commit-graph.c:1538
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:1373 midx.c:814
+#: commit-graph.c:1572 midx.c:812
#, c-format
msgid "unable to create leading directories of %s"
msgstr "no se pudo crear directorios principales para %s"
-#: commit-graph.c:1385 builtin/index-pack.c:306 builtin/repack.c:248
+#: commit-graph.c:1585
+msgid "unable to create temporary graph layer"
+msgstr "no es posible crear un una capa de gráfico temporal"
+
+#: commit-graph.c:1590
#, c-format
-msgid "unable to create '%s'"
-msgstr "no se puede crear '%s'"
+msgid "unable to adjust shared permissions for '%s'"
+msgstr "no se pudo poner permisos a '%s'"
-#: commit-graph.c:1445
+#: commit-graph.c:1667
#, 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:1486
+#: commit-graph.c:1712
msgid "unable to open commit-graph chain file"
msgstr "no se pudo abrir la cadena de archivos commit-graph"
-#: commit-graph.c:1498
+#: commit-graph.c:1728
msgid "failed to rename base commit-graph file"
msgstr "no se pudo renombrar el archivo base commit-graph"
-#: commit-graph.c:1518
+#: commit-graph.c:1748
msgid "failed to rename temporary commit-graph file"
msgstr "falló al renombrar el archivo temporal commit-graph"
-#: commit-graph.c:1631
+#: commit-graph.c:1874
msgid "Scanning merged commits"
msgstr "Escaneando commits fusionados"
-#: commit-graph.c:1642
+#: commit-graph.c:1885
#, c-format
msgid "unexpected duplicate commit id %s"
msgstr "id de commit duplicado inesperado %s"
-#: commit-graph.c:1665
+#: commit-graph.c:1908
msgid "Merging commit-graph"
msgstr "Fusionando commit-graph"
-#: commit-graph.c:1844
+#: commit-graph.c:2096
#, 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
+#: commit-graph.c:2107
msgid "too many commits to write graph"
msgstr "demasiados commits para escribir el gráfico"
-#: commit-graph.c:1944
+#: commit-graph.c:2200
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:1954
+#: commit-graph.c:2210
#, 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:1964 commit-graph.c:1979
+#: commit-graph.c:2220 commit-graph.c:2235
#, 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:1971
+#: commit-graph.c:2227
#, c-format
msgid "failed to parse commit %s from commit-graph"
msgstr "falló al analizar commit %s para commit-graph"
-#: commit-graph.c:1989
+#: commit-graph.c:2245
msgid "Verifying commits in commit graph"
msgstr "Verificando commits en commit graph"
-#: commit-graph.c:2003
+#: commit-graph.c:2259
#, 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:2010
+#: commit-graph.c:2266
#, 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:2020
+#: commit-graph.c:2276
#, 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:2029
+#: commit-graph.c:2285
#, c-format
msgid "commit-graph parent for %s is %s != %s"
msgstr "padre de commit-graph para %s es %s != %s"
-#: commit-graph.c:2042
+#: commit-graph.c:2298
#, 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:2047
+#: commit-graph.c:2303
#, 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:2051
+#: commit-graph.c:2307
#, 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:2066
+#: commit-graph.c:2322
#, 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:2072
+#: commit-graph.c:2328
#, c-format
msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
msgstr ""
"fecha de commit para commit %s en commit-graph es %<PRIuMAX> != %<PRIuMAX>"
+#: commit.c:52 sequencer.c:2739 builtin/am.c:359 builtin/am.c:403
+#: builtin/am.c:1371 builtin/am.c:2013 builtin/replace.c:457
+#, c-format
+msgid "could not parse %s"
+msgstr "no se puede analizar %s"
+
+#: commit.c:54
+#, c-format
+msgid "%s %s is not a commit!"
+msgstr "¡%s %s no es un commit!"
+
+#: commit.c:194
+msgid ""
+"Support for <GIT_DIR>/info/grafts is deprecated\n"
+"and will be removed in a future Git version.\n"
+"\n"
+"Please use \"git replace --convert-graft-file\"\n"
+"to convert the grafts into replace refs.\n"
+"\n"
+"Turn this message off by running\n"
+"\"git config advice.graftFileDeprecated false\""
+msgstr ""
+"El soporte para <GIT_DIR>/info/grafts ha sido deprecado\n"
+"y será eliminado en una versión futura de Git.\n"
+"\n"
+"Por favor use \"git replace --convert-graft-file\"\n"
+"para convertir los grafts en refs.\n"
+"\n"
+"Apapa este mensaje ejecutando\n"
+"\"git config advice.graftFileDeprecated false\""
+
+#: commit.c:1168
+#, 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:1172
+#, 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:1175
+#, c-format
+msgid "Commit %s does not have a GPG signature."
+msgstr "Commit %s no tiene una firma GPG."
+
+#: commit.c:1178
+#, 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:1432
+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 quieras enmendarlo después de arreglar el mensaje, o arreglar la\n"
+"variable de configuración i18n.commitencoding para la codificación que usa "
+"tu proyecto.\n"
+
#: compat/obstack.c:406 compat/obstack.c:408
msgid "memory exhausted"
msgstr "memoria agotada"
-#: config.c:124
+#: config.c:125
#, c-format
msgid ""
"exceeded maximum include depth (%d) while including\n"
@@ -2386,293 +2411,293 @@ msgstr ""
"\t%s\n"
"Esto puede ser causado por inclusiones circulares."
-#: config.c:140
+#: config.c:141
#, c-format
msgid "could not expand include path '%s'"
msgstr "no se pudo expandir rutas de inclusión '%s'"
-#: config.c:151
+#: config.c:152
msgid "relative config includes must come from files"
msgstr "inclusiones de configuración relativas tienen que venir de archivos"
-#: config.c:197
+#: config.c:198
msgid "relative config include conditionals must come from files"
msgstr ""
"la configuración relativa incluye condicionales que deben venir de archivos"
-#: config.c:376
+#: config.c:378
#, c-format
msgid "key does not contain a section: %s"
msgstr "llave no contiene una sección: %s"
-#: config.c:382
+#: config.c:384
#, c-format
msgid "key does not contain variable name: %s"
msgstr "llave no contiene el nombre de variable: %s"
-#: config.c:406 sequencer.c:2444
+#: config.c:408 sequencer.c:2456
#, c-format
msgid "invalid key: %s"
msgstr "llave inválida: %s"
-#: config.c:412
+#: config.c:414
#, c-format
msgid "invalid key (newline): %s"
msgstr "llave inválida (nueva línea): %s"
-#: config.c:448 config.c:460
+#: config.c:450 config.c:462
#, c-format
msgid "bogus config parameter: %s"
msgstr "parámetro de configuración malogrado: %s"
-#: config.c:495
+#: config.c:497
#, c-format
msgid "bogus format in %s"
msgstr "formato malogrado en %s"
-#: config.c:821
+#: config.c:836
#, c-format
msgid "bad config line %d in blob %s"
msgstr "mala línea de config %d en el blob %s"
-#: config.c:825
+#: config.c:840
#, c-format
msgid "bad config line %d in file %s"
msgstr "mala línea de config %d en el archivo %s"
-#: config.c:829
+#: config.c:844
#, c-format
msgid "bad config line %d in standard input"
msgstr "mala línea de config %d en la entrada standard"
-#: config.c:833
+#: config.c:848
#, 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:837
+#: config.c:852
#, 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:841
+#: config.c:856
#, c-format
msgid "bad config line %d in %s"
msgstr "mala línea de config %d en %s"
-#: config.c:978
+#: config.c:993
msgid "out of range"
msgstr "fuera de rango"
-#: config.c:978
+#: config.c:993
msgid "invalid unit"
msgstr "unidad inválida"
-#: config.c:979
+#: config.c:994
#, c-format
msgid "bad numeric config value '%s' for '%s': %s"
msgstr "mal valor de config numérica '%s' para '%s': %s"
-#: config.c:998
+#: config.c:1013
#, 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:1001
+#: config.c:1016
#, 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:1004
+#: config.c:1019
#, 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:1007
+#: config.c:1022
#, 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:1010
+#: config.c:1025
#, 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:1013
+#: config.c:1028
#, 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:1108
+#: config.c:1123
#, c-format
msgid "failed to expand user dir in: '%s'"
msgstr "falló al expandir el directorio de usuario en: '%s'"
-#: config.c:1117
+#: config.c:1132
#, 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:1208
+#: config.c:1223
#, c-format
msgid "abbrev length out of range: %d"
msgstr "largo de abreviatura fuera de rango: %d"
-#: config.c:1222 config.c:1233
+#: config.c:1237 config.c:1248
#, c-format
msgid "bad zlib compression level %d"
msgstr "nivel de compresión de zlib erróneo %d"
-#: config.c:1325
+#: config.c:1340
msgid "core.commentChar should only be one character"
msgstr "core.commentChar debería tener solo un caracter"
-#: config.c:1358
+#: config.c:1373
#, c-format
msgid "invalid mode for object creation: %s"
msgstr "modo inválido de creación de objetos: %s"
-#: config.c:1430
+#: config.c:1445
#, c-format
msgid "malformed value for %s"
msgstr "valor malformado para %s"
-#: config.c:1456
+#: config.c:1471
#, c-format
msgid "malformed value for %s: %s"
msgstr "valor malformado para %s: %s"
-#: config.c:1457
+#: config.c:1472
msgid "must be one of nothing, matching, simple, upstream or current"
msgstr "debe ser uno de nothing, matching, simple, upstream o current"
-#: config.c:1518 builtin/pack-objects.c:3541
+#: config.c:1533 builtin/pack-objects.c:3542
#, c-format
msgid "bad pack compression level %d"
msgstr "nivel de compresión de pack erróneo %d"
-#: config.c:1639
+#: config.c:1655
#, c-format
msgid "unable to load config blob object '%s'"
msgstr "incapaz de cargar configuración de objeto blob '%s'"
-#: config.c:1642
+#: config.c:1658
#, c-format
msgid "reference '%s' does not point to a blob"
msgstr "referencia '%s' no apunta a un blob"
-#: config.c:1659
+#: config.c:1675
#, c-format
msgid "unable to resolve config blob '%s'"
msgstr "no se posible resolver configuración de blob '%s'"
-#: config.c:1689
+#: config.c:1705
#, c-format
msgid "failed to parse %s"
msgstr "no se pudo analizar %s"
-#: config.c:1743
+#: config.c:1759
msgid "unable to parse command-line config"
msgstr "no es posible analizar la configuración de la línea de comando"
-#: config.c:2097
+#: config.c:2113
msgid "unknown error occurred while reading the configuration files"
msgstr ""
"error desconocido ocurrió mientras se leían los archivos de configuración"
-#: config.c:2267
+#: config.c:2283
#, c-format
msgid "Invalid %s: '%s'"
msgstr "Inválido %s: '%s'"
-#: config.c:2312
+#: config.c:2328
#, 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:2358
+#: config.c:2374
#, 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:2360
+#: config.c:2376
#, 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:2441
+#: config.c:2457
#, c-format
msgid "invalid section name '%s'"
msgstr "nombre de sección inválido '%s'"
-#: config.c:2473
+#: config.c:2489
#, c-format
msgid "%s has multiple values"
msgstr "%s tiene múltiples valores"
-#: config.c:2502
+#: config.c:2518
#, c-format
msgid "failed to write new configuration file %s"
msgstr "falló al escribir nuevo archivo de configuración %s"
-#: config.c:2754 config.c:3078
+#: config.c:2770 config.c:3094
#, c-format
msgid "could not lock config file %s"
msgstr "no se pudo bloquear archivo de configuración %s"
-#: config.c:2765
+#: config.c:2781
#, c-format
msgid "opening %s"
msgstr "abriendo %s"
-#: config.c:2800 builtin/config.c:344
+#: config.c:2816 builtin/config.c:344
#, c-format
msgid "invalid pattern: %s"
msgstr "patrón inválido: %s"
-#: config.c:2825
+#: config.c:2841
#, c-format
msgid "invalid config file %s"
msgstr "archivo de configuración inválido: %s"
-#: config.c:2838 config.c:3091
+#: config.c:2854 config.c:3107
#, c-format
msgid "fstat on %s failed"
msgstr "fstat en %s falló"
-#: config.c:2849
+#: config.c:2865
#, c-format
msgid "unable to mmap '%s'"
msgstr "no es posible hacer mmap '%s'"
-#: config.c:2858 config.c:3096
+#: config.c:2874 config.c:3112
#, c-format
msgid "chmod on %s failed"
msgstr "chmod en %s falló"
-#: config.c:2943 config.c:3193
+#: config.c:2959 config.c:3209
#, c-format
msgid "could not write config file %s"
msgstr "no se pudo escribir el archivo de configuración %s"
-#: config.c:2977
+#: config.c:2993
#, c-format
msgid "could not set '%s' to '%s'"
msgstr "no se pudo configurar '%s' a '%s'"
-#: config.c:2979 builtin/remote.c:655 builtin/remote.c:849 builtin/remote.c:857
+#: config.c:2995 builtin/remote.c:655 builtin/remote.c:849 builtin/remote.c:857
#, c-format
msgid "could not unset '%s'"
msgstr "no se pudo desactivar '%s'"
-#: config.c:3069
+#: config.c:3085
#, c-format
msgid "invalid section name: %s"
msgstr "sección de nombre inválida: %s"
-#: config.c:3236
+#: config.c:3252
#, c-format
msgid "missing value for '%s'"
msgstr "valor faltante para '%s'"
@@ -2837,19 +2862,19 @@ msgstr "ruta extraña '%s' bloqueada"
msgid "unable to fork"
msgstr "no es posible hacer fork"
-#: connected.c:98 builtin/fsck.c:208 builtin/prune.c:43
+#: connected.c:107 builtin/fsck.c:208 builtin/prune.c:45
msgid "Checking connectivity"
msgstr "Verificando conectividad"
-#: connected.c:110
+#: connected.c:119
msgid "Could not run 'git rev-list'"
msgstr "No se pudo correr 'git rev-list'"
-#: connected.c:130
+#: connected.c:139
msgid "failed write to rev-list"
msgstr "falló escribir a rev-list"
-#: connected.c:137
+#: connected.c:146
msgid "failed to close rev-list's stdin"
msgstr "falló al cerrar la entrada standard de rev-list"
@@ -2949,15 +2974,15 @@ msgstr "lectura de filtro externo '%s' falló"
msgid "external filter '%s' failed"
msgstr "filtro externo '%s' falló"
-#: convert.c:839
+#: convert.c:840
msgid "unexpected filter type"
msgstr "tipo de filtro inesperado"
-#: convert.c:850
+#: convert.c:851
msgid "path name too long for external filter"
msgstr "nombre de ruta muy largo para filtro externo"
-#: convert.c:924
+#: convert.c:943
#, c-format
msgid ""
"external filter '%s' is not available anymore although not all paths have "
@@ -2966,20 +2991,48 @@ msgstr ""
"filtro externo '%s' ya no está disponible aunque no todas las rutas han sido "
"filtradas"
-#: convert.c:1223
+#: convert.c:1243
msgid "true/false are no valid working-tree-encodings"
msgstr "true/false no son working-tree-encodings válidos"
-#: convert.c:1411 convert.c:1445
+#: convert.c:1431 convert.c:1465
#, c-format
msgid "%s: clean filter '%s' failed"
msgstr "%s: falló al limpiar filtro '%s'"
-#: convert.c:1489
+#: convert.c:1511
#, c-format
msgid "%s: smudge filter %s failed"
msgstr "%s: filtro smudge %s falló"
+#: credential.c:96
+#, c-format
+msgid "skipping credential lookup for key: credential.%s"
+msgstr "saltando revisión de credenciales para llave: credencial. %s"
+
+#: credential.c:112
+msgid "refusing to work with credential missing host field"
+msgstr "rehusando trabajar con credenciales faltantes en el campo host"
+
+#: credential.c:114
+msgid "refusing to work with credential missing protocol field"
+msgstr "rehusando trabajar con credenciales faltantes en el campo protocolo"
+
+#: credential.c:396
+#, c-format
+msgid "url contains a newline in its %s component: %s"
+msgstr "url contiene un espace de línea en su componente %s: %s"
+
+#: credential.c:440
+#, c-format
+msgid "url has no scheme: %s"
+msgstr "url no tiene scheme: %s"
+
+#: credential.c:513
+#, c-format
+msgid "credential url cannot be parsed: %s"
+msgstr "url credencial no puede ser analizada: %s"
+
#: date.c:138
msgid "in the future"
msgstr "en el futuro"
@@ -3072,15 +3125,6 @@ msgstr "regex isla de config tiene muchos grupos de captura (max=%d)"
msgid "Marked %d islands, done.\n"
msgstr "%d islas marcadas, listo.\n"
-#: diffcore-order.c:24
-#, c-format
-msgid "failed to read orderfile '%s'"
-msgstr "falló al leer orden de archivos '%s'"
-
-#: diffcore-rename.c:543
-msgid "Performing inexact rename detection"
-msgstr "Realizando una detección de cambios de nombre inexacta"
-
#: diff-no-index.c:238
msgid "git diff --no-index [<options>] <path> <path>"
msgstr "git diff --no-index [<opciones>] <path> <path>"
@@ -3144,35 +3188,35 @@ msgstr ""
"Errores en la variable de config 'diff.dirstat' encontrados:\n"
"%s"
-#: diff.c:4202
+#: diff.c:4238
#, c-format
msgid "external diff died, stopping at %s"
msgstr "diff externo murió, deteniendo en %s"
-#: diff.c:4547
+#: diff.c:4583
msgid "--name-only, --name-status, --check and -s are mutually exclusive"
msgstr "--name-only, --name-status, --check y -s son mutuamente exclusivas"
-#: diff.c:4550
+#: diff.c:4586
msgid "-G, -S and --find-object are mutually exclusive"
msgstr "-G, -S y --find-object son mutuamente exclusivas"
-#: diff.c:4628
+#: diff.c:4664
msgid "--follow requires exactly one pathspec"
msgstr "--follow requiere exactamente un pathspec"
-#: diff.c:4676
+#: diff.c:4712
#, c-format
msgid "invalid --stat value: %s"
msgstr "valor --stat inválido: %s"
-#: diff.c:4681 diff.c:4686 diff.c:4691 diff.c:4696 diff.c:5209
+#: diff.c:4717 diff.c:4722 diff.c:4727 diff.c:4732 diff.c:5245
#: parse-options.c:197 parse-options.c:201
#, c-format
msgid "%s expects a numerical value"
msgstr "%s espera un valor numérico"
-#: diff.c:4713
+#: diff.c:4749
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
@@ -3181,42 +3225,42 @@ msgstr ""
"Falló al analizar parámetro de opción --dirstat/-X:\n"
"%s"
-#: diff.c:4798
+#: diff.c:4834
#, c-format
msgid "unknown change class '%c' in --diff-filter=%s"
msgstr "cambio de clase desconocido '%c' en --diff-filter=%s"
-#: diff.c:4822
+#: diff.c:4858
#, c-format
msgid "unknown value after ws-error-highlight=%.*s"
msgstr "valor desconocido luego de ws-error-highlight=%.*s"
-#: diff.c:4836
+#: diff.c:4872
#, c-format
msgid "unable to resolve '%s'"
msgstr "no se puede resolver '%s'"
-#: diff.c:4886 diff.c:4892
+#: diff.c:4922 diff.c:4928
#, c-format
msgid "%s expects <n>/<m> form"
msgstr "%s espera forma <n>/<m>"
-#: diff.c:4904
+#: diff.c:4940
#, c-format
msgid "%s expects a character, got '%s'"
msgstr "%s esperaba un char, se obtuvo '%s'"
-#: diff.c:4925
+#: diff.c:4961
#, c-format
msgid "bad --color-moved argument: %s"
msgstr "mal argumento --color-moved: %s"
-#: diff.c:4944
+#: diff.c:4980
#, c-format
msgid "invalid mode '%s' in --color-moved-ws"
msgstr "modo inválido '%s' en --color-moved-ws"
-#: diff.c:4984
+#: diff.c:5020
msgid ""
"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
"\"histogram\""
@@ -3224,154 +3268,154 @@ msgstr ""
"opción diff-algorithm acepta \"myers\", \"minimal\", \"patience\" e "
"\"histogram\""
-#: diff.c:5020 diff.c:5040
+#: diff.c:5056 diff.c:5076
#, c-format
msgid "invalid argument to %s"
msgstr "argumento inválido para %s"
-#: diff.c:5178
+#: diff.c:5214
#, c-format
msgid "failed to parse --submodule option parameter: '%s'"
msgstr "falló al analizar parámetro de opción --submodule: '%s'"
-#: diff.c:5234
+#: diff.c:5270
#, c-format
msgid "bad --word-diff argument: %s"
msgstr "mal argumento --word-diff: %s"
-#: diff.c:5257
+#: diff.c:5293
msgid "Diff output format options"
msgstr "Opciones de formato de salida para diff"
-#: diff.c:5259 diff.c:5265
+#: diff.c:5295 diff.c:5301
msgid "generate patch"
msgstr "generar parche"
-#: diff.c:5262 builtin/log.c:173
+#: diff.c:5298 builtin/log.c:177
msgid "suppress diff output"
msgstr "suprimir salida de diff"
-#: diff.c:5267 diff.c:5381 diff.c:5388
+#: diff.c:5303 diff.c:5417 diff.c:5424
msgid "<n>"
msgstr "<n>"
-#: diff.c:5268 diff.c:5271
+#: diff.c:5304 diff.c:5307
msgid "generate diffs with <n> lines context"
msgstr "genera diffs con <n> líneas de contexto"
-#: diff.c:5273
+#: diff.c:5309
msgid "generate the diff in raw format"
msgstr "genera el diff en formato raw"
-#: diff.c:5276
+#: diff.c:5312
msgid "synonym for '-p --raw'"
msgstr "sinónimo para '-p --stat'"
-#: diff.c:5280
+#: diff.c:5316
msgid "synonym for '-p --stat'"
msgstr "sinónimo para '-p --stat'"
-#: diff.c:5284
+#: diff.c:5320
msgid "machine friendly --stat"
msgstr "--stat amigable para máquina"
-#: diff.c:5287
+#: diff.c:5323
msgid "output only the last line of --stat"
msgstr "mostrar solo la última línea para --stat"
-#: diff.c:5289 diff.c:5297
+#: diff.c:5325 diff.c:5333
msgid "<param1,param2>..."
msgstr "<param1,param2>..."
-#: diff.c:5290
+#: diff.c:5326
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:5294
+#: diff.c:5330
msgid "synonym for --dirstat=cumulative"
msgstr "sinónimo para --dirstat=cumulative"
-#: diff.c:5298
+#: diff.c:5334
msgid "synonym for --dirstat=files,param1,param2..."
msgstr "sinonimo para --dirstat=archivos,param1,param2..."
-#: diff.c:5302
+#: diff.c:5338
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:5305
+#: diff.c:5341
msgid "condensed summary such as creations, renames and mode changes"
msgstr ""
"resumen condensado de creaciones, cambios de nombres y cambios de modos"
-#: diff.c:5308
+#: diff.c:5344
msgid "show only names of changed files"
msgstr "mostrar solo nombres de archivos cambiados"
-#: diff.c:5311
+#: diff.c:5347
msgid "show only names and status of changed files"
msgstr "mostrar solo nombres y estados de archivos cambiados"
-#: diff.c:5313
+#: diff.c:5349
msgid "<width>[,<name-width>[,<count>]]"
msgstr "<ancho>[,<nombre-ancho>[,<cantidad>]]"
-#: diff.c:5314
+#: diff.c:5350
msgid "generate diffstat"
msgstr "generar diffstat"
-#: diff.c:5316 diff.c:5319 diff.c:5322
+#: diff.c:5352 diff.c:5355 diff.c:5358
msgid "<width>"
msgstr "<ancho>"
-#: diff.c:5317
+#: diff.c:5353
msgid "generate diffstat with a given width"
msgstr "genera diffstat con un ancho dado"
-#: diff.c:5320
+#: diff.c:5356
msgid "generate diffstat with a given name width"
msgstr "genera diffstat con un nombre de ancho dado"
-#: diff.c:5323
+#: diff.c:5359
msgid "generate diffstat with a given graph width"
msgstr "genera diffstat con un ancho de graph dado"
-#: diff.c:5325
+#: diff.c:5361
msgid "<count>"
msgstr "<cantidad>"
-#: diff.c:5326
+#: diff.c:5362
msgid "generate diffstat with limited lines"
msgstr "genera diffstat con líneas limitadas"
-#: diff.c:5329
+#: diff.c:5365
msgid "generate compact summary in diffstat"
msgstr "genera un resumen compacto de diffstat"
-#: diff.c:5332
+#: diff.c:5368
msgid "output a binary diff that can be applied"
msgstr "muestra un diff binario que puede ser aplicado"
-#: diff.c:5335
+#: diff.c:5371
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:5337
+#: diff.c:5373
msgid "show colored diff"
msgstr "mostrar diff colorido"
-#: diff.c:5338
+#: diff.c:5374
msgid "<kind>"
msgstr "<tipo>"
-#: diff.c:5339
+#: diff.c:5375
msgid ""
"highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
"diff"
@@ -3379,7 +3423,7 @@ msgstr ""
"resaltar errores de espacios en blanco en las líneas 'context', 'old' o "
"'new' del diff"
-#: diff.c:5342
+#: diff.c:5378
msgid ""
"do not munge pathnames and use NULs as output field terminators in --raw or "
"--numstat"
@@ -3387,89 +3431,89 @@ msgstr ""
"no consolidar los pathnames y usar NULs como terminadores de campos en --raw "
"o --numstat"
-#: diff.c:5345 diff.c:5348 diff.c:5351 diff.c:5457
+#: diff.c:5381 diff.c:5384 diff.c:5387 diff.c:5493
msgid "<prefix>"
msgstr "<prefijo>"
-#: diff.c:5346
+#: diff.c:5382
msgid "show the given source prefix instead of \"a/\""
msgstr "mostrar el prefijo de fuente dado en lugar de \"a/\""
-#: diff.c:5349
+#: diff.c:5385
msgid "show the given destination prefix instead of \"b/\""
msgstr "mostrar el prefijo de destino en lugar de \"b/\""
-#: diff.c:5352
+#: diff.c:5388
msgid "prepend an additional prefix to every line of output"
msgstr "anteponer un prefijo adicional a cada línea mostrada"
-#: diff.c:5355
+#: diff.c:5391
msgid "do not show any source or destination prefix"
msgstr "no mostrar ningún prefijo de fuente o destino"
-#: diff.c:5358
+#: diff.c:5394
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:5362 diff.c:5367 diff.c:5372
+#: diff.c:5398 diff.c:5403 diff.c:5408
msgid "<char>"
msgstr "<char>"
-#: diff.c:5363
+#: diff.c:5399
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:5368
+#: diff.c:5404
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:5373
+#: diff.c:5409
msgid "specify the character to indicate a context instead of ' '"
msgstr "especifica el char para indicar un contexto en lugar de ' '"
-#: diff.c:5376
+#: diff.c:5412
msgid "Diff rename options"
msgstr "Opciones de diff rename"
-#: diff.c:5377
+#: diff.c:5413
msgid "<n>[/<m>]"
msgstr "<n>[/<m>]"
-#: diff.c:5378
+#: diff.c:5414
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:5382
+#: diff.c:5418
msgid "detect renames"
msgstr "detectar renombrados"
-#: diff.c:5386
+#: diff.c:5422
msgid "omit the preimage for deletes"
msgstr "omite la preimage para borrados"
-#: diff.c:5389
+#: diff.c:5425
msgid "detect copies"
msgstr "detectar copias"
-#: diff.c:5393
+#: diff.c:5429
msgid "use unmodified files as source to find copies"
msgstr "usa archivos no modificados como fuente para encontrar copias"
-#: diff.c:5395
+#: diff.c:5431
msgid "disable rename detection"
msgstr "deshabilita detección de renombres"
-#: diff.c:5398
+#: diff.c:5434
msgid "use empty blobs as rename source"
msgstr "usa blobs vacíos como fuente de renombre"
-#: diff.c:5400
+#: diff.c:5436
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:5403
+#: diff.c:5439
msgid ""
"prevent rename/copy detection if the number of rename/copy targets exceeds "
"given limit"
@@ -3477,155 +3521,155 @@ msgstr ""
"previene detección de renombre/copias si el número de objetivos para "
"renombres/copias excede el límite dado"
-#: diff.c:5405
+#: diff.c:5441
msgid "Diff algorithm options"
msgstr "Opciones de algoritmos de diff"
-#: diff.c:5407
+#: diff.c:5443
msgid "produce the smallest possible diff"
msgstr "produce el diff más pequeño posible"
-#: diff.c:5410
+#: diff.c:5446
msgid "ignore whitespace when comparing lines"
msgstr "ignorar espacios en blanco cuando comparando líneas"
-#: diff.c:5413
+#: diff.c:5449
msgid "ignore changes in amount of whitespace"
msgstr "ignorar cambios en la cantidad de líneas en blanco"
-#: diff.c:5416
+#: diff.c:5452
msgid "ignore changes in whitespace at EOL"
msgstr "ignorar cambios en espacios en blanco en EOL"
-#: diff.c:5419
+#: diff.c:5455
msgid "ignore carrier-return at the end of line"
msgstr "ignora carrier-return al final de la línea"
-#: diff.c:5422
+#: diff.c:5458
msgid "ignore changes whose lines are all blank"
msgstr "ignora cambios cuyas líneas son todas en blanco"
-#: diff.c:5425
+#: diff.c:5461
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:5428
+#: diff.c:5464
msgid "generate diff using the \"patience diff\" algorithm"
msgstr "genera un diff usando algoritmo \"patience diff\""
-#: diff.c:5432
+#: diff.c:5468
msgid "generate diff using the \"histogram diff\" algorithm"
msgstr "genera un diff usando algoritmo \"histogram diff\""
-#: diff.c:5434
+#: diff.c:5470
msgid "<algorithm>"
msgstr "<algoritmo>"
-#: diff.c:5435
+#: diff.c:5471
msgid "choose a diff algorithm"
msgstr "escoge un algoritmo para diff"
-#: diff.c:5437
+#: diff.c:5473
msgid "<text>"
msgstr "<texto>"
-#: diff.c:5438
+#: diff.c:5474
msgid "generate diff using the \"anchored diff\" algorithm"
msgstr "genera un diff usando algoritmo \"anchored diff\""
-#: diff.c:5440 diff.c:5449 diff.c:5452
+#: diff.c:5476 diff.c:5485 diff.c:5488
msgid "<mode>"
msgstr "<modo>"
-#: diff.c:5441
+#: diff.c:5477
msgid "show word diff, using <mode> to delimit changed words"
msgstr ""
"muestra diff por palabras usando <modo> para delimitar las palabras cambiadas"
-#: diff.c:5443 diff.c:5446 diff.c:5491
+#: diff.c:5479 diff.c:5482 diff.c:5527
msgid "<regex>"
msgstr "<regex>"
-#: diff.c:5444
+#: diff.c:5480
msgid "use <regex> to decide what a word is"
msgstr "usa <regex> para decidir que palabra es"
-#: diff.c:5447
+#: diff.c:5483
msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
msgstr "equivalente a --word-diff=color --word-diff-regex=<regex>"
-#: diff.c:5450
+#: diff.c:5486
msgid "moved lines of code are colored differently"
msgstr "líneas movidas de código están coloreadas diferente"
-#: diff.c:5453
+#: diff.c:5489
msgid "how white spaces are ignored in --color-moved"
msgstr "como espacios en blanco son ignorados en --color-moved"
-#: diff.c:5456
+#: diff.c:5492
msgid "Other diff options"
msgstr "Otras opciones de diff"
-#: diff.c:5458
+#: diff.c:5494
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:5462
+#: diff.c:5498
msgid "treat all files as text"
msgstr "tratar todos los archivos como texto"
-#: diff.c:5464
+#: diff.c:5500
msgid "swap two inputs, reverse the diff"
msgstr "cambia dos inputs, invierte el diff"
-#: diff.c:5466
+#: diff.c:5502
msgid "exit with 1 if there were differences, 0 otherwise"
msgstr "termina con 1 si hubieron diferencias, de lo contrario con 0"
-#: diff.c:5468
+#: diff.c:5504
msgid "disable all output of the program"
msgstr "deshabilita todo el output del programa"
-#: diff.c:5470
+#: diff.c:5506
msgid "allow an external diff helper to be executed"
msgstr "permite la ejecución de un diff helper externo"
-#: diff.c:5472
+#: diff.c:5508
msgid "run external text conversion filters when comparing binary files"
msgstr ""
"ejecuta filtros de conversión de texto externos cuando comparando binarios"
-#: diff.c:5474
+#: diff.c:5510
msgid "<when>"
msgstr "<cuando>"
-#: diff.c:5475
+#: diff.c:5511
msgid "ignore changes to submodules in the diff generation"
msgstr "ignorar cambios a submódulos en la generación de diff"
-#: diff.c:5478
+#: diff.c:5514
msgid "<format>"
msgstr "<formato>"
-#: diff.c:5479
+#: diff.c:5515
msgid "specify how differences in submodules are shown"
msgstr "especifica como son mostradas las diferencias en submódulos"
-#: diff.c:5483
+#: diff.c:5519
msgid "hide 'git add -N' entries from the index"
msgstr "ocultar entradas 'git add -N' del index"
-#: diff.c:5486
+#: diff.c:5522
msgid "treat 'git add -N' entries as real in the index"
msgstr "trata entradas 'git add -N' como reales en el index"
-#: diff.c:5488
+#: diff.c:5524
msgid "<string>"
msgstr "<string>"
-#: diff.c:5489
+#: diff.c:5525
msgid ""
"look for differences that change the number of occurrences of the specified "
"string"
@@ -3633,7 +3677,7 @@ msgstr ""
"busca por diferencias que cambien el número de ocurrencias para el string "
"especificado"
-#: diff.c:5492
+#: diff.c:5528
msgid ""
"look for differences that change the number of occurrences of the specified "
"regex"
@@ -3641,23 +3685,23 @@ msgstr ""
"busca por diferencias que cambien el número de ocurrencias para el regex "
"especificado"
-#: diff.c:5495
+#: diff.c:5531
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:5498
+#: diff.c:5534
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:5501
+#: diff.c:5537
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:5502
+#: diff.c:5538
msgid "<object-id>"
msgstr "<id-objeto>"
-#: diff.c:5503
+#: diff.c:5539
msgid ""
"look for differences that change the number of occurrences of the specified "
"object"
@@ -3665,33 +3709,33 @@ msgstr ""
"busca por diferencias que cambien el número de ocurrencias para el objeto "
"especificado"
-#: diff.c:5505
+#: diff.c:5541
msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"
-#: diff.c:5506
+#: diff.c:5542
msgid "select files by diff type"
msgstr "selecciona archivos por tipo de diff"
-#: diff.c:5508
+#: diff.c:5544
msgid "<file>"
msgstr "<archivo>"
-#: diff.c:5509
+#: diff.c:5545
msgid "Output to a specific file"
msgstr "Output a un archivo específico"
-#: diff.c:6164
+#: diff.c:6200
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:6167
+#: diff.c:6203
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:6170
+#: diff.c:6206
#, c-format
msgid ""
"you may want to set your %s variable to at least %d and retry the command."
@@ -3699,6 +3743,15 @@ msgstr ""
"tal vez quieras configurar la variable %s para por lo menos %d y volver a "
"intentar el comando."
+#: diffcore-order.c:24
+#, c-format
+msgid "failed to read orderfile '%s'"
+msgstr "falló al leer orden de archivos '%s'"
+
+#: diffcore-rename.c:592
+msgid "Performing inexact rename detection"
+msgstr "Realizando una detección de cambios de nombre inexacta"
+
#: dir.c:555
#, c-format
msgid "pathspec '%s' did not match any file(s) known to git"
@@ -3730,35 +3783,35 @@ msgstr "deshabilitar coincidencia de patrónes cono"
msgid "cannot use %s as an exclude file"
msgstr "no se puede usar %s como archivo de exclusión"
-#: dir.c:2144
+#: dir.c:2275
#, c-format
msgid "could not open directory '%s'"
msgstr "no se pudo abrir el directorio '%s'"
-#: dir.c:2479
+#: dir.c:2575
msgid "failed to get kernel name and information"
msgstr "falló al conseguir la información y nombre del kernel"
-#: dir.c:2603
+#: dir.c:2699
msgid "untracked cache is disabled on this system or location"
msgstr "untracked cache está desactivado en este sistema o ubicación"
-#: dir.c:3407
+#: dir.c:3481
#, c-format
msgid "index file corrupt in repo %s"
msgstr "archivo índice corrompido en repositorio %s"
-#: dir.c:3452 dir.c:3457
+#: dir.c:3526 dir.c:3531
#, c-format
msgid "could not create directories for %s"
msgstr "no se pudo crear directorios para %s"
-#: dir.c:3486
+#: dir.c:3560
#, c-format
msgid "could not migrate git directory from '%s' to '%s'"
msgstr "no se pudo migrar el directorio git de '%s' a '%s'"
-#: editor.c:73
+#: editor.c:74
#, c-format
msgid "hint: Waiting for your editor to close the file...%c"
msgstr "ayuda: Esperando que tu editor cierre el archivo ...%c"
@@ -3767,17 +3820,17 @@ msgstr "ayuda: Esperando que tu editor cierre el archivo ...%c"
msgid "Filtering content"
msgstr "Filtrando contenido"
-#: entry.c:476
+#: entry.c:479
#, c-format
msgid "could not stat file '%s'"
msgstr "no se pudo establecer el archivo '%s'"
-#: environment.c:149
+#: environment.c:150
#, c-format
msgid "bad git namespace path \"%s\""
msgstr "ruta de namespace de git mala \"%s\""
-#: environment.c:331
+#: environment.c:337
#, c-format
msgid "could not set GIT_DIR to '%s'"
msgstr "no se pudo configurar GIT_DIR a '%s'"
@@ -3787,245 +3840,245 @@ msgstr "no se pudo configurar GIT_DIR a '%s'"
msgid "too many args to run %s"
msgstr "demasiados argumentos para correr %s"
-#: fetch-pack.c:150
+#: fetch-pack.c:151
msgid "git fetch-pack: expected shallow list"
msgstr "git fetch-pack: lista poco profunda esperada"
-#: fetch-pack.c:153
+#: fetch-pack.c:154
msgid "git fetch-pack: expected a flush packet after shallow list"
msgstr ""
"git fetch-pack: se esperaba un flush packet luego de la lista superficial"
-#: fetch-pack.c:164
+#: fetch-pack.c:165
msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
msgstr "git fetch-pack: se esperaba ACK/NAK, se obtuvo un flush packet"
-#: fetch-pack.c:184
+#: fetch-pack.c:185
#, c-format
msgid "git fetch-pack: expected ACK/NAK, got '%s'"
msgstr "git fetch-pack: se esperaba ACK/NAK, se obtuvo '%s'"
-#: fetch-pack.c:195
+#: fetch-pack.c:196
msgid "unable to write to remote"
msgstr "no se puede escribir al remoto"
-#: fetch-pack.c:257
+#: fetch-pack.c:258
msgid "--stateless-rpc requires multi_ack_detailed"
msgstr "--stateless-rpc requiere multi_ack_detailed"
-#: fetch-pack.c:356 fetch-pack.c:1340
+#: fetch-pack.c:357 fetch-pack.c:1364
#, c-format
msgid "invalid shallow line: %s"
msgstr "línea poco profunda inválida: %s"
-#: fetch-pack.c:362 fetch-pack.c:1346
+#: fetch-pack.c:363 fetch-pack.c:1370
#, c-format
msgid "invalid unshallow line: %s"
msgstr "línea superficial inválida: %s"
-#: fetch-pack.c:364 fetch-pack.c:1348
+#: fetch-pack.c:365 fetch-pack.c:1372
#, c-format
msgid "object not found: %s"
msgstr "objeto no encontrado: %s"
-#: fetch-pack.c:367 fetch-pack.c:1351
+#: fetch-pack.c:368 fetch-pack.c:1375
#, c-format
msgid "error in object: %s"
msgstr "error en objeto: %s"
-#: fetch-pack.c:369 fetch-pack.c:1353
+#: fetch-pack.c:370 fetch-pack.c:1377
#, c-format
msgid "no shallow found: %s"
msgstr "superficie no encontrada: %s"
-#: fetch-pack.c:372 fetch-pack.c:1357
+#: fetch-pack.c:373 fetch-pack.c:1381
#, c-format
msgid "expected shallow/unshallow, got %s"
msgstr "se esperaba shallow/unshallow, se obtuvo %s"
-#: fetch-pack.c:414
+#: fetch-pack.c:415
#, c-format
msgid "got %s %d %s"
msgstr "se obtuvo %s %d %s"
-#: fetch-pack.c:431
+#: fetch-pack.c:432
#, c-format
msgid "invalid commit %s"
msgstr "commit inválido %s"
-#: fetch-pack.c:462
+#: fetch-pack.c:463
msgid "giving up"
msgstr "rindiéndose"
-#: fetch-pack.c:475 progress.c:323
+#: fetch-pack.c:476 progress.c:340
msgid "done"
msgstr "listo"
-#: fetch-pack.c:487
+#: fetch-pack.c:488
#, c-format
msgid "got %s (%d) %s"
msgstr "se obtuvo %s (%d) %s"
-#: fetch-pack.c:533
+#: fetch-pack.c:534
#, c-format
msgid "Marking %s as complete"
msgstr "Marcando %s como completa"
-#: fetch-pack.c:754
+#: fetch-pack.c:755
#, c-format
msgid "already have %s (%s)"
msgstr "ya se tiene %s (%s)"
-#: fetch-pack.c:818
+#: fetch-pack.c:819
msgid "fetch-pack: unable to fork off sideband demultiplexer"
msgstr "fetch-pack: no se puede extraer un demultiplexor de banda lateral"
-#: fetch-pack.c:826
+#: fetch-pack.c:827
msgid "protocol error: bad pack header"
msgstr "error de protocolo: paquete de header erróneo"
-#: fetch-pack.c:900
+#: fetch-pack.c:901
#, c-format
msgid "fetch-pack: unable to fork off %s"
msgstr "fetch-pack: no se puede quitar %s"
-#: fetch-pack.c:916
+#: fetch-pack.c:917
#, c-format
msgid "%s failed"
msgstr "%s falló"
-#: fetch-pack.c:918
+#: fetch-pack.c:919
msgid "error in sideband demultiplexer"
msgstr "error en demultiplexor de banda lateral"
-#: fetch-pack.c:965
+#: fetch-pack.c:966
#, c-format
msgid "Server version is %.*s"
msgstr "Versión de servidor es %.*s"
-#: fetch-pack.c:970 fetch-pack.c:976 fetch-pack.c:979 fetch-pack.c:985
-#: fetch-pack.c:989 fetch-pack.c:993 fetch-pack.c:997 fetch-pack.c:1001
-#: fetch-pack.c:1005 fetch-pack.c:1009 fetch-pack.c:1013 fetch-pack.c:1017
-#: fetch-pack.c:1023 fetch-pack.c:1029 fetch-pack.c:1034 fetch-pack.c:1039
+#: fetch-pack.c:971 fetch-pack.c:977 fetch-pack.c:980 fetch-pack.c:986
+#: fetch-pack.c:990 fetch-pack.c:994 fetch-pack.c:998 fetch-pack.c:1002
+#: fetch-pack.c:1006 fetch-pack.c:1010 fetch-pack.c:1014 fetch-pack.c:1018
+#: fetch-pack.c:1024 fetch-pack.c:1030 fetch-pack.c:1035 fetch-pack.c:1040
#, c-format
msgid "Server supports %s"
msgstr "El servidor soporta %s"
-#: fetch-pack.c:972
+#: fetch-pack.c:973
msgid "Server does not support shallow clients"
msgstr "El servidor no soporta clientes superficiales"
-#: fetch-pack.c:1032
+#: fetch-pack.c:1033
msgid "Server does not support --shallow-since"
msgstr "El servidor no soporta --shalow-since"
-#: fetch-pack.c:1037
+#: fetch-pack.c:1038
msgid "Server does not support --shallow-exclude"
msgstr "El servidor no soporta --shalow-exclude"
-#: fetch-pack.c:1041
+#: fetch-pack.c:1042
msgid "Server does not support --deepen"
msgstr "El servidor no soporta --deepen"
-#: fetch-pack.c:1058
+#: fetch-pack.c:1059
msgid "no common commits"
msgstr "no hay commits comunes"
-#: fetch-pack.c:1070 fetch-pack.c:1536
+#: fetch-pack.c:1071 fetch-pack.c:1563
msgid "git fetch-pack: fetch failed."
msgstr "git fetch-pack: fetch falló."
-#: fetch-pack.c:1209
+#: fetch-pack.c:1211
msgid "Server does not support shallow requests"
msgstr "El servidor no soporta peticiones superficiales"
-#: fetch-pack.c:1216
+#: fetch-pack.c:1218
msgid "Server supports filter"
msgstr "El servidor soporta filtro"
-#: fetch-pack.c:1239
+#: fetch-pack.c:1242
msgid "unable to write request to remote"
msgstr "no se puede escribir request al remoto"
-#: fetch-pack.c:1257
+#: fetch-pack.c:1260
#, c-format
msgid "error reading section header '%s'"
msgstr "error leyendo sección header '%s'"
-#: fetch-pack.c:1263
+#: fetch-pack.c:1266
#, c-format
msgid "expected '%s', received '%s'"
msgstr "se esperaba '%s', se recibió '%s'"
-#: fetch-pack.c:1303
+#: fetch-pack.c:1327
#, c-format
msgid "unexpected acknowledgment line: '%s'"
msgstr "línea de confirmación inesperada: '%s'"
-#: fetch-pack.c:1308
+#: fetch-pack.c:1332
#, c-format
msgid "error processing acks: %d"
msgstr "error procesando acks: %d"
-#: fetch-pack.c:1318
+#: fetch-pack.c:1342
msgid "expected packfile to be sent after 'ready'"
msgstr "espere que el packfile sea mandado luego del 'listo'"
-#: fetch-pack.c:1320
+#: fetch-pack.c:1344
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:1362
+#: fetch-pack.c:1386
#, c-format
msgid "error processing shallow info: %d"
msgstr "error procesando información superficial: %d"
-#: fetch-pack.c:1409
+#: fetch-pack.c:1433
#, c-format
msgid "expected wanted-ref, got '%s'"
msgstr "se esperaba wanted-ref, se obtuvo '%s'"
-#: fetch-pack.c:1414
+#: fetch-pack.c:1438
#, c-format
msgid "unexpected wanted-ref: '%s'"
msgstr "wanted-ref inesperado: '%s'"
-#: fetch-pack.c:1419
+#: fetch-pack.c:1443
#, c-format
msgid "error processing wanted refs: %d"
msgstr "error procesando refs deseadas: %d"
-#: fetch-pack.c:1762
+#: fetch-pack.c:1789
msgid "no matching remote head"
msgstr "no concuerda el head remoto"
-#: fetch-pack.c:1785 builtin/clone.c:689
+#: fetch-pack.c:1812 builtin/clone.c:692
msgid "remote did not send all necessary objects"
msgstr "remoto no mando todos los objetos necesarios"
-#: fetch-pack.c:1812
+#: fetch-pack.c:1839
#, c-format
msgid "no such remote ref %s"
msgstr "no existe ref remota %s"
-#: fetch-pack.c:1815
+#: fetch-pack.c:1842
#, 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:408
-msgid "gpg failed to sign the data"
-msgstr "gpg falló al firmar la data"
-
-#: gpg-interface.c:434
+#: gpg-interface.c:272
msgid "could not create temporary file"
msgstr "no se pudo crear archivo temporal"
-#: gpg-interface.c:437
+#: gpg-interface.c:275
#, c-format
msgid "failed writing detached signature to '%s'"
msgstr "falló al escribir la firma separada para '%s'"
+#: gpg-interface.c:457
+msgid "gpg failed to sign the data"
+msgstr "gpg falló al firmar la data"
+
#: graph.c:98
#, c-format
msgid "ignore invalid color '%.*s' in log.graphColors"
@@ -4044,7 +4097,7 @@ msgstr ""
msgid "'%s': unable to read %s"
msgstr "'%s': no es posible leer %s"
-#: grep.c:2145 setup.c:166 builtin/clone.c:411 builtin/diff.c:82
+#: grep.c:2145 setup.c:176 builtin/clone.c:411 builtin/diff.c:82
#: builtin/rm.c:135
#, c-format
msgid "failed to stat '%s'"
@@ -4120,7 +4173,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:98
+#: help.c:363 git.c:99
#, c-format
msgid "unsupported command listing type '%s'"
msgstr "comando de listado de tipos no soportado '%s'"
@@ -4129,19 +4182,19 @@ msgstr "comando de listado de tipos no soportado '%s'"
msgid "The common Git guides are:"
msgstr "Las guías comunes de Git son:"
-#: help.c:512
+#: help.c:427
msgid "See 'git help <command>' to read about a specific subcommand"
msgstr "Vea 'git help <comando>' para leer sobre los subcomandos específicos"
-#: help.c:517
+#: help.c:432
msgid "External commands"
msgstr "Comandos externos"
-#: help.c:532
+#: help.c:447
msgid "Command aliases"
msgstr "Aliases de comando"
-#: help.c:596
+#: help.c:511
#, c-format
msgid ""
"'%s' appears to be a git command, but we were not\n"
@@ -4150,31 +4203,31 @@ msgstr ""
"'%s' parece ser un comando de git, pero no hemos\n"
"podido ejecutarlo. ¿Tal vez git-%s se ha roto?"
-#: help.c:655
+#: help.c:570
msgid "Uh oh. Your system reports no Git commands at all."
msgstr "Oh oh. Tu sistema no reporta ningún comando de Git."
-#: help.c:677
+#: help.c:592
#, c-format
msgid "WARNING: You called a Git command named '%s', which does not exist."
msgstr "PELIGRO: Has llamado a un comando de Git '%s', el cual no existe."
-#: help.c:682
+#: help.c:597
#, c-format
msgid "Continuing under the assumption that you meant '%s'."
msgstr "Continuando asumiendo que quisiste decir '%s'."
-#: help.c:687
+#: help.c:602
#, c-format
msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
msgstr "Continuando en %0.1f segundos, asumiendo que tu dijiste '%s'."
-#: help.c:695
+#: help.c:610
#, c-format
msgid "git: '%s' is not a git command. See 'git --help'."
msgstr "git: '%s'no es un comando de git. Mira 'git --help'."
-#: help.c:699
+#: help.c:614
msgid ""
"\n"
"The most similar command is"
@@ -4188,16 +4241,16 @@ msgstr[1] ""
"\n"
"Los comandos más similares son"
-#: help.c:714
+#: help.c:653
msgid "git version [<options>]"
msgstr "git versión [<opciones>]"
-#: help.c:783
+#: help.c:708
#, c-format
msgid "%s: %s - %s"
msgstr "%s: %s - %s"
-#: help.c:787
+#: help.c:712
msgid ""
"\n"
"Did you mean this?"
@@ -4265,36 +4318,11 @@ 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:635
+#: ident.c:436 builtin/commit.c:634
#, c-format
msgid "invalid date format: %s"
msgstr "formato de fecha inválido: %s"
-#: list-objects.c:127
-#, c-format
-msgid "entry '%s' in tree %s has tree mode, but is not a tree"
-msgstr "entrada '%s' en árbol %s tiene modo árbol, pero no es uno"
-
-#: list-objects.c:140
-#, c-format
-msgid "entry '%s' in tree %s has blob mode, but is not a blob"
-msgstr "entrada '%s' en árbol %s tiene modo blob, pero no es uno"
-
-#: list-objects.c:375
-#, c-format
-msgid "unable to load root tree for commit %s"
-msgstr "no se puede cargar árbol raíz para commit %s"
-
-#: list-objects-filter.c:492
-#, c-format
-msgid "unable to access sparse blob in '%s'"
-msgstr "no es posible acceder al blob en '%s'"
-
-#: list-objects-filter.c:495
-#, c-format
-msgid "unable to parse sparse filter data in %s"
-msgstr "incapaz de analizar filtro de data en %s"
-
#: list-objects-filter-options.c:58
msgid "expected 'tree:<depth>'"
msgstr "se esperaba 'tree:<depth>'"
@@ -4321,7 +4349,32 @@ msgstr "se espera algo luego de combine:"
msgid "multiple filter-specs cannot be combined"
msgstr "no se pueden combinar múltiples tipos de especificaciones de filtro"
-#: lockfile.c:151
+#: list-objects-filter.c:492
+#, c-format
+msgid "unable to access sparse blob in '%s'"
+msgstr "no es posible acceder al blob en '%s'"
+
+#: list-objects-filter.c:495
+#, c-format
+msgid "unable to parse sparse filter data in %s"
+msgstr "incapaz de analizar filtro de data en %s"
+
+#: list-objects.c:127
+#, c-format
+msgid "entry '%s' in tree %s has tree mode, but is not a tree"
+msgstr "entrada '%s' en árbol %s tiene modo árbol, pero no es uno"
+
+#: list-objects.c:140
+#, c-format
+msgid "entry '%s' in tree %s has blob mode, but is not a blob"
+msgstr "entrada '%s' en árbol %s tiene modo blob, pero no es uno"
+
+#: list-objects.c:375
+#, c-format
+msgid "unable to load root tree for commit %s"
+msgstr "no se puede cargar árbol raíz para commit %s"
+
+#: lockfile.c:152
#, c-format
msgid ""
"Unable to create '%s.lock': %s.\n"
@@ -4341,20 +4394,14 @@ msgstr ""
"puede haber roto el repositorio antes:\n"
"borra el archivo manualmente para continuar."
-#: lockfile.c:159
+#: lockfile.c:160
#, c-format
msgid "Unable to create '%s.lock': %s"
msgstr "No se pudo crear '%s.lock': %s"
-#: merge.c:41
-msgid "failed to read the cache"
-msgstr "falló al leer la cache"
-
-#: merge.c:107 rerere.c:720 builtin/am.c:1879 builtin/am.c:1913
-#: builtin/checkout.c:541 builtin/checkout.c:800 builtin/clone.c:810
-#: builtin/stash.c:265
-msgid "unable to write new index file"
-msgstr "no es posible escribir el archivo índice"
+#: ls-refs.c:109
+msgid "expected flush after ls-refs arguments"
+msgstr "se esperaba un flush luego de argumentos ls-refs"
#: merge-recursive.c:356
msgid "(bad commit)\n"
@@ -4669,7 +4716,7 @@ msgstr "agregar/agregar"
msgid "Skipped %s (merged same as existing)"
msgstr "Saltado %s (fusionado como existente)"
-#: merge-recursive.c:3089 git-submodule.sh:1003
+#: merge-recursive.c:3089 git-submodule.sh:985
msgid "submodule"
msgstr "submódulo"
@@ -4789,10 +4836,20 @@ msgstr ""
msgid "Could not parse object '%s'"
msgstr "No se pudo analizar el objeto '%s'"
-#: merge-recursive.c:3774 builtin/merge.c:697 builtin/merge.c:877
+#: merge-recursive.c:3774 builtin/merge.c:705 builtin/merge.c:885
msgid "Unable to write index."
msgstr "Incapaz de escribir el índice."
+#: merge.c:41
+msgid "failed to read the cache"
+msgstr "falló al leer la cache"
+
+#: merge.c:108 rerere.c:720 builtin/am.c:1878 builtin/am.c:1912
+#: builtin/checkout.c:559 builtin/checkout.c:824 builtin/clone.c:816
+#: builtin/stash.c:265
+msgid "unable to write new index file"
+msgstr "no es posible escribir el archivo índice"
+
#: midx.c:68
#, c-format
msgid "multi-pack-index file %s is too small"
@@ -4844,108 +4901,116 @@ msgstr "multi-pack-index le falta el conjunto de offset del objeto requerido"
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:210
+#: midx.c:208
#, c-format
msgid "bad pack-int-id: %u (%u total packs)"
msgstr "mal pack-int-id: %u (%u paquetes totales)"
-#: midx.c:260
+#: midx.c:258
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:288
+#: midx.c:286
msgid "error preparing packfile from multi-pack-index"
msgstr "error preparando packfile de multi-pack-index"
-#: midx.c:472
+#: midx.c:470
#, c-format
msgid "failed to add packfile '%s'"
msgstr "falló al agregar packfile '%s'"
-#: midx.c:478
+#: midx.c:476
#, c-format
msgid "failed to open pack-index '%s'"
msgstr "falló al abrir pack-index '%s'"
-#: midx.c:538
+#: midx.c:536
#, c-format
msgid "failed to locate object %d in packfile"
msgstr "falló al ubicar objeto %d en packfile"
-#: midx.c:842
+#: midx.c:840
msgid "Adding packfiles to multi-pack-index"
msgstr "Agregando packfiles a multi-pack-index"
-#: midx.c:875
+#: midx.c:873
#, c-format
msgid "did not see pack-file %s to drop"
msgstr "no se vió pack-file %s caer"
-#: midx.c:973
+#: midx.c:925
+msgid "no pack files to index."
+msgstr "no hay archivos pack para indexar."
+
+#: midx.c:977
msgid "Writing chunks to multi-pack-index"
msgstr "Escribiendo chunks a multi-pack-index"
-#: midx.c:1052
+#: midx.c:1056
#, c-format
msgid "failed to clear multi-pack-index at %s"
msgstr "falló al limpiar multi-pack-index en %s"
-#: midx.c:1108
+#: midx.c:1112
msgid "Looking for referenced packfiles"
msgstr "Buscando por packfiles referidos"
-#: midx.c:1123
+#: midx.c:1127
#, 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:1128
+#: midx.c:1132
+msgid "the midx contains no oid"
+msgstr "el midx no contiene oid"
+
+#: midx.c:1141
msgid "Verifying OID order in multi-pack-index"
msgstr "Verificando orden de OID en multi-pack-index"
-#: midx.c:1137
+#: midx.c:1150
#, 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:1157
+#: midx.c:1170
msgid "Sorting objects by packfile"
msgstr "Ordenando objetos por packfile"
-#: midx.c:1164
+#: midx.c:1177
msgid "Verifying object offsets"
msgstr "Verificando offsets de objetos"
-#: midx.c:1180
+#: midx.c:1193
#, c-format
msgid "failed to load pack entry for oid[%d] = %s"
msgstr "fallo al cargar entrada pack para oid[%d] = %s"
-#: midx.c:1186
+#: midx.c:1199
#, c-format
msgid "failed to load pack-index for packfile %s"
msgstr "falló al cargar el pack-index para packfile %s"
-#: midx.c:1195
+#: midx.c:1208
#, c-format
msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
msgstr "offset para objeto incorrecto oid[%d] = %s: %<PRIx64> != %<PRIx64>"
-#: midx.c:1220
+#: midx.c:1233
msgid "Counting referenced objects"
msgstr "Contando objetos no referenciados"
-#: midx.c:1230
+#: midx.c:1243
msgid "Finding and deleting unreferenced packfiles"
msgstr "Encontrando y borrando packfiles sin referencias"
-#: midx.c:1388
+#: midx.c:1433
msgid "could not start pack-objects"
msgstr "no se pudo empezar los pack-objetcts"
-#: midx.c:1407
+#: midx.c:1452
msgid "could not finish pack-objects"
msgstr "no se pudo finalizar pack-objetcts"
@@ -5031,6 +5096,11 @@ msgstr "incapaz de analizar objeto: %s"
msgid "hash mismatch %s"
msgstr "hash no concuerda %s"
+#: pack-bitmap.c:815 pack-bitmap.c:821 builtin/pack-objects.c:2135
+#, c-format
+msgid "unable to get size of %s"
+msgstr "no se pudo obtener el tamaño de %s"
+
#: packfile.c:629
msgid "offset before end of packfile (broken .idx?)"
msgstr "offset antes del final del paquete (broken .idx?)"
@@ -5047,10 +5117,25 @@ msgid "offset beyond end of pack index for %s (truncated index?)"
msgstr ""
"offset más allá del índice de fin de paquete para %s (¿índice truncado?)"
-#: pack-bitmap.c:800 pack-bitmap.c:806 builtin/pack-objects.c:2134
+#: parse-options-cb.c:20 parse-options-cb.c:24
#, c-format
-msgid "unable to get size of %s"
-msgstr "no se pudo obtener el tamaño de %s"
+msgid "option `%s' expects a numerical value"
+msgstr "opción `%s' espera un valor numérico"
+
+#: parse-options-cb.c:41
+#, c-format
+msgid "malformed expiration date '%s'"
+msgstr "fecha de expiración mal formada: '%s'"
+
+#: parse-options-cb.c:54
+#, c-format
+msgid "option `%s' expects \"always\", \"auto\", or \"never\""
+msgstr "opción `%s' puede usar \"always\", \"auto\", o \"never\""
+
+#: parse-options-cb.c:130 parse-options-cb.c:147
+#, c-format
+msgid "malformed object name '%s'"
+msgstr "nombre de objeto mal formado '%s'"
#: parse-options.c:38
#, c-format
@@ -5092,26 +5177,31 @@ msgstr "opción ambigua: %s (puede ser --%s%s o --%s%s)"
msgid "did you mean `--%s` (with two dashes)?"
msgstr "¿quisiste decir `--%s` (con dos guiones)?"
-#: parse-options.c:857
+#: parse-options.c:663 parse-options.c:963
+#, c-format
+msgid "alias of --%s"
+msgstr "alias de --%s"
+
+#: parse-options.c:854
#, c-format
msgid "unknown option `%s'"
msgstr "opción `%s' desconocida"
-#: parse-options.c:859
+#: parse-options.c:856
#, c-format
msgid "unknown switch `%c'"
msgstr "switch desconocido `%c'"
-#: parse-options.c:861
+#: parse-options.c:858
#, c-format
msgid "unknown non-ascii option in string: `%s'"
msgstr "opción desconocida en string no ascii: `%s'"
-#: parse-options.c:885
+#: parse-options.c:882
msgid "..."
msgstr "..."
-#: parse-options.c:904
+#: parse-options.c:901
#, c-format
msgid "usage: %s"
msgstr "uso: %s"
@@ -5119,45 +5209,20 @@ msgstr "uso: %s"
#. TRANSLATORS: the colon here should align with the
#. one in "usage: %s" translation.
#.
-#: parse-options.c:910
+#: parse-options.c:907
#, c-format
msgid " or: %s"
msgstr " o: %s"
-#: parse-options.c:913
+#: parse-options.c:910
#, c-format
msgid " %s"
msgstr " %s"
-#: parse-options.c:952
+#: parse-options.c:949
msgid "-NUM"
msgstr "-NUM"
-#: parse-options.c:966
-#, c-format
-msgid "alias of --%s"
-msgstr "alias de --%s"
-
-#: parse-options-cb.c:20 parse-options-cb.c:24
-#, c-format
-msgid "option `%s' expects a numerical value"
-msgstr "opción `%s' espera un valor numérico"
-
-#: parse-options-cb.c:41
-#, c-format
-msgid "malformed expiration date '%s'"
-msgstr "fecha de expiración mal formada: '%s'"
-
-#: parse-options-cb.c:54
-#, c-format
-msgid "option `%s' expects \"always\", \"auto\", or \"never\""
-msgstr "opción `%s' puede usar \"always\", \"auto\", o \"never\""
-
-#: parse-options-cb.c:130 parse-options-cb.c:147
-#, c-format
-msgid "malformed object name '%s'"
-msgstr "nombre de objeto mal formado '%s'"
-
#: path.c:915
#, c-format
msgid "Could not make %s writable by group"
@@ -5218,27 +5283,27 @@ msgstr "Magic pathspec '%c' no implementado en '%s'"
msgid "%s: 'literal' and 'glob' are incompatible"
msgstr "%s: 'literal' y 'glob' son incompatibles"
-#: pathspec.c:442
+#: pathspec.c:445
#, c-format
msgid "%s: '%s' is outside repository at '%s'"
msgstr "%s: '%s' está fuera del repositorio en '%s'"
-#: pathspec.c:517
+#: pathspec.c:521
#, c-format
msgid "'%s' (mnemonic: '%c')"
msgstr "'%s' (nemotécnico: '%c')"
-#: pathspec.c:527
+#: pathspec.c:531
#, c-format
msgid "%s: pathspec magic not supported by this command: %s"
msgstr "%s: magic pathspec no soportado por este comando: %s"
-#: pathspec.c:594
+#: pathspec.c:598
#, c-format
msgid "pathspec '%s' is beyond a symbolic link"
msgstr "el patrón de ruta '%s' está detrás de un enlace simbólico"
-#: pathspec.c:639
+#: pathspec.c:643
#, c-format
msgid "line is badly quoted: %s"
msgstr "la línea está mál citada: %s"
@@ -5303,7 +5368,7 @@ msgstr "Refrescando index"
msgid "unable to create threaded lstat: %s"
msgstr "no es posible crear lstat hilado: %s"
-#: pretty.c:981
+#: pretty.c:982
msgid "unable to parse --pretty format"
msgstr "incapaz de analizar el formato --pretty"
@@ -5316,29 +5381,42 @@ msgstr "Remoto sin URL"
msgid "promisor remote name cannot begin with '/': %s"
msgstr "nombre remoto promisor no puede comenzar con '/': %s"
-#: range-diff.c:75
+#: prune-packed.c:35
+msgid "Removing duplicate objects"
+msgstr "Removiendo objetos duplicados"
+
+#: range-diff.c:77
msgid "could not start `log`"
msgstr "no se pudo comenzar `log`"
-#: range-diff.c:77
+#: range-diff.c:79
msgid "could not read `log` output"
msgstr "no se pudo leer output de `log`"
-#: range-diff.c:96 sequencer.c:5020
+#: range-diff.c:98 sequencer.c:5143
#, c-format
msgid "could not parse commit '%s'"
msgstr "no se pudo analizar commit '%s'"
-#: range-diff.c:122
+#: range-diff.c:112
+#, c-format
+msgid ""
+"could not parse first line of `log` output: did not start with 'commit ': "
+"'%s'"
+msgstr ""
+"no se pudo leer la primera línea de salida `log`: no comienza con 'commit ': "
+"'%s'"
+
+#: range-diff.c:137
#, c-format
msgid "could not parse git header '%.*s'"
msgstr "no se puede analizar git header '%.*s'"
-#: range-diff.c:285
+#: range-diff.c:301
msgid "failed to generate diff"
msgstr "falló al generar diff"
-#: range-diff.c:518 range-diff.c:520
+#: range-diff.c:534 range-diff.c:536
#, c-format
msgid "could not parse log for '%s'"
msgstr "no se pudo leer el log para '%s'"
@@ -5455,9 +5533,9 @@ msgstr "entradas de stage desordenadas para '%s'"
#: read-cache.c:1983 read-cache.c:2271 rerere.c:565 rerere.c:599 rerere.c:1111
#: submodule.c:1619 builtin/add.c:532 builtin/check-ignore.c:181
-#: builtin/checkout.c:470 builtin/checkout.c:656 builtin/clean.c:967
-#: builtin/commit.c:367 builtin/diff-tree.c:120 builtin/grep.c:485
-#: builtin/mv.c:145 builtin/reset.c:246 builtin/rm.c:290
+#: builtin/checkout.c:488 builtin/checkout.c:676 builtin/clean.c:961
+#: builtin/commit.c:364 builtin/diff-tree.c:121 builtin/grep.c:507
+#: builtin/mv.c:145 builtin/reset.c:247 builtin/rm.c:290
#: builtin/submodule--helper.c:332
msgid "index file corrupt"
msgstr "archivo índice corrompido"
@@ -5512,12 +5590,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:3026 strbuf.c:1160 wrapper.c:622 builtin/merge.c:1122
+#: read-cache.c:3026 strbuf.c:1176 wrapper.c:622 builtin/merge.c:1130
#, c-format
msgid "could not close '%s'"
msgstr "no se pudo cerrar '%s'"
-#: read-cache.c:3129 sequencer.c:2343 sequencer.c:3959
+#: read-cache.c:3129 sequencer.c:2355 sequencer.c:4066
#, c-format
msgid "could not stat '%s'"
msgstr "no se pudo definir '%s'"
@@ -5648,14 +5726,14 @@ msgstr ""
"Como sea, si quieres borrar todo, el rebase será abortado.\n"
"\n"
-#: rebase-interactive.c:110 rerere.c:485 rerere.c:692 sequencer.c:3444
-#: sequencer.c:3470 sequencer.c:5125 builtin/fsck.c:346 builtin/rebase.c:252
+#: rebase-interactive.c:110 rerere.c:485 rerere.c:692 sequencer.c:3463
+#: sequencer.c:3489 sequencer.c:5248 builtin/fsck.c:346 builtin/rebase.c:258
#, c-format
msgid "could not write '%s'"
msgstr "no se pudo escribir '%s'"
-#: rebase-interactive.c:116 builtin/rebase.c:184 builtin/rebase.c:210
-#: builtin/rebase.c:234
+#: rebase-interactive.c:116 builtin/rebase.c:190 builtin/rebase.c:216
+#: builtin/rebase.c:240
#, c-format
msgid "could not write '%s'."
msgstr "no se pudo escribir '%s'."
@@ -5687,132 +5765,14 @@ msgstr ""
"Los posibles comportamientos son: ignore,warn,error.\n"
"\n"
-#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2262
-#: builtin/rebase.c:170 builtin/rebase.c:195 builtin/rebase.c:221
-#: builtin/rebase.c:246
+#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2274
+#: builtin/rebase.c:176 builtin/rebase.c:201 builtin/rebase.c:227
+#: builtin/rebase.c:252
#, c-format
msgid "could not read '%s'."
msgstr "no se puede leer '%s'."
-#: 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:667
-#, c-format
-msgid "ignoring dangling symref %s"
-msgstr "ignorando referencia rota %s"
-
-#: refs.c:669 ref-filter.c:2098
-#, c-format
-msgid "ignoring broken ref %s"
-msgstr "ignorando referencia rota %s"
-
-#: refs.c:804
-#, c-format
-msgid "could not open '%s' for writing: %s"
-msgstr "no se pudo abrir '%s' para escritura: %s"
-
-#: refs.c:814 refs.c:865
-#, c-format
-msgid "could not read ref '%s'"
-msgstr "no se pudo leer la referencia '%s'"
-
-#: refs.c:820
-#, c-format
-msgid "ref '%s' already exists"
-msgstr "ref '%s' ya existe"
-
-#: refs.c:825
-#, c-format
-msgid "unexpected object ID when writing '%s'"
-msgstr "ID de objecto inesperado al escribir '%s'"
-
-#: refs.c:833 sequencer.c:407 sequencer.c:2701 sequencer.c:2905
-#: sequencer.c:2919 sequencer.c:3177 sequencer.c:5036 strbuf.c:1157
-#: wrapper.c:620
-#, c-format
-msgid "could not write to '%s'"
-msgstr "no se pudo escribir en '%s'"
-
-#: refs.c:860 strbuf.c:1155 wrapper.c:188 wrapper.c:358 builtin/am.c:719
-#: builtin/rebase.c:1029
-#, c-format
-msgid "could not open '%s' for writing"
-msgstr "no se pudo abrir '%s' para escritura"
-
-#: refs.c:867
-#, c-format
-msgid "unexpected object ID when deleting '%s'"
-msgstr "ID de objecto inesperado al borrar '%s'"
-
-#: 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:1004
-#, c-format
-msgid "log for ref %s unexpectedly ended on %s"
-msgstr "log de ref %s finalizado inesperadamente en %s"
-
-#: refs.c:1063
-#, c-format
-msgid "log for %s is empty"
-msgstr "log de %s está vacío"
-
-#: refs.c:1155
-#, c-format
-msgid "refusing to update ref with bad name '%s'"
-msgstr "rehusando actualizar ref con mal nombre '%s'"
-
-#: refs.c:1231
-#, c-format
-msgid "update_ref failed for ref '%s': %s"
-msgstr "update_ref falló para ref '%s': %s"
-
-#: refs.c:2023
-#, c-format
-msgid "multiple updates for ref '%s' not allowed"
-msgstr "múltiples actualizaciones para ref '%s' no permitidas"
-
-#: refs.c:2055
-msgid "ref updates forbidden inside quarantine environment"
-msgstr "actualizaciones de ref prohibidas dentro de ambiente de cuarentena"
-
-#: refs.c:2151 refs.c:2181
-#, c-format
-msgid "'%s' exists; cannot create '%s'"
-msgstr "'%s' existe; no se puede crear '%s'"
-
-#: refs.c:2157 refs.c:2192
-#, c-format
-msgid "cannot process '%s' and '%s' at the same time"
-msgstr "no se puede procesar '%s' y '%s' al mismo tiempo"
-
-#: refs/files-backend.c:1233
-#, c-format
-msgid "could not remove reference %s"
-msgstr "no se pudo eliminar la referencia %s"
-
-#: refs/files-backend.c:1247 refs/packed-backend.c:1541
-#: refs/packed-backend.c:1551
-#, c-format
-msgid "could not delete reference %s: %s"
-msgstr "no se pudo eliminar la referencia %s: %s"
-
-#: refs/files-backend.c:1250 refs/packed-backend.c:1554
-#, c-format
-msgid "could not delete references: %s"
-msgstr "no se pudo eliminar la referencia: %s"
-
-#: refspec.c:137
-#, c-format
-msgid "invalid refspec '%s'"
-msgstr "refspec inválido: '%s'"
-
-#: ref-filter.c:42 wt-status.c:1938
+#: ref-filter.c:42 wt-status.c:1936
msgid "gone"
msgstr "desaparecido"
@@ -5998,114 +5958,232 @@ msgstr "formato: átomo %%(end) usado sin átomo correspondiente"
msgid "malformed format string %s"
msgstr "formato de cadena mal formado %s"
-#: ref-filter.c:1488
+#: ref-filter.c:1486
#, c-format
msgid "no branch, rebasing %s"
msgstr "no hay rama, rebasando %s"
-#: ref-filter.c:1491
+#: ref-filter.c:1489
#, c-format
msgid "no branch, rebasing detached HEAD %s"
msgstr "(o hay rama, rebasando con HEAD desacoplado %s"
-#: ref-filter.c:1494
+#: ref-filter.c:1492
#, c-format
msgid "no branch, bisect started on %s"
msgstr "no hay rama, comenzando biseccón en %s"
-#: ref-filter.c:1504
+#: ref-filter.c:1502
msgid "no branch"
msgstr "sin rama"
-#: ref-filter.c:1540 ref-filter.c:1749
+#: ref-filter.c:1538 ref-filter.c:1747
#, c-format
msgid "missing object %s for %s"
msgstr "falta objeto %s para %s"
-#: ref-filter.c:1550
+#: ref-filter.c:1548
#, c-format
msgid "parse_object_buffer failed on %s for %s"
msgstr "parse_object_buffer falló en %s para %s"
-#: ref-filter.c:2004
+#: ref-filter.c:2001
#, c-format
msgid "malformed object at '%s'"
msgstr "objeto mal formado en '%s'"
-#: ref-filter.c:2093
+#: ref-filter.c:2090
#, c-format
msgid "ignoring ref with broken name %s"
msgstr "ignorando referencia con nombre roto %s"
-#: ref-filter.c:2389
+#: ref-filter.c:2095 refs.c:625
+#, c-format
+msgid "ignoring broken ref %s"
+msgstr "ignorando referencia rota %s"
+
+#: ref-filter.c:2395
#, c-format
msgid "format: %%(end) atom missing"
msgstr "formato: falta átomo %%(end)"
-#: ref-filter.c:2489
+#: ref-filter.c:2495
#, c-format
msgid "option `%s' is incompatible with --merged"
msgstr "opción `%s' es incompatible con --merged"
-#: ref-filter.c:2492
+#: ref-filter.c:2498
#, c-format
msgid "option `%s' is incompatible with --no-merged"
msgstr "opción `%s' es incompatible con --no-merged"
-#: ref-filter.c:2502
+#: ref-filter.c:2508
#, c-format
msgid "malformed object name %s"
msgstr "nombre de objeto mal formado %s"
-#: ref-filter.c:2507
+#: ref-filter.c:2513
#, c-format
msgid "option `%s' must point to a commit"
msgstr "opción '%s' debe apuntar a un commit"
-#: remote.c:366
+#: 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:623
+#, c-format
+msgid "ignoring dangling symref %s"
+msgstr "ignorando referencia rota %s"
+
+#: refs.c:760
+#, c-format
+msgid "could not open '%s' for writing: %s"
+msgstr "no se pudo abrir '%s' para escritura: %s"
+
+#: refs.c:770 refs.c:821
+#, c-format
+msgid "could not read ref '%s'"
+msgstr "no se pudo leer la referencia '%s'"
+
+#: refs.c:776
+#, c-format
+msgid "ref '%s' already exists"
+msgstr "ref '%s' ya existe"
+
+#: refs.c:781
+#, c-format
+msgid "unexpected object ID when writing '%s'"
+msgstr "ID de objecto inesperado al escribir '%s'"
+
+#: refs.c:789 sequencer.c:408 sequencer.c:2721 sequencer.c:2925
+#: sequencer.c:2939 sequencer.c:3195 sequencer.c:5159 strbuf.c:1173
+#: wrapper.c:620
+#, c-format
+msgid "could not write to '%s'"
+msgstr "no se pudo escribir en '%s'"
+
+#: refs.c:816 strbuf.c:1171 wrapper.c:188 wrapper.c:358 builtin/am.c:719
+#: builtin/rebase.c:852
+#, c-format
+msgid "could not open '%s' for writing"
+msgstr "no se pudo abrir '%s' para escritura"
+
+#: refs.c:823
+#, c-format
+msgid "unexpected object ID when deleting '%s'"
+msgstr "ID de objecto inesperado al borrar '%s'"
+
+#: refs.c:954
+#, c-format
+msgid "log for ref %s has gap after %s"
+msgstr "log de ref %s tiene un vacío tras %s"
+
+#: refs.c:960
+#, c-format
+msgid "log for ref %s unexpectedly ended on %s"
+msgstr "log de ref %s finalizado inesperadamente en %s"
+
+#: refs.c:1019
+#, c-format
+msgid "log for %s is empty"
+msgstr "log de %s está vacío"
+
+#: refs.c:1111
+#, c-format
+msgid "refusing to update ref with bad name '%s'"
+msgstr "rehusando actualizar ref con mal nombre '%s'"
+
+#: refs.c:1187
+#, c-format
+msgid "update_ref failed for ref '%s': %s"
+msgstr "update_ref falló para ref '%s': %s"
+
+#: refs.c:1979
+#, c-format
+msgid "multiple updates for ref '%s' not allowed"
+msgstr "múltiples actualizaciones para ref '%s' no permitidas"
+
+#: refs.c:2011
+msgid "ref updates forbidden inside quarantine environment"
+msgstr "actualizaciones de ref prohibidas dentro de ambiente de cuarentena"
+
+#: refs.c:2107 refs.c:2137
+#, c-format
+msgid "'%s' exists; cannot create '%s'"
+msgstr "'%s' existe; no se puede crear '%s'"
+
+#: refs.c:2113 refs.c:2148
+#, c-format
+msgid "cannot process '%s' and '%s' at the same time"
+msgstr "no se puede procesar '%s' y '%s' al mismo tiempo"
+
+#: refs/files-backend.c:1233
+#, c-format
+msgid "could not remove reference %s"
+msgstr "no se pudo eliminar la referencia %s"
+
+#: refs/files-backend.c:1247 refs/packed-backend.c:1541
+#: refs/packed-backend.c:1551
+#, c-format
+msgid "could not delete reference %s: %s"
+msgstr "no se pudo eliminar la referencia %s: %s"
+
+#: refs/files-backend.c:1250 refs/packed-backend.c:1554
+#, c-format
+msgid "could not delete references: %s"
+msgstr "no se pudo eliminar la referencia: %s"
+
+#: refspec.c:137
+#, c-format
+msgid "invalid refspec '%s'"
+msgstr "refspec inválido: '%s'"
+
+#: remote.c:355
#, c-format
msgid "config remote shorthand cannot begin with '/': %s"
msgstr "config remote shorthand no puede comenzar con '/': %s"
-#: remote.c:414
+#: remote.c:403
msgid "more than one receivepack given, using the first"
msgstr "más de un receivepack dado, usando el primero"
-#: remote.c:422
+#: remote.c:411
msgid "more than one uploadpack given, using the first"
msgstr "más de un uploadpack dado, usando el primero"
-#: remote.c:612
+#: remote.c:594
#, c-format
msgid "Cannot fetch both %s and %s to %s"
msgstr "No se pueden traer ambos %s y %s a %s"
-#: remote.c:616
+#: remote.c:598
#, c-format
msgid "%s usually tracks %s, not %s"
msgstr "%s por lo general hace seguimiento a %s, no a %s"
-#: remote.c:620
+#: remote.c:602
#, c-format
msgid "%s tracks both %s and %s"
msgstr "%s hace seguimiento tanto a %s como a %s"
-#: remote.c:688
+#: remote.c:670
#, c-format
msgid "key '%s' of pattern had no '*'"
msgstr "llave '%s' de patrón no tuvo '*'"
-#: remote.c:698
+#: remote.c:680
#, c-format
msgid "value '%s' of pattern has no '*'"
msgstr "valor '%s' del patrón no tiene '*'"
-#: remote.c:1004
+#: remote.c:986
#, c-format
msgid "src refspec %s does not match any"
msgstr "src refsoec %s: no concuerda con ninguno"
-#: remote.c:1009
+#: remote.c:991
#, c-format
msgid "src refspec %s matches more than one"
msgstr "src refspec %s concuerda con más de uno"
@@ -6114,7 +6192,7 @@ msgstr "src refspec %s concuerda con más de uno"
#. <remote> <src>:<dst>" push, and "being pushed ('%s')" is
#. the <src>.
#.
-#: remote.c:1024
+#: remote.c:1006
#, c-format
msgid ""
"The destination you provided is not a full refname (i.e.,\n"
@@ -6138,7 +6216,7 @@ msgstr ""
"Ninguno funcionó así que nos dimos por vencidos. Tienes que especificar el "
"full ref."
-#: remote.c:1044
+#: remote.c:1026
#, c-format
msgid ""
"The <src> part of the refspec is a commit object.\n"
@@ -6149,7 +6227,7 @@ msgstr ""
"¿Quisiste crear un branch nuevo mediante un push a\n"
"'%s:refs/heads/%s'?"
-#: remote.c:1049
+#: remote.c:1031
#, c-format
msgid ""
"The <src> part of the refspec is a tag object.\n"
@@ -6160,7 +6238,7 @@ msgstr ""
"Did you mean to create a new tag by pushing to\n"
"'%s:refs/tags/%s'?"
-#: remote.c:1054
+#: remote.c:1036
#, c-format
msgid ""
"The <src> part of the refspec is a tree object.\n"
@@ -6171,7 +6249,7 @@ msgstr ""
"¿Quisiste crear un tag nuevo mediante un push a\n"
"'%s:refs/heads/%s'?"
-#: remote.c:1059
+#: remote.c:1041
#, c-format
msgid ""
"The <src> part of the refspec is a blob object.\n"
@@ -6182,115 +6260,115 @@ msgstr ""
"¿Quisiste crear un tag nuevo mediante un push a\n"
"'%s:refs/heads/%s'?"
-#: remote.c:1095
+#: remote.c:1077
#, c-format
msgid "%s cannot be resolved to branch"
msgstr "%s no puede ser resolver a un branch"
-#: remote.c:1106
+#: remote.c:1088
#, c-format
msgid "unable to delete '%s': remote ref does not exist"
msgstr "no es posible borrar '%s': ref remoto no existe"
-#: remote.c:1118
+#: remote.c:1100
#, c-format
msgid "dst refspec %s matches more than one"
msgstr "dst refspec %s concuerda con más de uno"
-#: remote.c:1125
+#: remote.c:1107
#, c-format
msgid "dst ref %s receives from more than one src"
msgstr "dst ref %s recibe de más de un src"
-#: remote.c:1628 remote.c:1729
+#: remote.c:1610 remote.c:1711
msgid "HEAD does not point to a branch"
msgstr "HEAD no apunta a ninguna rama"
-#: remote.c:1637
+#: remote.c:1619
#, c-format
msgid "no such branch: '%s'"
msgstr "no existe tal rama: '%s'"
-#: remote.c:1640
+#: remote.c:1622
#, c-format
msgid "no upstream configured for branch '%s'"
msgstr "no se ha configurado upstream para la rama '%s'"
-#: remote.c:1646
+#: remote.c:1628
#, c-format
msgid "upstream branch '%s' not stored as a remote-tracking branch"
msgstr "la rama '%s' de upstream no es guardad como rama de rastreo remoto"
-#: remote.c:1661
+#: remote.c:1643
#, c-format
msgid "push destination '%s' on remote '%s' has no local tracking branch"
msgstr ""
"destino de push '%s' en el remoto '%s' no tiene una rama de rastreo local"
-#: remote.c:1673
+#: remote.c:1655
#, c-format
msgid "branch '%s' has no remote for pushing"
msgstr "la rama '%s' no tiene remoto para enviar"
-#: remote.c:1683
+#: remote.c:1665
#, c-format
msgid "push refspecs for '%s' do not include '%s'"
msgstr "refspecs del push para '%s' no incluyen '%s'"
-#: remote.c:1696
+#: remote.c:1678
msgid "push has no destination (push.default is 'nothing')"
msgstr "push no tiene destino (push.default es 'nada')"
-#: remote.c:1718
+#: remote.c:1700
msgid "cannot resolve 'simple' push to a single destination"
msgstr "no se puede resolver push 'simple' para un destino único"
-#: remote.c:1844
+#: remote.c:1826
#, c-format
msgid "couldn't find remote ref %s"
msgstr "no se puedo encontrar ref remota %s"
-#: remote.c:1857
+#: remote.c:1839
#, c-format
msgid "* Ignoring funny ref '%s' locally"
msgstr "* Ignorando ref graciosa '%s' localmente"
-#: remote.c:2020
+#: remote.c:2002
#, c-format
msgid "Your branch is based on '%s', but the upstream is gone.\n"
msgstr "Tu rama está basada en '%s', pero upstream ha desaparecido.\n"
-#: remote.c:2024
+#: remote.c:2006
msgid " (use \"git branch --unset-upstream\" to fixup)\n"
msgstr " (usa \"git branch --unset-upstream\" para arreglar)\n"
-#: remote.c:2027
+#: remote.c:2009
#, c-format
msgid "Your branch is up to date with '%s'.\n"
msgstr "Tu rama está actualizada con '%s'.\n"
-#: remote.c:2031
+#: remote.c:2013
#, c-format
msgid "Your branch and '%s' refer to different commits.\n"
msgstr "Tu rama y '%s' refieren a commits diferentes.\n"
-#: remote.c:2034
+#: remote.c:2016
#, c-format
msgid " (use \"%s\" for details)\n"
msgstr " (usa \"%s\" para detalles)\n"
-#: remote.c:2038
+#: remote.c:2020
#, c-format
msgid "Your branch is ahead of '%s' by %d commit.\n"
msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
msgstr[0] "Tu rama está adelantada a '%s' por %d commit.\n"
msgstr[1] "Tu rama está adelantada a '%s' por %d commits.\n"
-#: remote.c:2044
+#: remote.c:2026
msgid " (use \"git push\" to publish your local commits)\n"
msgstr " (usa \"git push\" para publicar tus commits locales)\n"
-#: remote.c:2047
+#: remote.c:2029
#, c-format
msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
msgid_plural ""
@@ -6300,11 +6378,11 @@ msgstr[0] ""
msgstr[1] ""
"Tu rama está detrás de '%s' por %d commits, y puede ser avanzada rápido.\n"
-#: remote.c:2055
+#: remote.c:2037
msgid " (use \"git pull\" to update your local branch)\n"
msgstr " (usa \"git pull\" para actualizar tu rama local)\n"
-#: remote.c:2058
+#: remote.c:2040
#, c-format
msgid ""
"Your branch and '%s' have diverged,\n"
@@ -6319,11 +6397,11 @@ msgstr[1] ""
"Tu rama y '%s' han divergido,\n"
"y tienen %d y %d commits diferentes cada una respectivamente.\n"
-#: remote.c:2068
+#: remote.c:2050
msgid " (use \"git pull\" to merge the remote branch into yours)\n"
msgstr " (usa \"git pull\" para fusionar la rama remota en la tuya)\n"
-#: remote.c:2251
+#: remote.c:2233
#, c-format
msgid "cannot parse expected object name '%s'"
msgstr "no se puede leer el nombre de objeto '%s'"
@@ -6343,6 +6421,11 @@ msgstr "duplicar ref de reemplazo: %s"
msgid "replace depth too high for object %s"
msgstr "remplazar profundiad muy elevada para objeto %s"
+#: repository.c:94 builtin/init-db.c:188
+#, c-format
+msgid "The hash algorithm %s is not supported in this build."
+msgstr "El algoritmo hash %s no está soportado en este build."
+
#: rerere.c:217 rerere.c:226 rerere.c:229
msgid "corrupt MERGE_RR"
msgstr "MERGE_RR corrupto"
@@ -6401,7 +6484,7 @@ msgstr "no se puede desvincular stray '%s'"
msgid "Recorded preimage for '%s'"
msgstr "Resolución precargada para '%s'"
-#: rerere.c:881 submodule.c:2078 builtin/log.c:1871
+#: rerere.c:881 submodule.c:2078 builtin/log.c:1891
#: builtin/submodule--helper.c:1454 builtin/submodule--helper.c:1466
#, c-format
msgid "could not create directory '%s'"
@@ -6436,20 +6519,29 @@ 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:2497
+#: reset.c:42
+msgid "could not determine HEAD revision"
+msgstr "no se pudo determinar revisión HEAD"
+
+#: reset.c:70 reset.c:76 sequencer.c:3318
+#, c-format
+msgid "failed to find tree of %s"
+msgstr "falló al encontrar árbol de %s"
+
+#: revision.c:2655
msgid "your current branch appears to be broken"
msgstr "tu rama actual parece estar rota"
-#: revision.c:2500
+#: revision.c:2658
#, 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:2708
+#: revision.c:2866
msgid "--first-parent is incompatible with --bisect"
msgstr "--first-parent es incompatible con --bisect"
-#: revision.c:2712
+#: revision.c:2870
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"
@@ -6472,30 +6564,30 @@ msgstr ""
"Puedes desactivar esta advertencias con `git config advice.ignoredHook "
"false`."
-#: send-pack.c:144
+#: send-pack.c:145
msgid "unexpected flush packet while reading remote unpack status"
msgstr ""
"flush packet inesperado mientras se leía estatus de desempaquetado remoto"
-#: send-pack.c:146
+#: send-pack.c:147
#, c-format
msgid "unable to parse remote unpack status: %s"
msgstr "no es posible analizar el estado de desempaquetado remoto: %s"
-#: send-pack.c:148
+#: send-pack.c:149
#, c-format
msgid "remote unpack failed: %s"
msgstr "desempaquetado remoto falló: %s"
-#: send-pack.c:309
+#: send-pack.c:308
msgid "failed to sign the push certificate"
msgstr "falló al firmar el certificado de push"
-#: send-pack.c:423
+#: send-pack.c:399
msgid "the receiving end does not support --signed push"
msgstr "el final receptor no soporta --signed push"
-#: send-pack.c:425
+#: send-pack.c:401
msgid ""
"not sending a push certificate since the receiving end does not support --"
"signed push"
@@ -6503,47 +6595,47 @@ msgstr ""
"no se manda un certificado de push ya que el destino no soporta push firmado "
"(--signed )"
-#: send-pack.c:437
+#: send-pack.c:413
msgid "the receiving end does not support --atomic push"
msgstr "el destino no soporta push atómicos (--atomic)"
-#: send-pack.c:442
+#: send-pack.c:418
msgid "the receiving end does not support push options"
msgstr "el destino no soporta opciones de push"
-#: sequencer.c:191
+#: sequencer.c:192
#, c-format
msgid "invalid commit message cleanup mode '%s'"
msgstr "mensaje de commit inválido, modo cleanup '%s'"
-#: sequencer.c:296
+#: sequencer.c:297
#, c-format
msgid "could not delete '%s'"
msgstr "no se pudo borrar '%s'"
-#: sequencer.c:315 builtin/rebase.c:785 builtin/rebase.c:1750 builtin/rm.c:385
+#: sequencer.c:316 builtin/rebase.c:743 builtin/rebase.c:1582 builtin/rm.c:385
#, c-format
msgid "could not remove '%s'"
msgstr "no se pudo eliminar'%s'"
-#: sequencer.c:325
+#: sequencer.c:326
msgid "revert"
msgstr "revertir"
-#: sequencer.c:327
+#: sequencer.c:328
msgid "cherry-pick"
msgstr "cherry-pick"
-#: sequencer.c:329
+#: sequencer.c:330
msgid "rebase"
msgstr "rebase"
-#: sequencer.c:331
+#: sequencer.c:332
#, c-format
msgid "unknown action: %d"
msgstr "acción desconocida: %d"
-#: sequencer.c:389
+#: sequencer.c:390
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'"
@@ -6551,7 +6643,7 @@ msgstr ""
"después de resolver los conflictos, marca las rutas corregidas\n"
"con 'git add <rutas>' o 'git rm <rutas>'"
-#: sequencer.c:392
+#: sequencer.c:393
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'\n"
@@ -6561,44 +6653,43 @@ msgstr ""
"con 'git add <rutas>' o 'git rm <rutas>'\n"
"y haz un commit del resultado con 'git commit'"
-#: sequencer.c:405 sequencer.c:2901
+#: sequencer.c:406 sequencer.c:2921
#, c-format
msgid "could not lock '%s'"
msgstr "no se pudo bloquear '%s'"
-#: sequencer.c:412
+#: sequencer.c:413
#, c-format
msgid "could not write eol to '%s'"
msgstr "no se pudo escribir EOL en '%s'"
-#: sequencer.c:417 sequencer.c:2706 sequencer.c:2907 sequencer.c:2921
-#: sequencer.c:3185
+#: sequencer.c:418 sequencer.c:2726 sequencer.c:2927 sequencer.c:2941
+#: sequencer.c:3203
#, c-format
msgid "failed to finalize '%s'"
msgstr "falló al finalizar '%s'"
-#: sequencer.c:440 sequencer.c:1613 sequencer.c:2726 sequencer.c:3167
-#: sequencer.c:3276 builtin/am.c:249 builtin/commit.c:787 builtin/merge.c:1120
-#: builtin/rebase.c:593
+#: sequencer.c:431 sequencer.c:1620 sequencer.c:2746 sequencer.c:3185
+#: sequencer.c:3294 builtin/am.c:249 builtin/commit.c:786 builtin/merge.c:1128
#, c-format
msgid "could not read '%s'"
msgstr "no se pudo leer '%s'"
-#: sequencer.c:466
+#: sequencer.c:457
#, c-format
msgid "your local changes would be overwritten by %s."
msgstr "tus cambios locales serán sobreescritos por %s."
-#: sequencer.c:470
+#: sequencer.c:461
msgid "commit your changes or stash them to proceed."
msgstr "realiza un commit con tus cambios o aplica un stash para proceder."
-#: sequencer.c:502
+#: sequencer.c:493
#, c-format
msgid "%s: fast-forward"
msgstr "%s: avance rápido"
-#: sequencer.c:541 builtin/tag.c:565
+#: sequencer.c:532 builtin/tag.c:566
#, c-format
msgid "Invalid cleanup mode %s"
msgstr "Modo cleanup inválido %s"
@@ -6606,65 +6697,65 @@ msgstr "Modo cleanup inválido %s"
#. TRANSLATORS: %s will be "revert", "cherry-pick" or
#. "rebase".
#.
-#: sequencer.c:635
+#: sequencer.c:626
#, c-format
msgid "%s: Unable to write new index file"
msgstr "%s: Incapaz de escribir el nuevo archivo índice"
-#: sequencer.c:652
+#: sequencer.c:643
msgid "unable to update cache tree"
msgstr "no es posible actualizar el árbol de la caché"
-#: sequencer.c:666
+#: sequencer.c:657
msgid "could not resolve HEAD commit"
msgstr "no se pudo resolver el commit de HEAD"
-#: sequencer.c:746
+#: sequencer.c:737
#, c-format
msgid "no key present in '%.*s'"
msgstr "no hay llave presente en '%.*s'"
-#: sequencer.c:757
+#: sequencer.c:748
#, c-format
msgid "unable to dequote value of '%s'"
msgstr "no es posible dequote para '%s'"
-#: sequencer.c:794 wrapper.c:190 wrapper.c:360 builtin/am.c:710
-#: builtin/am.c:802 builtin/merge.c:1117 builtin/rebase.c:1072
+#: sequencer.c:785 wrapper.c:190 wrapper.c:360 builtin/am.c:710
+#: builtin/am.c:802 builtin/merge.c:1125 builtin/rebase.c:896
#, c-format
msgid "could not open '%s' for reading"
msgstr "no se pudo abrir '%s' para lectura"
-#: sequencer.c:804
+#: sequencer.c:795
msgid "'GIT_AUTHOR_NAME' already given"
msgstr "'GIT_AUTHOR_NAME' ya proporcionado"
-#: sequencer.c:809
+#: sequencer.c:800
msgid "'GIT_AUTHOR_EMAIL' already given"
msgstr "'GIT_AUTHOR_EMAIL' ya proporcionado"
-#: sequencer.c:814
+#: sequencer.c:805
msgid "'GIT_AUTHOR_DATE' already given"
msgstr "'GIT_AUTHOR_DATE' ya proporcionado"
-#: sequencer.c:818
+#: sequencer.c:809
#, c-format
msgid "unknown variable '%s'"
msgstr "variable desconocida '%s'"
-#: sequencer.c:823
+#: sequencer.c:814
msgid "missing 'GIT_AUTHOR_NAME'"
msgstr "falta 'GIT_AUTHOR_NAME'"
-#: sequencer.c:825
+#: sequencer.c:816
msgid "missing 'GIT_AUTHOR_EMAIL'"
msgstr "falta 'GIT_AUTHOR_EMAIL'"
-#: sequencer.c:827
+#: sequencer.c:818
msgid "missing 'GIT_AUTHOR_DATE'"
msgstr "falta 'GIT_AUTHOR_DATE'"
-#: sequencer.c:876
+#: sequencer.c:867
#, c-format
msgid ""
"you have staged changes in your working tree\n"
@@ -6694,11 +6785,11 @@ msgstr ""
"\n"
" git rebase --continue\n"
-#: sequencer.c:1148
+#: sequencer.c:1141
msgid "'prepare-commit-msg' hook failed"
msgstr "hook 'prepare-commit-msg' falló"
-#: sequencer.c:1154
+#: sequencer.c:1147
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
@@ -6725,7 +6816,7 @@ msgstr ""
"\n"
" git commit --amend --reset-author\n"
-#: sequencer.c:1167
+#: sequencer.c:1160
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
@@ -6749,324 +6840,329 @@ msgstr ""
"\n"
" git commit --amend --reset-author\n"
-#: sequencer.c:1209
+#: sequencer.c:1202
msgid "couldn't look up newly created commit"
msgstr "no se pudo revisar el commit recién creado"
-#: sequencer.c:1211
+#: sequencer.c:1204
msgid "could not parse newly created commit"
msgstr "no se pudo analizar el commit recién creado"
-#: sequencer.c:1257
+#: sequencer.c:1250
msgid "unable to resolve HEAD after creating commit"
msgstr "no se pudo resolver HEAD tras crear el commit"
-#: sequencer.c:1259
+#: sequencer.c:1252
msgid "detached HEAD"
msgstr "HEAD desacoplado"
-#: sequencer.c:1263
+#: sequencer.c:1256
msgid " (root-commit)"
msgstr " (commit-raíz)"
-#: sequencer.c:1284
+#: sequencer.c:1277
msgid "could not parse HEAD"
msgstr "no se pudo analizar HEAD"
-#: sequencer.c:1286
+#: sequencer.c:1279
#, c-format
msgid "HEAD %s is not a commit!"
msgstr "¡HEAD %s no es un commit!"
-#: sequencer.c:1290 sequencer.c:1364 builtin/commit.c:1574
+#: sequencer.c:1283 sequencer.c:1357 builtin/commit.c:1579
msgid "could not parse HEAD commit"
msgstr "no se pudo analizar el commit de HEAD"
-#: sequencer.c:1342 sequencer.c:1968
+#: sequencer.c:1335 sequencer.c:1980
msgid "unable to parse commit author"
msgstr "no es posible analizar el autor del commit"
-#: sequencer.c:1353 builtin/am.c:1566 builtin/merge.c:687
+#: sequencer.c:1346 builtin/am.c:1566 builtin/merge.c:695
msgid "git write-tree failed to write a tree"
msgstr "git write-tree falló al escribir el árbol"
-#: sequencer.c:1386 sequencer.c:1447
+#: sequencer.c:1379 sequencer.c:1450
#, c-format
msgid "unable to read commit message from '%s'"
msgstr "no se puede leer el mensaje del commit de '%s'"
-#: sequencer.c:1413 builtin/am.c:1588 builtin/commit.c:1673 builtin/merge.c:886
-#: builtin/merge.c:911
+#: sequencer.c:1406 builtin/am.c:1588 builtin/commit.c:1680 builtin/merge.c:894
+#: builtin/merge.c:919
msgid "failed to write commit object"
msgstr "falló al escribir el objeto commit"
-#: sequencer.c:1474
+#: sequencer.c:1433 sequencer.c:4118
+#, c-format
+msgid "could not update %s"
+msgstr "no se puede actualizar %s"
+
+#: sequencer.c:1481
#, c-format
msgid "could not parse commit %s"
msgstr "no se pudo analizar commit %s"
-#: sequencer.c:1479
+#: sequencer.c:1486
#, c-format
msgid "could not parse parent commit %s"
msgstr "no se pudo analizar el commit padre %s"
-#: sequencer.c:1562 sequencer.c:1673
+#: sequencer.c:1569 sequencer.c:1680
#, c-format
msgid "unknown command: %d"
msgstr "comando desconocido: %d"
-#: sequencer.c:1620 sequencer.c:1645
+#: sequencer.c:1627 sequencer.c:1652
#, c-format
msgid "This is a combination of %d commits."
msgstr "Esta es una combinación de %d commits."
-#: sequencer.c:1630
+#: sequencer.c:1637
msgid "need a HEAD to fixup"
msgstr "se necesita un HEAD para arreglar"
-#: sequencer.c:1632 sequencer.c:3212
+#: sequencer.c:1639 sequencer.c:3230
msgid "could not read HEAD"
msgstr "no se pudo leer HEAD"
-#: sequencer.c:1634
+#: sequencer.c:1641
msgid "could not read HEAD's commit message"
msgstr "no se pudo leer el mensaje de commit de HEAD"
-#: sequencer.c:1640
+#: sequencer.c:1647
#, c-format
msgid "cannot write '%s'"
msgstr "no se puede escribir '%s'"
-#: sequencer.c:1647 git-rebase--preserve-merges.sh:496
+#: sequencer.c:1654 git-rebase--preserve-merges.sh:496
msgid "This is the 1st commit message:"
msgstr "Este es el mensaje del 1er commit:"
-#: sequencer.c:1655
+#: sequencer.c:1662
#, c-format
msgid "could not read commit message of %s"
msgstr "no se puede leer el mensaje del commit de %s"
-#: sequencer.c:1662
+#: sequencer.c:1669
#, c-format
msgid "This is the commit message #%d:"
msgstr "Este es el mensaje del commit #%d:"
-#: sequencer.c:1668
+#: sequencer.c:1675
#, c-format
msgid "The commit message #%d will be skipped:"
msgstr "El mensaje del commit #%d será saltado:"
-#: sequencer.c:1756
+#: sequencer.c:1763
msgid "your index file is unmerged."
msgstr "tu archivo índice no está fusionado."
-#: sequencer.c:1763
+#: sequencer.c:1770
msgid "cannot fixup root commit"
msgstr "no se puede arreglar el commit raíz"
-#: sequencer.c:1782
+#: sequencer.c:1789
#, 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:1790 sequencer.c:1798
+#: sequencer.c:1797 sequencer.c:1805
#, c-format
msgid "commit %s does not have parent %d"
msgstr "el commit %s no tiene un padre %d"
-#: sequencer.c:1804
+#: sequencer.c:1811
#, 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:1823
+#: sequencer.c:1830
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr "%s: no se puede analizar el commit padre %s"
-#: sequencer.c:1888
+#: sequencer.c:1895
#, c-format
msgid "could not rename '%s' to '%s'"
msgstr "no se puede renombrar '%s' a '%s'"
-#: sequencer.c:1943
+#: sequencer.c:1952
#, c-format
msgid "could not revert %s... %s"
msgstr "no se pudo revertir %s... %s"
-#: sequencer.c:1944
+#: sequencer.c:1953
#, c-format
msgid "could not apply %s... %s"
msgstr "no se pudo aplicar %s... %s"
-#: sequencer.c:1961
+#: sequencer.c:1972
#, c-format
msgid "dropping %s %s -- patch contents already upstream\n"
msgstr "botando $%s %s -- contenidos del parche ya están en upstream\n"
-#: sequencer.c:2018
+#: sequencer.c:2030
#, c-format
msgid "git %s: failed to read the index"
msgstr "git %s: falló al leer el índice"
-#: sequencer.c:2025
+#: sequencer.c:2037
#, c-format
msgid "git %s: failed to refresh the index"
msgstr "git %s: falló al refrescar el índice"
-#: sequencer.c:2102
+#: sequencer.c:2114
#, c-format
msgid "%s does not accept arguments: '%s'"
msgstr "%s no acepta los argumentos: '%s'"
-#: sequencer.c:2111
+#: sequencer.c:2123
#, c-format
msgid "missing arguments for %s"
msgstr "faltan argumentos para para %s"
-#: sequencer.c:2142
+#: sequencer.c:2154
#, c-format
msgid "could not parse '%s'"
msgstr "no se puede analizar '%s'"
-#: sequencer.c:2203
+#: sequencer.c:2215
#, c-format
msgid "invalid line %d: %.*s"
msgstr "línea inválida %d: %.*s"
-#: sequencer.c:2214
+#: sequencer.c:2226
#, c-format
msgid "cannot '%s' without a previous commit"
msgstr "no se puede '%s' sin un commit previo"
-#: sequencer.c:2298
+#: sequencer.c:2310
msgid "cancelling a cherry picking in progress"
msgstr "cancelando cherry-pick en progreso"
-#: sequencer.c:2305
+#: sequencer.c:2317
msgid "cancelling a revert in progress"
msgstr "cancelando revert en progreso"
-#: sequencer.c:2349
+#: sequencer.c:2361
msgid "please fix this using 'git rebase --edit-todo'."
msgstr "por favor arregle esto usando 'git rebase --edit-todo'."
-#: sequencer.c:2351
+#: sequencer.c:2363
#, c-format
msgid "unusable instruction sheet: '%s'"
msgstr "hoja de instrucciones inutilizable: '%s'"
-#: sequencer.c:2356
+#: sequencer.c:2368
msgid "no commits parsed."
msgstr "ningún commit analizado."
-#: sequencer.c:2367
+#: sequencer.c:2379
msgid "cannot cherry-pick during a revert."
msgstr "no se puede realizar cherry-pick durante un revert."
-#: sequencer.c:2369
+#: sequencer.c:2381
msgid "cannot revert during a cherry-pick."
msgstr "no se puede realizar un revert durante un cherry-pick."
-#: sequencer.c:2447
+#: sequencer.c:2459
#, c-format
msgid "invalid value for %s: %s"
msgstr "valor inválido para %s: %s"
-#: sequencer.c:2540
+#: sequencer.c:2556
msgid "unusable squash-onto"
msgstr "squash-onto inservible"
-#: sequencer.c:2556
+#: sequencer.c:2576
#, c-format
msgid "malformed options sheet: '%s'"
msgstr "hoja de opciones mal formada: '%s'"
-#: sequencer.c:2644 sequencer.c:4361
+#: sequencer.c:2664 sequencer.c:4469
msgid "empty commit set passed"
msgstr "conjunto de commits vacío entregado"
-#: sequencer.c:2660
+#: sequencer.c:2680
msgid "revert is already in progress"
msgstr "revert ya está en progreso"
-#: sequencer.c:2662
+#: sequencer.c:2682
#, c-format
msgid "try \"git revert (--continue | %s--abort | --quit)\""
msgstr "intenta \"git revert (--continue | --quit | %s --abort)\""
-#: sequencer.c:2665
+#: sequencer.c:2685
msgid "cherry-pick is already in progress"
msgstr "cherry-pick ya está en progreso"
-#: sequencer.c:2667
+#: sequencer.c:2687
#, c-format
msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
msgstr "intenta \"git cherry-pick (--continue | --quit | %s --abort)\""
-#: sequencer.c:2681
+#: sequencer.c:2701
#, c-format
msgid "could not create sequencer directory '%s'"
msgstr "no se pudo crear un directorio secuenciador '%s'"
-#: sequencer.c:2696
+#: sequencer.c:2716
msgid "could not lock HEAD"
msgstr "no se pudo bloquear HEAD"
-#: sequencer.c:2756 sequencer.c:4099
+#: sequencer.c:2776 sequencer.c:4206
msgid "no cherry-pick or revert in progress"
msgstr "ningún cherry-pick o revert en progreso"
-#: sequencer.c:2758 sequencer.c:2769
+#: sequencer.c:2778 sequencer.c:2789
msgid "cannot resolve HEAD"
msgstr "no se puede resolver HEAD"
-#: sequencer.c:2760 sequencer.c:2804
+#: sequencer.c:2780 sequencer.c:2824
msgid "cannot abort from a branch yet to be born"
msgstr "no se puede abortar de una rama por nacer"
-#: sequencer.c:2790 builtin/grep.c:724
+#: sequencer.c:2810 builtin/grep.c:744
#, c-format
msgid "cannot open '%s'"
msgstr "no se puede abrir '%s'"
-#: sequencer.c:2792
+#: sequencer.c:2812
#, c-format
msgid "cannot read '%s': %s"
msgstr "no se puede leer '%s': %s"
-#: sequencer.c:2793
+#: sequencer.c:2813
msgid "unexpected end of file"
msgstr "final de archivo inesperado"
-#: sequencer.c:2799
+#: sequencer.c:2819
#, 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:2810
+#: sequencer.c:2830
msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
msgstr "Parece que se ha movido HEAD. No se hace rebobinado, ¡revisa tu HEAD!"
-#: sequencer.c:2851
+#: sequencer.c:2871
msgid "no revert in progress"
msgstr "no hay revert en progreso"
-#: sequencer.c:2859
+#: sequencer.c:2879
msgid "no cherry-pick in progress"
msgstr "ningún cherry-pick en progreso"
-#: sequencer.c:2869
+#: sequencer.c:2889
msgid "failed to skip the commit"
msgstr "falló al escribir el commit"
-#: sequencer.c:2876
+#: sequencer.c:2896
msgid "there is nothing to skip"
msgstr "no hay nada que saltar"
-#: sequencer.c:2879
+#: sequencer.c:2899
#, c-format
msgid ""
"have you committed already?\n"
@@ -7075,21 +7171,16 @@ msgstr ""
"¿ya has hecho el commit?\n"
"intenta \"git %s --continue\""
-#: sequencer.c:3003 sequencer.c:4011
-#, c-format
-msgid "could not update %s"
-msgstr "no se puede actualizar %s"
-
-#: sequencer.c:3042 sequencer.c:3991
+#: sequencer.c:3060 sequencer.c:4098
msgid "cannot read HEAD"
msgstr "no se puede leer HEAD"
-#: sequencer.c:3059
+#: sequencer.c:3077
#, c-format
msgid "unable to copy '%s' to '%s'"
msgstr "no se pudo copiar '%s' a '%s'"
-#: sequencer.c:3067
+#: sequencer.c:3085
#, c-format
msgid ""
"You can amend the commit now, with\n"
@@ -7108,22 +7199,27 @@ msgstr ""
"\n"
"\tgit rebase --continue\n"
-#: sequencer.c:3077
+#: sequencer.c:3095
#, c-format
msgid "Could not apply %s... %.*s"
msgstr "No se pudo aplicar %s... %.*s"
-#: sequencer.c:3084
+#: sequencer.c:3102
#, c-format
msgid "Could not merge %.*s"
msgstr "No se pudo fusionar %.*s"
-#: sequencer.c:3098 sequencer.c:3102 builtin/difftool.c:641
+#: sequencer.c:3116 sequencer.c:3120 builtin/difftool.c:641
#, c-format
msgid "could not copy '%s' to '%s'"
msgstr "no se pudo copiar '%s' a '%s'"
-#: sequencer.c:3129
+#: sequencer.c:3132
+#, c-format
+msgid "Executing: %s\n"
+msgstr "Ejecutando: %s\n"
+
+#: sequencer.c:3147
#, c-format
msgid ""
"execution failed: %s\n"
@@ -7138,11 +7234,11 @@ msgstr ""
" git rebase --continue\n"
"\n"
-#: sequencer.c:3135
+#: sequencer.c:3153
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:3141
+#: sequencer.c:3159
#, c-format
msgid ""
"execution succeeded: %s\n"
@@ -7159,103 +7255,129 @@ msgstr ""
" git rebase --continue\n"
"\n"
-#: sequencer.c:3202
+#: sequencer.c:3220
#, c-format
msgid "illegal label name: '%.*s'"
msgstr "nombre de label ilegal: '%.*s'"
-#: sequencer.c:3256
+#: sequencer.c:3274
msgid "writing fake root commit"
msgstr "escribiendo commit raíz falso"
-#: sequencer.c:3261
+#: sequencer.c:3279
msgid "writing squash-onto"
msgstr "escribiendo squash-onto"
-#: sequencer.c:3299 builtin/rebase.c:880 builtin/rebase.c:886
-#, c-format
-msgid "failed to find tree of %s"
-msgstr "falló al encontrar árbol de %s"
-
-#: sequencer.c:3344
+#: sequencer.c:3363
#, c-format
msgid "could not resolve '%s'"
msgstr "no se pudo resolver '%s'"
-#: sequencer.c:3375
+#: sequencer.c:3394
msgid "cannot merge without a current revision"
msgstr "no se puede fusionar sin una versión actual"
-#: sequencer.c:3397
+#: sequencer.c:3416
#, c-format
msgid "unable to parse '%.*s'"
msgstr "no se puede analizar '%.*s'"
-#: sequencer.c:3406
+#: sequencer.c:3425
#, c-format
msgid "nothing to merge: '%.*s'"
msgstr "nada para fusionar: '%.*s'"
-#: sequencer.c:3418
+#: sequencer.c:3437
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:3434
+#: sequencer.c:3453
#, c-format
msgid "could not get commit message of '%s'"
msgstr "no se puede leer el mensaje del commit '%s'"
-#: sequencer.c:3594
+#: sequencer.c:3613
#, c-format
msgid "could not even attempt to merge '%.*s'"
msgstr "no se pudo intentar fusionar '%.*s'"
-#: sequencer.c:3610
+#: sequencer.c:3629
msgid "merge: Unable to write new index file"
msgstr "fusión: No se puede escribir el nuevo archivo índice"
-#: sequencer.c:3679 builtin/rebase.c:737
+#: sequencer.c:3703
+msgid "Cannot autostash"
+msgstr "No se puede ejecutar autostash"
+
+#: sequencer.c:3706
+#, c-format
+msgid "Unexpected stash response: '%s'"
+msgstr "Respuesta de stash inesperada: '%s'"
+
+#: sequencer.c:3712
+#, c-format
+msgid "Could not create directory for '%s'"
+msgstr "No se pudo crear el directorio para '%s'"
+
+#: sequencer.c:3715
+#, c-format
+msgid "Created autostash: %s\n"
+msgstr "Autostash creado: %s\n"
+
+#: sequencer.c:3719
+msgid "could not reset --hard"
+msgstr "no se pudo reset --hard"
+
+#: sequencer.c:3744
#, c-format
msgid "Applied autostash.\n"
msgstr "Autostash aplicado.\n"
-#: sequencer.c:3691
+#: sequencer.c:3756
#, c-format
msgid "cannot store %s"
msgstr "no se puede guardar %s"
-#: sequencer.c:3694 builtin/rebase.c:753 git-rebase--preserve-merges.sh:113
+#: sequencer.c:3759
#, c-format
msgid ""
-"Applying autostash resulted in conflicts.\n"
+"%s\n"
"Your changes are safe in the stash.\n"
"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
msgstr ""
-"Aplicando autostash resultó en conflictos.\n"
+"%s\n"
"Tus cambios están seguros en el stash.\n"
"Puedes ejecutar \"git stash pop\" o \"git stash drop\" en cualquier "
"momento.\n"
-#: sequencer.c:3755
+#: sequencer.c:3764
+msgid "Applying autostash resulted in conflicts."
+msgstr "Apicar autostash resultó en conflictos."
+
+#: sequencer.c:3765
+msgid "Autostash exists; creating a new stash entry."
+msgstr "Autostash existe; creando una nueva entrada stash."
+
+#: sequencer.c:3857
#, c-format
msgid "%s: not a valid OID"
msgstr "%s no es OID válido"
-#: sequencer.c:3760 git-rebase--preserve-merges.sh:779
+#: sequencer.c:3862 git-rebase--preserve-merges.sh:779
msgid "could not detach HEAD"
msgstr "no se puede desacoplar HEAD"
-#: sequencer.c:3775
+#: sequencer.c:3877
#, c-format
msgid "Stopped at HEAD\n"
msgstr "Detenido en HEAD\n"
-#: sequencer.c:3777
+#: sequencer.c:3879
#, c-format
msgid "Stopped at %s\n"
msgstr "Detenido en %s\n"
-#: sequencer.c:3785
+#: sequencer.c:3887
#, c-format
msgid ""
"Could not execute the todo command\n"
@@ -7276,48 +7398,58 @@ msgstr ""
" git rebase --edit-todo\n"
" git rebase --continue\n"
-#: sequencer.c:3869
+#: sequencer.c:3931
+#, c-format
+msgid "Rebasing (%d/%d)%s"
+msgstr "Aplicando rebase (%d/%d)%s"
+
+#: sequencer.c:3976
#, c-format
msgid "Stopped at %s... %.*s\n"
msgstr "Detenido en %s... %.*s\n"
-#: sequencer.c:3940
+#: sequencer.c:4047
#, c-format
msgid "unknown command %d"
msgstr "comando desconocido %d"
-#: sequencer.c:3999
+#: sequencer.c:4106
msgid "could not read orig-head"
msgstr "no se puede leer orig-head"
-#: sequencer.c:4004
+#: sequencer.c:4111
msgid "could not read 'onto'"
msgstr "no se puede leer 'onto'"
-#: sequencer.c:4018
+#: sequencer.c:4125
#, c-format
msgid "could not update HEAD to %s"
msgstr "no se puede actualizar HEAD a %s"
-#: sequencer.c:4111
+#: sequencer.c:4185
+#, c-format
+msgid "Successfully rebased and updated %s.\n"
+msgstr "Rebase aplicado satisfactoriamente y actualizado %s.\n"
+
+#: sequencer.c:4218
msgid "cannot rebase: You have unstaged changes."
msgstr "no se puede realizar rebase: Tienes cambios fuera del área de stage."
-#: sequencer.c:4120
+#: sequencer.c:4227
msgid "cannot amend non-existing commit"
msgstr "no se puede arreglar un commit no existente"
-#: sequencer.c:4122
+#: sequencer.c:4229
#, c-format
msgid "invalid file: '%s'"
msgstr "archivo inválido: '%s'"
-#: sequencer.c:4124
+#: sequencer.c:4231
#, c-format
msgid "invalid contents: '%s'"
msgstr "contenido inválido: '%s'"
-#: sequencer.c:4127
+#: sequencer.c:4234
msgid ""
"\n"
"You have uncommitted changes in your working tree. Please, commit them\n"
@@ -7328,59 +7460,59 @@ msgstr ""
"un commit con estos\n"
"primero y luego ejecuta 'git rebase --continue' de nuevo."
-#: sequencer.c:4163 sequencer.c:4202
+#: sequencer.c:4270 sequencer.c:4309
#, c-format
msgid "could not write file: '%s'"
msgstr "no se pudo escribir el archivo: '%s'"
-#: sequencer.c:4217
+#: sequencer.c:4324
msgid "could not remove CHERRY_PICK_HEAD"
msgstr "no se puede eliminar CHERRY_PICK_HEAD"
-#: sequencer.c:4224
+#: sequencer.c:4331
msgid "could not commit staged changes."
msgstr "no se pudo realizar el commit con los cambios en el área de stage."
-#: sequencer.c:4338
+#: sequencer.c:4446
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr "%s: no se puede aplicar cherry-pick a un %s"
-#: sequencer.c:4342
+#: sequencer.c:4450
#, c-format
msgid "%s: bad revision"
msgstr "%s: revisión errónea"
-#: sequencer.c:4377
+#: sequencer.c:4485
msgid "can't revert as initial commit"
msgstr "no se puede revertir como commit inicial"
-#: sequencer.c:4846
+#: sequencer.c:4962
msgid "make_script: unhandled options"
msgstr "make_script: opciones desconocidas"
-#: sequencer.c:4849
+#: sequencer.c:4965
msgid "make_script: error preparing revisions"
msgstr "make_script: error preparando revisiones"
-#: sequencer.c:5083 sequencer.c:5100
+#: sequencer.c:5206 sequencer.c:5223
msgid "nothing to do"
msgstr "nada que hacer"
-#: sequencer.c:5119
+#: sequencer.c:5242
msgid "could not skip unnecessary pick commands"
msgstr "no se pudo saltar los comandos pick innecesarios"
-#: sequencer.c:5213
+#: sequencer.c:5336
msgid "the script was already rearranged."
msgstr "este script ya fue reorganizado."
-#: setup.c:124
+#: setup.c:133
#, c-format
msgid "'%s' is outside repository at '%s'"
msgstr "'%s' está fuera del repositorio en '%s'"
-#: setup.c:175
+#: setup.c:185
#, c-format
msgid ""
"%s: no such path in the working tree.\n"
@@ -7390,7 +7522,7 @@ msgstr ""
"Use 'git <comando> -- <ruta>...' para especificar rutas que no existen "
"localmente."
-#: setup.c:188
+#: setup.c:198
#, c-format
msgid ""
"ambiguous argument '%s': unknown revision or path not in the working tree.\n"
@@ -7402,12 +7534,12 @@ msgstr ""
"Use '--' para separar las rutas de las revisiones, de esta manera:\n"
"'git <comando> [<revisión>...] -- [<archivo>...]'"
-#: setup.c:254
+#: setup.c:264
#, c-format
msgid "option '%s' must come before non-option arguments"
msgstr "opción '%s' debe venir antes de argumentos no opcionales"
-#: setup.c:273
+#: setup.c:283
#, c-format
msgid ""
"ambiguous argument '%s': both revision and filename\n"
@@ -7418,95 +7550,95 @@ msgstr ""
"Use '--' para separar rutas de revisiones, de esta manera:\n"
"'git <comando> [<revisión>...] -- [<archivo>...]'"
-#: setup.c:409
+#: setup.c:419
msgid "unable to set up work tree using invalid config"
msgstr ""
"no es posible configurar el directorio de trabajo usando una configuración "
"inválida"
-#: setup.c:413
+#: setup.c:423
msgid "this operation must be run in a work tree"
msgstr "esta operación debe ser realizada en un árbol de trabajo"
-#: setup.c:559
+#: setup.c:569
#, c-format
msgid "Expected git repo version <= %d, found %d"
msgstr "Se esperaba versión de git repo <= %d, encontrada %d"
-#: setup.c:567
+#: setup.c:577
msgid "unknown repository extensions found:"
msgstr "se encontró extensión de repositorio desconocida:"
-#: setup.c:586
+#: setup.c:596
#, c-format
msgid "error opening '%s'"
msgstr "error abriendo '%s'"
-#: setup.c:588
+#: setup.c:598
#, c-format
msgid "too large to be a .git file: '%s'"
msgstr "muy grande para ser un archivo .git: '%s'"
-#: setup.c:590
+#: setup.c:600
#, c-format
msgid "error reading %s"
msgstr "error leyendo %s"
-#: setup.c:592
+#: setup.c:602
#, c-format
msgid "invalid gitfile format: %s"
msgstr "formato gitfile inválido: %s"
-#: setup.c:594
+#: setup.c:604
#, c-format
msgid "no path in gitfile: %s"
msgstr "no hay ruta en gitfile: %s"
-#: setup.c:596
+#: setup.c:606
#, c-format
msgid "not a git repository: %s"
msgstr "no es un repositorio git: %s"
-#: setup.c:695
+#: setup.c:708
#, c-format
msgid "'$%s' too big"
msgstr "'$%s' muy grande"
-#: setup.c:709
+#: setup.c:722
#, c-format
msgid "not a git repository: '%s'"
msgstr "no es un repositorio git: '%s'"
-#: setup.c:738 setup.c:740 setup.c:771
+#: setup.c:751 setup.c:753 setup.c:784
#, c-format
msgid "cannot chdir to '%s'"
msgstr "no se puede aplicar chdir a '%s'"
-#: setup.c:743 setup.c:799 setup.c:809 setup.c:848 setup.c:856
+#: setup.c:756 setup.c:812 setup.c:822 setup.c:861 setup.c:869
msgid "cannot come back to cwd"
msgstr "no se puede volver a cwd"
-#: setup.c:870
+#: setup.c:883
#, c-format
msgid "failed to stat '%*s%s%s'"
msgstr "falló al determinar '%*s%s%s'"
-#: setup.c:1108
+#: setup.c:1121
msgid "Unable to read current working directory"
msgstr "Incapaz de leer el directorio de trabajo actual"
-#: setup.c:1117 setup.c:1123
+#: setup.c:1130 setup.c:1136
#, c-format
msgid "cannot change to '%s'"
msgstr "no se puede cambiar a '%s'"
-#: setup.c:1128
+#: setup.c:1141
#, c-format
msgid "not a git repository (or any of the parent directories): %s"
msgstr ""
"no es un repositorio git (ni ninguno de los directorios superiores): %s"
-#: setup.c:1134
+#: setup.c:1147
#, c-format
msgid ""
"not a git repository (or any parent up to mount point %s)\n"
@@ -7516,7 +7648,7 @@ msgstr ""
"Parando en el límite del sistema de archivos "
"(GIT_DISCOVERY_ACROSS_FILESYSTEM no establecido)."
-#: setup.c:1245
+#: setup.c:1258
#, c-format
msgid ""
"problem with core.sharedRepository filemode value (0%.3o).\n"
@@ -7525,272 +7657,272 @@ msgstr ""
"problema con el valor del modo de archivo core.sharedRepository (0%.3o).\n"
"El dueño de los archivos tiene que tener permisos de lectura y escritura."
-#: setup.c:1289
+#: setup.c:1304
msgid "open /dev/null or dup failed"
msgstr "falló al abrir /dev/null o dup"
-#: setup.c:1304
+#: setup.c:1319
msgid "fork failed"
msgstr "falló fork"
-#: setup.c:1309
+#: setup.c:1324
msgid "setsid failed"
msgstr "falló setsid"
-#: sha1-file.c:452
+#: sha1-file.c:470
#, c-format
msgid "object directory %s does not exist; check .git/objects/info/alternates"
msgstr "objeto directorio %s no existe; revisa .git/objects/info/alternates"
-#: sha1-file.c:503
+#: sha1-file.c:521
#, c-format
msgid "unable to normalize alternate object path: %s"
msgstr "incapaz de normalizar la ruta de objeto alterno: %s"
-#: sha1-file.c:575
+#: sha1-file.c:593
#, c-format
msgid "%s: ignoring alternate object stores, nesting too deep"
msgstr "%s: ignorando espacios de objetos alternos, anidado muy profundo"
-#: sha1-file.c:582
+#: sha1-file.c:600
#, c-format
msgid "unable to normalize object directory: %s"
msgstr "incapaz de normalizar directorio de objeto: %s"
-#: sha1-file.c:625
+#: sha1-file.c:643
msgid "unable to fdopen alternates lockfile"
msgstr "no es posible hacer fdopen en lockfile alternos"
-#: sha1-file.c:643
+#: sha1-file.c:661
msgid "unable to read alternates file"
msgstr "no es posible leer archivos alternos"
-#: sha1-file.c:650
+#: sha1-file.c:668
msgid "unable to move new alternates file into place"
msgstr "no es posible mover archivos alternos en el lugar"
-#: sha1-file.c:685
+#: sha1-file.c:703
#, c-format
msgid "path '%s' does not exist"
msgstr "ruta '%s' no existe"
-#: sha1-file.c:711
+#: sha1-file.c:724
#, c-format
msgid "reference repository '%s' as a linked checkout is not supported yet."
msgstr ""
"repositorio de referencia '%s' como un checkout vinculado no es soportado "
"todavía."
-#: sha1-file.c:717
+#: sha1-file.c:730
#, c-format
msgid "reference repository '%s' is not a local repository."
msgstr "repositorio de referencia '%s' no es un repositorio local."
-#: sha1-file.c:723
+#: sha1-file.c:736
#, c-format
msgid "reference repository '%s' is shallow"
msgstr "repositorio de referencia '%s' es superficial (shallow)"
-#: sha1-file.c:731
+#: sha1-file.c:744
#, c-format
msgid "reference repository '%s' is grafted"
msgstr "repositorio de referencia '% s' está injertado"
-#: sha1-file.c:791
+#: sha1-file.c:804
#, c-format
msgid "invalid line while parsing alternate refs: %s"
msgstr "línea inválida mientras se analizaban refs alternas: %s"
-#: sha1-file.c:943
+#: sha1-file.c:954
#, c-format
msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
msgstr "intentando usar mmap %<PRIuMAX> sobre límite %<PRIuMAX>"
-#: sha1-file.c:964
+#: sha1-file.c:975
msgid "mmap failed"
msgstr "mmap falló"
-#: sha1-file.c:1128
+#: sha1-file.c:1139
#, c-format
msgid "object file %s is empty"
msgstr "archivo de objeto %s está vacío"
-#: sha1-file.c:1263 sha1-file.c:2443
+#: sha1-file.c:1274 sha1-file.c:2454
#, c-format
msgid "corrupt loose object '%s'"
msgstr "objeto perdido corrupto '%s'"
-#: sha1-file.c:1265 sha1-file.c:2447
+#: sha1-file.c:1276 sha1-file.c:2458
#, c-format
msgid "garbage at end of loose object '%s'"
msgstr "basura al final del objeto perdido '%s'"
-#: sha1-file.c:1307
+#: sha1-file.c:1318
msgid "invalid object type"
msgstr "tipo de objeto inválido"
-#: sha1-file.c:1391
+#: sha1-file.c:1402
#, 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:1394
+#: sha1-file.c:1405
#, c-format
msgid "unable to unpack %s header"
msgstr "incapaz de desempaquetar header %s"
-#: sha1-file.c:1400
+#: sha1-file.c:1411
#, 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:1403
+#: sha1-file.c:1414
#, c-format
msgid "unable to parse %s header"
msgstr "incapaz de analizar header %s"
-#: sha1-file.c:1629
+#: sha1-file.c:1640
#, c-format
msgid "failed to read object %s"
msgstr "falló al leer objeto %s"
-#: sha1-file.c:1633
+#: sha1-file.c:1644
#, c-format
msgid "replacement %s not found for %s"
msgstr "reemplazo %s no encontrado para %s"
-#: sha1-file.c:1637
+#: sha1-file.c:1648
#, c-format
msgid "loose object %s (stored in %s) is corrupt"
msgstr "objeto perdido %s (guardado en %s) está corrompido"
-#: sha1-file.c:1641
+#: sha1-file.c:1652
#, c-format
msgid "packed object %s (stored in %s) is corrupt"
msgstr "paquete de objeto %s (guardado en %s) está corrompido"
-#: sha1-file.c:1746
+#: sha1-file.c:1757
#, c-format
msgid "unable to write file %s"
msgstr "no es posible escribir archivo %s"
-#: sha1-file.c:1753
+#: sha1-file.c:1764
#, c-format
msgid "unable to set permission to '%s'"
msgstr "no se pudo poner permisos a '%s'"
-#: sha1-file.c:1760
+#: sha1-file.c:1771
msgid "file write error"
msgstr "falló de escritura"
-#: sha1-file.c:1780
+#: sha1-file.c:1791
msgid "error when closing loose object file"
msgstr "error cerrando el archivo de objeto suelto"
-#: sha1-file.c:1845
+#: sha1-file.c:1856
#, 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:1847
+#: sha1-file.c:1858
msgid "unable to create temporary file"
msgstr "no es posible crear un archivo temporal"
-#: sha1-file.c:1871
+#: sha1-file.c:1882
msgid "unable to write loose object file"
msgstr "no es posible escribir el archivo de objeto suelto"
-#: sha1-file.c:1877
+#: sha1-file.c:1888
#, c-format
msgid "unable to deflate new object %s (%d)"
msgstr "no es posible desinflar el objeto nuevo %s (%d)"
-#: sha1-file.c:1881
+#: sha1-file.c:1892
#, c-format
msgid "deflateEnd on object %s failed (%d)"
msgstr "deflateEnd en objeto %s falló (%d)"
-#: sha1-file.c:1885
+#: sha1-file.c:1896
#, 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:1895 builtin/pack-objects.c:1054
+#: sha1-file.c:1906 builtin/pack-objects.c:1055
#, c-format
msgid "failed utime() on %s"
msgstr "falló utime() en %s"
-#: sha1-file.c:1972
+#: sha1-file.c:1983
#, c-format
msgid "cannot read object for %s"
msgstr "no se pudo leer el objeto para %s"
-#: sha1-file.c:2011
+#: sha1-file.c:2022
msgid "corrupt commit"
msgstr "commit corrupto"
-#: sha1-file.c:2019
+#: sha1-file.c:2030
msgid "corrupt tag"
msgstr "tag corrupto"
-#: sha1-file.c:2119
+#: sha1-file.c:2130
#, c-format
msgid "read error while indexing %s"
msgstr "error leyendo al indexar %s"
-#: sha1-file.c:2122
+#: sha1-file.c:2133
#, c-format
msgid "short read while indexing %s"
msgstr "lectura corta al indexar %s"
-#: sha1-file.c:2195 sha1-file.c:2205
+#: sha1-file.c:2206 sha1-file.c:2216
#, c-format
msgid "%s: failed to insert into database"
msgstr "%s: falló al insertar en la base de datos"
-#: sha1-file.c:2211
+#: sha1-file.c:2222
#, c-format
msgid "%s: unsupported file type"
msgstr "%s: tipo de archivo no soportado"
-#: sha1-file.c:2235
+#: sha1-file.c:2246
#, c-format
msgid "%s is not a valid object"
msgstr "%s no es objeto válido"
-#: sha1-file.c:2237
+#: sha1-file.c:2248
#, c-format
msgid "%s is not a valid '%s' object"
msgstr "%s no es un objeto '%s' válido"
-#: sha1-file.c:2264 builtin/index-pack.c:155
+#: sha1-file.c:2275 builtin/index-pack.c:155
#, c-format
msgid "unable to open %s"
msgstr "no es posible abrir %s"
-#: sha1-file.c:2454 sha1-file.c:2507
+#: sha1-file.c:2465 sha1-file.c:2518
#, c-format
msgid "hash mismatch for %s (expected %s)"
msgstr "hash no concuerda para %s (se esperaba %s)"
-#: sha1-file.c:2478
+#: sha1-file.c:2489
#, c-format
msgid "unable to mmap %s"
msgstr "no es posible hacer mmap a %s"
-#: sha1-file.c:2483
+#: sha1-file.c:2494
#, c-format
msgid "unable to unpack header of %s"
msgstr "incapaz de desempaquetar header de %s"
-#: sha1-file.c:2489
+#: sha1-file.c:2500
#, c-format
msgid "unable to parse header of %s"
msgstr "incapaz de analizar header de %s"
-#: sha1-file.c:2500
+#: sha1-file.c:2511
#, c-format
msgid "unable to unpack contents of %s"
msgstr "no es posible desempaquetar contenidos de %s"
@@ -7895,43 +8027,43 @@ msgid "invalid object name '%.*s'."
msgstr "nombre de objeto no válido: '%.*s'."
#. TRANSLATORS: IEC 80000-13:2008 gibibyte
-#: strbuf.c:837
+#: strbuf.c:853
#, c-format
msgid "%u.%2.2u GiB"
msgstr "%u.%2.2u GiB"
#. TRANSLATORS: IEC 80000-13:2008 gibibyte/second
-#: strbuf.c:839
+#: strbuf.c:855
#, c-format
msgid "%u.%2.2u GiB/s"
msgstr "%u.%2.2u GiB/s"
#. TRANSLATORS: IEC 80000-13:2008 mebibyte
-#: strbuf.c:847
+#: strbuf.c:863
#, c-format
msgid "%u.%2.2u MiB"
msgstr "%u.%2.2u MiB"
#. TRANSLATORS: IEC 80000-13:2008 mebibyte/second
-#: strbuf.c:849
+#: strbuf.c:865
#, c-format
msgid "%u.%2.2u MiB/s"
msgstr "%u.%2.2u MiB/s"
#. TRANSLATORS: IEC 80000-13:2008 kibibyte
-#: strbuf.c:856
+#: strbuf.c:872
#, c-format
msgid "%u.%2.2u KiB"
msgstr "%u.%2.2u KiB"
#. TRANSLATORS: IEC 80000-13:2008 kibibyte/second
-#: strbuf.c:858
+#: strbuf.c:874
#, c-format
msgid "%u.%2.2u KiB/s"
msgstr "%u.%2.2u KiB/s"
#. TRANSLATORS: IEC 80000-13:2008 byte
-#: strbuf.c:864
+#: strbuf.c:880
#, c-format
msgid "%u byte"
msgid_plural "%u bytes"
@@ -7939,18 +8071,44 @@ msgstr[0] "%u byte"
msgstr[1] "%u bytes"
#. TRANSLATORS: IEC 80000-13:2008 byte/second
-#: strbuf.c:866
+#: strbuf.c:882
#, c-format
msgid "%u byte/s"
msgid_plural "%u bytes/s"
msgstr[0] "%u bytes/s"
msgstr[1] "%u bytes/s"
-#: strbuf.c:1164
+#: strbuf.c:1180
#, c-format
msgid "could not edit '%s'"
msgstr "no se pudo editar '%s'"
+#: submodule-config.c:237
+#, c-format
+msgid "ignoring suspicious submodule name: %s"
+msgstr "ignorando submódulo sospechoso: %s"
+
+#: submodule-config.c:304
+msgid "negative values not allowed for submodule.fetchjobs"
+msgstr "no se permiten valores negativos para submodule.fetchjobs"
+
+#: submodule-config.c:402
+#, c-format
+msgid "ignoring '%s' which may be interpreted as a command-line option: %s"
+msgstr ""
+"ignorando '%s' ya que puede ser interpretado como una opción de línea de "
+"comando: %s"
+
+#: submodule-config.c:499
+#, c-format
+msgid "invalid value for %s"
+msgstr "valor inválido para %s"
+
+#: submodule-config.c:766
+#, c-format
+msgid "Could not update .gitmodules entry %s"
+msgstr "No se pudo actualizar la entrada %s de .gitmodules"
+
#: submodule.c:114 submodule.c:143
msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
msgstr ""
@@ -8013,7 +8171,7 @@ msgstr ""
msgid "process for submodule '%s' failed"
msgstr "proceso para submódulo '%s' falló"
-#: submodule.c:1147 builtin/branch.c:680 builtin/submodule--helper.c:2045
+#: submodule.c:1147 builtin/branch.c:678 builtin/submodule--helper.c:2045
msgid "Failed to resolve HEAD as a valid ref."
msgstr "Falló al resolver HEAD como un ref válido."
@@ -8129,41 +8287,15 @@ msgstr ""
"'%s' hacia\n"
"'%s'\n"
-#: submodule.c:2209
+#: submodule.c:2210
msgid "could not start ls-files in .."
msgstr "no se pudo comenzar ls-files en .."
-#: submodule.c:2248
+#: submodule.c:2250
#, c-format
msgid "ls-tree returned unexpected return code %d"
msgstr "ls-tree devolvió un código %d inesperado"
-#: submodule-config.c:236
-#, c-format
-msgid "ignoring suspicious submodule name: %s"
-msgstr "ignorando submódulo sospechoso: %s"
-
-#: submodule-config.c:303
-msgid "negative values not allowed for submodule.fetchjobs"
-msgstr "no se permiten valores negativos para submodule.fetchjobs"
-
-#: submodule-config.c:401
-#, c-format
-msgid "ignoring '%s' which may be interpreted as a command-line option: %s"
-msgstr ""
-"ignorando '%s' ya que puede ser interpretado como una opción de línea de "
-"comando: %s"
-
-#: submodule-config.c:498
-#, c-format
-msgid "invalid value for %s"
-msgstr "valor inválido para %s"
-
-#: submodule-config.c:765
-#, c-format
-msgid "Could not update .gitmodules entry %s"
-msgstr "No se pudo actualizar la entrada %s de .gitmodules"
-
#: trailer.c:238
#, c-format
msgid "running trailer command '%s' failed"
@@ -8218,99 +8350,6 @@ msgstr "no se pudo abrir el archivo temporal"
msgid "could not rename temporary file to %s"
msgstr "no se pudo renombrar el archivo temporal a %s"
-#: transport.c:116
-#, c-format
-msgid "Would set upstream of '%s' to '%s' of '%s'\n"
-msgstr "Configurará upstream de '%s' a '%s' de '%s'\n"
-
-#: transport.c:145
-#, c-format
-msgid "could not read bundle '%s'"
-msgstr "no se pudo leer el conjunto '%s'"
-
-#: transport.c:214
-#, c-format
-msgid "transport: invalid depth option '%s'"
-msgstr "transport: opción inválida '%s'"
-
-#: transport.c:266
-msgid "see protocol.version in 'git help config' for more details"
-msgstr "ver protocol.version en 'git help config' para más información"
-
-#: transport.c:267
-msgid "server options require protocol version 2 or later"
-msgstr "opciones del servidor requieren protocolo versión 2 o posterior"
-
-#: transport.c:632
-msgid "could not parse transport.color.* config"
-msgstr "no se pudo analizar valor de configuración transport.color.*"
-
-#: transport.c:705
-msgid "support for protocol v2 not implemented yet"
-msgstr "soporte para protocolo v2 no implementado todavía"
-
-#: transport.c:831
-#, c-format
-msgid "unknown value for config '%s': %s"
-msgstr "valor desconocido para configuración '%s': %s"
-
-#: transport.c:897
-#, c-format
-msgid "transport '%s' not allowed"
-msgstr "transporte '%s' no permitido"
-
-#: transport.c:949
-msgid "git-over-rsync is no longer supported"
-msgstr "git-over-rsync ya no es soportado"
-
-#: transport.c:1044
-#, c-format
-msgid ""
-"The following submodule paths contain changes that can\n"
-"not be found on any remote:\n"
-msgstr ""
-"La siguiente ruta de submódulo contiene cambios que no\n"
-"pueden ser encontrados en ningún remoto:\n"
-
-#: transport.c:1048
-#, c-format
-msgid ""
-"\n"
-"Please try\n"
-"\n"
-"\tgit push --recurse-submodules=on-demand\n"
-"\n"
-"or cd to the path and use\n"
-"\n"
-"\tgit push\n"
-"\n"
-"to push them to a remote.\n"
-"\n"
-msgstr ""
-"\n"
-"Por favor intenta\n"
-"\n"
-"\tgit push --recurse-submodules=on-demand\n"
-"\n"
-"o cd a la ruta y usa\n"
-"\n"
-"\tgit push\n"
-"\n"
-"para hacer un push al remoto.\n"
-"\n"
-
-#: transport.c:1056
-msgid "Aborting."
-msgstr "Abortando."
-
-#: transport.c:1201
-msgid "failed to push all needed submodules"
-msgstr "falló al hacer push a todos los submódulos necesarios"
-
-#: transport.c:1345 transport-helper.c:657
-msgid "operation not supported by protocol"
-msgstr "operación no soportada por protocolo"
-
#: transport-helper.c:61 transport-helper.c:90
msgid "full write to remote helper failed"
msgstr "escritura total al helper remoto falló"
@@ -8355,7 +8394,7 @@ msgstr "no se pudo ejecutar fast-import"
msgid "error while running fast-import"
msgstr "error al ejecutar fast-import"
-#: transport-helper.c:545 transport-helper.c:1134
+#: transport-helper.c:545 transport-helper.c:1135
#, c-format
msgid "could not read ref %s"
msgstr "no se pudo leer la referencia %s"
@@ -8373,6 +8412,10 @@ msgstr "configurando servicio de ruta remota no soportado por el protocolo"
msgid "invalid remote service path"
msgstr "ruta de servicio remoto inválida"
+#: transport-helper.c:657 transport.c:1339
+msgid "operation not supported by protocol"
+msgstr "operación no soportada por protocolo"
+
#: transport-helper.c:660
#, c-format
msgid "can't connect to subservice %s"
@@ -8413,24 +8456,24 @@ msgstr "helper %s no soporta --atomic"
msgid "helper %s does not support 'push-option'"
msgstr "helper %s no soporta 'push-option'"
-#: transport-helper.c:965
+#: transport-helper.c:966
msgid "remote-helper doesn't support push; refspec needed"
msgstr "remote-helper no soporta push; se necesita refspec"
-#: transport-helper.c:970
+#: transport-helper.c:971
#, c-format
msgid "helper %s does not support 'force'"
msgstr "helper %s no soporta 'force'"
-#: transport-helper.c:1017
+#: transport-helper.c:1018
msgid "couldn't run fast-export"
msgstr "no se pudo ejecutar fast-export"
-#: transport-helper.c:1022
+#: transport-helper.c:1023
msgid "error while running fast-export"
msgstr "error al ejecutar fast-export"
-#: transport-helper.c:1047
+#: transport-helper.c:1048
#, c-format
msgid ""
"No refs in common and none specified; doing nothing.\n"
@@ -8439,50 +8482,139 @@ 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:1120
+#: transport-helper.c:1121
#, c-format
msgid "malformed response in ref list: %s"
msgstr "respuesta malformada en lista de refs: %s"
-#: transport-helper.c:1272
+#: transport-helper.c:1273
#, c-format
msgid "read(%s) failed"
msgstr "leer(%s) falló"
-#: transport-helper.c:1299
+#: transport-helper.c:1300
#, c-format
msgid "write(%s) failed"
msgstr "escribir(%s) falló"
-#: transport-helper.c:1348
+#: transport-helper.c:1349
#, c-format
msgid "%s thread failed"
msgstr "hilo %s falló"
-#: transport-helper.c:1352
+#: transport-helper.c:1353
#, c-format
msgid "%s thread failed to join: %s"
msgstr "hilo %s falló al unirse: %s"
-#: transport-helper.c:1371 transport-helper.c:1375
+#: transport-helper.c:1372 transport-helper.c:1376
#, 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:1412
+#: transport-helper.c:1413
#, c-format
msgid "%s process failed to wait"
msgstr "proceso %s falló al esperar"
-#: transport-helper.c:1416
+#: transport-helper.c:1417
#, c-format
msgid "%s process failed"
msgstr "proceso %s falló"
-#: transport-helper.c:1434 transport-helper.c:1443
+#: transport-helper.c:1435 transport-helper.c:1444
msgid "can't start thread for copying data"
msgstr "no se puede iniciar hilo para copiar data"
+#: transport.c:116
+#, c-format
+msgid "Would set upstream of '%s' to '%s' of '%s'\n"
+msgstr "Configurará upstream de '%s' a '%s' de '%s'\n"
+
+#: transport.c:145
+#, c-format
+msgid "could not read bundle '%s'"
+msgstr "no se pudo leer el conjunto '%s'"
+
+#: transport.c:214
+#, c-format
+msgid "transport: invalid depth option '%s'"
+msgstr "transport: opción inválida '%s'"
+
+#: transport.c:266
+msgid "see protocol.version in 'git help config' for more details"
+msgstr "ver protocol.version en 'git help config' para más información"
+
+#: transport.c:267
+msgid "server options require protocol version 2 or later"
+msgstr "opciones del servidor requieren protocolo versión 2 o posterior"
+
+#: transport.c:632
+msgid "could not parse transport.color.* config"
+msgstr "no se pudo analizar valor de configuración transport.color.*"
+
+#: transport.c:705
+msgid "support for protocol v2 not implemented yet"
+msgstr "soporte para protocolo v2 no implementado todavía"
+
+#: transport.c:839
+#, c-format
+msgid "unknown value for config '%s': %s"
+msgstr "valor desconocido para configuración '%s': %s"
+
+#: transport.c:905
+#, c-format
+msgid "transport '%s' not allowed"
+msgstr "transporte '%s' no permitido"
+
+#: transport.c:957
+msgid "git-over-rsync is no longer supported"
+msgstr "git-over-rsync ya no es soportado"
+
+#: transport.c:1052
+#, c-format
+msgid ""
+"The following submodule paths contain changes that can\n"
+"not be found on any remote:\n"
+msgstr ""
+"La siguiente ruta de submódulo contiene cambios que no\n"
+"pueden ser encontrados en ningún remoto:\n"
+
+#: transport.c:1056
+#, c-format
+msgid ""
+"\n"
+"Please try\n"
+"\n"
+"\tgit push --recurse-submodules=on-demand\n"
+"\n"
+"or cd to the path and use\n"
+"\n"
+"\tgit push\n"
+"\n"
+"to push them to a remote.\n"
+"\n"
+msgstr ""
+"\n"
+"Por favor intenta\n"
+"\n"
+"\tgit push --recurse-submodules=on-demand\n"
+"\n"
+"o cd a la ruta y usa\n"
+"\n"
+"\tgit push\n"
+"\n"
+"para hacer un push al remoto.\n"
+"\n"
+
+#: transport.c:1064
+msgid "Aborting."
+msgstr "Abortando."
+
+#: transport.c:1209
+msgid "failed to push all needed submodules"
+msgstr "falló al hacer push a todos los submódulos necesarios"
+
#: tree-walk.c:32
msgid "too-short tree object"
msgstr "objeto de árbol muy corto"
@@ -8499,7 +8631,7 @@ msgstr "nombre de archivo vacío en la entrada de árbol"
msgid "too-short tree file"
msgstr "archivo de árbol muy corto"
-#: unpack-trees.c:110
+#: unpack-trees.c:113
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
@@ -8510,7 +8642,7 @@ msgstr ""
"%%sPor favor realiza un commit con los cambios o un stash antes de cambiar "
"ramas."
-#: unpack-trees.c:112
+#: unpack-trees.c:115
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
@@ -8520,7 +8652,7 @@ msgstr ""
"checkout:\n"
"%%s"
-#: unpack-trees.c:115
+#: unpack-trees.c:118
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
@@ -8530,7 +8662,7 @@ msgstr ""
"fusionar:\n"
"%%sPor favor, confirma tus cambios o aguárdalos antes de fusionar."
-#: unpack-trees.c:117
+#: unpack-trees.c:120
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
@@ -8540,7 +8672,7 @@ msgstr ""
"merge:\n"
"%%s"
-#: unpack-trees.c:120
+#: unpack-trees.c:123
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
@@ -8549,7 +8681,7 @@ msgstr ""
"Los cambios locales de los siguientes archivos serán sobrescritos al %s:\n"
"%%sPor favor, confirma tus cambios o guárdalos antes de %s."
-#: unpack-trees.c:122
+#: unpack-trees.c:125
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
@@ -8558,7 +8690,7 @@ msgstr ""
"Los cambios locales de los siguientes archivos serán sobreescritos por %s:\n"
"%%s"
-#: unpack-trees.c:127
+#: unpack-trees.c:130
#, c-format
msgid ""
"Updating the following directories would lose untracked files in them:\n"
@@ -8568,7 +8700,7 @@ msgstr ""
"seguimiento en ellos:\n"
"%s"
-#: unpack-trees.c:131
+#: unpack-trees.c:134
#, c-format
msgid ""
"The following untracked working tree files would be removed by checkout:\n"
@@ -8578,7 +8710,7 @@ msgstr ""
"eliminados al actualizar el árbol de trabajo:\n"
"%%sPor favor, muévelos o elimínalos antes de intercambiar ramas."
-#: unpack-trees.c:133
+#: unpack-trees.c:136
#, c-format
msgid ""
"The following untracked working tree files would be removed by checkout:\n"
@@ -8588,7 +8720,7 @@ msgstr ""
"eliminadosal actualizar el árbol de trabajo:\n"
"%%s"
-#: unpack-trees.c:136
+#: unpack-trees.c:139
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
@@ -8598,7 +8730,7 @@ msgstr ""
"eliminados al fusionar:\n"
"%%sPor favor, muévelos o elimínalos antes de fusionar."
-#: unpack-trees.c:138
+#: unpack-trees.c:141
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
@@ -8608,7 +8740,7 @@ msgstr ""
"eliminadosal fusionar:\n"
"%%s"
-#: unpack-trees.c:141
+#: unpack-trees.c:144
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
@@ -8618,7 +8750,7 @@ msgstr ""
"eliminados al %s:\n"
"%%sPor favor, muévelos o elimínalos antes de %s."
-#: unpack-trees.c:143
+#: unpack-trees.c:146
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
@@ -8628,7 +8760,7 @@ msgstr ""
"eliminados al ejecutar %s:\n"
"%%s"
-#: unpack-trees.c:149
+#: unpack-trees.c:152
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by "
@@ -8639,7 +8771,7 @@ msgstr ""
"sobrescritos al actualizar el árbol de trabajo:\n"
"%%sPor favor, muévelos o elimínalos antes de intercambiar ramas."
-#: unpack-trees.c:151
+#: unpack-trees.c:154
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by "
@@ -8650,7 +8782,7 @@ msgstr ""
"sobrescritos al actualizar el árbol de trabajo:\n"
"%%s"
-#: unpack-trees.c:154
+#: unpack-trees.c:157
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
@@ -8660,7 +8792,7 @@ msgstr ""
"sobrescritos al fusionar:\n"
"%%sPor favor, muévelos o elimínalos antes de fusionar."
-#: unpack-trees.c:156
+#: unpack-trees.c:159
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
@@ -8670,7 +8802,7 @@ msgstr ""
"sobrescritos al fusionar:\n"
"%%s"
-#: unpack-trees.c:159
+#: unpack-trees.c:162
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
@@ -8680,7 +8812,7 @@ msgstr ""
"sobrescritos al %s:\n"
"%%sPor favor, muévelos o elimínalos antes de %s."
-#: unpack-trees.c:161
+#: unpack-trees.c:164
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
@@ -8690,62 +8822,71 @@ msgstr ""
"eliminadospor %s:\n"
"%%s"
-#: unpack-trees.c:169
+#: unpack-trees.c:172
#, c-format
msgid "Entry '%s' overlaps with '%s'. Cannot bind."
msgstr "Entrada '%s' se superpone con '%s'. No se pueden unir."
-#: unpack-trees.c:172
+#: unpack-trees.c:175
#, c-format
msgid ""
-"Cannot update sparse checkout: the following entries are not up to date:\n"
+"Cannot update submodule:\n"
"%s"
msgstr ""
-"No se puede actualizar el sparse checkout: las siguientes entradas no están "
-"actualizadas:\n"
+"No se puede actualizar le submódulo:\n"
"%s"
-#: unpack-trees.c:174
+#: unpack-trees.c:178
#, c-format
msgid ""
-"The following working tree files would be overwritten by sparse checkout "
-"update:\n"
+"The following paths are not up to date and were left despite sparse "
+"patterns:\n"
"%s"
msgstr ""
-"Los siguientes archivos del árbol de trabajo serán sobrescritos por la "
-"actualización sparse checkout:\n"
+"La siguientes rutas no están actualizadas y fueron dejadas a pesar del "
+"patrón especificado:\n"
"%s"
-#: unpack-trees.c:176
+#: unpack-trees.c:180
#, c-format
msgid ""
-"The following working tree files would be removed by sparse checkout "
-"update:\n"
+"The following paths are unmerged and were left despite sparse patterns:\n"
"%s"
msgstr ""
-"Los siguientes archivos del árbol de trabajo serán eliminados por la "
-"actualización sparse checkout:\n"
+"Las siguientes rutas son ignoradas y fueron dejadas a pesar de los patrones "
+"sparse:\n"
"%s"
-#: unpack-trees.c:178
+#: unpack-trees.c:182
#, c-format
msgid ""
-"Cannot update submodule:\n"
+"The following paths were already present and thus not updated despite sparse "
+"patterns:\n"
"%s"
msgstr ""
-"No se puede actualizar le submódulo:\n"
+"Las siguientes rutas ya estaban presentes y por eso no fueron actualizadas a "
+"pesar del patrón especificado:\n"
"%s"
-#: unpack-trees.c:255
+#: unpack-trees.c:262
#, c-format
msgid "Aborting\n"
msgstr "Abortando\n"
-#: unpack-trees.c:317
+#: unpack-trees.c:289
+#, c-format
+msgid ""
+"After fixing the above paths, you may want to run `git sparse-checkout "
+"reapply`.\n"
+msgstr ""
+"Luego de arreglar las rutas mostradas, puede que quieras ejecutar `git "
+"sparse-checkout reapply`.\n"
+
+#: unpack-trees.c:350
msgid "Updating files"
msgstr "Actualizando archivos"
-#: unpack-trees.c:349
+#: unpack-trees.c:382
msgid ""
"the following paths have collided (e.g. case-sensitive paths\n"
"on a case-insensitive filesystem) and only one from the same\n"
@@ -8755,10 +8896,14 @@ msgstr ""
"en un filesystem case-insensitive) y solo una del grupo\n"
"colisionando está en el árbol de trabajo:\n"
-#: unpack-trees.c:1445
+#: unpack-trees.c:1498
msgid "Updating index flags"
msgstr "Actualizando flags del index"
+#: upload-pack.c:1337
+msgid "expected flush after fetch arguments"
+msgstr "se espera flush tras argumentos fetch"
+
#: urlmatch.c:163
msgid "invalid URL scheme name or missing '://' suffix"
msgstr "nombre de URL inválido o sufijo '://' faltante"
@@ -8792,35 +8937,35 @@ msgstr "segmento de ruta '..' inválido"
msgid "Fetching objects"
msgstr "Haciendo fetch a objetos"
-#: worktree.c:259 builtin/am.c:2099
+#: worktree.c:262 builtin/am.c:2098
#, c-format
msgid "failed to read '%s'"
msgstr "falló al leer '%s'"
-#: worktree.c:305
+#: worktree.c:309
#, 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:316
+#: worktree.c:320
#, 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:328
+#: worktree.c:332
#, c-format
msgid "'%s' does not exist"
msgstr "'%s' no existe"
-#: worktree.c:334
+#: worktree.c:338
#, 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:342
+#: worktree.c:347
#, c-format
msgid "'%s' does not point back to '%s'"
msgstr "'%s' no apunta de vuelta a '%s'"
@@ -8873,11 +9018,11 @@ msgstr ""
msgid " (use \"git rm <file>...\" to mark resolution)"
msgstr " (usa \"git rm <file>...\" para marcar la resolución)"
-#: wt-status.c:211 wt-status.c:1074
+#: wt-status.c:211 wt-status.c:1072
msgid "Changes to be committed:"
msgstr "Cambios a ser confirmados:"
-#: wt-status.c:234 wt-status.c:1083
+#: wt-status.c:234 wt-status.c:1081
msgid "Changes not staged for commit:"
msgstr "Cambios no rastreados para el commit:"
@@ -8983,22 +9128,22 @@ msgstr "contenido modificado, "
msgid "untracked content, "
msgstr "contenido no rastreado, "
-#: wt-status.c:906
+#: wt-status.c:904
#, 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:938
+#: wt-status.c:936
msgid "Submodules changed but not updated:"
msgstr "Submódulos cambiados pero no actualizados:"
-#: wt-status.c:940
+#: wt-status.c:938
msgid "Submodule changes to be committed:"
msgstr "Submódulos cambiados listos para realizar commit:"
-#: wt-status.c:1022
+#: wt-status.c:1020
msgid ""
"Do not modify or remove the line above.\n"
"Everything below it will be ignored."
@@ -9006,7 +9151,7 @@ msgstr ""
"No modifique o borre la línea de encima.\n"
"Todo lo que este por abajo será eliminado."
-#: wt-status.c:1114
+#: wt-status.c:1112
#, c-format
msgid ""
"\n"
@@ -9017,107 +9162,107 @@ msgstr ""
"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
+#: wt-status.c:1142
msgid "You have unmerged paths."
msgstr "Tienes rutas no fusionadas."
-#: wt-status.c:1147
+#: wt-status.c:1145
msgid " (fix conflicts and run \"git commit\")"
msgstr " (arregla los conflictos y corre \"git commit\""
-#: wt-status.c:1149
+#: wt-status.c:1147
msgid " (use \"git merge --abort\" to abort the merge)"
msgstr " (usa \"git merge --abort\" para abortar la fusion)"
-#: wt-status.c:1153
+#: wt-status.c:1151
msgid "All conflicts fixed but you are still merging."
msgstr "Todos los conflictos resueltos pero sigues fusionando."
-#: wt-status.c:1156
+#: wt-status.c:1154
msgid " (use \"git commit\" to conclude merge)"
msgstr " (usa \"git commit\" para concluir la fusión)"
-#: wt-status.c:1165
+#: wt-status.c:1163
msgid "You are in the middle of an am session."
msgstr "Estás en medio de una sesión am."
-#: wt-status.c:1168
+#: wt-status.c:1166
msgid "The current patch is empty."
msgstr "El parche actual está vacío."
-#: wt-status.c:1172
+#: wt-status.c:1170
msgid " (fix conflicts and then run \"git am --continue\")"
msgstr " (arregla los conflictos y luego corre \"git am --continue\""
-#: wt-status.c:1174
+#: wt-status.c:1172
msgid " (use \"git am --skip\" to skip this patch)"
msgstr " (usa \"git am --skip\" para saltar este parche)"
-#: wt-status.c:1176
+#: wt-status.c:1174
msgid " (use \"git am --abort\" to restore the original branch)"
msgstr " (usa \"git am --abort\" para restaurar la rama original)"
-#: wt-status.c:1309
+#: wt-status.c:1307
msgid "git-rebase-todo is missing."
msgstr "git-rebase-todo no está presente."
-#: wt-status.c:1311
+#: wt-status.c:1309
msgid "No commands done."
msgstr "No se realizaron los comandos."
-#: wt-status.c:1314
+#: wt-status.c:1312
#, 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:1325
+#: wt-status.c:1323
#, c-format
msgid " (see more in file %s)"
msgstr " (ver más en el archivo %s)"
-#: wt-status.c:1330
+#: wt-status.c:1328
msgid "No commands remaining."
msgstr "No quedan más comandos."
-#: wt-status.c:1333
+#: wt-status.c:1331
#, 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:1341
+#: wt-status.c:1339
msgid " (use \"git rebase --edit-todo\" to view and edit)"
msgstr " (usa \"git rebase --edit-todo\" para ver y editar)"
-#: wt-status.c:1353
+#: wt-status.c:1351
#, 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:1358
+#: wt-status.c:1356
msgid "You are currently rebasing."
msgstr "Estás aplicando un rebase."
-#: wt-status.c:1371
+#: wt-status.c:1369
msgid " (fix conflicts and then run \"git rebase --continue\")"
msgstr " (corrige los conflictos y ejecuta \"git rebase --continue\")"
-#: wt-status.c:1373
+#: wt-status.c:1371
msgid " (use \"git rebase --skip\" to skip this patch)"
msgstr " (usa \"git rebase --skip\" para omitir este parche)"
-#: wt-status.c:1375
+#: wt-status.c:1373
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:1382
+#: wt-status.c:1380
msgid " (all conflicts fixed: run \"git rebase --continue\")"
msgstr " (todos los conflictos corregidos: ejecuta \"git rebase --continue\")"
-#: wt-status.c:1386
+#: wt-status.c:1384
#, c-format
msgid ""
"You are currently splitting a commit while rebasing branch '%s' on '%s'."
@@ -9125,144 +9270,144 @@ msgstr ""
"Estás dividiendo un commit mientras aplicas un rebase de la rama '%s' en "
"'%s'."
-#: wt-status.c:1391
+#: wt-status.c:1389
msgid "You are currently splitting a commit during a rebase."
msgstr "Estás dividiendo un commit durante un rebase."
-#: wt-status.c:1394
+#: wt-status.c:1392
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:1398
+#: wt-status.c:1396
#, 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:1403
+#: wt-status.c:1401
msgid "You are currently editing a commit during a rebase."
msgstr "Estás editando un commit durante un rebase."
-#: wt-status.c:1406
+#: wt-status.c:1404
msgid " (use \"git commit --amend\" to amend the current commit)"
msgstr " (usa \"git commit --amend\" para enmendar el commit actual)"
-#: wt-status.c:1408
+#: wt-status.c:1406
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:1419
+#: wt-status.c:1417
msgid "Cherry-pick currently in progress."
msgstr "Cherry-pick en progreso actualmente."
-#: wt-status.c:1422
+#: wt-status.c:1420
#, c-format
msgid "You are currently cherry-picking commit %s."
msgstr "Estás realizando un cherry-picking en el commit %s."
-#: wt-status.c:1429
+#: wt-status.c:1427
msgid " (fix conflicts and run \"git cherry-pick --continue\")"
msgstr " (corrige los conflictos y ejecuta \"git cherry-pick --continue\")"
-#: wt-status.c:1432
+#: wt-status.c:1430
msgid " (run \"git cherry-pick --continue\" to continue)"
msgstr " (ejecuta \"git cherry-pick --continue\" para continuar)"
-#: wt-status.c:1435
+#: wt-status.c:1433
msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
msgstr ""
" (todos los conflictos corregidos: ejecuta \"git cherry-pick --continue\")"
-#: wt-status.c:1437
+#: wt-status.c:1435
msgid " (use \"git cherry-pick --skip\" to skip this patch)"
msgstr " (usa \"git cherry-pick --skip\" para saltar este parche)"
-#: wt-status.c:1439
+#: 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:1449
+#: wt-status.c:1447
msgid "Revert currently in progress."
msgstr "Revierte el estado en progreso actual."
-#: wt-status.c:1452
+#: wt-status.c:1450
#, c-format
msgid "You are currently reverting commit %s."
msgstr "Estás revirtiendo el commit %s."
-#: wt-status.c:1458
+#: wt-status.c:1456
msgid " (fix conflicts and run \"git revert --continue\")"
msgstr " (corrige los conflictos y ejecuta \"git revert --continue\")"
-#: wt-status.c:1461
+#: wt-status.c:1459
msgid " (run \"git revert --continue\" to continue)"
msgstr " (ejecuta \"git revert --continue\" para continuar)"
-#: wt-status.c:1464
+#: wt-status.c:1462
msgid " (all conflicts fixed: run \"git revert --continue\")"
msgstr " (todos los conflictos corregidos: ejecuta \"git revert --continue\")"
-#: wt-status.c:1466
+#: wt-status.c:1464
msgid " (use \"git revert --skip\" to skip this patch)"
msgstr " (usa \"git revert --skip\" para omitir este parche)"
-#: wt-status.c:1468
+#: wt-status.c:1466
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:1478
+#: wt-status.c:1476
#, 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:1482
+#: wt-status.c:1480
msgid "You are currently bisecting."
msgstr "Estás aplicando un bisect."
-#: wt-status.c:1485
+#: wt-status.c:1483
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:1694
+#: wt-status.c:1692
msgid "On branch "
msgstr "En la rama "
-#: wt-status.c:1701
+#: wt-status.c:1699
msgid "interactive rebase in progress; onto "
msgstr "rebase interactivo en progreso; en "
-#: wt-status.c:1703
+#: wt-status.c:1701
msgid "rebase in progress; onto "
msgstr "rebase en progreso; en "
-#: wt-status.c:1713
+#: wt-status.c:1711
msgid "Not currently on any branch."
msgstr "Actualmente no estás en ninguna rama."
-#: wt-status.c:1730
+#: wt-status.c:1728
msgid "Initial commit"
msgstr "Confirmación inicial"
-#: wt-status.c:1731
+#: wt-status.c:1729
msgid "No commits yet"
msgstr "No hay commits todavía"
-#: wt-status.c:1745
+#: wt-status.c:1743
msgid "Untracked files"
msgstr "Archivos sin seguimiento"
-#: wt-status.c:1747
+#: wt-status.c:1745
msgid "Ignored files"
msgstr "Archivos ignorados"
-#: wt-status.c:1751
+#: wt-status.c:1749
#, c-format
msgid ""
"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -9273,31 +9418,31 @@ msgstr ""
"puede acelerarlo, pero tienes que ser cuidadoso de no olvidar agregar\n"
"nuevos archivos tú mismo (vea 'git help status')."
-#: wt-status.c:1757
+#: wt-status.c:1755
#, c-format
msgid "Untracked files not listed%s"
msgstr "Archivos no rastreados no son mostrados %s"
-#: wt-status.c:1759
+#: wt-status.c:1757
msgid " (use -u option to show untracked files)"
msgstr " (usa la opción -u para mostrar los archivos sin seguimiento)"
-#: wt-status.c:1765
+#: wt-status.c:1763
msgid "No changes"
msgstr "Sin cambios"
-#: wt-status.c:1770
+#: wt-status.c:1768
#, 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:1773
+#: wt-status.c:1771
#, c-format
msgid "no changes added to commit\n"
msgstr "no se agregaron cambios al commit\n"
-#: wt-status.c:1776
+#: wt-status.c:1774
#, c-format
msgid ""
"nothing added to commit but untracked files present (use \"git add\" to "
@@ -9306,72 +9451,72 @@ msgstr ""
"no hay nada agregado al commit pero hay archivos sin seguimiento presentes "
"(usa \"git add\" para hacerles seguimiento)\n"
-#: wt-status.c:1779
+#: wt-status.c:1777
#, 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:1782
+#: wt-status.c:1780
#, 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:1785 wt-status.c:1790
+#: wt-status.c:1783 wt-status.c:1788
#, c-format
msgid "nothing to commit\n"
msgstr "nada para hacer commit\n"
-#: wt-status.c:1788
+#: wt-status.c:1786
#, 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:1792
+#: wt-status.c:1790
#, 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:1905
+#: wt-status.c:1903
msgid "No commits yet on "
msgstr "No hay commits todavía en "
-#: wt-status.c:1909
+#: wt-status.c:1907
msgid "HEAD (no branch)"
msgstr "HEAD (sin rama)"
-#: wt-status.c:1940
+#: wt-status.c:1938
msgid "different"
msgstr "diferente"
-#: wt-status.c:1942 wt-status.c:1950
+#: wt-status.c:1940 wt-status.c:1948
msgid "behind "
msgstr "detrás "
-#: wt-status.c:1945 wt-status.c:1948
+#: wt-status.c:1943 wt-status.c:1946
msgid "ahead "
msgstr "adelante "
#. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2470
+#: wt-status.c:2468
#, c-format
msgid "cannot %s: You have unstaged changes."
msgstr "no se puede %s: Tienes cambios sin marcar."
-#: wt-status.c:2476
+#: wt-status.c:2474
msgid "additionally, your index contains uncommitted changes."
msgstr "adicionalmente, tu índice contiene cambios que no están en un commit."
-#: wt-status.c:2478
+#: wt-status.c:2476
#, 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."
-#: compat/precompose_utf8.c:58 builtin/clone.c:455
+#: compat/precompose_utf8.c:58 builtin/clone.c:456
#, c-format
msgid "failed to unlink '%s'"
msgstr "falló al desvincular '%s'"
@@ -9385,7 +9530,7 @@ msgstr "git add [<opción>] [--] <especificación-de-ruta>..."
msgid "unexpected diff status %c"
msgstr "diff status inesperado %c"
-#: builtin/add.c:93 builtin/commit.c:288
+#: builtin/add.c:93 builtin/commit.c:285
msgid "updating files failed"
msgstr "falló la actualización de carpetas"
@@ -9398,7 +9543,7 @@ msgstr "eliminar '%s'\n"
msgid "Unstaged changes after refreshing the index:"
msgstr "Cambios fuera del área de stage tras refrescar el índice:"
-#: builtin/add.c:266 builtin/rev-parse.c:899
+#: builtin/add.c:266 builtin/rev-parse.c:904
msgid "Could not read the index"
msgstr "No se pudo leer el índice"
@@ -9434,8 +9579,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:322 builtin/clean.c:910 builtin/fetch.c:163 builtin/mv.c:124
-#: builtin/prune-packed.c:56 builtin/pull.c:203 builtin/push.c:548
+#: builtin/add.c:322 builtin/clean.c:904 builtin/fetch.c:164 builtin/mv.c:124
+#: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:548
#: builtin/remote.c:1421 builtin/rm.c:242 builtin/send-pack.c:165
msgid "dry run"
msgstr "dry run ( ejecución en seco)"
@@ -9444,7 +9589,7 @@ msgstr "dry run ( ejecución en seco)"
msgid "interactive picking"
msgstr "selección interactiva"
-#: builtin/add.c:326 builtin/checkout.c:1511 builtin/reset.c:307
+#: builtin/add.c:326 builtin/checkout.c:1535 builtin/reset.c:308
msgid "select hunks interactively"
msgstr "elegir hunks de forma interactiva"
@@ -9551,7 +9696,7 @@ msgstr ""
msgid "adding files failed"
msgstr "falló al agregar archivos"
-#: builtin/add.c:447 builtin/commit.c:348
+#: builtin/add.c:447 builtin/commit.c:345
msgid "--pathspec-from-file is incompatible with --interactive/--patch"
msgstr "--pathspec-from-file es incompatible con --interactive/--patch"
@@ -9572,13 +9717,13 @@ msgstr "Opción --ignore-missing solo puede ser usada junto a --dry-run"
msgid "--chmod param '%s' must be either -x or +x"
msgstr "El parámetro '%s' para --chmod debe ser -x ó +x"
-#: builtin/add.c:501 builtin/checkout.c:1675 builtin/commit.c:354
-#: builtin/reset.c:327 builtin/rm.c:272 builtin/stash.c:1509
+#: builtin/add.c:501 builtin/checkout.c:1703 builtin/commit.c:351
+#: builtin/reset.c:328 builtin/rm.c:272 builtin/stash.c:1506
msgid "--pathspec-from-file is incompatible with pathspec arguments"
msgstr "--pathspec-from-file es incompatible con argumentos de pathspec"
-#: builtin/add.c:508 builtin/checkout.c:1687 builtin/commit.c:360
-#: builtin/reset.c:333 builtin/rm.c:278 builtin/stash.c:1515
+#: builtin/add.c:508 builtin/checkout.c:1715 builtin/commit.c:357
+#: builtin/reset.c:334 builtin/rm.c:278 builtin/stash.c:1512
msgid "--pathspec-file-nul requires --pathspec-from-file"
msgstr "--pathspec-file-nul requiere --pathspec-from-file"
@@ -9739,34 +9884,34 @@ msgstr "Cuerpo de commit es:"
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:1700 builtin/commit.c:398
+#: builtin/am.c:1699 builtin/commit.c:395
msgid "unable to write index file"
msgstr "no es posible escribir en el archivo índice"
-#: builtin/am.c:1704
+#: builtin/am.c:1703
#, c-format
msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr "Índice sucio: no se puede aplicar parches (sucio: %s)"
-#: builtin/am.c:1744 builtin/am.c:1812
+#: builtin/am.c:1743 builtin/am.c:1811
#, c-format
msgid "Applying: %.*s"
msgstr "Aplicando: %.*s"
-#: builtin/am.c:1761
+#: builtin/am.c:1760
msgid "No changes -- Patch already applied."
msgstr "Sin cambios -- parche ya aplicado."
-#: builtin/am.c:1767
+#: builtin/am.c:1766
#, c-format
msgid "Patch failed at %s %.*s"
msgstr "El parche falló en %s %.*s"
-#: builtin/am.c:1771
+#: builtin/am.c:1770
msgid "Use 'git am --show-current-patch=diff' to see the failed patch"
msgstr "Use 'git am --show-current-patch=diff' para ver el parche fallido"
-#: builtin/am.c:1815
+#: builtin/am.c:1814
msgid ""
"No changes - did you forget to use 'git add'?\n"
"If there is nothing left to stage, chances are that something else\n"
@@ -9776,7 +9921,7 @@ 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:1822
+#: builtin/am.c:1821
msgid ""
"You still have unmerged paths in your index.\n"
"You should 'git add' each file with resolved conflicts to mark them as "
@@ -9789,17 +9934,17 @@ msgstr ""
"Se puede ejecutar `git rm` en el archivo para aceptar \"borrado por ellos\" "
"en él."
-#: builtin/am.c:1929 builtin/am.c:1933 builtin/am.c:1945 builtin/reset.c:346
-#: builtin/reset.c:354
+#: builtin/am.c:1928 builtin/am.c:1932 builtin/am.c:1944 builtin/reset.c:347
+#: builtin/reset.c:355
#, c-format
msgid "Could not parse object '%s'."
msgstr "No se pudo analizar el objeto '%s'."
-#: builtin/am.c:1981
+#: builtin/am.c:1980
msgid "failed to clean index"
msgstr "falló al limpiar el índice"
-#: builtin/am.c:2025
+#: builtin/am.c:2024
msgid ""
"You seem to have moved HEAD since the last 'am' failure.\n"
"Not rewinding to ORIG_HEAD"
@@ -9807,154 +9952,156 @@ msgstr ""
"Parece haber movido HEAD desde el último falló 'am'.\n"
"No rebobinando a ORIG_HEAD"
-#: builtin/am.c:2132
+#: builtin/am.c:2131
#, c-format
msgid "Invalid value for --patch-format: %s"
msgstr "Valor inválido para --patch-format: %s"
-#: builtin/am.c:2172
+#: builtin/am.c:2171
#, c-format
msgid "Invalid value for --show-current-patch: %s"
msgstr "Valor inválido para --show-current-patch: %s"
-#: builtin/am.c:2176
+#: builtin/am.c:2175
#, c-format
msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s"
msgstr "--show-current-patch=%s es incompatible con --show-current-patch=%s"
-#: builtin/am.c:2207
+#: builtin/am.c:2206
msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
msgstr "git am [<opciones>] [(<mbox> | <Directorio-de-correo>)...]"
-#: builtin/am.c:2208
+#: builtin/am.c:2207
msgid "git am [<options>] (--continue | --skip | --abort)"
msgstr "git am [<opciones>] (--continue | --skip | --abort)"
-#: builtin/am.c:2214
+#: builtin/am.c:2213
msgid "run interactively"
msgstr "ejecutar de manera interactiva"
-#: builtin/am.c:2216
+#: builtin/am.c:2215
msgid "historical option -- no-op"
msgstr "opción histórica -- no-op"
-#: builtin/am.c:2218
+#: builtin/am.c:2217
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:2219 builtin/init-db.c:494 builtin/prune-packed.c:58
-#: builtin/repack.c:304 builtin/stash.c:812
+#: builtin/am.c:2218 builtin/init-db.c:541 builtin/prune-packed.c:16
+#: builtin/repack.c:306 builtin/stash.c:816
msgid "be quiet"
msgstr "ser silencioso"
-#: builtin/am.c:2221
+#: builtin/am.c:2220
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:2224
+#: builtin/am.c:2223
msgid "recode into utf8 (default)"
msgstr "recodificar en utf8 (default)"
-#: builtin/am.c:2226
+#: builtin/am.c:2225
msgid "pass -k flag to git-mailinfo"
msgstr "pasar flag -k a git-mailinfo"
-#: builtin/am.c:2228
+#: builtin/am.c:2227
msgid "pass -b flag to git-mailinfo"
msgstr "pasar flag -b a git-mailinfo"
-#: builtin/am.c:2230
+#: builtin/am.c:2229
msgid "pass -m flag to git-mailinfo"
msgstr "pasar flag -m a git-mailinfo"
-#: builtin/am.c:2232
+#: builtin/am.c:2231
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:2235
+#: builtin/am.c:2234
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:2238
+#: builtin/am.c:2237
msgid "strip everything before a scissors line"
msgstr "descubrir todo antes de una línea de tijeras"
-#: builtin/am.c:2240 builtin/am.c:2243 builtin/am.c:2246 builtin/am.c:2249
-#: builtin/am.c:2252 builtin/am.c:2255 builtin/am.c:2258 builtin/am.c:2261
-#: builtin/am.c:2267
+#: builtin/am.c:2239 builtin/am.c:2242 builtin/am.c:2245 builtin/am.c:2248
+#: builtin/am.c:2251 builtin/am.c:2254 builtin/am.c:2257 builtin/am.c:2260
+#: builtin/am.c:2266
msgid "pass it through git-apply"
msgstr "pasarlo a través de git-apply"
-#: builtin/am.c:2257 builtin/commit.c:1391 builtin/fmt-merge-msg.c:670
-#: builtin/fmt-merge-msg.c:673 builtin/grep.c:871 builtin/merge.c:250
-#: builtin/pull.c:140 builtin/pull.c:199 builtin/rebase.c:1505
-#: builtin/repack.c:315 builtin/repack.c:319 builtin/repack.c:321
-#: builtin/show-branch.c:650 builtin/show-ref.c:172 builtin/tag.c:403
-#: parse-options.h:154 parse-options.h:175 parse-options.h:316
+#: builtin/am.c:2256 builtin/commit.c:1397 builtin/fmt-merge-msg.c:17
+#: builtin/fmt-merge-msg.c:20 builtin/grep.c:891 builtin/merge.c:252
+#: builtin/pull.c:141 builtin/pull.c:200 builtin/pull.c:217
+#: builtin/rebase.c:1329 builtin/repack.c:317 builtin/repack.c:321
+#: builtin/repack.c:323 builtin/show-branch.c:650 builtin/show-ref.c:172
+#: builtin/tag.c:404 parse-options.h:154 parse-options.h:175
+#: parse-options.h:316
msgid "n"
msgstr "n"
-#: builtin/am.c:2263 builtin/branch.c:661 builtin/for-each-ref.c:38
-#: builtin/replace.c:556 builtin/tag.c:437 builtin/verify-tag.c:38
+#: builtin/am.c:2262 builtin/branch.c:659 builtin/for-each-ref.c:38
+#: builtin/replace.c:556 builtin/tag.c:438 builtin/verify-tag.c:38
+#: bugreport.c:131
msgid "format"
msgstr "formato"
-#: builtin/am.c:2264
+#: builtin/am.c:2263
msgid "format the patch(es) are in"
msgstr "formatear el parche(s)"
-#: builtin/am.c:2270
+#: builtin/am.c:2269
msgid "override error message when patch failure occurs"
msgstr "sobrescribir mensajes de error cuando fallos de parchado ocurran"
-#: builtin/am.c:2272
+#: builtin/am.c:2271
msgid "continue applying patches after resolving a conflict"
msgstr "continuar aplicando los parches tras resolver conflictos"
-#: builtin/am.c:2275
+#: builtin/am.c:2274
msgid "synonyms for --continue"
msgstr "sinónimos para --continue"
-#: builtin/am.c:2278
+#: builtin/am.c:2277
msgid "skip the current patch"
msgstr "saltar el parche actual"
-#: builtin/am.c:2281
+#: builtin/am.c:2280
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:2284
+#: builtin/am.c:2283
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:2288
+#: builtin/am.c:2287
msgid "show the patch being applied"
msgstr "muestra el parche siendo aplicado"
-#: builtin/am.c:2293
+#: builtin/am.c:2292
msgid "lie about committer date"
msgstr "mentir sobre la fecha del committer"
-#: builtin/am.c:2295
+#: builtin/am.c:2294
msgid "use current timestamp for author date"
msgstr "usar el timestamp actual para la fecha del autor"
-#: builtin/am.c:2297 builtin/commit-tree.c:120 builtin/commit.c:1512
-#: builtin/merge.c:287 builtin/pull.c:174 builtin/rebase.c:517
-#: builtin/rebase.c:1556 builtin/revert.c:117 builtin/tag.c:418
+#: builtin/am.c:2296 builtin/commit-tree.c:120 builtin/commit.c:1517
+#: builtin/merge.c:289 builtin/pull.c:175 builtin/rebase.c:524
+#: builtin/rebase.c:1380 builtin/revert.c:117 builtin/tag.c:419
msgid "key-id"
msgstr "key-id"
-#: builtin/am.c:2298 builtin/rebase.c:518 builtin/rebase.c:1557
+#: builtin/am.c:2297 builtin/rebase.c:525 builtin/rebase.c:1381
msgid "GPG-sign commits"
msgstr "Commits con firma GPG"
-#: builtin/am.c:2301
+#: builtin/am.c:2300
msgid "(internal use for git-rebase)"
msgstr "(uso interno para git-rebase)"
-#: builtin/am.c:2319
+#: builtin/am.c:2318
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."
@@ -9962,16 +10109,16 @@ msgstr ""
"La opción -b/--binary ha estado deshabilitada por mucho tiempo, y\n"
"será eliminada. Por favor no la use más."
-#: builtin/am.c:2326
+#: builtin/am.c:2325
msgid "failed to read the index"
msgstr "falló al leer el índice"
-#: builtin/am.c:2341
+#: builtin/am.c:2340
#, 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:2365
+#: builtin/am.c:2364
#, c-format
msgid ""
"Stray %s directory found.\n"
@@ -9980,11 +10127,11 @@ msgstr ""
"Directorio extraviado %s encontrado.\n"
"Use \"git am --abort\" para borrarlo."
-#: builtin/am.c:2371
+#: builtin/am.c:2370
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:2381
+#: builtin/am.c:2380
msgid "interactive mode requires patches on the command line"
msgstr "modo interactivo requiere parches en la línea de comando"
@@ -10394,7 +10541,7 @@ msgstr "Mostrar en cambio el email del autor (Default: off)"
msgid "Ignore whitespace differences"
msgstr "Ignorar diferencias de espacios en blanco"
-#: builtin/blame.c:860 builtin/log.c:1702
+#: builtin/blame.c:860 builtin/log.c:1721
msgid "rev"
msgstr "rev"
@@ -10462,14 +10609,14 @@ msgstr "--progress no puede ser usado con --incremental o formatos porcelana"
msgid "4 years, 11 months ago"
msgstr "hace 4 años, 11 meses"
-#: builtin/blame.c:1079
+#: 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:1125
+#: builtin/blame.c:1133
msgid "Blaming lines"
msgstr "Blaming a líneas"
@@ -10682,7 +10829,7 @@ msgstr "configurando modo tracking (mirar git-pull(1))"
msgid "do not use"
msgstr "no usar"
-#: builtin/branch.c:626 builtin/rebase.c:513
+#: builtin/branch.c:626 builtin/rebase.c:520
msgid "upstream"
msgstr "upstream"
@@ -10774,68 +10921,68 @@ msgstr "muestra solo ramas que no han sido fusionadas"
msgid "list branches in columns"
msgstr "muestra las ramas en columnas"
-#: builtin/branch.c:657 builtin/for-each-ref.c:42 builtin/notes.c:415
+#: builtin/branch.c:656 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:433
+#: builtin/tag.c:434
msgid "object"
msgstr "objeto"
-#: builtin/branch.c:658
+#: builtin/branch.c:657
msgid "print only branches of the object"
msgstr "imprimir sólo las ramas del objeto"
-#: builtin/branch.c:660 builtin/for-each-ref.c:48 builtin/tag.c:440
+#: builtin/branch.c:658 builtin/for-each-ref.c:48 builtin/tag.c:441
msgid "sorting and filtering are case insensitive"
msgstr "ordenamiento y filtrado son case-insensitive"
-#: builtin/branch.c:661 builtin/for-each-ref.c:38 builtin/tag.c:438
+#: builtin/branch.c:659 builtin/for-each-ref.c:38 builtin/tag.c:439
#: builtin/verify-tag.c:38
msgid "format to use for the output"
msgstr "formato para usar para el output"
-#: builtin/branch.c:684 builtin/clone.c:785
+#: builtin/branch.c:682 builtin/clone.c:789
msgid "HEAD not found below refs/heads!"
msgstr "¡HEAD no encontrado abajo de refs/heads!"
-#: builtin/branch.c:708
+#: builtin/branch.c:706
msgid "--column and --verbose are incompatible"
msgstr "--column y --verbose son incompatibles"
-#: builtin/branch.c:723 builtin/branch.c:777 builtin/branch.c:786
+#: builtin/branch.c:721 builtin/branch.c:775 builtin/branch.c:784
msgid "branch name required"
msgstr "se necesita el nombre de la rama"
-#: builtin/branch.c:753
+#: builtin/branch.c:751
msgid "Cannot give description to detached HEAD"
msgstr "No se puede dar descripción al HEAD desacoplado"
-#: builtin/branch.c:758
+#: builtin/branch.c:756
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:765
+#: builtin/branch.c:763
#, c-format
msgid "No commit on branch '%s' yet."
msgstr "Aún no hay commits en la rama '%s'."
-#: builtin/branch.c:768
+#: builtin/branch.c:766
#, c-format
msgid "No branch named '%s'."
msgstr "No hay ninguna rama llamada '%s'."
-#: builtin/branch.c:783
+#: builtin/branch.c:781
msgid "too many branches for a copy operation"
msgstr "demasiadas ramas para una operación de copiado"
-#: builtin/branch.c:792
+#: builtin/branch.c:790
msgid "too many arguments for a rename operation"
msgstr "demasiados argumentos para una operación de renombrado"
-#: builtin/branch.c:797
+#: builtin/branch.c:795
msgid "too many arguments to set new upstream"
msgstr "demasiados argumentos para configurar un nuevo upstream"
-#: builtin/branch.c:801
+#: builtin/branch.c:799
#, c-format
msgid ""
"could not set upstream of HEAD to %s when it does not point to any branch."
@@ -10843,32 +10990,32 @@ msgstr ""
"no se pudo configurar upstream de HEAD a %s cuando este no apunta a ninguna "
"rama."
-#: builtin/branch.c:804 builtin/branch.c:827
+#: builtin/branch.c:802 builtin/branch.c:825
#, c-format
msgid "no such branch '%s'"
msgstr "no hay tal rama '%s'"
-#: builtin/branch.c:808
+#: builtin/branch.c:806
#, c-format
msgid "branch '%s' does not exist"
msgstr "la rama '%s' no existe"
-#: builtin/branch.c:821
+#: builtin/branch.c:819
msgid "too many arguments to unset upstream"
msgstr "demasiados argumentos para desconfigurar upstream"
-#: builtin/branch.c:825
+#: builtin/branch.c:823
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:831
+#: builtin/branch.c:829
#, c-format
msgid "Branch '%s' has no upstream information"
msgstr "Rama '%s' no tiene información de upstream"
-#: builtin/branch.c:841
+#: builtin/branch.c:839
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>?"
@@ -10876,7 +11023,7 @@ msgstr ""
"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:845
+#: builtin/branch.c:843
msgid ""
"the '--set-upstream' option is no longer supported. Please use '--track' or "
"'--set-upstream-to' instead."
@@ -10900,19 +11047,19 @@ msgstr "git bundle list-heads <archivo> [<nombre-de-ref>...]"
msgid "git bundle unbundle <file> [<refname>...]"
msgstr "git bundle unbundle <archivo> [<nombre-de-ref>...]"
-#: builtin/bundle.c:66 builtin/pack-objects.c:3375
+#: builtin/bundle.c:66 builtin/pack-objects.c:3376
msgid "do not show progress meter"
msgstr "no mostrar medidor de progreso"
-#: builtin/bundle.c:68 builtin/pack-objects.c:3377
+#: builtin/bundle.c:68 builtin/pack-objects.c:3378
msgid "show progress meter"
msgstr "mostrar medidor de progreso"
-#: builtin/bundle.c:70 builtin/pack-objects.c:3379
+#: builtin/bundle.c:70 builtin/pack-objects.c:3380
msgid "show progress meter during object writing phase"
msgstr "mostrar medidor de progreso durante la fase de escritura de objeto"
-#: builtin/bundle.c:73 builtin/pack-objects.c:3382
+#: builtin/bundle.c:73 builtin/pack-objects.c:3383
msgid "similar to --all-progress when progress meter is shown"
msgstr "similar a --all-progress cuando medidor de progreso es mostrado"
@@ -10942,7 +11089,7 @@ msgstr "ser verboso; tiene que ser agregado antes de un subcomando"
msgid "Unknown subcommand: %s"
msgstr "Sub-comando desconocido: %s"
-#: builtin/cat-file.c:595
+#: builtin/cat-file.c:598
msgid ""
"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
"p | <type> | --textconv | --filters) [--path=<path>] <object>"
@@ -10950,7 +11097,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:596
+#: builtin/cat-file.c:599
msgid ""
"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
"filters]"
@@ -10958,72 +11105,72 @@ msgstr ""
"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
"filters]"
-#: builtin/cat-file.c:617
+#: builtin/cat-file.c:620
msgid "only one batch option may be specified"
msgstr "solo se puede especificar una opción batch"
-#: builtin/cat-file.c:635
+#: builtin/cat-file.c:638
msgid "<type> can be one of: blob, tree, commit, tag"
msgstr "<tipo> puede ser: blob, tree, commit, tag"
-#: builtin/cat-file.c:636
+#: builtin/cat-file.c:639
msgid "show object type"
msgstr "mostrar el tipo del objeto"
-#: builtin/cat-file.c:637
+#: builtin/cat-file.c:640
msgid "show object size"
msgstr "mostrar el tamaño del objeto"
-#: builtin/cat-file.c:639
+#: builtin/cat-file.c:642
msgid "exit with zero when there's no error"
msgstr "salir con cero cuando no haya error"
-#: builtin/cat-file.c:640
+#: builtin/cat-file.c:643
msgid "pretty-print object's content"
msgstr "realizar pretty-print del contenido del objeto"
-#: builtin/cat-file.c:642
+#: builtin/cat-file.c:645
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:644
+#: builtin/cat-file.c:647
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:645 git-submodule.sh:1002
+#: builtin/cat-file.c:648 git-submodule.sh:984
msgid "blob"
msgstr "blob"
-#: builtin/cat-file.c:646
+#: builtin/cat-file.c:649
msgid "use a specific path for --textconv/--filters"
msgstr "use una ruta específica para --textconv/--filters"
-#: builtin/cat-file.c:648
+#: builtin/cat-file.c:651
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:649
+#: builtin/cat-file.c:652
msgid "buffer --batch output"
msgstr "salida buffer --batch"
-#: builtin/cat-file.c:651
+#: builtin/cat-file.c:654
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:655
+#: builtin/cat-file.c:658
msgid "show info about objects fed from the standard input"
msgstr "mostrar info de los objetos alimentados por standard input"
-#: builtin/cat-file.c:659
+#: builtin/cat-file.c:662
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:661
+#: builtin/cat-file.c:664
msgid "show all objects with --batch or --batch-check"
msgstr "mostrar todos los objetos con --batch o --batch-check"
-#: builtin/cat-file.c:663
+#: builtin/cat-file.c:666
msgid "do not order --batch-all-objects output"
msgstr "no ordenar el output de --batch-all-objects"
@@ -11051,8 +11198,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:1464 builtin/gc.c:537
-#: builtin/worktree.c:499
+#: builtin/check-ignore.c:21 builtin/checkout.c:1488 builtin/gc.c:537
+#: builtin/worktree.c:502
msgid "suppress progress reporting"
msgstr "suprimir el reporte de progreso"
@@ -11146,7 +11293,7 @@ msgstr "escribir el contenido en un archivo temporal"
#: builtin/checkout-index.c:178 builtin/column.c:31
#: builtin/submodule--helper.c:1400 builtin/submodule--helper.c:1403
#: builtin/submodule--helper.c:1411 builtin/submodule--helper.c:1909
-#: builtin/worktree.c:672
+#: builtin/worktree.c:675
msgid "string"
msgstr "string"
@@ -11174,98 +11321,98 @@ msgstr "git switch [<opciones>] [<rama>]"
msgid "git restore [<options>] [--source=<branch>] <file>..."
msgstr "git restore [<opciones>] [--source=<rama>] -- <archivo>..."
-#: builtin/checkout.c:175 builtin/checkout.c:214
+#: builtin/checkout.c:188 builtin/checkout.c:227
#, c-format
msgid "path '%s' does not have our version"
msgstr "ruta '%s' no tiene nuestra versión"
-#: builtin/checkout.c:177 builtin/checkout.c:216
+#: builtin/checkout.c:190 builtin/checkout.c:229
#, c-format
msgid "path '%s' does not have their version"
msgstr "ruta '%s' no tiene su versión"
-#: builtin/checkout.c:193
+#: builtin/checkout.c:206
#, c-format
msgid "path '%s' does not have all necessary versions"
msgstr "ruta '%s' no tiene todas las versiones necesarias"
-#: builtin/checkout.c:243
+#: builtin/checkout.c:256
#, c-format
msgid "path '%s' does not have necessary versions"
msgstr "ruta '%s' no tiene versiones necesarias"
-#: builtin/checkout.c:261
+#: builtin/checkout.c:274
#, c-format
msgid "path '%s': cannot merge"
msgstr "ruta '%s': no se puede fusionar"
-#: builtin/checkout.c:277
+#: builtin/checkout.c:290
#, c-format
msgid "Unable to add merge result for '%s'"
msgstr "Incapaz de agregar resultados de fusión a '%s'"
-#: builtin/checkout.c:377
+#: builtin/checkout.c:395
#, 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:382
+#: builtin/checkout.c:400
#, 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:389
+#: builtin/checkout.c:407
#, 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:412 builtin/checkout.c:415 builtin/checkout.c:418
-#: builtin/checkout.c:422
+#: builtin/checkout.c:430 builtin/checkout.c:433 builtin/checkout.c:436
+#: builtin/checkout.c:440
#, c-format
msgid "'%s' cannot be used with updating paths"
msgstr "'%s' no puede ser usada con rutas actualizadas"
-#: builtin/checkout.c:425 builtin/checkout.c:428
+#: builtin/checkout.c:443 builtin/checkout.c:446
#, c-format
msgid "'%s' cannot be used with %s"
msgstr "'%s' no puede ser usado con %s"
-#: builtin/checkout.c:432
+#: builtin/checkout.c:450
#, 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:436
+#: builtin/checkout.c:454
#, c-format
msgid "neither '%s' or '%s' is specified"
msgstr "ni '%s' o '%s' están especificados"
-#: builtin/checkout.c:440
+#: builtin/checkout.c:458
#, c-format
msgid "'%s' must be used when '%s' is not specified"
msgstr "'%s' tiene que ser usado cuando '%s' no es especificado"
-#: builtin/checkout.c:445 builtin/checkout.c:450
+#: builtin/checkout.c:463 builtin/checkout.c:468
#, c-format
msgid "'%s' or '%s' cannot be used with %s"
msgstr "'%s' o '%s' no puede ser usado con %s"
-#: builtin/checkout.c:509 builtin/checkout.c:516
+#: builtin/checkout.c:527 builtin/checkout.c:534
#, c-format
msgid "path '%s' is unmerged"
msgstr "ruta '%s' no esta fusionada"
-#: builtin/checkout.c:684 builtin/sparse-checkout.c:106
+#: builtin/checkout.c:704
msgid "you need to resolve your current index first"
msgstr "necesitas resolver tu índice actual primero"
-#: builtin/checkout.c:734
+#: builtin/checkout.c:758
#, c-format
msgid ""
"cannot continue with staged changes in the following files:\n"
@@ -11274,50 +11421,50 @@ msgstr ""
"no se puede continuar con los cambios en stage en los siguientes archivos:\n"
"%s"
-#: builtin/checkout.c:837
+#: builtin/checkout.c:861
#, c-format
msgid "Can not do reflog for '%s': %s\n"
msgstr "No se puede hacer reflog para '%s': %s\n"
-#: builtin/checkout.c:879
+#: builtin/checkout.c:903
msgid "HEAD is now at"
msgstr "HEAD está ahora en"
-#: builtin/checkout.c:883 builtin/clone.c:717
+#: builtin/checkout.c:907 builtin/clone.c:720
msgid "unable to update HEAD"
msgstr "no es posible actualizar HEAD"
-#: builtin/checkout.c:887
+#: builtin/checkout.c:911
#, c-format
msgid "Reset branch '%s'\n"
msgstr "Reiniciar rama '%s'\n"
-#: builtin/checkout.c:890
+#: builtin/checkout.c:914
#, c-format
msgid "Already on '%s'\n"
msgstr "Ya en '%s'\n"
-#: builtin/checkout.c:894
+#: builtin/checkout.c:918
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr "Rama reiniciada y cambiada a '%s'\n"
-#: builtin/checkout.c:896 builtin/checkout.c:1320
+#: builtin/checkout.c:920 builtin/checkout.c:1344
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr "Cambiado a nueva rama '%s'\n"
-#: builtin/checkout.c:898
+#: builtin/checkout.c:922
#, c-format
msgid "Switched to branch '%s'\n"
msgstr "Cambiado a rama '%s'\n"
-#: builtin/checkout.c:949
+#: builtin/checkout.c:973
#, c-format
msgid " ... and %d more.\n"
msgstr " ... y %d más.\n"
-#: builtin/checkout.c:955
+#: builtin/checkout.c:979
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
@@ -11340,7 +11487,7 @@ msgstr[1] ""
"\n"
"%s\n"
-#: builtin/checkout.c:974
+#: builtin/checkout.c:998
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
@@ -11367,19 +11514,19 @@ msgstr[1] ""
" git branch <nombre-de-rama> %s\n"
"\n"
-#: builtin/checkout.c:1009
+#: builtin/checkout.c:1033
msgid "internal error in revision walk"
msgstr "error interno en camino de revisión"
-#: builtin/checkout.c:1013
+#: builtin/checkout.c:1037
msgid "Previous HEAD position was"
msgstr "La posición previa de HEAD era"
-#: builtin/checkout.c:1053 builtin/checkout.c:1315
+#: builtin/checkout.c:1077 builtin/checkout.c:1339
msgid "You are on a branch yet to be born"
msgstr "Estás en una rama por nacer"
-#: builtin/checkout.c:1128
+#: builtin/checkout.c:1152
#, c-format
msgid ""
"'%s' could be both a local file and a tracking branch.\n"
@@ -11388,7 +11535,7 @@ 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:1135
+#: builtin/checkout.c:1159
msgid ""
"If you meant to check out a remote tracking branch on, e.g. 'origin',\n"
"you can do so by fully qualifying the name with the --track option:\n"
@@ -11409,51 +11556,51 @@ msgstr ""
"de nombre <nombre> remota, como 'origin', considera configurar\n"
"checkout.defaultRemote=origin en tu configuración."
-#: builtin/checkout.c:1145
+#: builtin/checkout.c:1169
#, c-format
msgid "'%s' matched multiple (%d) remote tracking branches"
msgstr "'%s' concordó con multiples (%d) ramas de rastreo remoto"
-#: builtin/checkout.c:1211
+#: builtin/checkout.c:1235
msgid "only one reference expected"
msgstr "solo una referencia esperada"
-#: builtin/checkout.c:1228
+#: builtin/checkout.c:1252
#, c-format
msgid "only one reference expected, %d given."
msgstr "solo una referencia esperada, %d entregadas."
-#: builtin/checkout.c:1274 builtin/worktree.c:283 builtin/worktree.c:448
+#: builtin/checkout.c:1298 builtin/worktree.c:283 builtin/worktree.c:451
#, c-format
msgid "invalid reference: %s"
msgstr "referencia inválida: %s"
-#: builtin/checkout.c:1287 builtin/checkout.c:1649
+#: builtin/checkout.c:1311 builtin/checkout.c:1677
#, c-format
msgid "reference is not a tree: %s"
msgstr "la referencia no es n árbol: %s"
-#: builtin/checkout.c:1334
+#: builtin/checkout.c:1358
#, c-format
msgid "a branch is expected, got tag '%s'"
msgstr "se esperaba un branch, se obtuvo tag '%s'"
-#: builtin/checkout.c:1336
+#: builtin/checkout.c:1360
#, 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:1337 builtin/checkout.c:1345
+#: builtin/checkout.c:1361 builtin/checkout.c:1369
#, c-format
msgid "a branch is expected, got '%s'"
msgstr "se esperaba branch, se obuto '%s'"
-#: builtin/checkout.c:1340
+#: builtin/checkout.c:1364
#, c-format
msgid "a branch is expected, got commit '%s'"
msgstr "se espera una rama, se obtuvo commit '%s'"
-#: builtin/checkout.c:1356
+#: builtin/checkout.c:1380
msgid ""
"cannot switch branch while merging\n"
"Consider \"git merge --quit\" or \"git worktree add\"."
@@ -11461,7 +11608,7 @@ msgstr ""
"no se puede cambiar de branch durante un merge\n"
"Considera \"git merge --quit\" o \"git worktree add\"."
-#: builtin/checkout.c:1360
+#: builtin/checkout.c:1384
msgid ""
"cannot switch branch in the middle of an am session\n"
"Consider \"git am --quit\" or \"git worktree add\"."
@@ -11469,7 +11616,7 @@ 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:1364
+#: builtin/checkout.c:1388
msgid ""
"cannot switch branch while rebasing\n"
"Consider \"git rebase --quit\" or \"git worktree add\"."
@@ -11477,7 +11624,7 @@ msgstr ""
"no se puede cambiar de branch durante un rebase\n"
"Considera \"git rebase --quit\" o \"git worktree add\"."
-#: builtin/checkout.c:1368
+#: builtin/checkout.c:1392
msgid ""
"cannot switch branch while cherry-picking\n"
"Consider \"git cherry-pick --quit\" or \"git worktree add\"."
@@ -11485,7 +11632,7 @@ msgstr ""
"no se puede cambiar de branch durante un cherry-pick\n"
"Considera \"git cherry-pick --quit\" o \"git worktree add\"."
-#: builtin/checkout.c:1372
+#: builtin/checkout.c:1396
msgid ""
"cannot switch branch while reverting\n"
"Consider \"git revert --quit\" or \"git worktree add\"."
@@ -11493,142 +11640,144 @@ msgstr ""
"no se puede cambiar de branch durante un revert\n"
"Considera \"git revert --quit\" o \"git worktree add\"."
-#: builtin/checkout.c:1376
+#: builtin/checkout.c:1400
msgid "you are switching branch while bisecting"
msgstr "estás cambiando ramas durante un bisect"
-#: builtin/checkout.c:1383
+#: builtin/checkout.c:1407
msgid "paths cannot be used with switching branches"
msgstr "rutas no pueden ser usadas con cambios de rama"
-#: builtin/checkout.c:1386 builtin/checkout.c:1390 builtin/checkout.c:1394
+#: builtin/checkout.c:1410 builtin/checkout.c:1414 builtin/checkout.c:1418
#, c-format
msgid "'%s' cannot be used with switching branches"
msgstr "'%s' no puede ser usado con cambios de ramas"
-#: builtin/checkout.c:1398 builtin/checkout.c:1401 builtin/checkout.c:1404
-#: builtin/checkout.c:1409 builtin/checkout.c:1414
+#: builtin/checkout.c:1422 builtin/checkout.c:1425 builtin/checkout.c:1428
+#: builtin/checkout.c:1433 builtin/checkout.c:1438
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "'%s' no puede ser usado con '%s'"
-#: builtin/checkout.c:1411
+#: builtin/checkout.c:1435
#, c-format
msgid "'%s' cannot take <start-point>"
msgstr "'%s' no puede tomar <punto de partida>"
-#: builtin/checkout.c:1419
+#: builtin/checkout.c:1443
#, 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:1426
+#: builtin/checkout.c:1450
msgid "missing branch or commit argument"
msgstr "falta branch o commit como argumento"
-#: builtin/checkout.c:1468 builtin/clone.c:91 builtin/commit-graph.c:72
-#: builtin/commit-graph.c:135 builtin/fetch.c:167 builtin/merge.c:286
-#: builtin/multi-pack-index.c:27 builtin/pull.c:118 builtin/push.c:563
-#: builtin/send-pack.c:174
+#: builtin/checkout.c:1492 builtin/clone.c:91 builtin/commit-graph.c:80
+#: builtin/commit-graph.c:164 builtin/fetch.c:168 builtin/merge.c:288
+#: builtin/multi-pack-index.c:27 builtin/pull.c:119 builtin/push.c:561
+#: builtin/send-pack.c:173
msgid "force progress reporting"
msgstr "forzar el reporte de progreso"
-#: builtin/checkout.c:1469
+#: builtin/checkout.c:1493
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:1470 builtin/log.c:1690 parse-options.h:322
+#: builtin/checkout.c:1494 builtin/log.c:1709 parse-options.h:322
msgid "style"
msgstr "estilo"
-#: builtin/checkout.c:1471
+#: builtin/checkout.c:1495
msgid "conflict style (merge or diff3)"
msgstr "conflicto de estilos (merge o diff3)"
-#: builtin/checkout.c:1483 builtin/worktree.c:496
+#: builtin/checkout.c:1507 builtin/worktree.c:499
msgid "detach HEAD at named commit"
msgstr "desacoplar HEAD en el commit nombrado"
-#: builtin/checkout.c:1484
+#: builtin/checkout.c:1508
msgid "set upstream info for new branch"
msgstr "configurar info de upstream para una rama nueva"
-#: builtin/checkout.c:1486
+#: builtin/checkout.c:1510
msgid "force checkout (throw away local modifications)"
msgstr "forzar el checkout (descartar modificaciones locales)"
-#: builtin/checkout.c:1488
+#: builtin/checkout.c:1512
msgid "new-branch"
msgstr "nueva-rama"
-#: builtin/checkout.c:1488
+#: builtin/checkout.c:1512
msgid "new unparented branch"
msgstr "nueva rama no emparentada"
-#: builtin/checkout.c:1490 builtin/merge.c:289
+#: builtin/checkout.c:1514 builtin/merge.c:292
msgid "update ignored files (default)"
msgstr "actualizar archivos ignorados (default)"
-#: builtin/checkout.c:1493
+#: builtin/checkout.c:1517
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:1506
+#: builtin/checkout.c:1530
msgid "checkout our version for unmerged files"
msgstr "hacer checkout a nuestra versión para archivos sin fusionar"
-#: builtin/checkout.c:1509
+#: builtin/checkout.c:1533
msgid "checkout their version for unmerged files"
msgstr "hacer checkout a su versión para los archivos sin fusionar"
-#: builtin/checkout.c:1513
+#: builtin/checkout.c:1537
msgid "do not limit pathspecs to sparse entries only"
msgstr "no limitar pathspecs a dispersar entradas solamente"
-#: builtin/checkout.c:1565
-msgid "-b, -B and --orphan are mutually exclusive"
-msgstr "-b, -B y --orphan son mutuamente exclusivas"
+#: builtin/checkout.c:1592
+#, c-format
+msgid "-%c, -%c and --orphan are mutually exclusive"
+msgstr "-%c, -%c y --orphan son mutuamente exclusivas"
-#: builtin/checkout.c:1568
+#: builtin/checkout.c:1596
msgid "-p and --overlay are mutually exclusive"
msgstr "-p y --overlay son mutuamente exclusivas"
-#: builtin/checkout.c:1605
+#: builtin/checkout.c:1633
msgid "--track needs a branch name"
msgstr "--track necesita el nombre de una rama"
-#: builtin/checkout.c:1610
-msgid "missing branch name; try -b"
-msgstr "falta nombre de rama; prueba -b"
+#: builtin/checkout.c:1638
+#, c-format
+msgid "missing branch name; try -%c"
+msgstr "falta nombre de rama; prueba -%c"
-#: builtin/checkout.c:1642
+#: builtin/checkout.c:1670
#, c-format
msgid "could not resolve %s"
msgstr "no se pudo resolver %s"
-#: builtin/checkout.c:1658
+#: builtin/checkout.c:1686
msgid "invalid path specification"
msgstr "especificación de ruta inválida"
-#: builtin/checkout.c:1665
+#: builtin/checkout.c:1693
#, 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:1669
+#: builtin/checkout.c:1697
#, 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:1678
+#: builtin/checkout.c:1706
msgid "--pathspec-from-file is incompatible with --detach"
msgstr "--pathspec-from-file es incompatible con --detach"
-#: builtin/checkout.c:1681 builtin/reset.c:324 builtin/stash.c:1506
+#: builtin/checkout.c:1709 builtin/reset.c:325 builtin/stash.c:1503
msgid "--pathspec-from-file is incompatible with --patch"
msgstr "--pathspec-from-file es incompatible con --patch"
-#: builtin/checkout.c:1692
+#: builtin/checkout.c:1720
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
@@ -11636,109 +11785,109 @@ msgstr ""
"git checkout: --ours/--theirs, --force y --merge son incompatibles cuando\n"
"se revisa fuera del índice."
-#: builtin/checkout.c:1697
+#: builtin/checkout.c:1725
msgid "you must specify path(s) to restore"
msgstr "debes especificar path(s) para restaurar"
-#: builtin/checkout.c:1723 builtin/checkout.c:1725 builtin/checkout.c:1774
-#: builtin/checkout.c:1776 builtin/clone.c:121 builtin/remote.c:170
-#: builtin/remote.c:172 builtin/worktree.c:492 builtin/worktree.c:494
+#: builtin/checkout.c:1751 builtin/checkout.c:1753 builtin/checkout.c:1802
+#: builtin/checkout.c:1804 builtin/clone.c:121 builtin/remote.c:170
+#: builtin/remote.c:172 builtin/worktree.c:495 builtin/worktree.c:497
msgid "branch"
msgstr "rama"
-#: builtin/checkout.c:1724
+#: builtin/checkout.c:1752
msgid "create and checkout a new branch"
msgstr "crear y hacer checkout a una nueva rama"
-#: builtin/checkout.c:1726
+#: builtin/checkout.c:1754
msgid "create/reset and checkout a branch"
msgstr "crear/reiniciar y hacer checkout a una rama"
-#: builtin/checkout.c:1727
+#: builtin/checkout.c:1755
msgid "create reflog for new branch"
msgstr "crear un reflog para una nueva rama"
-#: builtin/checkout.c:1729
+#: builtin/checkout.c:1757
msgid "second guess 'git checkout <no-such-branch>' (default)"
msgstr "adivinar segunda opción 'git checkout <no-hay-tal-rama>' (default)"
-#: builtin/checkout.c:1730
+#: builtin/checkout.c:1758
msgid "use overlay mode (default)"
msgstr "usar modo overlay (default)"
-#: builtin/checkout.c:1775
+#: builtin/checkout.c:1803
msgid "create and switch to a new branch"
msgstr "crear y hacer switch a una nueva rama"
-#: builtin/checkout.c:1777
+#: builtin/checkout.c:1805
msgid "create/reset and switch to a branch"
msgstr "crear/reiniciar y hacer switch a una rama"
-#: builtin/checkout.c:1779
+#: builtin/checkout.c:1807
msgid "second guess 'git switch <no-such-branch>'"
msgstr "adivinar segunda opción 'git checkout <no-hay-tal-rama>'"
-#: builtin/checkout.c:1781
+#: builtin/checkout.c:1809
msgid "throw away local modifications"
msgstr "descartar modificaciones locales"
-#: builtin/checkout.c:1813
+#: builtin/checkout.c:1843
msgid "which tree-ish to checkout from"
msgstr "de qué árbol hacer el checkout"
-#: builtin/checkout.c:1815
+#: builtin/checkout.c:1845
msgid "restore the index"
msgstr "restaurar el index"
-#: builtin/checkout.c:1817
+#: builtin/checkout.c:1847
msgid "restore the working tree (default)"
msgstr "restaurar el árbol de trabajo (default)"
-#: builtin/checkout.c:1819
+#: builtin/checkout.c:1849
msgid "ignore unmerged entries"
msgstr "ignorar entradas no fusionadas"
-#: builtin/checkout.c:1820
+#: builtin/checkout.c:1850
msgid "use overlay mode"
msgstr "usar modo overlay"
-#: builtin/clean.c:28
+#: builtin/clean.c:29
msgid ""
"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
msgstr ""
"git clean [-d] [-f] [-i] [-n] [-q] [-e <patrón>] [-x | -X] [--] <rutas>..."
-#: builtin/clean.c:32
+#: builtin/clean.c:33
#, c-format
msgid "Removing %s\n"
msgstr "Borrando %s\n"
-#: builtin/clean.c:33
+#: builtin/clean.c:34
#, c-format
msgid "Would remove %s\n"
msgstr "Sera borrado %s\n"
-#: builtin/clean.c:34
+#: builtin/clean.c:35
#, c-format
msgid "Skipping repository %s\n"
msgstr "Saltando repositorio %s\n"
-#: builtin/clean.c:35
+#: builtin/clean.c:36
#, c-format
msgid "Would skip repository %s\n"
msgstr "Se saltara repositorio %s\n"
-#: builtin/clean.c:36
+#: builtin/clean.c:37
#, c-format
msgid "failed to remove %s"
msgstr "falló al borrar %s"
-#: builtin/clean.c:37
+#: builtin/clean.c:38
#, c-format
msgid "could not lstat %s\n"
msgstr "no se pudo lstat %s\n"
-#: builtin/clean.c:301 git-add--interactive.perl:595
+#: builtin/clean.c:302 git-add--interactive.perl:595
#, c-format
msgid ""
"Prompt help:\n"
@@ -11751,7 +11900,7 @@ msgstr ""
"foo - selecciona un objeto basado en un prefijo único\n"
" - (vacío) no elegir nada\n"
-#: builtin/clean.c:305 git-add--interactive.perl:604
+#: builtin/clean.c:306 git-add--interactive.perl:604
#, c-format
msgid ""
"Prompt help:\n"
@@ -11778,27 +11927,27 @@ msgstr ""
msgid "Huh (%s)?\n"
msgstr "¿Ahh (%s)?\n"
-#: builtin/clean.c:663
+#: builtin/clean.c:661
#, c-format
msgid "Input ignore patterns>> "
msgstr "Input ignora los patrones >> "
-#: builtin/clean.c:700
+#: builtin/clean.c:696
#, c-format
msgid "WARNING: Cannot find items matched by: %s"
msgstr "PELIGRO: No se puede encontrar objetos que concuerden con: %s"
-#: builtin/clean.c:721
+#: builtin/clean.c:717
msgid "Select items to delete"
msgstr "Seleccionar objetos para borrar"
#. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:762
+#: builtin/clean.c:758
#, c-format
msgid "Remove %s [y/N]? "
msgstr "¿Borrar %s [y/N]? "
-#: builtin/clean.c:795
+#: builtin/clean.c:789
msgid ""
"clean - start cleaning\n"
"filter by pattern - exclude items from deletion\n"
@@ -11816,56 +11965,56 @@ msgstr ""
"help - esta ventana\n"
"? - ayuda para selección de opciones"
-#: builtin/clean.c:831
+#: builtin/clean.c:825
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:847
+#: builtin/clean.c:841
msgid "No more files to clean, exiting."
msgstr "No hay más archivos para limpiar, saliendo."
-#: builtin/clean.c:909
+#: builtin/clean.c:903
msgid "do not print names of files removed"
msgstr "no imprimir nombres de archivos borrados"
-#: builtin/clean.c:911
+#: builtin/clean.c:905
msgid "force"
msgstr "forzar"
-#: builtin/clean.c:912
+#: builtin/clean.c:906
msgid "interactive cleaning"
msgstr "limpieza interactiva"
-#: builtin/clean.c:914
+#: builtin/clean.c:908
msgid "remove whole directories"
msgstr "borrar directorios completos"
-#: builtin/clean.c:915 builtin/describe.c:562 builtin/describe.c:564
-#: builtin/grep.c:889 builtin/log.c:177 builtin/log.c:179
-#: builtin/ls-files.c:557 builtin/name-rev.c:526 builtin/name-rev.c:528
+#: builtin/clean.c:909 builtin/describe.c:565 builtin/describe.c:567
+#: builtin/grep.c:909 builtin/log.c:182 builtin/log.c:184
+#: builtin/ls-files.c:558 builtin/name-rev.c:526 builtin/name-rev.c:528
#: builtin/show-ref.c:179
msgid "pattern"
msgstr "patrón"
-#: builtin/clean.c:916
+#: builtin/clean.c:910
msgid "add <pattern> to ignore rules"
msgstr "agregar <patrón> para ignorar reglas"
-#: builtin/clean.c:917
+#: builtin/clean.c:911
msgid "remove ignored files, too"
msgstr "borrar archivos ignorados, también"
-#: builtin/clean.c:919
+#: builtin/clean.c:913
msgid "remove only ignored files"
msgstr "borrar solo archivos ignorados"
-#: builtin/clean.c:937
+#: builtin/clean.c:931
msgid "-x and -X cannot be used together"
msgstr "-x y -X no pueden ser usadas juntas"
-#: builtin/clean.c:941
+#: builtin/clean.c:935
msgid ""
"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
"clean"
@@ -11873,7 +12022,7 @@ msgstr ""
"clean.requireForce configurado como true y ninguno -i, -n, ni -f entregados; "
"rehusando el clean"
-#: builtin/clean.c:944
+#: builtin/clean.c:938
msgid ""
"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
"refusing to clean"
@@ -11889,7 +12038,7 @@ msgstr "git clone [<opciones>] [--] <repo> [<directorio>]"
msgid "don't create a checkout"
msgstr "no crear checkout"
-#: builtin/clone.c:94 builtin/clone.c:96 builtin/init-db.c:489
+#: builtin/clone.c:94 builtin/clone.c:96 builtin/init-db.c:536
msgid "create a bare repository"
msgstr "crear un repositorio vacío"
@@ -11909,11 +12058,11 @@ msgstr "no usar hardlinks, siempre copiar"
msgid "setup as shared repository"
msgstr "configurar como repositorio compartido"
-#: builtin/clone.c:107
+#: builtin/clone.c:106
msgid "pathspec"
msgstr "pathspec"
-#: builtin/clone.c:107
+#: builtin/clone.c:106
msgid "initialize submodules in the clone"
msgstr "inicializar submódulos en el clonado"
@@ -11921,11 +12070,11 @@ msgstr "inicializar submódulos en el clonado"
msgid "number of submodules cloned in parallel"
msgstr "numero de submódulos clonados en paralelo"
-#: builtin/clone.c:111 builtin/init-db.c:486
+#: builtin/clone.c:111 builtin/init-db.c:533
msgid "template-directory"
msgstr "directorio-template"
-#: builtin/clone.c:112 builtin/init-db.c:487
+#: builtin/clone.c:112 builtin/init-db.c:534
msgid "directory from which templates will be used"
msgstr "directorio del cual los templates serán usados"
@@ -11940,7 +12089,7 @@ msgid "use --reference only while cloning"
msgstr "usa--reference solamente si estás clonado"
#: builtin/clone.c:119 builtin/column.c:27 builtin/merge-file.c:46
-#: builtin/pack-objects.c:3441 builtin/repack.c:327
+#: builtin/pack-objects.c:3442 builtin/repack.c:329
msgid "name"
msgstr "nombre"
@@ -11956,8 +12105,8 @@ msgstr "checkout <rama> en lugar de HEAD remota"
msgid "path to git-upload-pack on the remote"
msgstr "ruta para git-upload-pack en el remoto"
-#: builtin/clone.c:125 builtin/fetch.c:168 builtin/grep.c:828
-#: builtin/pull.c:207
+#: builtin/clone.c:125 builtin/fetch.c:169 builtin/grep.c:848
+#: builtin/pull.c:208
msgid "depth"
msgstr "profundidad"
@@ -11965,7 +12114,8 @@ msgstr "profundidad"
msgid "create a shallow clone of that depth"
msgstr "crear un clon superficial para esa profundidad"
-#: builtin/clone.c:127 builtin/fetch.c:170 builtin/pack-objects.c:3430
+#: builtin/clone.c:127 builtin/fetch.c:171 builtin/pack-objects.c:3431
+#: builtin/pull.c:211
msgid "time"
msgstr "tiempo"
@@ -11973,12 +12123,12 @@ msgstr "tiempo"
msgid "create a shallow clone since a specific time"
msgstr "crear un clon superficial desde el tiempo específico"
-#: builtin/clone.c:129 builtin/fetch.c:172 builtin/fetch.c:195
-#: builtin/rebase.c:1480
+#: builtin/clone.c:129 builtin/fetch.c:173 builtin/fetch.c:196
+#: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1304
msgid "revision"
msgstr "revision"
-#: builtin/clone.c:130 builtin/fetch.c:173
+#: builtin/clone.c:130 builtin/fetch.c:174 builtin/pull.c:215
msgid "deepen history of shallow clone, excluding rev"
msgstr "ahondando historia de clon superficial, excluyendo rev"
@@ -11995,11 +12145,11 @@ msgstr "no clonar ningún tag, y hacer que los subsiguientes fetch no los sigan"
msgid "any cloned submodules will be shallow"
msgstr "cualquier submódulo clonado será superficial"
-#: builtin/clone.c:137 builtin/init-db.c:495
+#: builtin/clone.c:137 builtin/init-db.c:542
msgid "gitdir"
msgstr "gitdir"
-#: builtin/clone.c:138 builtin/init-db.c:496
+#: builtin/clone.c:138 builtin/init-db.c:543
msgid "separate git dir from working tree"
msgstr "separa git dir del árbol de trabajo"
@@ -12011,23 +12161,23 @@ msgstr "llave=valor"
msgid "set config inside the new repository"
msgstr "configurar config dentro del nuevo repositorio"
-#: builtin/clone.c:142 builtin/fetch.c:190 builtin/ls-remote.c:76
-#: builtin/push.c:573 builtin/send-pack.c:172
+#: builtin/clone.c:142 builtin/fetch.c:191 builtin/ls-remote.c:76
+#: builtin/pull.c:230 builtin/push.c:570 builtin/send-pack.c:171
msgid "server-specific"
msgstr "especifico-de-servidor"
-#: builtin/clone.c:142 builtin/fetch.c:190 builtin/ls-remote.c:76
-#: builtin/push.c:573 builtin/send-pack.c:173
+#: builtin/clone.c:142 builtin/fetch.c:191 builtin/ls-remote.c:76
+#: builtin/pull.c:231 builtin/push.c:570 builtin/send-pack.c:172
msgid "option to transmit"
msgstr "opción para trasmitir"
-#: builtin/clone.c:143 builtin/fetch.c:191 builtin/pull.c:220
-#: builtin/push.c:574
+#: builtin/clone.c:143 builtin/fetch.c:192 builtin/pull.c:234
+#: builtin/push.c:571
msgid "use IPv4 addresses only"
msgstr "solo usar direcciones IPv4"
-#: builtin/clone.c:145 builtin/fetch.c:193 builtin/pull.c:223
-#: builtin/push.c:576
+#: builtin/clone.c:145 builtin/fetch.c:194 builtin/pull.c:237
+#: builtin/push.c:573
msgid "use IPv6 addresses only"
msgstr "solo usar direcciones IPv6"
@@ -12058,32 +12208,32 @@ msgstr "info: No se pudo agregar un alterno para '%s': %s\n"
msgid "%s exists and is not a directory"
msgstr "%s existe pero no es un directorio"
-#: builtin/clone.c:430
+#: builtin/clone.c:431
#, c-format
msgid "failed to start iterator over '%s'"
msgstr "falló al iniciar el iterador sobre '%s'"
-#: builtin/clone.c:460
+#: builtin/clone.c:462
#, c-format
msgid "failed to create link '%s'"
msgstr "falló al crear link '%s'"
-#: builtin/clone.c:464
+#: builtin/clone.c:466
#, c-format
msgid "failed to copy file to '%s'"
msgstr "falló al copiar archivo a '%s'"
-#: builtin/clone.c:469
+#: builtin/clone.c:471
#, c-format
msgid "failed to iterate over '%s'"
msgstr "falló al iterar sobre '%s'"
-#: builtin/clone.c:494
+#: builtin/clone.c:498
#, c-format
msgid "done.\n"
msgstr "hecho.\n"
-#: builtin/clone.c:508
+#: builtin/clone.c:512
msgid ""
"Clone succeeded, but checkout failed.\n"
"You can inspect what was checked out with 'git status'\n"
@@ -12093,100 +12243,100 @@ msgstr ""
"Puedes inspeccionar a qué se hizo checkout con 'git status'\n"
"y volver a intentarlo con 'git restore --source=HEAD :/'\n"
-#: builtin/clone.c:585
+#: builtin/clone.c:589
#, 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:705
+#: builtin/clone.c:708
#, c-format
msgid "unable to update %s"
msgstr "incapaz de actualizar %s"
-#: builtin/clone.c:753
+#: builtin/clone.c:756
msgid "failed to initialize sparse-checkout"
msgstr "falló al inicializar sparse-checkout"
-#: builtin/clone.c:776
+#: builtin/clone.c:779
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:807
+#: builtin/clone.c:811
msgid "unable to checkout working tree"
msgstr "no es posible realizar checkout en el árbol de trabajo"
-#: builtin/clone.c:862
+#: builtin/clone.c:868
msgid "unable to write parameters to config file"
msgstr "no es posible escribir parámetros al archivo config"
-#: builtin/clone.c:925
+#: builtin/clone.c:931
msgid "cannot repack to clean up"
msgstr "no se puede reempaquetar para limpiar"
-#: builtin/clone.c:927
+#: builtin/clone.c:933
msgid "cannot unlink temporary alternates file"
msgstr "no se puede desvincular archivos alternos temporales"
-#: builtin/clone.c:965 builtin/receive-pack.c:1950
+#: builtin/clone.c:971 builtin/receive-pack.c:1972
msgid "Too many arguments."
msgstr "Muchos argumentos."
-#: builtin/clone.c:969
+#: builtin/clone.c:975
msgid "You must specify a repository to clone."
msgstr "Tienes que especificar un repositorio para clonar."
-#: builtin/clone.c:982
+#: builtin/clone.c:988
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr "Las opciones --bare y --origin %s son incompatibles."
-#: builtin/clone.c:985
+#: builtin/clone.c:991
msgid "--bare and --separate-git-dir are incompatible."
msgstr "--bare y --separate-git-dir son incompatibles."
-#: builtin/clone.c:998
+#: builtin/clone.c:1004
#, c-format
msgid "repository '%s' does not exist"
msgstr "repositorio '%s' no existe"
-#: builtin/clone.c:1004 builtin/fetch.c:1796
+#: builtin/clone.c:1010 builtin/fetch.c:1789
#, c-format
msgid "depth %s is not a positive number"
msgstr "profundidad %s no es un numero positivo"
-#: builtin/clone.c:1014
+#: builtin/clone.c:1020
#, 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:1024
+#: builtin/clone.c:1030
#, c-format
msgid "working tree '%s' already exists."
msgstr "directorio de trabajo '%s' ya existe."
-#: builtin/clone.c:1039 builtin/clone.c:1060 builtin/difftool.c:271
-#: builtin/log.c:1866 builtin/worktree.c:295 builtin/worktree.c:327
+#: builtin/clone.c:1045 builtin/clone.c:1066 builtin/difftool.c:271
+#: builtin/log.c:1886 builtin/worktree.c:295 builtin/worktree.c:327
#, c-format
msgid "could not create leading directories of '%s'"
msgstr "no se pudo crear directorios principales de '%s'"
-#: builtin/clone.c:1044
+#: builtin/clone.c:1050
#, c-format
msgid "could not create work tree dir '%s'"
msgstr "no se pudo crear un árbol de trabajo '%s'"
-#: builtin/clone.c:1064
+#: builtin/clone.c:1070
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr "Clonando en un repositorio vacío '%s'...\n"
-#: builtin/clone.c:1066
+#: builtin/clone.c:1072
#, c-format
msgid "Cloning into '%s'...\n"
msgstr "Clonando en '%s'...\n"
-#: builtin/clone.c:1090
+#: builtin/clone.c:1096
msgid ""
"clone --recursive is not compatible with both --reference and --reference-if-"
"able"
@@ -12194,36 +12344,36 @@ msgstr ""
"clone --recursive no es compatible con --reference y --reference-if-able al "
"mismo tiempo"
-#: builtin/clone.c:1154
+#: builtin/clone.c:1160
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:1156
+#: builtin/clone.c:1162
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:1158
+#: builtin/clone.c:1164
msgid "--shallow-exclude is ignored in local clones; use file:// instead."
msgstr "--shallow-exclude es ignorado en clones locales; use file://."
-#: builtin/clone.c:1160
+#: builtin/clone.c:1166
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:1163
+#: builtin/clone.c:1169
msgid "source repository is shallow, ignoring --local"
msgstr "repositorio fuente es superficial, ignorando --local"
-#: builtin/clone.c:1168
+#: builtin/clone.c:1174
msgid "--local is ignored"
msgstr "--local es ignorado"
-#: builtin/clone.c:1243 builtin/clone.c:1251
+#: builtin/clone.c:1249 builtin/clone.c:1257
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr "Rama remota %s no encontrada en upstream %s"
-#: builtin/clone.c:1254
+#: builtin/clone.c:1260
msgid "You appear to have cloned an empty repository."
msgstr "Pareces haber clonado un repositorio sin contenido."
@@ -12259,6 +12409,96 @@ msgstr "Realizando padding entre columnas"
msgid "--command must be the first argument"
msgstr "--command debe ser el primer argumento"
+#: builtin/commit-graph.c:11 builtin/commit-graph.c:19
+msgid ""
+"git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]"
+msgstr ""
+"git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]"
+
+#: builtin/commit-graph.c:12 builtin/commit-graph.c:24
+msgid ""
+"git commit-graph write [--object-dir <objdir>] [--append] [--"
+"split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-"
+"paths] [--[no-]progress] <split options>"
+msgstr ""
+"git commit-graph write [--object-dir <objeto dir>] [--append] [--"
+"split[=<estrategia>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-"
+"paths] [--[no-]progress] <opciones de split>"
+
+#: builtin/commit-graph.c:60
+#, c-format
+msgid "could not find object directory matching %s"
+msgstr "no se pudo entoncrar el objeto directorio concordante con %s"
+
+#: builtin/commit-graph.c:76 builtin/commit-graph.c:152
+#: builtin/commit-graph.c:257 builtin/fetch.c:180 builtin/log.c:1678
+msgid "dir"
+msgstr "dir"
+
+#: builtin/commit-graph.c:77 builtin/commit-graph.c:153
+#: builtin/commit-graph.c:258
+msgid "The object directory to store the graph"
+msgstr "El directorio de objetos para guardar el gráfico"
+
+#: builtin/commit-graph.c:79
+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:102
+#, c-format
+msgid "Could not open commit-graph '%s'"
+msgstr "No se pudo abrir commit-graph '%s'"
+
+#: builtin/commit-graph.c:136
+#, c-format
+msgid "unrecognized --split argument, %s"
+msgstr "argumento --split no reconocido, %s"
+
+#: builtin/commit-graph.c:155
+msgid "start walk at all refs"
+msgstr "comenzar caminata en todas las refs"
+
+#: builtin/commit-graph.c:157
+msgid "scan pack-indexes listed by stdin for commits"
+msgstr "escanear paquete de índices por stdin por commits"
+
+#: builtin/commit-graph.c:159
+msgid "start walk at commits listed by stdin"
+msgstr "comenzar a caminar a los commits listados por stdin"
+
+#: builtin/commit-graph.c:161
+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:163
+msgid "enable computation for changed paths"
+msgstr "habilitar computación para rutas cambiadas"
+
+#: builtin/commit-graph.c:166
+msgid "allow writing an incremental commit-graph file"
+msgstr "permitir escribir un archivo commit-graph incremental"
+
+#: builtin/commit-graph.c:170
+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:172
+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:174
+msgid "only expire files older than a given date-time"
+msgstr "expirar objetos más viejos a una fecha dada"
+
+#: builtin/commit-graph.c:190
+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"
+
+#: builtin/commit-graph.c:229
+#, c-format
+msgid "unexpected non-hex object ID: %s"
+msgstr "ID de objeto no hex inesperado :%s"
+
#: builtin/commit-tree.c:18
msgid ""
"git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F "
@@ -12272,7 +12512,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:526
+#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:547
#, c-format
msgid "not a valid object name %s"
msgstr "no es un nombre de objeto válido %s"
@@ -12300,13 +12540,13 @@ msgstr "padre"
msgid "id of a parent commit object"
msgstr "id del objeto commit padre"
-#: builtin/commit-tree.c:114 builtin/commit.c:1501 builtin/merge.c:271
-#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1477
-#: builtin/tag.c:412
+#: builtin/commit-tree.c:114 builtin/commit.c:1506 builtin/merge.c:273
+#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1474
+#: builtin/tag.c:413
msgid "message"
msgstr "mensaje"
-#: builtin/commit-tree.c:115 builtin/commit.c:1501
+#: builtin/commit-tree.c:115 builtin/commit.c:1506
msgid "commit message"
msgstr "mensaje del commit"
@@ -12314,8 +12554,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:1513 builtin/merge.c:288
-#: builtin/pull.c:175 builtin/revert.c:118
+#: builtin/commit-tree.c:121 builtin/commit.c:1518 builtin/merge.c:290
+#: builtin/pull.c:176 builtin/revert.c:118
msgid "GPG sign commit"
msgstr "Firmar commit con GPG"
@@ -12361,10 +12601,14 @@ msgstr ""
"\n"
#: builtin/commit.c:63
+msgid "Otherwise, please use 'git rebase --skip'\n"
+msgstr "Caso contrario, por favor usa 'git rebase --skip'\n"
+
+#: builtin/commit.c:66
msgid "Otherwise, please use 'git cherry-pick --skip'\n"
msgstr "Caso contrario, por favor usa 'git cherry-pick --skip'\n"
-#: builtin/commit.c:66
+#: builtin/commit.c:69
msgid ""
"and then use:\n"
"\n"
@@ -12386,69 +12630,73 @@ msgstr ""
" git cherry-pick --skip\n"
"\n"
-#: builtin/commit.c:315
+#: builtin/commit.c:312
msgid "failed to unpack HEAD tree object"
msgstr "falló al desempaquetar objeto del árbol HEAD"
-#: builtin/commit.c:351
+#: builtin/commit.c:348
msgid "--pathspec-from-file with -a does not make sense"
msgstr "--pathspec-from-file con -a no tiene sentido"
-#: builtin/commit.c:364
+#: builtin/commit.c:361
msgid "No paths with --include/--only does not make sense."
msgstr "No hay rutas con --include/--only no tiene sentido."
-#: builtin/commit.c:376
+#: builtin/commit.c:373
msgid "unable to create temporary index"
msgstr "no es posible crear un índice temporal"
-#: builtin/commit.c:385
+#: builtin/commit.c:382
msgid "interactive add failed"
msgstr "adición interactiva fallida"
-#: builtin/commit.c:400
+#: builtin/commit.c:397
msgid "unable to update temporary index"
msgstr "no es posible actualizar el índice temporal"
-#: builtin/commit.c:402
+#: builtin/commit.c:399
msgid "Failed to update main cache tree"
msgstr "Falló al actualizar el cache principal del árbol"
-#: builtin/commit.c:427 builtin/commit.c:450 builtin/commit.c:496
+#: builtin/commit.c:424 builtin/commit.c:447 builtin/commit.c:495
msgid "unable to write new_index file"
msgstr "no es posible escribir archivo new_index"
-#: builtin/commit.c:479
+#: builtin/commit.c:476
msgid "cannot do a partial commit during a merge."
msgstr "no se puede realizar un commit parcial durante una fusión."
-#: builtin/commit.c:481
+#: builtin/commit.c:478
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:489
+#: builtin/commit.c:480
+msgid "cannot do a partial commit during a rebase."
+msgstr "no se puede realizar un commit parcial durante un rebase."
+
+#: builtin/commit.c:488
msgid "cannot read the index"
msgstr "no se puede leer el índice"
-#: builtin/commit.c:508
+#: builtin/commit.c:507
msgid "unable to write temporary index file"
msgstr "no es posible escribir el índice temporal"
-#: builtin/commit.c:606
+#: builtin/commit.c:605
#, c-format
msgid "commit '%s' lacks author header"
msgstr "commit '%s' requiere cabecera de autor"
-#: builtin/commit.c:608
+#: builtin/commit.c:607
#, c-format
msgid "commit '%s' has malformed author line"
msgstr "el commit '%s' tiene una línea de autor mal formada"
-#: builtin/commit.c:627
+#: builtin/commit.c:626
msgid "malformed --author parameter"
msgstr "parámetro --author mal formado"
-#: builtin/commit.c:680
+#: builtin/commit.c:679
msgid ""
"unable to select a comment character that is not used\n"
"in the current commit message"
@@ -12456,38 +12704,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:718 builtin/commit.c:751 builtin/commit.c:1097
+#: builtin/commit.c:717 builtin/commit.c:750 builtin/commit.c:1099
#, c-format
msgid "could not lookup commit %s"
msgstr "no se pudo revisar el commit %s"
-#: builtin/commit.c:730 builtin/shortlog.c:319
+#: builtin/commit.c:729 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:732
+#: builtin/commit.c:731
msgid "could not read log from standard input"
msgstr "no se pudo leer log desde standard input"
-#: builtin/commit.c:736
+#: builtin/commit.c:735
#, c-format
msgid "could not read log file '%s'"
msgstr "no se pudo leer el log '%s'"
-#: builtin/commit.c:767 builtin/commit.c:783
+#: builtin/commit.c:766 builtin/commit.c:782
msgid "could not read SQUASH_MSG"
msgstr "no se pudo leer SQUASH_MSG"
-#: builtin/commit.c:774
+#: builtin/commit.c:773
msgid "could not read MERGE_MSG"
msgstr "no se pudo leer MERGE_MSG"
-#: builtin/commit.c:834
+#: builtin/commit.c:833
msgid "could not write commit template"
msgstr "no se pudo escribir el template del commit"
-#: builtin/commit.c:853
+#: builtin/commit.c:852
#, c-format
msgid ""
"\n"
@@ -12502,7 +12750,7 @@ msgstr ""
"\t%s\n"
"y vuelve a intentar.\n"
-#: builtin/commit.c:858
+#: builtin/commit.c:857
#, c-format
msgid ""
"\n"
@@ -12517,7 +12765,7 @@ msgstr ""
"\t%s\n"
"y vuelve a intentar.\n"
-#: builtin/commit.c:871
+#: builtin/commit.c:870
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -12527,7 +12775,7 @@ msgstr ""
" líneas que comiencen con '%c' serán ignoradas, y un mensaje\n"
" vacío aborta el commit.\n"
-#: builtin/commit.c:879
+#: builtin/commit.c:878
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -12539,143 +12787,147 @@ msgstr ""
" usted mismo si lo desea.\n"
"Un mensaje vacío aborta el commit.\n"
-#: builtin/commit.c:896
+#: builtin/commit.c:895
#, c-format
msgid "%sAuthor: %.*s <%.*s>"
msgstr "%sAutor: %.*s <%.*s>"
-#: builtin/commit.c:904
+#: builtin/commit.c:903
#, c-format
msgid "%sDate: %s"
msgstr "%sFecha: %s"
-#: builtin/commit.c:911
+#: builtin/commit.c:910
#, c-format
msgid "%sCommitter: %.*s <%.*s>"
msgstr "%sCommitter: %.*s <%.*s>"
-#: builtin/commit.c:929
+#: builtin/commit.c:928
msgid "Cannot read index"
msgstr "No se puede leer el índice"
-#: builtin/commit.c:997
+#: builtin/commit.c:999
msgid "Error building trees"
msgstr "Error al construir los árboles"
-#: builtin/commit.c:1011 builtin/tag.c:275
+#: builtin/commit.c:1013 builtin/tag.c:276
#, 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:1055
+#: builtin/commit.c:1057
#, 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:1069
+#: builtin/commit.c:1071
#, c-format
msgid "Invalid ignored mode '%s'"
msgstr "Modo ignorado inválido '%s'"
-#: builtin/commit.c:1087 builtin/commit.c:1327
+#: builtin/commit.c:1089 builtin/commit.c:1333
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr "Modo inválido de los archivos no rastreados '%s'"
-#: builtin/commit.c:1127
+#: builtin/commit.c:1129
msgid "--long and -z are incompatible"
msgstr "--long y -z son incompatibles"
-#: builtin/commit.c:1171
+#: builtin/commit.c:1173
msgid "Using both --reset-author and --author does not make sense"
msgstr "Usar ambos --reset-author y --author no tiene sentido"
-#: builtin/commit.c:1180
+#: builtin/commit.c:1182
msgid "You have nothing to amend."
msgstr "No tienes nada que enmendar."
-#: builtin/commit.c:1183
+#: builtin/commit.c:1185
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:1185
+#: builtin/commit.c:1187
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:1188
+#: builtin/commit.c:1189
+msgid "You are in the middle of a rebase -- cannot amend."
+msgstr "Estás en medio de una fusión -- no puedes enmendar."
+
+#: builtin/commit.c:1192
msgid "Options --squash and --fixup cannot be used together"
msgstr "Opciones --squash y --fixup no pueden ser usadas juntas"
-#: builtin/commit.c:1198
+#: builtin/commit.c:1202
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:1200
+#: builtin/commit.c:1204
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:1208
+#: builtin/commit.c:1213
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:1225
+#: builtin/commit.c:1231
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:1231
+#: builtin/commit.c:1237
#, c-format
msgid "paths '%s ...' with -a does not make sense"
msgstr "paths '%s ...' con -a no tiene sentido"
-#: builtin/commit.c:1362 builtin/commit.c:1524
+#: builtin/commit.c:1368 builtin/commit.c:1529
msgid "show status concisely"
msgstr "mostrar status de manera concisa"
-#: builtin/commit.c:1364 builtin/commit.c:1526
+#: builtin/commit.c:1370 builtin/commit.c:1531
msgid "show branch information"
msgstr "mostrar información de la rama"
-#: builtin/commit.c:1366
+#: builtin/commit.c:1372
msgid "show stash information"
msgstr "mostrar información del stash"
-#: builtin/commit.c:1368 builtin/commit.c:1528
+#: builtin/commit.c:1374 builtin/commit.c:1533
msgid "compute full ahead/behind values"
msgstr "calcular todos los valores delante/atrás"
-#: builtin/commit.c:1370
+#: builtin/commit.c:1376
msgid "version"
msgstr "version"
-#: builtin/commit.c:1370 builtin/commit.c:1530 builtin/push.c:549
-#: builtin/worktree.c:643
+#: builtin/commit.c:1376 builtin/commit.c:1535 builtin/push.c:549
+#: builtin/worktree.c:646
msgid "machine-readable output"
msgstr "output formato-maquina"
-#: builtin/commit.c:1373 builtin/commit.c:1532
+#: builtin/commit.c:1379 builtin/commit.c:1537
msgid "show status in long format (default)"
msgstr "mostrar status en formato largo (default)"
-#: builtin/commit.c:1376 builtin/commit.c:1535
+#: builtin/commit.c:1382 builtin/commit.c:1540
msgid "terminate entries with NUL"
msgstr "terminar entradas con NUL"
-#: builtin/commit.c:1378 builtin/commit.c:1382 builtin/commit.c:1538
+#: builtin/commit.c:1384 builtin/commit.c:1388 builtin/commit.c:1543
#: builtin/fast-export.c:1153 builtin/fast-export.c:1156
-#: builtin/fast-export.c:1159 builtin/rebase.c:1569 parse-options.h:336
+#: builtin/fast-export.c:1159 builtin/rebase.c:1392 parse-options.h:336
msgid "mode"
msgstr "modo"
-#: builtin/commit.c:1379 builtin/commit.c:1538
+#: builtin/commit.c:1385 builtin/commit.c:1543
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:1383
+#: builtin/commit.c:1389
msgid ""
"show ignored files, optional modes: traditional, matching, no. (Default: "
"traditional)"
@@ -12683,11 +12935,11 @@ msgstr ""
"mostrar archivos ignorados, modos opcionales: traditional, matching, no. "
"(Predeterminado: traditional)"
-#: builtin/commit.c:1385 parse-options.h:192
+#: builtin/commit.c:1391 parse-options.h:192
msgid "when"
msgstr "cuando"
-#: builtin/commit.c:1386
+#: builtin/commit.c:1392
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
@@ -12695,173 +12947,173 @@ msgstr ""
"ignorar cambios en submódulos, opcional cuando: all,dirty,untracked. "
"(Default: all)"
-#: builtin/commit.c:1388
+#: builtin/commit.c:1394
msgid "list untracked files in columns"
msgstr "listar en columnas los archivos sin seguimiento"
-#: builtin/commit.c:1389
+#: builtin/commit.c:1395
msgid "do not detect renames"
msgstr "no detectar renombrados"
-#: builtin/commit.c:1391
+#: builtin/commit.c:1397
msgid "detect renames, optionally set similarity index"
msgstr "detectar renombres, opcionalmente configurar similaridad de índice"
-#: builtin/commit.c:1411
+#: builtin/commit.c:1417
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:1494
+#: builtin/commit.c:1499
msgid "suppress summary after successful commit"
msgstr "suprime summary tras un commit exitoso"
-#: builtin/commit.c:1495
+#: builtin/commit.c:1500
msgid "show diff in commit message template"
msgstr "mostrar diff en el template del mensaje de commit"
-#: builtin/commit.c:1497
+#: builtin/commit.c:1502
msgid "Commit message options"
msgstr "Opciones para el mensaje del commit"
-#: builtin/commit.c:1498 builtin/merge.c:275 builtin/tag.c:414
+#: builtin/commit.c:1503 builtin/merge.c:277 builtin/tag.c:415
msgid "read message from file"
msgstr "leer mensaje desde un archivo"
-#: builtin/commit.c:1499
+#: builtin/commit.c:1504
msgid "author"
msgstr "autor"
-#: builtin/commit.c:1499
+#: builtin/commit.c:1504
msgid "override author for commit"
msgstr "sobrescribe el autor del commit"
-#: builtin/commit.c:1500 builtin/gc.c:538
+#: builtin/commit.c:1505 builtin/gc.c:538
msgid "date"
msgstr "fecha"
-#: builtin/commit.c:1500
+#: builtin/commit.c:1505
msgid "override date for commit"
msgstr "sobrescribe la fecha del commit"
-#: builtin/commit.c:1502 builtin/commit.c:1503 builtin/commit.c:1504
-#: builtin/commit.c:1505 parse-options.h:328 ref-filter.h:92
+#: builtin/commit.c:1507 builtin/commit.c:1508 builtin/commit.c:1509
+#: builtin/commit.c:1510 parse-options.h:328 ref-filter.h:92
msgid "commit"
msgstr "confirmar"
-#: builtin/commit.c:1502
+#: builtin/commit.c:1507
msgid "reuse and edit message from specified commit"
msgstr "reusar y editar el mensaje de un commit especifico"
-#: builtin/commit.c:1503
+#: builtin/commit.c:1508
msgid "reuse message from specified commit"
msgstr "reusar el mensaje de un commit especifico"
-#: builtin/commit.c:1504
+#: builtin/commit.c:1509
msgid "use autosquash formatted message to fixup specified commit"
msgstr ""
"usar mensaje de formato autosquash para arreglar el commit especificado"
-#: builtin/commit.c:1505
+#: builtin/commit.c:1510
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:1506
+#: builtin/commit.c:1511
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:1507 builtin/log.c:1634 builtin/merge.c:290
-#: builtin/pull.c:144 builtin/revert.c:110
+#: builtin/commit.c:1512 builtin/log.c:1655 builtin/merge.c:293
+#: builtin/pull.c:145 builtin/revert.c:110
msgid "add Signed-off-by:"
msgstr "agregar Signed-off-by: (firmado por)"
-#: builtin/commit.c:1508
+#: builtin/commit.c:1513
msgid "use specified template file"
msgstr "usar archivo de template especificado"
-#: builtin/commit.c:1509
+#: builtin/commit.c:1514
msgid "force edit of commit"
msgstr "forzar la edición del commit"
-#: builtin/commit.c:1511
+#: builtin/commit.c:1516
msgid "include status in commit message template"
msgstr "incluir status en el template del mensaje de commit"
-#: builtin/commit.c:1516
+#: builtin/commit.c:1521
msgid "Commit contents options"
msgstr "Opciones para el contenido del commit"
-#: builtin/commit.c:1517
+#: builtin/commit.c:1522
msgid "commit all changed files"
msgstr "confirmar todos los archivos cambiados"
-#: builtin/commit.c:1518
+#: builtin/commit.c:1523
msgid "add specified files to index for commit"
msgstr "agregar archivos específicos al índice para confirmar"
-#: builtin/commit.c:1519
+#: builtin/commit.c:1524
msgid "interactively add files"
msgstr "agregar archivos interactivamente"
-#: builtin/commit.c:1520
+#: builtin/commit.c:1525
msgid "interactively add changes"
msgstr "agregar cambios interactivamente"
-#: builtin/commit.c:1521
+#: builtin/commit.c:1526
msgid "commit only specified files"
msgstr "sólo confirmar archivos específicos"
-#: builtin/commit.c:1522
+#: builtin/commit.c:1527
msgid "bypass pre-commit and commit-msg hooks"
msgstr "evitar los capturadores (hooks) de pre-commit y commit-msg"
-#: builtin/commit.c:1523
+#: builtin/commit.c:1528
msgid "show what would be committed"
msgstr "mostrar lo que sería incluido en el commit"
-#: builtin/commit.c:1536
+#: builtin/commit.c:1541
msgid "amend previous commit"
msgstr "enmendar commit previo"
-#: builtin/commit.c:1537
+#: builtin/commit.c:1542
msgid "bypass post-rewrite hook"
msgstr "gancho bypass post reescritura"
-#: builtin/commit.c:1544
+#: builtin/commit.c:1549
msgid "ok to record an empty change"
msgstr "ok al grabar un cambio vacío"
-#: builtin/commit.c:1546
+#: builtin/commit.c:1551
msgid "ok to record a change with an empty message"
msgstr "ok al grabar un cambio con un mensaje vacío"
-#: builtin/commit.c:1619
+#: builtin/commit.c:1624
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr "Archivo MERGE_HEAD (%s) corrupto"
-#: builtin/commit.c:1626
+#: builtin/commit.c:1631
msgid "could not read MERGE_MODE"
msgstr "no se pudo leer MERGE_MODE"
-#: builtin/commit.c:1645
+#: builtin/commit.c:1652
#, c-format
msgid "could not read commit message: %s"
msgstr "no se pudo leer el mensaje de commit: %s"
-#: builtin/commit.c:1652
+#: builtin/commit.c:1659
#, 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:1657
+#: builtin/commit.c:1664
#, 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:1691
+#: builtin/commit.c:1698
msgid ""
"repository has been updated, but unable to write\n"
"new_index file. Check that disk is not full and quota is\n"
@@ -12871,77 +13123,6 @@ msgstr ""
"new_index. Verifique que el disco no este lleno y la quota no ha\n"
"sido superada, y luego \"git restore --sateged :/\" para recuperar."
-#: builtin/commit-graph.c:11 builtin/commit-graph.c:17
-msgid ""
-"git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]"
-msgstr ""
-"git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]"
-
-#: builtin/commit-graph.c:12 builtin/commit-graph.c:22
-msgid ""
-"git commit-graph write [--object-dir <objdir>] [--append|--split] [--"
-"reachable|--stdin-packs|--stdin-commits] [--[no-]progress] <split options>"
-msgstr ""
-"git commit-graph write [--object-dir <dir objeto>] [--append|--split] [--"
-"reachable|--stdin-packs|--stdin-commits] [--[no-]progress] <opciones de "
-"split>"
-
-#: builtin/commit-graph.c:52
-#, c-format
-msgid "could not find object directory matching %s"
-msgstr "no se pudo entoncrar el objeto directorio concordante con %s"
-
-#: builtin/commit-graph.c:68 builtin/commit-graph.c:125
-#: builtin/commit-graph.c:210 builtin/fetch.c:179 builtin/log.c:1657
-msgid "dir"
-msgstr "dir"
-
-#: builtin/commit-graph.c:69 builtin/commit-graph.c:126
-#: builtin/commit-graph.c:211
-msgid "The object directory to store the graph"
-msgstr "El directorio de objetos para guardar el gráfico"
-
-#: builtin/commit-graph.c:71
-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:94 t/helper/test-read-graph.c:23
-#, c-format
-msgid "Could not open commit-graph '%s'"
-msgstr "No se pudo abrir commit-graph '%s'"
-
-#: builtin/commit-graph.c:128
-msgid "start walk at all refs"
-msgstr "comenzar caminata en todas las refs"
-
-#: builtin/commit-graph.c:130
-msgid "scan pack-indexes listed by stdin for commits"
-msgstr "escanear paquete de índices por stdin por commits"
-
-#: builtin/commit-graph.c:132
-msgid "start walk at commits listed by stdin"
-msgstr "comenzar a caminar a los commits listados por stdin"
-
-#: builtin/commit-graph.c:134
-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:137
-msgid "allow writing an incremental commit-graph file"
-msgstr "permitir escribir un archivo commit-graph incremental"
-
-#: builtin/commit-graph.c:139 builtin/commit-graph.c:143
-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:141
-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:159
-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"
-
#: builtin/config.c:11
msgid "git config [<options>]"
msgstr "git config [<opciones>]"
@@ -13269,49 +13450,44 @@ msgstr "git describe [<opciones>] [<commit-ish>...]"
msgid "git describe [<options>] --dirty"
msgstr "git describe [<opciones>] --dirty"
-#: builtin/describe.c:62
+#: builtin/describe.c:63
msgid "head"
msgstr "head"
-#: builtin/describe.c:62
+#: builtin/describe.c:63
msgid "lightweight"
msgstr "ligero"
-#: builtin/describe.c:62
+#: builtin/describe.c:63
msgid "annotated"
msgstr "anotado"
-#: builtin/describe.c:275
+#: builtin/describe.c:277
#, c-format
msgid "annotated tag %s not available"
msgstr "tag anotado %s no disponible"
-#: builtin/describe.c:279
-#, c-format
-msgid "annotated tag %s has no embedded name"
-msgstr "tag anotado %s no tiene nombre embebido"
-
#: builtin/describe.c:281
#, c-format
-msgid "tag '%s' is really '%s' here"
-msgstr "tag '%s' es realmente '%s' aquí"
+msgid "tag '%s' is externally known as '%s'"
+msgstr "tag '%s' es literalmente conocida como '%s'"
-#: builtin/describe.c:325
+#: builtin/describe.c:328
#, c-format
msgid "no tag exactly matches '%s'"
msgstr "no hay tag que concuerde exactamente con '%s'"
-#: builtin/describe.c:327
+#: builtin/describe.c:330
#, c-format
msgid "No exact match on refs or tags, searching to describe\n"
msgstr "No hay coincidencia exacta en refs o tags, buscando en describe\n"
-#: builtin/describe.c:394
+#: builtin/describe.c:397
#, c-format
msgid "finished search at %s\n"
msgstr "búsqueda finalizada a las %s\n"
-#: builtin/describe.c:421
+#: builtin/describe.c:424
#, c-format
msgid ""
"No annotated tags can describe '%s'.\n"
@@ -13320,7 +13496,7 @@ msgstr ""
"No hay tags anotados que puedan describir '%s'.\n"
"Sin embargo, hubieron tags no anotados: intente --tags."
-#: builtin/describe.c:425
+#: builtin/describe.c:428
#, c-format
msgid ""
"No tags can describe '%s'.\n"
@@ -13329,12 +13505,12 @@ msgstr ""
"Ningún tag puede describit '%s'.\n"
"Intente --always, o cree algunos tags."
-#: builtin/describe.c:455
+#: builtin/describe.c:458
#, c-format
msgid "traversed %lu commits\n"
msgstr "%lu commits cruzados\n"
-#: builtin/describe.c:458
+#: builtin/describe.c:461
#, c-format
msgid ""
"more than %i tags found; listed %i most recent\n"
@@ -13343,90 +13519,90 @@ msgstr ""
"se encontró más de %i tags; se mostró %i más reciente\n"
"fin de la búsqueda en %s\n"
-#: builtin/describe.c:526
+#: builtin/describe.c:529
#, c-format
msgid "describe %s\n"
msgstr "describe %s\n"
-#: builtin/describe.c:529
+#: builtin/describe.c:532
#, c-format
msgid "Not a valid object name %s"
msgstr "Nombre de objeto %s no válido"
-#: builtin/describe.c:537
+#: builtin/describe.c:540
#, c-format
msgid "%s is neither a commit nor blob"
msgstr "%s no es un commit ni un blob"
-#: builtin/describe.c:551
+#: builtin/describe.c:554
msgid "find the tag that comes after the commit"
msgstr "encontrar el tag que viene después del commit"
-#: builtin/describe.c:552
+#: builtin/describe.c:555
msgid "debug search strategy on stderr"
msgstr "hacer debug a la estrategia de búsqueda en stderr"
-#: builtin/describe.c:553
+#: builtin/describe.c:556
msgid "use any ref"
msgstr "use cualquier ref"
-#: builtin/describe.c:554
+#: builtin/describe.c:557
msgid "use any tag, even unannotated"
msgstr "use cualquier tag, incluso los no anotados"
-#: builtin/describe.c:555
+#: builtin/describe.c:558
msgid "always use long format"
msgstr "siempre usar formato largo"
-#: builtin/describe.c:556
+#: builtin/describe.c:559
msgid "only follow first parent"
msgstr "solo seguir el primer patrón"
-#: builtin/describe.c:559
+#: builtin/describe.c:562
msgid "only output exact matches"
msgstr "solo mostrar concordancias exactas"
-#: builtin/describe.c:561
+#: builtin/describe.c:564
msgid "consider <n> most recent tags (default: 10)"
msgstr "considerar <n> tags más recientes (default:10)"
-#: builtin/describe.c:563
+#: builtin/describe.c:566
msgid "only consider tags matching <pattern>"
msgstr "solo considerar tags que concuerden con <patrón>"
-#: builtin/describe.c:565
+#: builtin/describe.c:568
msgid "do not consider tags matching <pattern>"
msgstr "no considerar tags que concuerden con <patrón>"
-#: builtin/describe.c:567 builtin/name-rev.c:535
+#: builtin/describe.c:570 builtin/name-rev.c:535
msgid "show abbreviated commit object as fallback"
msgstr "mostrar el objeto commit abreviado como fallback"
-#: builtin/describe.c:568 builtin/describe.c:571
+#: builtin/describe.c:571 builtin/describe.c:574
msgid "mark"
msgstr "marca"
-#: builtin/describe.c:569
+#: builtin/describe.c:572
msgid "append <mark> on dirty working tree (default: \"-dirty\")"
msgstr "adjuntar <marca> en el árbol de trabajo sucio (default: \"-dirty\")"
-#: builtin/describe.c:572
+#: builtin/describe.c:575
msgid "append <mark> on broken working tree (default: \"-broken\")"
msgstr "adjuntar <marca> en un árbol de trabajo roto (default: \"-broken\")"
-#: builtin/describe.c:590
+#: builtin/describe.c:593
msgid "--long is incompatible with --abbrev=0"
msgstr "--long es incompatible con --abbrev=0"
-#: builtin/describe.c:619
+#: builtin/describe.c:622
msgid "No names found, cannot describe anything."
msgstr "No se encontraron nombres, no se puede describir nada."
-#: builtin/describe.c:670
+#: builtin/describe.c:673
msgid "--dirty is incompatible with commit-ishes"
msgstr "--dirty es incompatible con commit-ismos"
-#: builtin/describe.c:672
+#: builtin/describe.c:675
msgid "--broken is incompatible with commit-ishes"
msgstr "--broken es incompatible con commit-ismos"
@@ -13657,7 +13833,7 @@ msgstr "Use el feature done para terminar el stream"
msgid "Skip output of blob data"
msgstr "Saltar el output de data blob"
-#: builtin/fast-export.c:1177 builtin/log.c:1705
+#: builtin/fast-export.c:1177 builtin/log.c:1724
msgid "refspec"
msgstr "refspec"
@@ -13686,105 +13862,106 @@ msgstr "Marcar tags con ids de mark"
msgid "Cannot pass both --import-marks and --import-marks-if-exists"
msgstr "No se puede pasar ambos --import-marks y --import-marks-if-exists"
-#: builtin/fetch.c:34
+#: builtin/fetch.c:35
msgid "git fetch [<options>] [<repository> [<refspec>...]]"
msgstr "git fetch [<opciones>] [<repositorio> [<refspec>...]]"
-#: builtin/fetch.c:35
+#: builtin/fetch.c:36
msgid "git fetch [<options>] <group>"
msgstr "git fetch [<opciones>] <grupo>"
-#: builtin/fetch.c:36
+#: builtin/fetch.c:37
msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
msgstr "git fetch --multiple [<opciones>] [(<repositorio> | <grupo>)...]"
-#: builtin/fetch.c:37
+#: builtin/fetch.c:38
msgid "git fetch --all [<options>]"
msgstr "git fetch --all [<opciones>]"
-#: builtin/fetch.c:116
+#: builtin/fetch.c:117
msgid "fetch.parallel cannot be negative"
msgstr "fetch.parallel no puede ser negativo"
-#: builtin/fetch.c:139 builtin/pull.c:184
+#: builtin/fetch.c:140 builtin/pull.c:185
msgid "fetch from all remotes"
msgstr "extraer de todos los remotos"
-#: builtin/fetch.c:141 builtin/pull.c:228
+#: builtin/fetch.c:142 builtin/pull.c:245
msgid "set upstream for git pull/fetch"
msgstr "configurar upstream para git pulll/fetch"
-#: builtin/fetch.c:143 builtin/pull.c:187
+#: builtin/fetch.c:144 builtin/pull.c:188
msgid "append to .git/FETCH_HEAD instead of overwriting"
msgstr "adjuntar a .git/FETCH_HEAD en lugar de sobrescribir"
-#: builtin/fetch.c:145 builtin/pull.c:190
+#: builtin/fetch.c:146 builtin/pull.c:191
msgid "path to upload pack on remote end"
msgstr "ruta para cargar el paquete al final del remoto"
-#: builtin/fetch.c:146
+#: builtin/fetch.c:147
msgid "force overwrite of local reference"
msgstr "forzar sobrescritura de referencia local"
-#: builtin/fetch.c:148
+#: builtin/fetch.c:149
msgid "fetch from multiple remotes"
msgstr "extraer de múltiples remotos"
-#: builtin/fetch.c:150 builtin/pull.c:194
+#: builtin/fetch.c:151 builtin/pull.c:195
msgid "fetch all tags and associated objects"
msgstr "extraer todos los tags y objetos asociados"
-#: builtin/fetch.c:152
+#: builtin/fetch.c:153
msgid "do not fetch all tags (--no-tags)"
msgstr "no extraer todos los tags (--no-tags)"
-#: builtin/fetch.c:154
+#: builtin/fetch.c:155
msgid "number of submodules fetched in parallel"
msgstr "número de submódulos extraídos en paralelo"
-#: builtin/fetch.c:156 builtin/pull.c:197
+#: builtin/fetch.c:157 builtin/pull.c:198
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:158
+#: builtin/fetch.c:159
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:159 builtin/fetch.c:182 builtin/pull.c:121
+#: builtin/fetch.c:160 builtin/fetch.c:183 builtin/pull.c:122
msgid "on-demand"
msgstr "en demanda"
-#: builtin/fetch.c:160
+#: builtin/fetch.c:161
msgid "control recursive fetching of submodules"
msgstr "controlar extracción recursiva de submódulos"
-#: builtin/fetch.c:164 builtin/pull.c:205
+#: builtin/fetch.c:165 builtin/pull.c:206
msgid "keep downloaded pack"
msgstr "mantener el paquete descargado"
-#: builtin/fetch.c:166
+#: builtin/fetch.c:167
msgid "allow updating of HEAD ref"
msgstr "permitir actualizar la ref HEAD"
-#: builtin/fetch.c:169 builtin/fetch.c:175 builtin/pull.c:208
+#: builtin/fetch.c:170 builtin/fetch.c:176 builtin/pull.c:209
+#: builtin/pull.c:218
msgid "deepen history of shallow clone"
msgstr "historia profunda de un clon superficial"
-#: builtin/fetch.c:171
+#: builtin/fetch.c:172 builtin/pull.c:212
msgid "deepen history of shallow repository based on time"
msgstr "historia profunda de un repositorio superficial basado en tiempo"
-#: builtin/fetch.c:177 builtin/pull.c:211
+#: builtin/fetch.c:178 builtin/pull.c:221
msgid "convert to a complete repository"
msgstr "convertir a un repositorio completo"
-#: builtin/fetch.c:180
+#: builtin/fetch.c:181
msgid "prepend this to submodule path output"
msgstr "anteponer esto a salida de la ruta del submódulo"
-#: builtin/fetch.c:183
+#: builtin/fetch.c:184
msgid ""
"default for recursive fetching of submodules (lower priority than config "
"files)"
@@ -13792,94 +13969,94 @@ msgstr ""
"default para extracción recursiva de submódulos (menor prioridad que "
"archivos de configuración)"
-#: builtin/fetch.c:187 builtin/pull.c:214
+#: builtin/fetch.c:188 builtin/pull.c:224
msgid "accept refs that update .git/shallow"
msgstr "aceptar refs que actualicen .git/shallow"
-#: builtin/fetch.c:188 builtin/pull.c:216
+#: builtin/fetch.c:189 builtin/pull.c:226
msgid "refmap"
msgstr "refmap"
-#: builtin/fetch.c:189 builtin/pull.c:217
+#: builtin/fetch.c:190 builtin/pull.c:227
msgid "specify fetch refmap"
msgstr "especificar extracción de refmap"
-#: builtin/fetch.c:196
+#: builtin/fetch.c:197 builtin/pull.c:240
msgid "report that we have only objects reachable from this object"
msgstr "reporta que solo tenemos objetos alcanzables de este objeto"
-#: builtin/fetch.c:199
+#: builtin/fetch.c:200
msgid "run 'gc --auto' after fetching"
msgstr "ejecutar 'gc --auto' tras el fetch"
-#: builtin/fetch.c:201 builtin/pull.c:226
+#: builtin/fetch.c:202 builtin/pull.c:243
msgid "check for forced-updates on all updated branches"
msgstr "verificar updates forzados en todos los branch actualizados"
-#: builtin/fetch.c:203
+#: builtin/fetch.c:204
msgid "write the commit-graph after fetching"
msgstr "escribir commit-graph luego del fetch"
-#: builtin/fetch.c:513
+#: builtin/fetch.c:514
msgid "Couldn't find remote ref HEAD"
msgstr "No se puedo encontrar ref remota HEAD"
-#: builtin/fetch.c:653
+#: builtin/fetch.c:654
#, 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:751
+#: builtin/fetch.c:752
#, c-format
msgid "object %s not found"
msgstr "objeto %s no encontrado"
-#: builtin/fetch.c:755
+#: builtin/fetch.c:756
msgid "[up to date]"
msgstr "[actualizado]"
-#: builtin/fetch.c:768 builtin/fetch.c:784 builtin/fetch.c:856
+#: builtin/fetch.c:769 builtin/fetch.c:785 builtin/fetch.c:857
msgid "[rejected]"
msgstr "[rechazado]"
-#: builtin/fetch.c:769
+#: builtin/fetch.c:770
msgid "can't fetch in current branch"
msgstr "no se puede traer en la rama actual"
-#: builtin/fetch.c:779
+#: builtin/fetch.c:780
msgid "[tag update]"
msgstr "[actualización de tag]"
-#: builtin/fetch.c:780 builtin/fetch.c:817 builtin/fetch.c:839
-#: builtin/fetch.c:851
+#: builtin/fetch.c:781 builtin/fetch.c:818 builtin/fetch.c:840
+#: builtin/fetch.c:852
msgid "unable to update local ref"
msgstr "no se posible actualizar el ref local"
-#: builtin/fetch.c:784
+#: builtin/fetch.c:785
msgid "would clobber existing tag"
msgstr "podría golpear tag existente"
-#: builtin/fetch.c:806
+#: builtin/fetch.c:807
msgid "[new tag]"
msgstr "[nuevo tag]"
-#: builtin/fetch.c:809
+#: builtin/fetch.c:810
msgid "[new branch]"
msgstr "[nueva rama]"
-#: builtin/fetch.c:812
+#: builtin/fetch.c:813
msgid "[new ref]"
msgstr "[nueva referencia]"
-#: builtin/fetch.c:851
+#: builtin/fetch.c:852
msgid "forced update"
msgstr "actualización forzada"
-#: builtin/fetch.c:856
+#: builtin/fetch.c:857
msgid "non-fast-forward"
msgstr "avance lento"
-#: builtin/fetch.c:877
+#: builtin/fetch.c:878
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"
@@ -13890,7 +14067,7 @@ msgstr ""
"show-forced-updates'\n"
"o ejecute 'git config fetch.showForcedUpdates true'."
-#: builtin/fetch.c:881
+#: builtin/fetch.c:882
#, c-format
msgid ""
"It took %.2f seconds to check forced updates. You can use\n"
@@ -13903,22 +14080,22 @@ msgstr ""
"false'\n"
"para evitar esta validación.\n"
-#: builtin/fetch.c:920
+#: builtin/fetch.c:914
#, c-format
msgid "%s did not send all necessary objects\n"
msgstr "%s no envió todos los objetos necesarios\n"
-#: builtin/fetch.c:941
+#: builtin/fetch.c:935
#, 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:1026 builtin/fetch.c:1164
+#: builtin/fetch.c:1020 builtin/fetch.c:1158
#, c-format
msgid "From %.*s\n"
msgstr "Desde %.*s\n"
-#: builtin/fetch.c:1037
+#: builtin/fetch.c:1031
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
@@ -13927,56 +14104,56 @@ 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:1134
+#: builtin/fetch.c:1128
#, c-format
msgid " (%s will become dangling)"
msgstr " (%s se pondrá colgado)"
-#: builtin/fetch.c:1135
+#: builtin/fetch.c:1129
#, c-format
msgid " (%s has become dangling)"
msgstr " (%s se ha colgado)"
-#: builtin/fetch.c:1167
+#: builtin/fetch.c:1161
msgid "[deleted]"
msgstr "[eliminado]"
-#: builtin/fetch.c:1168 builtin/remote.c:1112
+#: builtin/fetch.c:1162 builtin/remote.c:1112
msgid "(none)"
msgstr "(nada)"
-#: builtin/fetch.c:1191
+#: builtin/fetch.c:1185
#, 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:1210
+#: builtin/fetch.c:1204
#, 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:1213
+#: builtin/fetch.c:1207
#, c-format
msgid "Option \"%s\" is ignored for %s\n"
msgstr "Opción \"%s\" es ignorada por %s\n"
-#: builtin/fetch.c:1421
+#: builtin/fetch.c:1415
msgid "multiple branches detected, incompatible with --set-upstream"
msgstr "múltiples ramas detectadas, incompatible con --set-upstream"
-#: builtin/fetch.c:1436
+#: builtin/fetch.c:1430
msgid "not setting upstream for a remote remote-tracking branch"
msgstr "no configurar upstream para una rama de rastreo remoto"
-#: builtin/fetch.c:1438
+#: builtin/fetch.c:1432
msgid "not setting upstream for a remote tag"
msgstr "no configurar upstream para un tag remoto"
-#: builtin/fetch.c:1440
+#: builtin/fetch.c:1434
msgid "unknown branch type"
msgstr "tipo de branch desconocido"
-#: builtin/fetch.c:1442
+#: builtin/fetch.c:1436
msgid ""
"no source branch found.\n"
"you need to specify exactly one branch with the --set-upstream option."
@@ -13984,22 +14161,22 @@ msgstr ""
"no se encontró rama fuente.\n"
"tienes que especificar exactamente una rama con la opción --set-upstream."
-#: builtin/fetch.c:1568 builtin/fetch.c:1631
+#: builtin/fetch.c:1562 builtin/fetch.c:1625
#, c-format
msgid "Fetching %s\n"
msgstr "Extrayendo %s\n"
-#: builtin/fetch.c:1578 builtin/fetch.c:1633 builtin/remote.c:101
+#: builtin/fetch.c:1572 builtin/fetch.c:1627 builtin/remote.c:101
#, c-format
msgid "Could not fetch %s"
msgstr "No se pudo extraer %s"
-#: builtin/fetch.c:1590
+#: builtin/fetch.c:1584
#, c-format
msgid "could not fetch '%s' (exit code: %d)\n"
msgstr "no se pudo hacer fetch a '%s' (código de salida: %d)\n"
-#: builtin/fetch.c:1693
+#: builtin/fetch.c:1687
msgid ""
"No remote repository specified. Please, specify either a URL or a\n"
"remote name from which new revisions should be fetched."
@@ -14007,44 +14184,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:1730
+#: builtin/fetch.c:1724
msgid "You need to specify a tag name."
msgstr "Tienes que especificar un nombre de tag."
-#: builtin/fetch.c:1780
+#: builtin/fetch.c:1773
msgid "Negative depth in --deepen is not supported"
msgstr "Profundidad negativa en --deepen no soportada"
-#: builtin/fetch.c:1782
+#: builtin/fetch.c:1775
msgid "--deepen and --depth are mutually exclusive"
msgstr "--deepen y --depth son mutuamente exclusivas"
-#: builtin/fetch.c:1787
+#: builtin/fetch.c:1780
msgid "--depth and --unshallow cannot be used together"
msgstr "--depth y --unshallow no pueden ser usadas juntas"
-#: builtin/fetch.c:1789
+#: builtin/fetch.c:1782
msgid "--unshallow on a complete repository does not make sense"
msgstr "--unshallow no tiene sentido en un repositorio completo"
-#: builtin/fetch.c:1805
+#: builtin/fetch.c:1798
msgid "fetch --all does not take a repository argument"
msgstr "fetch --all no toma un argumento de repositorio"
-#: builtin/fetch.c:1807
+#: builtin/fetch.c:1800
msgid "fetch --all does not make sense with refspecs"
msgstr "fetch --all no tiene sentido con refspecs"
-#: builtin/fetch.c:1816
+#: builtin/fetch.c:1809
#, c-format
msgid "No such remote or remote group: %s"
msgstr "No existe el remoto o grupo remoto: %s"
-#: builtin/fetch.c:1823
+#: builtin/fetch.c:1816
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:1841
+#: builtin/fetch.c:1834
msgid ""
"--filter can only be used with the remote configured in extensions."
"partialclone"
@@ -14052,29 +14229,29 @@ msgstr ""
"--filter solo puede ser usado con el remoto configurado en extensions."
"partialClone"
-#: builtin/fmt-merge-msg.c:18
+#: builtin/fmt-merge-msg.c:7
msgid ""
"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
msgstr ""
"git fmt-merge-msg [-m <mensaje>] [--log[=<n>] | --no-log] [--file <archivo>]"
-#: builtin/fmt-merge-msg.c:671
+#: builtin/fmt-merge-msg.c:18
msgid "populate log with at most <n> entries from shortlog"
msgstr "poblar el log con máximo <n> entradas del shorlog"
-#: builtin/fmt-merge-msg.c:674
+#: builtin/fmt-merge-msg.c:21
msgid "alias for --log (deprecated)"
msgstr "alias para --log (deprecado)"
-#: builtin/fmt-merge-msg.c:677
+#: builtin/fmt-merge-msg.c:24
msgid "text"
msgstr "texto"
-#: builtin/fmt-merge-msg.c:678
+#: builtin/fmt-merge-msg.c:25
msgid "use <text> as start of message"
msgstr "use <text> como comienzo de mensaje"
-#: builtin/fmt-merge-msg.c:679
+#: builtin/fmt-merge-msg.c:26
msgid "file to read from"
msgstr "archivo del cual leer"
@@ -14114,7 +14291,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:439
+#: builtin/for-each-ref.c:39 builtin/tag.c:440
msgid "respect format colors"
msgstr "respetar el formato de colores"
@@ -14359,7 +14536,7 @@ msgstr "habilitar revisión más estricta"
msgid "write dangling objects in .git/lost-found"
msgstr "escribir objetos colgados en .git/lost-found"
-#: builtin/fsck.c:786 builtin/prune.c:132
+#: builtin/fsck.c:786 builtin/prune.c:134
msgid "show progress"
msgstr "mostrar progreso"
@@ -14395,12 +14572,12 @@ msgstr "Falló el fstat %s: %s"
msgid "failed to parse '%s' value '%s'"
msgstr "falló al analizar '%s' valor '%s'"
-#: builtin/gc.c:475 builtin/init-db.c:55
+#: builtin/gc.c:475 builtin/init-db.c:57
#, c-format
msgid "cannot stat '%s'"
msgstr "no se pudo definir '%s'"
-#: builtin/gc.c:484 builtin/notes.c:240 builtin/tag.c:529
+#: builtin/gc.c:484 builtin/notes.c:240 builtin/tag.c:530
#, c-format
msgid "cannot read '%s'"
msgstr "no se puede leer '%s'"
@@ -14500,262 +14677,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:1538 builtin/index-pack.c:1731
-#: builtin/pack-objects.c:2854
+#: builtin/grep.c:287 builtin/index-pack.c:1537 builtin/index-pack.c:1730
+#: builtin/pack-objects.c:2855
#, c-format
msgid "no threads support, ignoring %s"
msgstr "no hay soporte para hilos, ignorando %s"
-#: builtin/grep.c:453 builtin/grep.c:578 builtin/grep.c:618
+#: builtin/grep.c:475 builtin/grep.c:600 builtin/grep.c:640
#, c-format
msgid "unable to read tree (%s)"
msgstr "no es posible leer el árbol (%s)"
-#: builtin/grep.c:633
+#: builtin/grep.c:655
#, 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:704
+#: builtin/grep.c:724
#, c-format
msgid "switch `%c' expects a numerical value"
msgstr "switch `%c' espera un valor numérico"
-#: builtin/grep.c:803
+#: builtin/grep.c:823
msgid "search in index instead of in the work tree"
msgstr "buscar en el índice en lugar del árbol de trabajo"
-#: builtin/grep.c:805
+#: builtin/grep.c:825
msgid "find in contents not managed by git"
msgstr "encontrar en contenidos no manejados por git"
-#: builtin/grep.c:807
+#: builtin/grep.c:827
msgid "search in both tracked and untracked files"
msgstr "buscar en archivos rastreados y no rastreados"
-#: builtin/grep.c:809
+#: builtin/grep.c:829
msgid "ignore files specified via '.gitignore'"
msgstr "ignorar archivos especificados via '.gitignore'"
-#: builtin/grep.c:811
+#: builtin/grep.c:831
msgid "recursively search in each submodule"
msgstr "búsqueda recursiva en cada submódulo"
-#: builtin/grep.c:814
+#: builtin/grep.c:834
msgid "show non-matching lines"
msgstr "mostrar líneas que no concuerdan"
-#: builtin/grep.c:816
+#: builtin/grep.c:836
msgid "case insensitive matching"
msgstr "búsqueda insensible a mayúsculas"
-#: builtin/grep.c:818
+#: builtin/grep.c:838
msgid "match patterns only at word boundaries"
msgstr "concordar patrón solo a los límites de las palabras"
-#: builtin/grep.c:820
+#: builtin/grep.c:840
msgid "process binary files as text"
msgstr "procesar archivos binarios como texto"
-#: builtin/grep.c:822
+#: builtin/grep.c:842
msgid "don't match patterns in binary files"
msgstr "no concordar patrones en archivos binarios"
-#: builtin/grep.c:825
+#: builtin/grep.c:845
msgid "process binary files with textconv filters"
msgstr "procesar archivos binarios con filtros textconv"
-#: builtin/grep.c:827
+#: builtin/grep.c:847
msgid "search in subdirectories (default)"
msgstr "buscar en subdirectorios (default)"
-#: builtin/grep.c:829
+#: builtin/grep.c:849
msgid "descend at most <depth> levels"
msgstr "descender como máximo <valor-de-profundiad> niveles"
-#: builtin/grep.c:833
+#: builtin/grep.c:853
msgid "use extended POSIX regular expressions"
msgstr "usar expresiones regulares POSIX extendidas"
-#: builtin/grep.c:836
+#: builtin/grep.c:856
msgid "use basic POSIX regular expressions (default)"
msgstr "usar expresiones regulares POSIX (default)"
-#: builtin/grep.c:839
+#: builtin/grep.c:859
msgid "interpret patterns as fixed strings"
msgstr "interpretar patrones como strings arreglados"
-#: builtin/grep.c:842
+#: builtin/grep.c:862
msgid "use Perl-compatible regular expressions"
msgstr "usar expresiones regulares compatibles con Perl"
-#: builtin/grep.c:845
+#: builtin/grep.c:865
msgid "show line numbers"
msgstr "mostrar números de línea"
-#: builtin/grep.c:846
+#: builtin/grep.c:866
msgid "show column number of first match"
msgstr "mostrar el número de columna de la primer coincidencia"
-#: builtin/grep.c:847
+#: builtin/grep.c:867
msgid "don't show filenames"
msgstr "no mostrar nombres de archivo"
-#: builtin/grep.c:848
+#: builtin/grep.c:868
msgid "show filenames"
msgstr "mostrar nombres de archivo"
-#: builtin/grep.c:850
+#: builtin/grep.c:870
msgid "show filenames relative to top directory"
msgstr "mostrar nombres de archivo relativos al directorio superior"
-#: builtin/grep.c:852
+#: builtin/grep.c:872
msgid "show only filenames instead of matching lines"
msgstr "mostrar solo nombres de archivos en lugar de líneas encontradas"
-#: builtin/grep.c:854
+#: builtin/grep.c:874
msgid "synonym for --files-with-matches"
msgstr "sinónimo para --files-with-matches"
-#: builtin/grep.c:857
+#: builtin/grep.c:877
msgid "show only the names of files without match"
msgstr "mostrar solo los nombres de archivos sin coincidencias"
-#: builtin/grep.c:859
+#: builtin/grep.c:879
msgid "print NUL after filenames"
msgstr "imprimir NUL después del nombre de archivo"
-#: builtin/grep.c:862
+#: builtin/grep.c:882
msgid "show only matching parts of a line"
msgstr "mostrar solo partes que concuerdan de una línea"
-#: builtin/grep.c:864
+#: builtin/grep.c:884
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:865
+#: builtin/grep.c:885
msgid "highlight matches"
msgstr "resaltar concordancias"
-#: builtin/grep.c:867
+#: builtin/grep.c:887
msgid "print empty line between matches from different files"
msgstr "imprimir una línea vacía entre coincidencias de diferentes archivos"
-#: builtin/grep.c:869
+#: builtin/grep.c:889
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:872
+#: builtin/grep.c:892
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:875
+#: builtin/grep.c:895
msgid "show <n> context lines before matches"
msgstr "mostrar <n> líneas de contexto antes de las concordancias"
-#: builtin/grep.c:877
+#: builtin/grep.c:897
msgid "show <n> context lines after matches"
msgstr "mostrar <n> líneas de context después de las concordancias"
-#: builtin/grep.c:879
+#: builtin/grep.c:899
msgid "use <n> worker threads"
msgstr "usar <n> hilos de trabajo"
-#: builtin/grep.c:880
+#: builtin/grep.c:900
msgid "shortcut for -C NUM"
msgstr "atajo para -C NUM"
-#: builtin/grep.c:883
+#: builtin/grep.c:903
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:885
+#: builtin/grep.c:905
msgid "show the surrounding function"
msgstr "mostrar la función circundante"
-#: builtin/grep.c:888
+#: builtin/grep.c:908
msgid "read patterns from file"
msgstr "leer patrones del archivo"
-#: builtin/grep.c:890
+#: builtin/grep.c:910
msgid "match <pattern>"
msgstr "concordar <patrón>"
-#: builtin/grep.c:892
+#: builtin/grep.c:912
msgid "combine patterns specified with -e"
msgstr "combinar patrones especificados con -e"
-#: builtin/grep.c:904
+#: builtin/grep.c:924
msgid "indicate hit with exit status without output"
msgstr "indicar concordancia con exit status sin output"
-#: builtin/grep.c:906
+#: builtin/grep.c:926
msgid "show only matches from files that match all patterns"
msgstr ""
"mostrar solo concordancias con archivos que concuerdan todos los patrones"
-#: builtin/grep.c:908
+#: builtin/grep.c:928
msgid "show parse tree for grep expression"
msgstr "mostrar árbol analizado para la expresión grep"
-#: builtin/grep.c:912
+#: builtin/grep.c:932
msgid "pager"
msgstr "paginador"
-#: builtin/grep.c:912
+#: builtin/grep.c:932
msgid "show matching files in the pager"
msgstr "mostrar archivos concordantes en el paginador"
-#: builtin/grep.c:916
+#: builtin/grep.c:936
msgid "allow calling of grep(1) (ignored by this build)"
msgstr "permitir el llamado de grep(1) (ignorado por esta build)"
-#: builtin/grep.c:983
+#: builtin/grep.c:1003
msgid "no pattern given"
msgstr "no se ha entregado patrón"
-#: builtin/grep.c:1019
+#: builtin/grep.c:1039
msgid "--no-index or --untracked cannot be used with revs"
msgstr "--no-index o --untracked no se puede usar con revs"
-#: builtin/grep.c:1027
+#: builtin/grep.c:1047
#, c-format
msgid "unable to resolve revision: %s"
msgstr "no se posible resolver revisión: %s"
-#: builtin/grep.c:1057
+#: builtin/grep.c:1077
msgid "--untracked not supported with --recurse-submodules"
msgstr "--untracked no es soportada con --recurse-submodules"
-#: builtin/grep.c:1061
+#: builtin/grep.c:1081
msgid "invalid option combination, ignoring --threads"
msgstr "combinación de opciones inválida, ignorando --threads"
-#: builtin/grep.c:1064 builtin/pack-objects.c:3547
+#: builtin/grep.c:1084 builtin/pack-objects.c:3548
msgid "no threads support, ignoring --threads"
msgstr "no se soportan hilos, ignorando --threads"
-#: builtin/grep.c:1067 builtin/index-pack.c:1535 builtin/pack-objects.c:2851
+#: builtin/grep.c:1087 builtin/index-pack.c:1534 builtin/pack-objects.c:2852
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr "número inválido de hilos especificado (%d)"
-#: builtin/grep.c:1101
+#: builtin/grep.c:1121
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:1127
+#: builtin/grep.c:1147
msgid "--cached or --untracked cannot be used with --no-index"
msgstr "--cached o --untracked no pueden ser usadas con --no-index"
-#: builtin/grep.c:1133
+#: builtin/grep.c:1153
msgid "--[no-]exclude-standard cannot be used for tracked contents"
msgstr "--[no-]exclude-standard no puede ser usada para contenido rastreado"
-#: builtin/grep.c:1141
+#: builtin/grep.c:1161
msgid "both --cached and trees are given"
msgstr "--cached y árboles han sido entregados"
@@ -14798,66 +14975,66 @@ msgstr ""
msgid "process file as it were from this path"
msgstr "procesar el archivo como si fuera de esta ruta"
-#: builtin/help.c:46
+#: builtin/help.c:47
msgid "print all available commands"
msgstr "mostrar todos los comandos disponibles"
-#: builtin/help.c:47
+#: builtin/help.c:48
msgid "exclude guides"
msgstr "excluir las guias"
-#: builtin/help.c:48
+#: builtin/help.c:49
msgid "print list of useful guides"
msgstr "mostrar una lista de nociones utiles"
-#: builtin/help.c:49
+#: builtin/help.c:50
msgid "print all configuration variable names"
msgstr "imprimir todos los nombres de variables de configuración"
-#: builtin/help.c:51
+#: builtin/help.c:52
msgid "show man page"
msgstr "mostrar la pagina del manual"
-#: builtin/help.c:52
+#: builtin/help.c:53
msgid "show manual in web browser"
msgstr "mostrar la pagina del manual en un navegador web"
-#: builtin/help.c:54
+#: builtin/help.c:55
msgid "show info page"
msgstr "mostrar la pagina de info"
-#: builtin/help.c:56
+#: builtin/help.c:57
msgid "print command description"
msgstr "imprimir descripción del comando"
-#: builtin/help.c:61
+#: builtin/help.c:62
msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
msgstr "git help [--all] [--guides] [--man | --web | --info] [<comando>]"
-#: builtin/help.c:77
+#: builtin/help.c:163
#, c-format
msgid "unrecognized help format '%s'"
msgstr "formato help no reconocido '%s'"
-#: builtin/help.c:104
+#: builtin/help.c:190
msgid "Failed to start emacsclient."
msgstr "Falló al iniciar emacsclient."
-#: builtin/help.c:117
+#: builtin/help.c:203
msgid "Failed to parse emacsclient version."
msgstr "Falló al analizar la versión de emacsclient."
-#: builtin/help.c:125
+#: builtin/help.c:211
#, c-format
msgid "emacsclient version '%d' too old (< 22)."
msgstr "la versión '%d' de emacsclient es muy antigua (<22)."
-#: builtin/help.c:143 builtin/help.c:165 builtin/help.c:175 builtin/help.c:183
+#: builtin/help.c:229 builtin/help.c:251 builtin/help.c:261 builtin/help.c:269
#, c-format
msgid "failed to exec '%s'"
msgstr "falló al ejecutar '%s'"
-#: builtin/help.c:221
+#: builtin/help.c:307
#, c-format
msgid ""
"'%s': path for unsupported man viewer.\n"
@@ -14866,7 +15043,7 @@ msgstr ""
"'%s': ruta para el visualizador del manual no soportada.\n"
"Por favor considere usar 'man.<herramienta.cmd'."
-#: builtin/help.c:233
+#: builtin/help.c:319
#, c-format
msgid ""
"'%s': cmd for supported man viewer.\n"
@@ -14875,35 +15052,35 @@ msgstr ""
"'%s': comando no soportado para man viewer.\n"
"Por favor considere usar 'man.<herramienta>.path."
-#: builtin/help.c:350
+#: builtin/help.c:436
#, c-format
msgid "'%s': unknown man viewer."
msgstr "'%s': visualizador de man desconocido."
-#: builtin/help.c:367
+#: builtin/help.c:453
msgid "no man viewer handled the request"
msgstr "ningún visualizador de manual proceso la petición"
-#: builtin/help.c:375
+#: builtin/help.c:461
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:336
+#: builtin/help.c:520 builtin/help.c:531 git.c:337
#, c-format
msgid "'%s' is aliased to '%s'"
msgstr "'%s' tiene el alias '%s'"
-#: builtin/help.c:448 git.c:365
+#: builtin/help.c:534 git.c:367
#, c-format
msgid "bad alias.%s string: %s"
msgstr "mal alias.%s string: %s"
-#: builtin/help.c:477 builtin/help.c:507
+#: builtin/help.c:563 builtin/help.c:593
#, c-format
msgid "usage: %s%s"
msgstr "uso: %s%s"
-#: builtin/help.c:491
+#: builtin/help.c:577
msgid "'git help config' for more information"
msgstr "'git help config' para más información"
@@ -14941,7 +15118,7 @@ msgstr "leer error en input"
msgid "used more bytes than were available"
msgstr "se usaron más bytes de los disponibles"
-#: builtin/index-pack.c:288 builtin/pack-objects.c:606
+#: builtin/index-pack.c:288 builtin/pack-objects.c:607
msgid "pack too large for current definition of off_t"
msgstr "paquete muy grande para la definición actual de off_t"
@@ -14949,6 +15126,11 @@ msgstr "paquete muy grande para la definición actual de off_t"
msgid "pack exceeds maximum allowed size"
msgstr "paquete excede el máximo tamaño permitido"
+#: builtin/index-pack.c:306 builtin/repack.c:250
+#, c-format
+msgid "unable to create '%s'"
+msgstr "no se puede crear '%s'"
+
#: builtin/index-pack.c:312
#, c-format
msgid "cannot open packfile '%s'"
@@ -15007,8 +15189,8 @@ msgstr "inconsistencia seria en inflate"
msgid "SHA1 COLLISION FOUND WITH %s !"
msgstr "¡COLISIÓN DE TIPO SHA1 ENCONTRADA CON %s !"
-#: builtin/index-pack.c:738 builtin/pack-objects.c:158
-#: builtin/pack-objects.c:218 builtin/pack-objects.c:313
+#: builtin/index-pack.c:738 builtin/pack-objects.c:159
+#: builtin/pack-objects.c:219 builtin/pack-objects.c:314
#, c-format
msgid "unable to read %s"
msgstr "no se posible leer %s"
@@ -15069,7 +15251,7 @@ msgstr "confusión más allá de la locura en parse_pack_objects()"
msgid "Resolving deltas"
msgstr "Resolviendo deltas"
-#: builtin/index-pack.c:1208 builtin/pack-objects.c:2615
+#: builtin/index-pack.c:1208 builtin/pack-objects.c:2616
#, c-format
msgid "unable to create thread: %s"
msgstr "no es posible crear hilo: %s"
@@ -15102,169 +15284,178 @@ msgstr[1] "paquete tiene %d deltas sin resolver"
msgid "unable to deflate appended object (%d)"
msgstr "no es posible desinflar el objeto adjunto (%d)"
-#: builtin/index-pack.c:1392
+#: builtin/index-pack.c:1391
#, c-format
msgid "local object %s is corrupt"
msgstr "objeto local %s está corrompido"
-#: builtin/index-pack.c:1406
+#: builtin/index-pack.c:1405
#, 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:1431
+#: builtin/index-pack.c:1430
#, c-format
msgid "cannot write %s file '%s'"
msgstr "no se puede escribir %s en el archivo '%s'"
-#: builtin/index-pack.c:1439
+#: builtin/index-pack.c:1438
#, c-format
msgid "cannot close written %s file '%s'"
msgstr "no se puede cerrar escrito %s en archivo '%s'"
-#: builtin/index-pack.c:1463
+#: builtin/index-pack.c:1462
msgid "error while closing pack file"
msgstr "error mientras se cierra el archivo paquete"
-#: builtin/index-pack.c:1477
+#: builtin/index-pack.c:1476
msgid "cannot store pack file"
msgstr "no se puede guardar el archivo paquete"
-#: builtin/index-pack.c:1485
+#: builtin/index-pack.c:1484
msgid "cannot store index file"
msgstr "no se puede guardar el archivo índice"
-#: builtin/index-pack.c:1529 builtin/pack-objects.c:2862
+#: builtin/index-pack.c:1528 builtin/pack-objects.c:2863
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr "mal pack.indexversion=%<PRIu32>"
-#: builtin/index-pack.c:1597
+#: builtin/index-pack.c:1596
#, c-format
msgid "Cannot open existing pack file '%s'"
msgstr "No se puede abrir el archivo paquete existente '%s'"
-#: builtin/index-pack.c:1599
+#: builtin/index-pack.c:1598
#, 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:1647
+#: builtin/index-pack.c:1646
#, 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:1654
+#: builtin/index-pack.c:1653
#, 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:1693
+#: builtin/index-pack.c:1692
msgid "Cannot come back to cwd"
msgstr "No se puede regresar a cwd"
-#: builtin/index-pack.c:1742 builtin/index-pack.c:1745
-#: builtin/index-pack.c:1761 builtin/index-pack.c:1765
+#: builtin/index-pack.c:1741 builtin/index-pack.c:1744
+#: builtin/index-pack.c:1760 builtin/index-pack.c:1764
#, c-format
msgid "bad %s"
msgstr "mal %s"
-#: builtin/index-pack.c:1781
+#: builtin/index-pack.c:1780
msgid "--fix-thin cannot be used without --stdin"
msgstr "--fix-thin no puede ser usada sin --stdin"
-#: builtin/index-pack.c:1783
+#: builtin/index-pack.c:1782
msgid "--stdin requires a git repository"
msgstr "--stdin requiere un repositorio git"
-#: builtin/index-pack.c:1789
+#: builtin/index-pack.c:1788
msgid "--verify with no packfile name given"
msgstr "--verify no recibió ningún nombre de archivo de paquete"
-#: builtin/index-pack.c:1837 builtin/unpack-objects.c:582
+#: builtin/index-pack.c:1836 builtin/unpack-objects.c:582
msgid "fsck error in pack objects"
msgstr "error de fsck en objetos paquete"
-#: builtin/init-db.c:61
+#: builtin/init-db.c:63
#, c-format
msgid "cannot stat template '%s'"
msgstr "no se pudo definir template '%s'"
-#: builtin/init-db.c:66
+#: builtin/init-db.c:68
#, c-format
msgid "cannot opendir '%s'"
msgstr "no se puede abrir directorio '%s'"
-#: builtin/init-db.c:78
+#: builtin/init-db.c:80
#, c-format
msgid "cannot readlink '%s'"
msgstr "no se puede leer link '%s'"
-#: builtin/init-db.c:80
+#: builtin/init-db.c:82
#, c-format
msgid "cannot symlink '%s' '%s'"
msgstr "no se puede crear symlink '%s' '%s'"
-#: builtin/init-db.c:86
+#: builtin/init-db.c:88
#, c-format
msgid "cannot copy '%s' to '%s'"
msgstr "no se puede copiar '%s' a '%s'"
-#: builtin/init-db.c:90
+#: builtin/init-db.c:92
#, c-format
msgid "ignoring template %s"
msgstr "ignorando template %s"
-#: builtin/init-db.c:121
+#: builtin/init-db.c:123
#, c-format
msgid "templates not found in %s"
msgstr "template no encontrado en %s"
-#: builtin/init-db.c:136
+#: builtin/init-db.c:138
#, c-format
msgid "not copying templates from '%s': %s"
msgstr "no se copian templates de '%s': %s"
-#: builtin/init-db.c:334
+#: builtin/init-db.c:356
#, c-format
msgid "unable to handle file type %d"
msgstr "no es posible manejar el tipo de archivo %d"
-#: builtin/init-db.c:337
+#: builtin/init-db.c:359
#, c-format
msgid "unable to move %s to %s"
msgstr "no se puede mover %s a %s"
-#: builtin/init-db.c:354 builtin/init-db.c:357
+#: builtin/init-db.c:374
+msgid "attempt to reinitialize repository with different hash"
+msgstr "intentar reinicializar el repositorio con un hash diferente"
+
+#: builtin/init-db.c:380 builtin/init-db.c:601
+#, c-format
+msgid "unknown hash algorithm '%s'"
+msgstr "algoritmo hash desconocido '%s'"
+
+#: builtin/init-db.c:397 builtin/init-db.c:400
#, c-format
msgid "%s already exists"
msgstr "%s ya existe"
-#: builtin/init-db.c:413
+#: builtin/init-db.c:458
#, c-format
msgid "Reinitialized existing shared Git repository in %s%s\n"
msgstr "Reinicializado el repositorio Git compartido existente en %s%s\n"
-#: builtin/init-db.c:414
+#: builtin/init-db.c:459
#, c-format
msgid "Reinitialized existing Git repository in %s%s\n"
msgstr "Reinicializado el repositorio Git existente en %s%s\n"
-#: builtin/init-db.c:418
+#: builtin/init-db.c:463
#, c-format
msgid "Initialized empty shared Git repository in %s%s\n"
msgstr "Inicializado repositorio Git compartido vacío en %s%s\n"
-#: builtin/init-db.c:419
+#: builtin/init-db.c:464
#, c-format
msgid "Initialized empty Git repository in %s%s\n"
msgstr "Inicializado repositorio Git vacío en %s%s\n"
-#: builtin/init-db.c:468
+#: builtin/init-db.c:513
msgid ""
"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
"shared[=<permissions>]] [<directory>]"
@@ -15272,26 +15463,34 @@ msgstr ""
"git init [-q | --quiet] [--bare] [--template=<directorio-template>] [--"
"shared[=<permisos>]] [<directorio>]"
-#: builtin/init-db.c:491
+#: builtin/init-db.c:538
msgid "permissions"
msgstr "permisos"
-#: builtin/init-db.c:492
+#: builtin/init-db.c:539
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:529 builtin/init-db.c:534
+#: builtin/init-db.c:544
+msgid "hash"
+msgstr "hash"
+
+#: builtin/init-db.c:545
+msgid "specify the hash algorithm to use"
+msgstr "especificar el algoritmo hash a usar"
+
+#: builtin/init-db.c:578 builtin/init-db.c:583
#, c-format
msgid "cannot mkdir %s"
msgstr "no se pude crear directorio %s"
-#: builtin/init-db.c:538
+#: builtin/init-db.c:587
#, c-format
msgid "cannot chdir to %s"
msgstr "no se puede aplicar chdir a %s"
-#: builtin/init-db.c:559
+#: builtin/init-db.c:614
#, c-format
msgid ""
"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
@@ -15300,7 +15499,7 @@ msgstr ""
"%s (o --work-tree=<directorio>) no se permite sin especificar %s (o --git-"
"dir=<directorio>)"
-#: builtin/init-db.c:587
+#: builtin/init-db.c:642
#, c-format
msgid "Cannot access work tree '%s'"
msgstr "No se puede acceder al árbol de trabajo '%s'"
@@ -15369,126 +15568,126 @@ msgstr "--trailer con --only-input no tiene sentido"
msgid "no input file given for in-place editing"
msgstr "no se entregó archivo de entrada para edición en lugar"
-#: builtin/log.c:56
+#: builtin/log.c:57
msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
msgstr "git log [<opciones>] [<rango-de-revisión>] [[--] <ruta>...]"
-#: builtin/log.c:57
+#: builtin/log.c:58
msgid "git show [<options>] <object>..."
msgstr "git show [<opciones>] <objeto>..."
-#: builtin/log.c:110
+#: builtin/log.c:111
#, c-format
msgid "invalid --decorate option: %s"
msgstr "opción --decorate inválida: %s"
-#: builtin/log.c:174
+#: builtin/log.c:178
msgid "show source"
msgstr "mostrar fuente"
-#: builtin/log.c:175
+#: builtin/log.c:179
msgid "Use mail map file"
msgstr "Usar archivo de mapa de mail"
-#: builtin/log.c:177
+#: builtin/log.c:182
msgid "only decorate refs that match <pattern>"
msgstr "solo decorar refs que concuerden con <patrón>"
-#: builtin/log.c:179
+#: builtin/log.c:184
msgid "do not decorate refs that match <pattern>"
msgstr "no decorar refs que concuerden con <patrón>"
-#: builtin/log.c:180
+#: builtin/log.c:185
msgid "decorate options"
msgstr "opciones de decorado"
-#: builtin/log.c:183
+#: builtin/log.c:188
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:281
+#: builtin/log.c:298
#, c-format
msgid "Final output: %d %s\n"
msgstr "Salida final: %d %s\n"
-#: builtin/log.c:535
+#: builtin/log.c:556
#, c-format
msgid "git show %s: bad file"
msgstr "git show %s: mal archivo"
-#: builtin/log.c:550 builtin/log.c:645
+#: builtin/log.c:571 builtin/log.c:666
#, c-format
msgid "could not read object %s"
msgstr "no se pudo leer objeto %s"
-#: builtin/log.c:670
+#: builtin/log.c:691
#, c-format
msgid "unknown type: %d"
msgstr "tipo desconocido: %d"
-#: builtin/log.c:814
+#: builtin/log.c:835
#, c-format
msgid "%s: invalid cover from description mode"
msgstr "%s: modo cover from description inválido"
-#: builtin/log.c:821
+#: builtin/log.c:842
msgid "format.headers without value"
msgstr "formate.headers. sin valor"
-#: builtin/log.c:936
+#: builtin/log.c:957
msgid "name of output directory is too long"
msgstr "nombre del directorio de salida es muy largo"
-#: builtin/log.c:952
+#: builtin/log.c:973
#, c-format
msgid "cannot open patch file %s"
msgstr "no se puede abrir archivo patch %s"
-#: builtin/log.c:969
+#: builtin/log.c:990
msgid "need exactly one range"
msgstr "necesita exactamente un rango"
-#: builtin/log.c:979
+#: builtin/log.c:1000
msgid "not a range"
msgstr "no es un rango"
-#: builtin/log.c:1143
+#: builtin/log.c:1164
msgid "cover letter needs email format"
msgstr "letras de portada necesita formato email"
-#: builtin/log.c:1149
+#: builtin/log.c:1170
msgid "failed to create cover-letter file"
msgstr "falló al crear los archivos cover-letter"
-#: builtin/log.c:1228
+#: builtin/log.c:1249
#, c-format
msgid "insane in-reply-to: %s"
msgstr "insano in-reply-to: %s"
-#: builtin/log.c:1255
+#: builtin/log.c:1276
msgid "git format-patch [<options>] [<since> | <revision-range>]"
msgstr "git format-patch [<opciones>] [<desde> | <rango-de-revisiones>]"
-#: builtin/log.c:1313
+#: builtin/log.c:1334
msgid "two output directories?"
msgstr "¿dos directorios de salida?"
-#: builtin/log.c:1424 builtin/log.c:2197 builtin/log.c:2199 builtin/log.c:2211
+#: builtin/log.c:1445 builtin/log.c:2217 builtin/log.c:2219 builtin/log.c:2231
#, c-format
msgid "unknown commit %s"
msgstr "commit desconocido %s"
-#: builtin/log.c:1434 builtin/replace.c:58 builtin/replace.c:207
+#: builtin/log.c:1455 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:1439
+#: builtin/log.c:1460
msgid "could not find exact merge base"
msgstr "no se pudo encontrar una base de fusión exacta"
-#: builtin/log.c:1443
+#: builtin/log.c:1464
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"
@@ -15500,281 +15699,281 @@ msgstr ""
"O puedes especificar un commit base mediante --base=<id-commit-base> "
"manualmente"
-#: builtin/log.c:1463
+#: builtin/log.c:1484
msgid "failed to find exact merge base"
msgstr "falló al encontrar una base de fusión exacta"
-#: builtin/log.c:1474
+#: builtin/log.c:1495
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:1478
+#: builtin/log.c:1499
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:1531
+#: builtin/log.c:1552
msgid "cannot get patch id"
msgstr "no se puede obtener id de patch"
-#: builtin/log.c:1583
+#: builtin/log.c:1604
msgid "failed to infer range-diff ranges"
msgstr "falló al inferir rangos range-diff"
-#: builtin/log.c:1629
+#: builtin/log.c:1650
msgid "use [PATCH n/m] even with a single patch"
msgstr "use [PATCH n/m] incluso con un único parche"
-#: builtin/log.c:1632
+#: builtin/log.c:1653
msgid "use [PATCH] even with multiple patches"
msgstr "use [PATCH] incluso con múltiples parches"
-#: builtin/log.c:1636
+#: builtin/log.c:1657
msgid "print patches to standard out"
msgstr "mostrar parches en standard out"
-#: builtin/log.c:1638
+#: builtin/log.c:1659
msgid "generate a cover letter"
msgstr "generar letra de cover"
-#: builtin/log.c:1640
+#: builtin/log.c:1661
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:1641
+#: builtin/log.c:1662
msgid "sfx"
msgstr "sfx"
-#: builtin/log.c:1642
+#: builtin/log.c:1663
msgid "use <sfx> instead of '.patch'"
msgstr "use <sfx> en lugar de '.patch'"
-#: builtin/log.c:1644
+#: builtin/log.c:1665
msgid "start numbering patches at <n> instead of 1"
msgstr "comenzar a numerar los parches desde <n> en lugar de 1"
-#: builtin/log.c:1646
+#: builtin/log.c:1667
msgid "mark the series as Nth re-roll"
msgstr "marcar las series como Nth re-roll"
-#: builtin/log.c:1648
+#: builtin/log.c:1669
msgid "Use [RFC PATCH] instead of [PATCH]"
msgstr "Use [RFC PATCH] en lugar de [PATCH]"
-#: builtin/log.c:1651
+#: builtin/log.c:1672
msgid "cover-from-description-mode"
msgstr "modo-cover-from-description"
-#: builtin/log.c:1652
+#: builtin/log.c:1673
msgid "generate parts of a cover letter based on a branch's description"
msgstr ""
"genera partes de una carta de presentación basado en la descripción de la "
"rama"
-#: builtin/log.c:1654
+#: builtin/log.c:1675
msgid "Use [<prefix>] instead of [PATCH]"
msgstr "Use [<prefijo>] en lugar de [PATCH]"
-#: builtin/log.c:1657
+#: builtin/log.c:1678
msgid "store resulting files in <dir>"
msgstr "guardar archivos resultantes en <dir>"
-#: builtin/log.c:1660
+#: builtin/log.c:1681
msgid "don't strip/add [PATCH]"
msgstr "no cortar/agregar [PATCH]"
-#: builtin/log.c:1663
+#: builtin/log.c:1684
msgid "don't output binary diffs"
msgstr "no mostrar diffs binarios"
-#: builtin/log.c:1665
+#: builtin/log.c:1686
msgid "output all-zero hash in From header"
msgstr "salida como hash de todos-ceros en la cabecera From"
-#: builtin/log.c:1667
+#: builtin/log.c:1688
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:1669
+#: builtin/log.c:1690
msgid "show patch format instead of default (patch + stat)"
msgstr "mostrar formato de parche en lugar del default (parche + stat)"
-#: builtin/log.c:1671
+#: builtin/log.c:1692
msgid "Messaging"
msgstr "Mensajeando"
-#: builtin/log.c:1672
+#: builtin/log.c:1693
msgid "header"
msgstr "cabezal"
-#: builtin/log.c:1673
+#: builtin/log.c:1694
msgid "add email header"
msgstr "agregar cabecera email"
-#: builtin/log.c:1674 builtin/log.c:1676
+#: builtin/log.c:1695 builtin/log.c:1696
msgid "email"
msgstr "email"
-#: builtin/log.c:1674
+#: builtin/log.c:1695
msgid "add To: header"
msgstr "agregar cabecera To:"
-#: builtin/log.c:1676
+#: builtin/log.c:1696
msgid "add Cc: header"
msgstr "agregar cabecera Cc:"
-#: builtin/log.c:1678
+#: builtin/log.c:1697
msgid "ident"
msgstr "ident"
-#: builtin/log.c:1679
+#: builtin/log.c:1698
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:1681
+#: builtin/log.c:1700
msgid "message-id"
msgstr "id de mensaje"
-#: builtin/log.c:1682
+#: builtin/log.c:1701
msgid "make first mail a reply to <message-id>"
msgstr "hacer primer mail una respuesta a <id de mensaje>"
-#: builtin/log.c:1683 builtin/log.c:1686
+#: builtin/log.c:1702 builtin/log.c:1705
msgid "boundary"
msgstr "límite"
-#: builtin/log.c:1684
+#: builtin/log.c:1703
msgid "attach the patch"
msgstr "adjuntar el parche"
-#: builtin/log.c:1687
+#: builtin/log.c:1706
msgid "inline the patch"
msgstr "poner el parche en línea"
-#: builtin/log.c:1691
+#: builtin/log.c:1710
msgid "enable message threading, styles: shallow, deep"
msgstr "habilitar hilos de mensajes, estilos: superficial, profundo"
-#: builtin/log.c:1693
+#: builtin/log.c:1712
msgid "signature"
msgstr "firma"
-#: builtin/log.c:1694
+#: builtin/log.c:1713
msgid "add a signature"
msgstr "agregar una firma"
-#: builtin/log.c:1695
+#: builtin/log.c:1714
msgid "base-commit"
msgstr "commit-base"
-#: builtin/log.c:1696
+#: builtin/log.c:1715
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:1698
+#: builtin/log.c:1717
msgid "add a signature from a file"
msgstr "agregar una firma de un archivo"
-#: builtin/log.c:1699
+#: builtin/log.c:1718
msgid "don't print the patch filenames"
msgstr "no mostrar los nombres de archivos de los parches"
-#: builtin/log.c:1701
+#: builtin/log.c:1720
msgid "show progress while generating patches"
msgstr "mostrar medidor de progreso mientras se generan los parches"
-#: builtin/log.c:1703
+#: builtin/log.c:1722
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:1706
+#: builtin/log.c:1725
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:1708
+#: builtin/log.c:1727
msgid "percentage by which creation is weighted"
msgstr "porcentaje por el cual la creación es pesada"
-#: builtin/log.c:1792
+#: builtin/log.c:1812
#, c-format
msgid "invalid ident line: %s"
msgstr "línea de identificación inválida: %s"
-#: builtin/log.c:1807
+#: builtin/log.c:1827
msgid "-n and -k are mutually exclusive"
msgstr "-n y -k son mutuamente exclusivas"
-#: builtin/log.c:1809
+#: builtin/log.c:1829
msgid "--subject-prefix/--rfc and -k are mutually exclusive"
msgstr "--subject-prefix/--rfc y -k son mutuamente exclusivos"
-#: builtin/log.c:1817
+#: builtin/log.c:1837
msgid "--name-only does not make sense"
msgstr "--name-only no tiene sentido"
-#: builtin/log.c:1819
+#: builtin/log.c:1839
msgid "--name-status does not make sense"
msgstr "--name-status no tiene sentido"
-#: builtin/log.c:1821
+#: builtin/log.c:1841
msgid "--check does not make sense"
msgstr "--check no tiene sentido"
-#: builtin/log.c:1854
+#: builtin/log.c:1874
msgid "standard output, or directory, which one?"
msgstr "¿salida standard, o directorio, cual?"
-#: builtin/log.c:1958
+#: builtin/log.c:1978
msgid "--interdiff requires --cover-letter or single patch"
msgstr "--interdiff requiere --cover-letter o un parche único"
-#: builtin/log.c:1962
+#: builtin/log.c:1982
msgid "Interdiff:"
msgstr "Interdiff:"
-#: builtin/log.c:1963
+#: builtin/log.c:1983
#, c-format
msgid "Interdiff against v%d:"
msgstr "Interdiff contra v%d:"
-#: builtin/log.c:1969
+#: builtin/log.c:1989
msgid "--creation-factor requires --range-diff"
msgstr "--creation-factor requiere --range-diff"
-#: builtin/log.c:1973
+#: builtin/log.c:1993
msgid "--range-diff requires --cover-letter or single patch"
msgstr "--range-diff requiere --cover-letter o parche único"
-#: builtin/log.c:1981
+#: builtin/log.c:2001
msgid "Range-diff:"
msgstr "Range-diff:"
-#: builtin/log.c:1982
+#: builtin/log.c:2002
#, c-format
msgid "Range-diff against v%d:"
msgstr "Range-diff contra v%d:"
-#: builtin/log.c:1993
+#: builtin/log.c:2013
#, c-format
msgid "unable to read signature file '%s'"
msgstr "no se puede leer la firma del archivo '%s'"
-#: builtin/log.c:2029
+#: builtin/log.c:2049
msgid "Generating patches"
msgstr "Generando parches"
-#: builtin/log.c:2073
+#: builtin/log.c:2093
msgid "failed to create output files"
msgstr "falló al crear los archivos de salida"
-#: builtin/log.c:2132
+#: builtin/log.c:2152
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr "git cherry [-v] [<upstream> [<head> [<límite>]]]"
-#: builtin/log.c:2186
+#: builtin/log.c:2206
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
@@ -15782,111 +15981,111 @@ msgstr ""
"No se pudo encontrar una rama remota rastreada, por favor especifique "
"<upstream> manualmente.\n"
-#: builtin/ls-files.c:470
+#: builtin/ls-files.c:471
msgid "git ls-files [<options>] [<file>...]"
msgstr "git ls-files [<opciones>] [<archivo>...]"
-#: builtin/ls-files.c:526
+#: builtin/ls-files.c:527
msgid "identify the file status with tags"
msgstr "identifique el estado del archivo con tags"
-#: builtin/ls-files.c:528
+#: builtin/ls-files.c:529
msgid "use lowercase letters for 'assume unchanged' files"
msgstr "usar letras minúsculas para archivos 'asumidos sin cambios'"
-#: builtin/ls-files.c:530
+#: builtin/ls-files.c:531
msgid "use lowercase letters for 'fsmonitor clean' files"
msgstr "usar letras minúsculas para archivos de 'fsmonitor clean'"
-#: builtin/ls-files.c:532
+#: builtin/ls-files.c:533
msgid "show cached files in the output (default)"
msgstr "mostrar archivos en caché en la salida (default)"
-#: builtin/ls-files.c:534
+#: builtin/ls-files.c:535
msgid "show deleted files in the output"
msgstr "mostrar archivos borrados en la salida"
-#: builtin/ls-files.c:536
+#: builtin/ls-files.c:537
msgid "show modified files in the output"
msgstr "mostrar archivos modificados en la salida"
-#: builtin/ls-files.c:538
+#: builtin/ls-files.c:539
msgid "show other files in the output"
msgstr "mostrar otros archivos en la salida"
-#: builtin/ls-files.c:540
+#: builtin/ls-files.c:541
msgid "show ignored files in the output"
msgstr "mostrar archivos ignorados en la salida"
-#: builtin/ls-files.c:543
+#: builtin/ls-files.c:544
msgid "show staged contents' object name in the output"
msgstr ""
"mostrar contenido de nombres de objetos en el área de stage en la salida"
-#: builtin/ls-files.c:545
+#: builtin/ls-files.c:546
msgid "show files on the filesystem that need to be removed"
msgstr "mostrar archivos en el filesystem que necesitan ser borrados"
-#: builtin/ls-files.c:547
+#: builtin/ls-files.c:548
msgid "show 'other' directories' names only"
msgstr "mostrar solo nombres de 'directorios otros'"
-#: builtin/ls-files.c:549
+#: builtin/ls-files.c:550
msgid "show line endings of files"
msgstr "mostrar finales de línea de archivos"
-#: builtin/ls-files.c:551
+#: builtin/ls-files.c:552
msgid "don't show empty directories"
msgstr "no mostrar directorios vacíos"
-#: builtin/ls-files.c:554
+#: builtin/ls-files.c:555
msgid "show unmerged files in the output"
msgstr "mostrar archivos no fusionados en la salida"
-#: builtin/ls-files.c:556
+#: builtin/ls-files.c:557
msgid "show resolve-undo information"
msgstr "mostrar información resolver-deshacer"
-#: builtin/ls-files.c:558
+#: builtin/ls-files.c:559
msgid "skip files matching pattern"
msgstr "saltar archivos que concuerden con el patrón"
-#: builtin/ls-files.c:561
+#: builtin/ls-files.c:562
msgid "exclude patterns are read from <file>"
msgstr "excluir patrones leídos de <archivo>"
-#: builtin/ls-files.c:564
+#: builtin/ls-files.c:565
msgid "read additional per-directory exclude patterns in <file>"
msgstr ""
"leer patrones de exclusión de manera adicional por directorio en <archivo>"
-#: builtin/ls-files.c:566
+#: builtin/ls-files.c:567
msgid "add the standard git exclusions"
msgstr "agregar las exclusiones standard de git"
-#: builtin/ls-files.c:570
+#: builtin/ls-files.c:571
msgid "make the output relative to the project top directory"
msgstr "hacer la salida relativa al directorio principal del proyecto"
-#: builtin/ls-files.c:573
+#: builtin/ls-files.c:574
msgid "recurse through submodules"
msgstr "recurrir a través de submódulos"
-#: builtin/ls-files.c:575
+#: builtin/ls-files.c:576
msgid "if any <file> is not in the index, treat this as an error"
msgstr "si cualquier <archivo> no está en el índice, tratarlo como un error"
-#: builtin/ls-files.c:576
+#: builtin/ls-files.c:577
msgid "tree-ish"
msgstr "árbol-ismo"
-#: builtin/ls-files.c:577
+#: builtin/ls-files.c:578
msgid "pretend that paths removed since <tree-ish> are still present"
msgstr ""
"fingir que las rutas han sido borradas ya que todavía hay <árbol-ismos> "
"presentes"
-#: builtin/ls-files.c:579
+#: builtin/ls-files.c:580
msgid "show debugging data"
msgstr "mostrar data de debug"
@@ -15904,7 +16103,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:1561
+#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1384
msgid "exec"
msgstr "ejecutar"
@@ -15978,193 +16177,304 @@ msgstr ""
msgid "empty mbox: '%s'"
msgstr "mbox vacío: '%s'"
-#: builtin/merge.c:55
+#: builtin/merge-base.c:32
+msgid "git merge-base [-a | --all] <commit> <commit>..."
+msgstr "git merge-base [-a | --all] <commit> <commit>..."
+
+#: builtin/merge-base.c:33
+msgid "git merge-base [-a | --all] --octopus <commit>..."
+msgstr "git merge-base [-a | --all] --octopus <commit>..."
+
+#: builtin/merge-base.c:34
+msgid "git merge-base --independent <commit>..."
+msgstr "git merge-base --independent <commit>..."
+
+#: builtin/merge-base.c:35
+msgid "git merge-base --is-ancestor <commit> <commit>"
+msgstr "git merge-base --is-ancestor <commit> <commit>"
+
+#: builtin/merge-base.c:36
+msgid "git merge-base --fork-point <ref> [<commit>]"
+msgstr "git merge-base --fork-point <ref> [<commit>]"
+
+#: builtin/merge-base.c:143
+msgid "output all common ancestors"
+msgstr "mostrar todos los ancestros comunes"
+
+#: builtin/merge-base.c:145
+msgid "find ancestors for a single n-way merge"
+msgstr "encontrar ancestros para una única fusión de n-vías"
+
+#: builtin/merge-base.c:147
+msgid "list revs not reachable from others"
+msgstr "listar revs no alcanzables desde otros"
+
+#: builtin/merge-base.c:149
+msgid "is the first one ancestor of the other?"
+msgstr "¿es el primer ancestro del otro?"
+
+#: builtin/merge-base.c:151
+msgid "find where <commit> forked from reflog of <ref>"
+msgstr "encontrar donde <commit> forjó del reflog de <ref>"
+
+#: builtin/merge-file.c:9
+msgid ""
+"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
+"<orig-file> <file2>"
+msgstr ""
+"git merge-file [<opciones>] [-L <nombre1> [-L <origen> [-L <nombre2>]]] "
+"<archivo1> <archivo-origen> <archivo2>"
+
+#: builtin/merge-file.c:35
+msgid "send results to standard output"
+msgstr "mandar resultados a standard output"
+
+#: builtin/merge-file.c:36
+msgid "use a diff3 based merge"
+msgstr "usar un fusión basada en diff3"
+
+#: builtin/merge-file.c:37
+msgid "for conflicts, use our version"
+msgstr "por conflictos, usar nuestra versión"
+
+#: builtin/merge-file.c:39
+msgid "for conflicts, use their version"
+msgstr "por conflictos, usar la versión de ellos"
+
+#: builtin/merge-file.c:41
+msgid "for conflicts, use a union version"
+msgstr "por conflictos, usar una versión de unión"
+
+#: builtin/merge-file.c:44
+msgid "for conflicts, use this marker size"
+msgstr "por conflictos, usar el tamaño de este marcador"
+
+#: builtin/merge-file.c:45
+msgid "do not warn about conflicts"
+msgstr "no advertir sobre conflictos"
+
+#: builtin/merge-file.c:47
+msgid "set labels for file1/orig-file/file2"
+msgstr "configurar labels para archivo1/orig-archivo/archivo2"
+
+#: builtin/merge-recursive.c:47
+#, c-format
+msgid "unknown option %s"
+msgstr "opción %s desconocida"
+
+#: builtin/merge-recursive.c:53
+#, c-format
+msgid "could not parse object '%s'"
+msgstr "no se pudo analizar el objeto '%s'"
+
+#: builtin/merge-recursive.c:57
+#, c-format
+msgid "cannot handle more than %d base. Ignoring %s."
+msgid_plural "cannot handle more than %d bases. Ignoring %s."
+msgstr[0] "no se puede manejar más de %d base. Ignorando %s."
+msgstr[1] "no se puede manejar más de %d bases. Ignorando %s."
+
+#: builtin/merge-recursive.c:65
+msgid "not handling anything other than two heads merge."
+msgstr "no manejando nada distinto a fusiones de dos heads."
+
+#: builtin/merge-recursive.c:74 builtin/merge-recursive.c:76
+#, c-format
+msgid "could not resolve ref '%s'"
+msgstr "no se pudo resolver ref '%s'"
+
+#: builtin/merge-recursive.c:82
+#, c-format
+msgid "Merging %s with %s\n"
+msgstr "Fusionando %s con %s\n"
+
+#: builtin/merge.c:56
msgid "git merge [<options>] [<commit>...]"
msgstr "git merge [<opciones>] [<commit>...]"
-#: builtin/merge.c:56
+#: builtin/merge.c:57
msgid "git merge --abort"
msgstr "git merge --abort"
-#: builtin/merge.c:57
+#: builtin/merge.c:58
msgid "git merge --continue"
msgstr "git merge --continue"
-#: builtin/merge.c:119
+#: builtin/merge.c:121
msgid "switch `m' requires a value"
msgstr "cambiar `m' requiere un valor"
-#: builtin/merge.c:142
+#: builtin/merge.c:144
#, c-format
msgid "option `%s' requires a value"
msgstr "opción `%s' requiere un valor"
-#: builtin/merge.c:188
+#: builtin/merge.c:190
#, c-format
msgid "Could not find merge strategy '%s'.\n"
msgstr "No se pudo encontrar estrategia de fusión '%s'.\n"
-#: builtin/merge.c:189
+#: builtin/merge.c:191
#, c-format
msgid "Available strategies are:"
msgstr "Estrategias disponibles son:"
-#: builtin/merge.c:194
+#: builtin/merge.c:196
#, c-format
msgid "Available custom strategies are:"
msgstr "Estrategias personalizadas disponibles son:"
-#: builtin/merge.c:245 builtin/pull.c:132
+#: builtin/merge.c:247 builtin/pull.c:133
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:248 builtin/pull.c:135
+#: builtin/merge.c:250 builtin/pull.c:136
msgid "show a diffstat at the end of the merge"
msgstr "mostrar un diffstat al final de la fusión"
-#: builtin/merge.c:249 builtin/pull.c:138
+#: builtin/merge.c:251 builtin/pull.c:139
msgid "(synonym to --stat)"
msgstr "(sinónimo para --stat)"
-#: builtin/merge.c:251 builtin/pull.c:141
+#: builtin/merge.c:253 builtin/pull.c:142
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:254 builtin/pull.c:147
+#: builtin/merge.c:256 builtin/pull.c:148
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:256 builtin/pull.c:150
+#: builtin/merge.c:258 builtin/pull.c:151
msgid "perform a commit if the merge succeeds (default)"
msgstr "realizar un commit si la fusión es exitosa (default)"
-#: builtin/merge.c:258 builtin/pull.c:153
+#: builtin/merge.c:260 builtin/pull.c:154
msgid "edit message before committing"
msgstr "editar mensaje antes de realizar commit"
-#: builtin/merge.c:260
+#: builtin/merge.c:262
msgid "allow fast-forward (default)"
msgstr "permitir fast-forwars (default)"
-#: builtin/merge.c:262 builtin/pull.c:160
+#: builtin/merge.c:264 builtin/pull.c:161
msgid "abort if fast-forward is not possible"
msgstr "abortar si fast-forward no es posible"
-#: builtin/merge.c:266 builtin/pull.c:163
+#: builtin/merge.c:268 builtin/pull.c:164
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:267 builtin/notes.c:787 builtin/pull.c:167
-#: builtin/rebase.c:520 builtin/rebase.c:1575 builtin/revert.c:114
+#: builtin/merge.c:269 builtin/notes.c:787 builtin/pull.c:168
+#: builtin/rebase.c:527 builtin/rebase.c:1398 builtin/revert.c:114
msgid "strategy"
msgstr "estrategia"
-#: builtin/merge.c:268 builtin/pull.c:168
+#: builtin/merge.c:270 builtin/pull.c:169
msgid "merge strategy to use"
msgstr "estrategia de fusión para usar"
-#: builtin/merge.c:269 builtin/pull.c:171
+#: builtin/merge.c:271 builtin/pull.c:172
msgid "option=value"
msgstr "opción=valor"
-#: builtin/merge.c:270 builtin/pull.c:172
+#: builtin/merge.c:272 builtin/pull.c:173
msgid "option for selected merge strategy"
msgstr "opción para la estrategia de fusión seleccionada"
-#: builtin/merge.c:272
+#: builtin/merge.c:274
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:279
+#: builtin/merge.c:281
msgid "abort the current in-progress merge"
msgstr "abortar la fusión en progreso actual"
-#: builtin/merge.c:281
+#: builtin/merge.c:283
msgid "--abort but leave index and working tree alone"
msgstr "--abort pero deja el índice y el árbol de trabajo solos"
-#: builtin/merge.c:283
+#: builtin/merge.c:285
msgid "continue the current in-progress merge"
msgstr "continuar la fusión en progreso actual"
-#: builtin/merge.c:285 builtin/pull.c:179
+#: builtin/merge.c:287 builtin/pull.c:180
msgid "allow merging unrelated histories"
msgstr "permitir fusionar historias no relacionadas"
-#: builtin/merge.c:291
+#: builtin/merge.c:294
msgid "bypass pre-merge-commit and commit-msg hooks"
msgstr "hacer un bypass a hooks pre-merge-commit y commit-msg"
-#: builtin/merge.c:308
+#: builtin/merge.c:311
msgid "could not run stash."
msgstr "no se pudo ejecutar stash."
-#: builtin/merge.c:313
+#: builtin/merge.c:316
msgid "stash failed"
msgstr "stash falló"
-#: builtin/merge.c:318
+#: builtin/merge.c:321
#, c-format
msgid "not a valid object: %s"
msgstr "no es un objeto válido: %s"
-#: builtin/merge.c:340 builtin/merge.c:357
+#: builtin/merge.c:343 builtin/merge.c:360
msgid "read-tree failed"
msgstr "lectura de árbol falló"
-#: builtin/merge.c:387
+#: builtin/merge.c:390
msgid " (nothing to squash)"
msgstr " (nada para hacer squash)"
-#: builtin/merge.c:398
+#: builtin/merge.c:401
#, c-format
msgid "Squash commit -- not updating HEAD\n"
msgstr "Commit de squash -- no actualizando HEAD\n"
-#: builtin/merge.c:448
+#: builtin/merge.c:451
#, c-format
msgid "No merge message -- not updating HEAD\n"
msgstr "No hay mensaje de fusión -- no actualizando HEAD\n"
-#: builtin/merge.c:499
+#: builtin/merge.c:502
#, c-format
msgid "'%s' does not point to a commit"
msgstr "'%s' no apunta a ningún commit"
-#: builtin/merge.c:586
+#: builtin/merge.c:589
#, c-format
msgid "Bad branch.%s.mergeoptions string: %s"
msgstr "Mal string branch.%s.mergeoptions: %s"
-#: builtin/merge.c:708
+#: builtin/merge.c:716
msgid "Not handling anything other than two heads merge."
msgstr "No manejando nada más que fusión de dos heads."
-#: builtin/merge.c:722
+#: builtin/merge.c:730
#, c-format
msgid "Unknown option for merge-recursive: -X%s"
msgstr "Opción desconocida para merge-recursive: -X%s"
-#: builtin/merge.c:737
+#: builtin/merge.c:745
#, c-format
msgid "unable to write %s"
msgstr "no es posible escribir %s"
-#: builtin/merge.c:789
+#: builtin/merge.c:797
#, c-format
msgid "Could not read from '%s'"
msgstr "No se puedo leer de '%s'"
-#: builtin/merge.c:798
+#: builtin/merge.c:806
#, 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:804
+#: builtin/merge.c:812
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"
@@ -16176,11 +16486,11 @@ msgstr ""
"tópico.\n"
"\n"
-#: builtin/merge.c:809
+#: builtin/merge.c:817
msgid "An empty message aborts the commit.\n"
msgstr "Un mensaje vacío aborta el commit.\n"
-#: builtin/merge.c:812
+#: builtin/merge.c:820
#, c-format
msgid ""
"Lines starting with '%c' will be ignored, and an empty message aborts\n"
@@ -16189,74 +16499,74 @@ msgstr ""
"Líneas comenzando con '%c' serán ignoradas, y un mensaje vacío aborta\n"
" el commit.\n"
-#: builtin/merge.c:865
+#: builtin/merge.c:873
msgid "Empty commit message."
msgstr "Mensaje de commit vacío."
-#: builtin/merge.c:880
+#: builtin/merge.c:888
#, c-format
msgid "Wonderful.\n"
msgstr "Maravilloso.\n"
-#: builtin/merge.c:941
+#: builtin/merge.c:949
#, 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:980
+#: builtin/merge.c:988
msgid "No current branch."
msgstr "No rama actual."
-#: builtin/merge.c:982
+#: builtin/merge.c:990
msgid "No remote for the current branch."
msgstr "No hay remoto para la rama actual."
-#: builtin/merge.c:984
+#: builtin/merge.c:992
msgid "No default upstream defined for the current branch."
msgstr "Por defecto, no hay un upstream definido para la rama actual."
-#: builtin/merge.c:989
+#: builtin/merge.c:997
#, 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:1046
+#: builtin/merge.c:1054
#, c-format
msgid "Bad value '%s' in environment '%s'"
msgstr "Valor erróneo '%s' en el entorno '%s'"
-#: builtin/merge.c:1149
+#: builtin/merge.c:1157
#, c-format
msgid "not something we can merge in %s: %s"
msgstr "nada que podamos fusionar en %s: %s"
-#: builtin/merge.c:1183
+#: builtin/merge.c:1191
msgid "not something we can merge"
msgstr "nada que podamos fusionar"
-#: builtin/merge.c:1286
+#: builtin/merge.c:1295
msgid "--abort expects no arguments"
msgstr "--abort no espera argumentos"
-#: builtin/merge.c:1290
+#: builtin/merge.c:1299
msgid "There is no merge to abort (MERGE_HEAD missing)."
msgstr "No hay una fusión para abortar (falta MERGE_HEAD)"
-#: builtin/merge.c:1299
+#: builtin/merge.c:1317
msgid "--quit expects no arguments"
msgstr "--quit no espera argumentos"
-#: builtin/merge.c:1312
+#: builtin/merge.c:1330
msgid "--continue expects no arguments"
msgstr "--continue no espera argumentos"
-#: builtin/merge.c:1316
+#: builtin/merge.c:1334
msgid "There is no merge in progress (MERGE_HEAD missing)."
msgstr "No hay fusión en progreso (falta MERGE_HEAD)."
-#: builtin/merge.c:1332
+#: builtin/merge.c:1350
msgid ""
"You have not concluded your merge (MERGE_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -16264,7 +16574,7 @@ msgstr ""
"No has concluido la fusión (existe MERGE_HEAD).\n"
"Por favor, realiza un commit con los cambios antes de fusionar."
-#: builtin/merge.c:1339
+#: builtin/merge.c:1357
msgid ""
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -16272,213 +16582,102 @@ msgstr ""
"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:1342
+#: builtin/merge.c:1360
msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
msgstr "No has concluido el cherry-pick (existe CHERRY_PICK_HEAD)."
-#: builtin/merge.c:1356
+#: builtin/merge.c:1374
msgid "You cannot combine --squash with --no-ff."
msgstr "No se puede combinar --squash con --no-ff."
-#: builtin/merge.c:1358
+#: builtin/merge.c:1376
msgid "You cannot combine --squash with --commit."
msgstr "No se puede combinar --squash con --commit."
-#: builtin/merge.c:1374
+#: builtin/merge.c:1392
msgid "No commit specified and merge.defaultToUpstream not set."
msgstr ""
"No hay commit especificado y merge.defaultToUpstream no está configurado."
-#: builtin/merge.c:1391
+#: builtin/merge.c:1409
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:1393
+#: builtin/merge.c:1411
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:1398
+#: builtin/merge.c:1416
#, c-format
msgid "%s - not something we can merge"
msgstr "%s - nada que podamos fusionar"
-#: builtin/merge.c:1400
+#: builtin/merge.c:1418
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:1481
+#: builtin/merge.c:1499
msgid "refusing to merge unrelated histories"
msgstr "rehusando fusionar historias no relacionadas"
-#: builtin/merge.c:1490
+#: builtin/merge.c:1508
msgid "Already up to date."
msgstr "Ya está actualizado."
-#: builtin/merge.c:1500
+#: builtin/merge.c:1518
#, c-format
msgid "Updating %s..%s\n"
msgstr "Actualizando %s..%s\n"
-#: builtin/merge.c:1542
+#: builtin/merge.c:1564
#, c-format
msgid "Trying really trivial in-index merge...\n"
msgstr "Intentando fusión en índice realmente trivial...\n"
-#: builtin/merge.c:1549
+#: builtin/merge.c:1571
#, c-format
msgid "Nope.\n"
msgstr "Nop.\n"
-#: builtin/merge.c:1574
+#: builtin/merge.c:1596
msgid "Already up to date. Yeeah!"
msgstr "Ya está actualizado. ¡Oh, yeaahh!"
-#: builtin/merge.c:1580
+#: builtin/merge.c:1602
msgid "Not possible to fast-forward, aborting."
msgstr "No es posible hacer fast-forward, abortando."
-#: builtin/merge.c:1603 builtin/merge.c:1668
+#: builtin/merge.c:1630 builtin/merge.c:1695
#, c-format
msgid "Rewinding the tree to pristine...\n"
msgstr "Rebobinando el árbol a original...\n"
-#: builtin/merge.c:1607
+#: builtin/merge.c:1634
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr "Intentando estrategia de fusión %s...\n"
-#: builtin/merge.c:1659
+#: builtin/merge.c:1686
#, c-format
msgid "No merge strategy handled the merge.\n"
msgstr "Ninguna estrategia de fusión manejó la fusión.\n"
-#: builtin/merge.c:1661
+#: builtin/merge.c:1688
#, c-format
msgid "Merge with strategy %s failed.\n"
msgstr "Fusionar con estrategia %s falló.\n"
-#: builtin/merge.c:1670
+#: builtin/merge.c:1697
#, 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:1682
+#: builtin/merge.c:1711
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr ""
"Fusión automática fue bien; detenida antes del commit como se solicitó\n"
-#: builtin/merge-base.c:32
-msgid "git merge-base [-a | --all] <commit> <commit>..."
-msgstr "git merge-base [-a | --all] <commit> <commit>..."
-
-#: builtin/merge-base.c:33
-msgid "git merge-base [-a | --all] --octopus <commit>..."
-msgstr "git merge-base [-a | --all] --octopus <commit>..."
-
-#: builtin/merge-base.c:34
-msgid "git merge-base --independent <commit>..."
-msgstr "git merge-base --independent <commit>..."
-
-#: builtin/merge-base.c:35
-msgid "git merge-base --is-ancestor <commit> <commit>"
-msgstr "git merge-base --is-ancestor <commit> <commit>"
-
-#: builtin/merge-base.c:36
-msgid "git merge-base --fork-point <ref> [<commit>]"
-msgstr "git merge-base --fork-point <ref> [<commit>]"
-
-#: builtin/merge-base.c:153
-msgid "output all common ancestors"
-msgstr "mostrar todos los ancestros comunes"
-
-#: builtin/merge-base.c:155
-msgid "find ancestors for a single n-way merge"
-msgstr "encontrar ancestros para una única fusión de n-vías"
-
-#: builtin/merge-base.c:157
-msgid "list revs not reachable from others"
-msgstr "listar revs no alcanzables desde otros"
-
-#: builtin/merge-base.c:159
-msgid "is the first one ancestor of the other?"
-msgstr "¿es el primer ancestro del otro?"
-
-#: builtin/merge-base.c:161
-msgid "find where <commit> forked from reflog of <ref>"
-msgstr "encontrar donde <commit> forjó del reflog de <ref>"
-
-#: builtin/merge-file.c:9
-msgid ""
-"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
-"<orig-file> <file2>"
-msgstr ""
-"git merge-file [<opciones>] [-L <nombre1> [-L <origen> [-L <nombre2>]]] "
-"<archivo1> <archivo-origen> <archivo2>"
-
-#: builtin/merge-file.c:35
-msgid "send results to standard output"
-msgstr "mandar resultados a standard output"
-
-#: builtin/merge-file.c:36
-msgid "use a diff3 based merge"
-msgstr "usar un fusión basada en diff3"
-
-#: builtin/merge-file.c:37
-msgid "for conflicts, use our version"
-msgstr "por conflictos, usar nuestra versión"
-
-#: builtin/merge-file.c:39
-msgid "for conflicts, use their version"
-msgstr "por conflictos, usar la versión de ellos"
-
-#: builtin/merge-file.c:41
-msgid "for conflicts, use a union version"
-msgstr "por conflictos, usar una versión de unión"
-
-#: builtin/merge-file.c:44
-msgid "for conflicts, use this marker size"
-msgstr "por conflictos, usar el tamaño de este marcador"
-
-#: builtin/merge-file.c:45
-msgid "do not warn about conflicts"
-msgstr "no advertir sobre conflictos"
-
-#: builtin/merge-file.c:47
-msgid "set labels for file1/orig-file/file2"
-msgstr "configurar labels para archivo1/orig-archivo/archivo2"
-
-#: builtin/merge-recursive.c:47
-#, c-format
-msgid "unknown option %s"
-msgstr "opción %s desconocida"
-
-#: builtin/merge-recursive.c:53
-#, c-format
-msgid "could not parse object '%s'"
-msgstr "no se pudo analizar el objeto '%s'"
-
-#: builtin/merge-recursive.c:57
-#, c-format
-msgid "cannot handle more than %d base. Ignoring %s."
-msgid_plural "cannot handle more than %d bases. Ignoring %s."
-msgstr[0] "no se puede manejar más de %d base. Ignorando %s."
-msgstr[1] "no se puede manejar más de %d bases. Ignorando %s."
-
-#: builtin/merge-recursive.c:65
-msgid "not handling anything other than two heads merge."
-msgstr "no manejando nada distinto a fusiones de dos heads."
-
-#: builtin/merge-recursive.c:74 builtin/merge-recursive.c:76
-#, c-format
-msgid "could not resolve ref '%s'"
-msgstr "no se pudo resolver ref '%s'"
-
-#: builtin/merge-recursive.c:82
-#, c-format
-msgid "Merging %s with %s\n"
-msgstr "Fusionando %s con %s\n"
-
#: builtin/mktree.c:66
msgid "git mktree [-z] [--missing] [--batch]"
msgstr "git mktree [-z] [--missing] [--batch]"
@@ -16515,7 +16714,7 @@ 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:50 builtin/prune-packed.c:67
+#: builtin/multi-pack-index.c:50 builtin/prune-packed.c:25
msgid "too many arguments"
msgstr "muchos argumentos"
@@ -16617,7 +16816,7 @@ 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:781 builtin/repack.c:518
+#: builtin/mv.c:277 builtin/remote.c:781 builtin/repack.c:520
#, c-format
msgid "renaming '%s' failed"
msgstr "renombrando '%s' falló"
@@ -16811,7 +17010,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:532
+#: builtin/notes.c:242 builtin/tag.c:533
#, c-format
msgid "could not open or read '%s'"
msgstr "no se pudo abrir o leer '%s'"
@@ -17044,7 +17243,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:545
+#: builtin/notes.c:897 builtin/tag.c:546
#, c-format
msgid "Failed to resolve '%s' as a valid ref."
msgstr "Falló al resolver '%s' como una ref válida."
@@ -17062,7 +17261,7 @@ msgstr "intentar eliminar una nota no existente no es un error"
msgid "read object names from the standard input"
msgstr "leer nombres de objetos de standard input"
-#: builtin/notes.c:954 builtin/prune.c:130 builtin/worktree.c:164
+#: builtin/notes.c:954 builtin/prune.c:132 builtin/worktree.c:164
msgid "do not remove, show only"
msgstr "no eliminar, solo mostrar"
@@ -17078,125 +17277,125 @@ msgstr "referencia-de-notas"
msgid "use notes from <notes-ref>"
msgstr "usar notas desde <referencia-de-notas>"
-#: builtin/notes.c:1034 builtin/stash.c:1643
+#: builtin/notes.c:1034 builtin/stash.c:1608
#, c-format
msgid "unknown subcommand: %s"
msgstr "subcomando desconocido: %s"
-#: builtin/pack-objects.c:52
+#: builtin/pack-objects.c:53
msgid ""
"git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
msgstr ""
"git pack-objects --stdout [<opciones>...] [< <lista-de-ref> | < <lista-de-"
"objetos>]"
-#: builtin/pack-objects.c:53
+#: builtin/pack-objects.c:54
msgid ""
"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
msgstr ""
"git pack-objects [<opciones>...] <nombre-base> [< <lista-de-refs> | < <lista-"
"de-objetos>]"
-#: builtin/pack-objects.c:430
+#: builtin/pack-objects.c:431
#, c-format
msgid "bad packed object CRC for %s"
msgstr "mal paquete de objeto CRC para %s"
-#: builtin/pack-objects.c:441
+#: builtin/pack-objects.c:442
#, c-format
msgid "corrupt packed object for %s"
msgstr "objeto empaquetado corrupto para %s"
-#: builtin/pack-objects.c:572
+#: builtin/pack-objects.c:573
#, c-format
msgid "recursive delta detected for object %s"
msgstr "delta recursivo encontrado para objeto %s"
-#: builtin/pack-objects.c:783
+#: builtin/pack-objects.c:784
#, c-format
msgid "ordered %u objects, expected %<PRIu32>"
msgstr "%u objetos ordenados, esperados %<PRIu32>"
-#: builtin/pack-objects.c:972
+#: builtin/pack-objects.c:973
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:985
+#: builtin/pack-objects.c:986
msgid "Writing objects"
msgstr "Escribiendo objetos"
-#: builtin/pack-objects.c:1046 builtin/update-index.c:90
+#: builtin/pack-objects.c:1047 builtin/update-index.c:90
#, c-format
msgid "failed to stat %s"
msgstr "falló al iniciar %s"
-#: builtin/pack-objects.c:1099
+#: builtin/pack-objects.c:1100
#, c-format
msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
msgstr "%<PRIu32> objetos escritos mientras se esperaban %<PRIu32>"
-#: builtin/pack-objects.c:1297
+#: builtin/pack-objects.c:1298
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:1724
+#: builtin/pack-objects.c:1725
#, 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:1733
+#: builtin/pack-objects.c:1734
#, 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:2004
+#: builtin/pack-objects.c:2005
msgid "Counting objects"
msgstr "Contando objetos"
-#: builtin/pack-objects.c:2149
+#: builtin/pack-objects.c:2150
#, c-format
msgid "unable to parse object header of %s"
msgstr "incapaz de analizar header del objeto %s"
-#: builtin/pack-objects.c:2219 builtin/pack-objects.c:2235
-#: builtin/pack-objects.c:2245
+#: builtin/pack-objects.c:2220 builtin/pack-objects.c:2236
+#: builtin/pack-objects.c:2246
#, c-format
msgid "object %s cannot be read"
msgstr "objeto %s no puede ser leído"
-#: builtin/pack-objects.c:2222 builtin/pack-objects.c:2249
+#: builtin/pack-objects.c:2223 builtin/pack-objects.c:2250
#, 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:2259
+#: builtin/pack-objects.c:2260
msgid "suboptimal pack - out of memory"
msgstr "suboptimal pack - fuera de memoria"
-#: builtin/pack-objects.c:2574
+#: builtin/pack-objects.c:2575
#, c-format
msgid "Delta compression using up to %d threads"
msgstr "Compresión delta usando hasta %d hilos"
-#: builtin/pack-objects.c:2713
+#: builtin/pack-objects.c:2714
#, 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:2801
+#: builtin/pack-objects.c:2802
msgid "Compressing objects"
msgstr "Comprimiendo objetos"
-#: builtin/pack-objects.c:2807
+#: builtin/pack-objects.c:2808
msgid "inconsistency with delta count"
msgstr "inconsistencia con la cuenta de delta"
-#: builtin/pack-objects.c:2888
+#: builtin/pack-objects.c:2889
#, c-format
msgid ""
"expected edge object ID, got garbage:\n"
@@ -17205,7 +17404,7 @@ msgstr ""
"se espseraba ID de objeto al borde, se obtuvo basura:\n"
"%s"
-#: builtin/pack-objects.c:2894
+#: builtin/pack-objects.c:2895
#, c-format
msgid ""
"expected object ID, got garbage:\n"
@@ -17214,230 +17413,230 @@ msgstr ""
"se esperaba ID de objeto, se obtuvo basuta:\n"
"%s"
-#: builtin/pack-objects.c:2992
+#: builtin/pack-objects.c:2993
msgid "invalid value for --missing"
msgstr "valor inválido para --missing"
-#: builtin/pack-objects.c:3051 builtin/pack-objects.c:3159
+#: builtin/pack-objects.c:3052 builtin/pack-objects.c:3160
msgid "cannot open pack index"
msgstr "no se puede abrir índice de paquetes"
-#: builtin/pack-objects.c:3082
+#: builtin/pack-objects.c:3083
#, c-format
msgid "loose object at %s could not be examined"
msgstr "objeto perdido en %s no pudo ser examinado"
-#: builtin/pack-objects.c:3167
+#: builtin/pack-objects.c:3168
msgid "unable to force loose object"
msgstr "incapaz de forzar un objeto perdido"
-#: builtin/pack-objects.c:3260
+#: builtin/pack-objects.c:3261
#, c-format
msgid "not a rev '%s'"
msgstr "no es una rev '%s'"
-#: builtin/pack-objects.c:3263
+#: builtin/pack-objects.c:3264
#, c-format
msgid "bad revision '%s'"
msgstr "mala revisión '%s'"
-#: builtin/pack-objects.c:3288
+#: builtin/pack-objects.c:3289
msgid "unable to add recent objects"
msgstr "incapaz de añadir objetos recientes"
-#: builtin/pack-objects.c:3341
+#: builtin/pack-objects.c:3342
#, c-format
msgid "unsupported index version %s"
msgstr "versión de índice no soportada %s"
-#: builtin/pack-objects.c:3345
+#: builtin/pack-objects.c:3346
#, c-format
msgid "bad index version '%s'"
msgstr "mala versión del índice '%s'"
-#: builtin/pack-objects.c:3383
+#: builtin/pack-objects.c:3384
msgid "<version>[,<offset>]"
msgstr "<versión>[,<offset>]"
-#: builtin/pack-objects.c:3384
+#: builtin/pack-objects.c:3385
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:3387
+#: builtin/pack-objects.c:3388
msgid "maximum size of each output pack file"
msgstr "tamaño máximo de cada paquete resultante"
-#: builtin/pack-objects.c:3389
+#: builtin/pack-objects.c:3390
msgid "ignore borrowed objects from alternate object store"
msgstr "ignorar objetos prestados de otros almacenes de objetos"
-#: builtin/pack-objects.c:3391
+#: builtin/pack-objects.c:3392
msgid "ignore packed objects"
msgstr "ignorar objetos paquete"
-#: builtin/pack-objects.c:3393
+#: builtin/pack-objects.c:3394
msgid "limit pack window by objects"
msgstr "limitar ventana de paquete por objetos"
-#: builtin/pack-objects.c:3395
+#: builtin/pack-objects.c:3396
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:3397
+#: builtin/pack-objects.c:3398
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:3399
+#: builtin/pack-objects.c:3400
msgid "reuse existing deltas"
msgstr "reusar deltas existentes"
-#: builtin/pack-objects.c:3401
+#: builtin/pack-objects.c:3402
msgid "reuse existing objects"
msgstr "reutilizar objetos existentes"
-#: builtin/pack-objects.c:3403
+#: builtin/pack-objects.c:3404
msgid "use OFS_DELTA objects"
msgstr "usar objetos OFS_DELTA"
-#: builtin/pack-objects.c:3405
+#: builtin/pack-objects.c:3406
msgid "use threads when searching for best delta matches"
msgstr "usar hilos cuando se busque para mejores concordancias de delta"
-#: builtin/pack-objects.c:3407
+#: builtin/pack-objects.c:3408
msgid "do not create an empty pack output"
msgstr "no crear un paquete resultante vacío"
-#: builtin/pack-objects.c:3409
+#: builtin/pack-objects.c:3410
msgid "read revision arguments from standard input"
msgstr "leer argumentos de revisión de standard input"
-#: builtin/pack-objects.c:3411
+#: builtin/pack-objects.c:3412
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:3414
+#: builtin/pack-objects.c:3415
msgid "include objects reachable from any reference"
msgstr "incluir objetos alcanzables por cualquier referencia"
-#: builtin/pack-objects.c:3417
+#: builtin/pack-objects.c:3418
msgid "include objects referred by reflog entries"
msgstr "incluir objetos referidos por entradas de reflog"
-#: builtin/pack-objects.c:3420
+#: builtin/pack-objects.c:3421
msgid "include objects referred to by the index"
msgstr "incluir objetos referidos por el índice"
-#: builtin/pack-objects.c:3423
+#: builtin/pack-objects.c:3424
msgid "output pack to stdout"
msgstr "mostrar paquete en stdout"
-#: builtin/pack-objects.c:3425
+#: builtin/pack-objects.c:3426
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:3427
+#: builtin/pack-objects.c:3428
msgid "keep unreachable objects"
msgstr "mantener objetos inalcanzables"
-#: builtin/pack-objects.c:3429
+#: builtin/pack-objects.c:3430
msgid "pack loose unreachable objects"
msgstr "empaquetar objetos sueltos inalcanzables"
-#: builtin/pack-objects.c:3431
+#: builtin/pack-objects.c:3432
msgid "unpack unreachable objects newer than <time>"
msgstr "desempaquetar objetos inalcanzables más nuevos que <tiempo>"
-#: builtin/pack-objects.c:3434
+#: builtin/pack-objects.c:3435
msgid "use the sparse reachability algorithm"
msgstr "usar el algoritmo sparse reachability"
-#: builtin/pack-objects.c:3436
+#: builtin/pack-objects.c:3437
msgid "create thin packs"
msgstr "crear paquetes delgados"
-#: builtin/pack-objects.c:3438
+#: builtin/pack-objects.c:3439
msgid "create packs suitable for shallow fetches"
msgstr "crear paquetes adecuados para fetches superficiales"
-#: builtin/pack-objects.c:3440
+#: builtin/pack-objects.c:3441
msgid "ignore packs that have companion .keep file"
msgstr "ignorar paquetes que tienen un archivo .keep acompañante"
-#: builtin/pack-objects.c:3442
+#: builtin/pack-objects.c:3443
msgid "ignore this pack"
msgstr "ignorar este paquete"
-#: builtin/pack-objects.c:3444
+#: builtin/pack-objects.c:3445
msgid "pack compression level"
msgstr "nivel de compresión del paquete"
-#: builtin/pack-objects.c:3446
+#: builtin/pack-objects.c:3447
msgid "do not hide commits by grafts"
msgstr "no ocultar commits por injertos"
-#: builtin/pack-objects.c:3448
+#: builtin/pack-objects.c:3449
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:3450
+#: builtin/pack-objects.c:3451
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:3454
+#: builtin/pack-objects.c:3455
msgid "write a bitmap index if possible"
msgstr "escribir un índice de bitmap si es posible"
-#: builtin/pack-objects.c:3458
+#: builtin/pack-objects.c:3459
msgid "handling for missing objects"
msgstr "manejo de objetos perdidos"
-#: builtin/pack-objects.c:3461
+#: builtin/pack-objects.c:3462
msgid "do not pack objects in promisor packfiles"
msgstr "no se puede empaquetar objetos en packfiles promisores"
-#: builtin/pack-objects.c:3463
+#: builtin/pack-objects.c:3464
msgid "respect islands during delta compression"
msgstr "respetar islas durante la compresión delta"
-#: builtin/pack-objects.c:3492
+#: builtin/pack-objects.c:3493
#, 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:3497
+#: builtin/pack-objects.c:3498
#, c-format
msgid "pack.deltaCacheLimit is too high, forcing %d"
msgstr "pack.deltaCacheLimit es muy grande, forzando %d"
-#: builtin/pack-objects.c:3551
+#: builtin/pack-objects.c:3552
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:3553
+#: builtin/pack-objects.c:3554
msgid "minimum pack size limit is 1 MiB"
msgstr "tamaño mínimo del paquete es 1 MiB"
-#: builtin/pack-objects.c:3558
+#: builtin/pack-objects.c:3559
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:3561
+#: builtin/pack-objects.c:3562
msgid "--keep-unreachable and --unpack-unreachable are incompatible"
msgstr "--keep-unreachable y --unpack-unreachable son incompatibles"
-#: builtin/pack-objects.c:3567
+#: builtin/pack-objects.c:3568
msgid "cannot use --filter without --stdout"
msgstr "no se puede usar--filter sin --stdout"
-#: builtin/pack-objects.c:3627
+#: builtin/pack-objects.c:3628
msgid "Enumerating objects"
msgstr "Enumerando objetos"
-#: builtin/pack-objects.c:3657
+#: builtin/pack-objects.c:3658
#, c-format
msgid ""
"Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-"
@@ -17458,31 +17657,27 @@ msgstr "empaquetar todo"
msgid "prune loose refs (default)"
msgstr "recortar refs perdidos (default)"
-#: builtin/prune-packed.c:9
+#: builtin/prune-packed.c:6
msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]"
-#: builtin/prune-packed.c:42
-msgid "Removing duplicate objects"
-msgstr "Removiendo objetos duplicados"
-
-#: builtin/prune.c:12
+#: builtin/prune.c:14
msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"
msgstr "git prune [-n] [-v] [--progress] [--expire <tiempo>] [--] [<head>...]"
-#: builtin/prune.c:131
+#: builtin/prune.c:133
msgid "report pruned objects"
msgstr "reportar objetos recortados"
-#: builtin/prune.c:134
+#: builtin/prune.c:136
msgid "expire objects older than <time>"
msgstr "expirar objetos más viejos a <tiempo>"
-#: builtin/prune.c:136
+#: builtin/prune.c:138
msgid "limit traversal to objects outside promisor packfiles"
msgstr "limitar el recorrido a objetos fuera de los paquetes del promisor"
-#: builtin/prune.c:150
+#: builtin/prune.c:152
msgid "cannot prune in a precious-objects repo"
msgstr "no se puede recortar en un repositorio de objetos-preciosos"
@@ -17496,56 +17691,86 @@ msgid "git pull [<options>] [<repository> [<refspec>...]]"
msgstr ""
"git pull [<opciones>] [<repositorio> [<especificación-de-referencia>...]]"
-#: builtin/pull.c:122
+#: builtin/pull.c:123
msgid "control for recursive fetching of submodules"
msgstr "control de fetch recursivo en submódulos"
-#: builtin/pull.c:126
+#: builtin/pull.c:127
msgid "Options related to merging"
msgstr "Opciones relacionadas a fusión"
-#: builtin/pull.c:129
+#: builtin/pull.c:130
msgid "incorporate changes by rebasing rather than merging"
msgstr "incorporar cambios por rebase en lugar de fusión"
-#: builtin/pull.c:157 builtin/rebase.c:471 builtin/revert.c:126
+#: builtin/pull.c:158 builtin/rebase.c:478 builtin/revert.c:126
msgid "allow fast-forward"
msgstr "permitir fast-forward"
-#: builtin/pull.c:166
-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:167 parse-options.h:339
+msgid "automatically stash/stash pop before and after"
+msgstr "ejecutar automáticamente stash/stash pop antes y después"
-#: builtin/pull.c:182
+#: builtin/pull.c:183
msgid "Options related to fetching"
msgstr "Opciones relacionadas a fetch"
-#: builtin/pull.c:192
+#: builtin/pull.c:193
msgid "force overwrite of local branch"
msgstr "forzar sobrescritura de la rama local"
-#: builtin/pull.c:200
+#: builtin/pull.c:201
msgid "number of submodules pulled in parallel"
msgstr "número de submódulos que realizan pull en paralelo"
-#: builtin/pull.c:300
+#: builtin/pull.c:317
#, c-format
msgid "Invalid value for pull.ff: %s"
msgstr "Valor inválido para pull.ff: %s"
-#: builtin/pull.c:426
+#: builtin/pull.c:349
+msgid ""
+"Pulling without specifying how to reconcile divergent branches is\n"
+"discouraged. You can squelch this message by running one of the following\n"
+"commands sometime before your next pull:\n"
+"\n"
+" git config pull.rebase false # merge (the default strategy)\n"
+" git config pull.rebase true # rebase\n"
+" git config pull.ff only # fast-forward only\n"
+"\n"
+"You can replace \"git config\" with \"git config --global\" to set a "
+"default\n"
+"preference for all repositories. You can also pass --rebase, --no-rebase,\n"
+"or --ff-only on the command line to override the configured default per\n"
+"invocation.\n"
+msgstr ""
+"Hacer un pull sin especificar cómo reconciliar las ramas es poco\n"
+"recomendable. Puedes eliminar este mensaje usando uno de los\n"
+"siguientes comandos antes de tu siguiente pull:\n"
+"\n"
+" git config pull.rebase false # hacer merge (estrategia por defecto)\n"
+" git config pull.rebase true # aplicar rebase\n"
+" git config pull.ff only # aplicar solo fast-forward\n"
+"\n"
+"Puedes reemplazar \"git config\" con \"git config --global\" para aplicar\n"
+"la preferencia en todos los repositorios. Puedes también pasar --rebase,\n"
+"--no-rebase, o --ff-only en el comando para sobreescribir la configuración\n"
+"por defecto en cada invocación.\n"
+"\n"
+
+#: builtin/pull.c:459
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:428
+#: builtin/pull.c:461
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:429
+#: builtin/pull.c:462
msgid ""
"Generally this means that you provided a wildcard refspec which had no\n"
"matches on the remote end."
@@ -17554,7 +17779,7 @@ msgstr ""
"tiene\n"
"concordancia en el final remoto."
-#: builtin/pull.c:432
+#: builtin/pull.c:465
#, c-format
msgid ""
"You asked to pull from the remote '%s', but did not specify\n"
@@ -17565,44 +17790,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:437 builtin/rebase.c:1409 git-parse-remote.sh:73
+#: builtin/pull.c:470 builtin/rebase.c:1234 git-parse-remote.sh:73
msgid "You are not currently on a branch."
msgstr "No te encuentras actualmente en la rama."
-#: builtin/pull.c:439 builtin/pull.c:454 git-parse-remote.sh:79
+#: builtin/pull.c:472 builtin/pull.c:487 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:441 builtin/pull.c:456 git-parse-remote.sh:82
+#: builtin/pull.c:474 builtin/pull.c:489 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:442 builtin/pull.c:457
+#: builtin/pull.c:475 builtin/pull.c:490
msgid "See git-pull(1) for details."
msgstr "Ver git-pull(1) para detalles."
-#: builtin/pull.c:444 builtin/pull.c:450 builtin/pull.c:459
-#: builtin/rebase.c:1415 git-parse-remote.sh:64
+#: builtin/pull.c:477 builtin/pull.c:483 builtin/pull.c:492
+#: builtin/rebase.c:1240 git-parse-remote.sh:64
msgid "<remote>"
msgstr "<remoto>"
-#: builtin/pull.c:444 builtin/pull.c:459 builtin/pull.c:464
+#: builtin/pull.c:477 builtin/pull.c:492 builtin/pull.c:497
#: git-parse-remote.sh:65
msgid "<branch>"
msgstr "<rama>"
-#: builtin/pull.c:452 builtin/rebase.c:1407 git-parse-remote.sh:75
+#: builtin/pull.c:485 builtin/rebase.c:1232 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:461 git-parse-remote.sh:95
+#: builtin/pull.c:494 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:466
+#: builtin/pull.c:499
#, c-format
msgid ""
"Your configuration specifies to merge with the ref '%s'\n"
@@ -17611,32 +17836,28 @@ 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:576
+#: builtin/pull.c:610
#, c-format
msgid "unable to access commit %s"
msgstr "no es posible acceder al commit %s"
-#: builtin/pull.c:857
+#: builtin/pull.c:895
msgid "ignoring --verify-signatures for rebase"
msgstr "ignorando --verify-signatures para rebase"
-#: builtin/pull.c:912
-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:920
+#: builtin/pull.c:955
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:924
+#: builtin/pull.c:959
msgid "pull with rebase"
msgstr "pull con rebase"
-#: builtin/pull.c:925
+#: builtin/pull.c:960
msgid "please commit or stash them."
msgstr "por favor realiza un commit o un stash con ellos."
-#: builtin/pull.c:950
+#: builtin/pull.c:985
#, c-format
msgid ""
"fetch updated the current branch head.\n"
@@ -17647,7 +17868,7 @@ msgstr ""
"realizando fast-forward al árbol de trabajo\n"
"desde commit %s."
-#: builtin/pull.c:956
+#: builtin/pull.c:991
#, c-format
msgid ""
"Cannot fast-forward your working tree.\n"
@@ -17664,15 +17885,15 @@ msgstr ""
"$ git reset --hard\n"
"para recuperar."
-#: builtin/pull.c:971
+#: builtin/pull.c:1006
msgid "Cannot merge multiple branches into empty head."
msgstr "No se puede fusionar múltiples ramas en un head vacío."
-#: builtin/pull.c:975
+#: builtin/pull.c:1010
msgid "Cannot rebase onto multiple branches."
msgstr "No se puede rebasar en múltiples ramas."
-#: builtin/pull.c:982
+#: builtin/pull.c:1018
msgid "cannot rebase with locally recorded submodule modifications"
msgstr ""
"no se puede rebasar con modificaciones de submódulos grabadas localmente"
@@ -17829,12 +18050,12 @@ msgstr ""
"o actualizar un ref remoto para hacer que apunte a un objeto no-commit,\n"
"sin usar la opción '--force'.\n"
-#: builtin/push.c:360
+#: builtin/push.c:361
#, c-format
msgid "Pushing to %s\n"
msgstr "Haciendo push a %s\n"
-#: builtin/push.c:367
+#: builtin/push.c:368
#, c-format
msgid "failed to push some refs to '%s'"
msgstr "falló el push de algunas referencias a '%s'"
@@ -17863,65 +18084,65 @@ msgstr "realizar push a tags (no puede ser usado con --all o --mirror)"
msgid "force updates"
msgstr "forzar actualizaciones"
-#: builtin/push.c:552 builtin/send-pack.c:181
+#: builtin/push.c:551 builtin/send-pack.c:179
msgid "<refname>:<expect>"
msgstr "<refname>:<expect>"
-#: builtin/push.c:553 builtin/send-pack.c:182
+#: builtin/push.c:552 builtin/send-pack.c:180
msgid "require old value of ref to be at this value"
msgstr "requiere haber valor viejo de ref en este valor"
-#: builtin/push.c:556
+#: builtin/push.c:555
msgid "control recursive pushing of submodules"
msgstr "controlar push recursivo de submódulos"
-#: builtin/push.c:558 builtin/send-pack.c:175
+#: builtin/push.c:556 builtin/send-pack.c:174
msgid "use thin pack"
msgstr "usar empaquetado delgado"
-#: builtin/push.c:559 builtin/push.c:560 builtin/send-pack.c:161
+#: builtin/push.c:557 builtin/push.c:558 builtin/send-pack.c:161
#: builtin/send-pack.c:162
msgid "receive pack program"
msgstr "recibir programa de paquete"
-#: builtin/push.c:561
+#: builtin/push.c:559
msgid "set upstream for git pull/status"
msgstr "configurar upstream para git pulll/status"
-#: builtin/push.c:564
+#: builtin/push.c:562
msgid "prune locally removed refs"
msgstr "recortando refs eliminadas localmente"
-#: builtin/push.c:566
+#: builtin/push.c:564
msgid "bypass pre-push hook"
msgstr "hacer un bypass al hook pre-push"
-#: builtin/push.c:567
+#: builtin/push.c:565
msgid "push missing but relevant tags"
msgstr "realizar push de tags faltantes pero relevantes"
-#: builtin/push.c:570 builtin/send-pack.c:169
+#: builtin/push.c:567 builtin/send-pack.c:168
msgid "GPG sign the push"
msgstr "Firmar con GPG el push"
-#: builtin/push.c:572 builtin/send-pack.c:176
+#: builtin/push.c:569 builtin/send-pack.c:175
msgid "request atomic transaction on remote side"
msgstr "solicitar transacción atómica en el lado remoto"
-#: builtin/push.c:590
+#: builtin/push.c:587
msgid "--delete is incompatible with --all, --mirror and --tags"
msgstr "--delete es incompatible con --all, --mirror y --tags"
-#: builtin/push.c:592
+#: builtin/push.c:589
msgid "--delete doesn't make sense without any refs"
msgstr "--delete no tiene sentido sin ninguna referencia"
-#: builtin/push.c:612
+#: builtin/push.c:609
#, c-format
msgid "bad repository '%s'"
msgstr "mal repositorio '%s'"
-#: builtin/push.c:613
+#: builtin/push.c:610
msgid ""
"No configured push destination.\n"
"Either specify the URL from the command-line or configure a remote "
@@ -17943,27 +18164,27 @@ msgstr ""
"\n"
" git push <nombre>\n"
-#: builtin/push.c:628
+#: builtin/push.c:625
msgid "--all and --tags are incompatible"
msgstr "--all y --tags son incompatibles"
-#: builtin/push.c:630
+#: builtin/push.c:627
msgid "--all can't be combined with refspecs"
msgstr "--all no puede ser combinada con refspecs"
-#: builtin/push.c:634
+#: builtin/push.c:631
msgid "--mirror and --tags are incompatible"
msgstr "--mirror y --tags son incompatibles"
-#: builtin/push.c:636
+#: builtin/push.c:633
msgid "--mirror can't be combined with refspecs"
msgstr "--mirror no puede ser combinado con refspecs"
-#: builtin/push.c:639
+#: builtin/push.c:636
msgid "--all and --mirror are incompatible"
msgstr "--all y --mirror son incompatibles"
-#: builtin/push.c:643
+#: builtin/push.c:640
msgid "push options must not have new line characters"
msgstr "opciones de push no pueden tener caracteres de línea nueva"
@@ -18093,7 +18314,7 @@ msgstr "suprimir mensajes de feedback"
msgid "You need to resolve your current index first"
msgstr "Necesitas resolver tu índice actual primero"
-#: builtin/rebase.c:32
+#: builtin/rebase.c:35
msgid ""
"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] "
"[<upstream> [<branch>]]"
@@ -18101,217 +18322,203 @@ msgstr ""
"git rebase [-i] [opciones] [--exec <cmd>] [--onto <newbase> | --keep-base] "
"[<upstream> [<branch>]]"
-#: builtin/rebase.c:34
+#: builtin/rebase.c:37
msgid ""
"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]"
msgstr ""
"git rebase [-i] [opciones] [--exec <cmd>] [--onto <newbase>] --root[<rama>]"
-#: builtin/rebase.c:36
+#: builtin/rebase.c:39
msgid "git rebase --continue | --abort | --skip | --edit-todo"
msgstr "git rebase --continue | --abort | --skip | --edit-todo"
-#: builtin/rebase.c:175 builtin/rebase.c:199 builtin/rebase.c:226
+#: builtin/rebase.c:181 builtin/rebase.c:205 builtin/rebase.c:232
#, c-format
msgid "unusable todo list: '%s'"
msgstr "lista de pendientes inutilizable: '%s'"
-#: builtin/rebase.c:292
+#: builtin/rebase.c:298
#, c-format
msgid "could not create temporary %s"
msgstr "no se pudo crear archivo temporal %s"
-#: builtin/rebase.c:298
+#: builtin/rebase.c:304
msgid "could not mark as interactive"
msgstr "no se pudo marcar como interactivo"
-#: builtin/rebase.c:352
+#: builtin/rebase.c:358
msgid "could not generate todo list"
msgstr "no se pudo generar lista de pendientes"
-#: builtin/rebase.c:391
+#: builtin/rebase.c:399
msgid "a base commit must be provided with --upstream or --onto"
msgstr "un commit base tiene que ser provisto con --upstream o --onto"
-#: builtin/rebase.c:461
+#: builtin/rebase.c:468
msgid "git rebase--interactive [<options>]"
msgstr "git rebase--interactive [<opciones>]"
-#: builtin/rebase.c:474 builtin/rebase.c:1550
-msgid "(DEPRECATED) keep empty commits"
-msgstr "(DEPRECADO) mantener commits vacíos"
+#: builtin/rebase.c:481 builtin/rebase.c:1374
+msgid "keep commits which start empty"
+msgstr "mantener commits que comienzan con vacío"
-#: builtin/rebase.c:478 builtin/revert.c:128
+#: builtin/rebase.c:485 builtin/revert.c:128
msgid "allow commits with empty messages"
msgstr "permitir commits con mensajes vacíos"
-#: builtin/rebase.c:480
+#: builtin/rebase.c:487
msgid "rebase merge commits"
msgstr "rebasando commits de fusión"
-#: builtin/rebase.c:482
+#: builtin/rebase.c:489
msgid "keep original branch points of cousins"
msgstr "mantener puntos originales de la rama de sus primos"
-#: builtin/rebase.c:484
+#: builtin/rebase.c:491
msgid "move commits that begin with squash!/fixup!"
msgstr "mover commits que comienzan con squash!/fixup!"
-#: builtin/rebase.c:485
+#: builtin/rebase.c:492
msgid "sign commits"
msgstr "firmar commits"
-#: builtin/rebase.c:487 builtin/rebase.c:1490
+#: builtin/rebase.c:494 builtin/rebase.c:1314
msgid "display a diffstat of what changed upstream"
msgstr "mostrar un diffstat de lo que cambió en upstream"
-#: builtin/rebase.c:489
+#: builtin/rebase.c:496
msgid "continue rebase"
msgstr "continuar rebase"
-#: builtin/rebase.c:491
+#: builtin/rebase.c:498
msgid "skip commit"
msgstr "saltar commit"
-#: builtin/rebase.c:492
+#: builtin/rebase.c:499
msgid "edit the todo list"
msgstr "editar la lista de pendientes"
-#: builtin/rebase.c:494
+#: builtin/rebase.c:501
msgid "show the current patch"
msgstr "mostrar el parche actual"
-#: builtin/rebase.c:497
+#: builtin/rebase.c:504
msgid "shorten commit ids in the todo list"
msgstr "ids de commits cortos en la lista de pendientes"
-#: builtin/rebase.c:499
+#: builtin/rebase.c:506
msgid "expand commit ids in the todo list"
msgstr "expandir ids de commits en la lista de pendientes"
-#: builtin/rebase.c:501
+#: builtin/rebase.c:508
msgid "check the todo list"
msgstr "revisar la lista de pendientes"
-#: builtin/rebase.c:503
+#: builtin/rebase.c:510
msgid "rearrange fixup/squash lines"
msgstr "reorganizar líneas fixup/squash"
-#: builtin/rebase.c:505
+#: builtin/rebase.c:512
msgid "insert exec commands in todo list"
msgstr "insertar comando exec en la lista de pendientes"
-#: builtin/rebase.c:506
+#: builtin/rebase.c:513
msgid "onto"
msgstr "hacia"
-#: builtin/rebase.c:509
+#: builtin/rebase.c:516
msgid "restrict-revision"
msgstr "restrict-revision"
-#: builtin/rebase.c:509
+#: builtin/rebase.c:516
msgid "restrict revision"
msgstr "restringir revision"
-#: builtin/rebase.c:511
+#: builtin/rebase.c:518
msgid "squash-onto"
msgstr "squash-onto"
-#: builtin/rebase.c:512
+#: builtin/rebase.c:519
msgid "squash onto"
msgstr "squash hacia"
-#: builtin/rebase.c:514
+#: builtin/rebase.c:521
msgid "the upstream commit"
msgstr "el commit de upstream"
-#: builtin/rebase.c:516
+#: builtin/rebase.c:523
msgid "head-name"
msgstr "head-name"
-#: builtin/rebase.c:516
+#: builtin/rebase.c:523
msgid "head name"
msgstr "nombre de head"
-#: builtin/rebase.c:521
+#: builtin/rebase.c:528
msgid "rebase strategy"
msgstr "estrategia de rebase"
-#: builtin/rebase.c:522
+#: builtin/rebase.c:529
msgid "strategy-opts"
msgstr "strategy-opts"
-#: builtin/rebase.c:523
+#: builtin/rebase.c:530
msgid "strategy options"
msgstr "opciones de estrategia"
-#: builtin/rebase.c:524
+#: builtin/rebase.c:531
msgid "switch-to"
msgstr "cambiar a"
-#: builtin/rebase.c:525
+#: builtin/rebase.c:532
msgid "the branch or commit to checkout"
msgstr "la rama o commit para hacer checkout"
-#: builtin/rebase.c:526
+#: builtin/rebase.c:533
msgid "onto-name"
msgstr "hacia-nombre"
-#: builtin/rebase.c:526
+#: builtin/rebase.c:533
msgid "onto name"
msgstr "hacia nombre"
-#: builtin/rebase.c:527
+#: builtin/rebase.c:534
msgid "cmd"
msgstr "cmd"
-#: builtin/rebase.c:527
+#: builtin/rebase.c:534
msgid "the command to run"
msgstr "el comando para ejecutar"
-#: builtin/rebase.c:530 builtin/rebase.c:1584
+#: builtin/rebase.c:537 builtin/rebase.c:1407
msgid "automatically re-schedule any `exec` that fails"
msgstr "reprogramar automaticamente cualquier `exec` que falle"
-#: builtin/rebase.c:546
+#: builtin/rebase.c:553
msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
msgstr "--[no-]rebase-cousins no tiene efecto sin --rebase-merges"
-#: builtin/rebase.c:562
+#: builtin/rebase.c:569
#, c-format
-msgid "%s requires an interactive rebase"
-msgstr "%s requiere un rebase interactivo"
+msgid "%s requires the merge backend"
+msgstr "%s requiere un backend de fusión"
#: builtin/rebase.c:612
#, c-format
msgid "could not get 'onto': '%s'"
msgstr "no se pudo conseguir 'onto': '%s'"
-#: builtin/rebase.c:627
+#: builtin/rebase.c:629
#, c-format
msgid "invalid orig-head: '%s'"
msgstr "orig-head inválido: '%s'"
-#: builtin/rebase.c:652
+#: builtin/rebase.c:654
#, c-format
msgid "ignoring invalid allow_rerere_autoupdate: '%s'"
msgstr "ignorando inválido allow_rerere_autoupdate: '%s'"
-#: builtin/rebase.c:728
-#, c-format
-msgid "Could not read '%s'"
-msgstr "No se pudo leer '%s'"
-
-#: builtin/rebase.c:746
-#, c-format
-msgid "Cannot store %s"
-msgstr "No se puede guardar %s"
-
-#: builtin/rebase.c:853
-msgid "could not determine HEAD revision"
-msgstr "no se pudo determinar revisión HEAD"
-
-#: builtin/rebase.c:976 git-rebase--preserve-merges.sh:81
+#: builtin/rebase.c:799 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"
@@ -18326,7 +18533,7 @@ msgstr ""
"Para abortar y regresar al estado previo al \"git rebase\", ejecuta \"git "
"rebase --abort\"."
-#: builtin/rebase.c:1058
+#: builtin/rebase.c:882
#, c-format
msgid ""
"\n"
@@ -18345,7 +18552,7 @@ msgstr ""
"\n"
"Como resultado, git no puede hacer rebase con ellos."
-#: builtin/rebase.c:1383
+#: builtin/rebase.c:1208
#, c-format
msgid ""
"unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask"
@@ -18354,7 +18561,7 @@ msgstr ""
"tipo '%s' vacío y desconocido; valores válidos son \"drop\", \"keep\", y "
"\"ask\"."
-#: builtin/rebase.c:1401
+#: builtin/rebase.c:1226
#, c-format
msgid ""
"%s\n"
@@ -18371,7 +18578,7 @@ msgstr ""
" git rebase '<rama>'\n"
"\n"
-#: builtin/rebase.c:1417
+#: builtin/rebase.c:1242
#, c-format
msgid ""
"If you wish to set tracking information for this branch you can do so with:\n"
@@ -18384,135 +18591,137 @@ msgstr ""
" git branch --set-upstream-to=%s/<rama> %s\n"
"\n"
-#: builtin/rebase.c:1447
+#: builtin/rebase.c:1272
msgid "exec commands cannot contain newlines"
msgstr "comandos exec no pueden contener newlines"
-#: builtin/rebase.c:1451
+#: builtin/rebase.c:1276
msgid "empty exec command"
msgstr "comando exec vacío"
-#: builtin/rebase.c:1481
+#: builtin/rebase.c:1305
msgid "rebase onto given branch instead of upstream"
msgstr "haciendo rebase hacia rama dada en lugar de upstream"
-#: builtin/rebase.c:1483
+#: builtin/rebase.c:1307
msgid "use the merge-base of upstream and branch as the current base"
msgstr "usar la base de fusión de upstream y la rama como base actual"
-#: builtin/rebase.c:1485
+#: builtin/rebase.c:1309
msgid "allow pre-rebase hook to run"
msgstr "permitir ejecutar hook pre-rebase"
-#: builtin/rebase.c:1487
+#: builtin/rebase.c:1311
msgid "be quiet. implies --no-stat"
msgstr "ser silencioso implica --no-stat"
-#: builtin/rebase.c:1493
+#: builtin/rebase.c:1317
msgid "do not show diffstat of what changed upstream"
msgstr "no mostrar un diffstat de lo que cambió en upstream"
-#: builtin/rebase.c:1496
+#: builtin/rebase.c:1320
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:1498 builtin/rebase.c:1502 builtin/rebase.c:1504
+#: builtin/rebase.c:1322 builtin/rebase.c:1326 builtin/rebase.c:1328
msgid "passed to 'git am'"
msgstr "pasado a 'git am'"
-#: builtin/rebase.c:1506 builtin/rebase.c:1508
+#: builtin/rebase.c:1330 builtin/rebase.c:1332
msgid "passed to 'git apply'"
msgstr "pasado a 'git-apply'"
-#: builtin/rebase.c:1510 builtin/rebase.c:1513
+#: builtin/rebase.c:1334 builtin/rebase.c:1337
msgid "cherry-pick all commits, even if unchanged"
msgstr "cherry-pick todos los commits, incluso si no han cambiado"
-#: builtin/rebase.c:1515
+#: builtin/rebase.c:1339
msgid "continue"
msgstr "continuar"
-#: builtin/rebase.c:1518
+#: builtin/rebase.c:1342
msgid "skip current patch and continue"
msgstr "saltar el parche y continuar"
-#: builtin/rebase.c:1520
+#: builtin/rebase.c:1344
msgid "abort and check out the original branch"
msgstr "aborta y revisa la rama original"
-#: builtin/rebase.c:1523
+#: builtin/rebase.c:1347
msgid "abort but keep HEAD where it is"
msgstr "aborta pero mantiene HEAD donde está"
-#: builtin/rebase.c:1524
+#: builtin/rebase.c:1348
msgid "edit the todo list during an interactive rebase"
msgstr "editar la lista de pendientes durante el rebase interactivo"
-#: builtin/rebase.c:1527
+#: builtin/rebase.c:1351
msgid "show the patch file being applied or merged"
msgstr "muestra el archivo parche siendo aplicado o fusionado"
-#: builtin/rebase.c:1530
+#: builtin/rebase.c:1354
msgid "use apply strategies to rebase"
msgstr "usar estrategias de apply para el rebase"
-#: builtin/rebase.c:1534
+#: builtin/rebase.c:1358
msgid "use merging strategies to rebase"
msgstr "usar estrategias de fusión para el rebase"
-#: builtin/rebase.c:1538
+#: builtin/rebase.c:1362
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:1542
+#: builtin/rebase.c:1366
msgid "(DEPRECATED) try to recreate merges instead of ignoring them"
msgstr "(DEPRECADO) intentar recrear merges en lugar de ignorarlos"
-#: builtin/rebase.c:1547
+#: builtin/rebase.c:1371
msgid "how to handle commits that become empty"
msgstr "como manejar commits que se vuelven vacíos"
-#: builtin/rebase.c:1554
+#: builtin/rebase.c:1378
msgid "move commits that begin with squash!/fixup! under -i"
msgstr "mover commits que comienzan con squash!/fixup! bajo -i"
-#: builtin/rebase.c:1560
-msgid "automatically stash/stash pop before and after"
-msgstr "ejecutar automáticamente stash/stash pop antes y después"
-
-#: builtin/rebase.c:1562
+#: builtin/rebase.c:1385
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:1566
+#: builtin/rebase.c:1389
msgid "allow rebasing commits with empty messages"
msgstr "permitir rebase commits con mensajes vacíos"
-#: builtin/rebase.c:1570
+#: builtin/rebase.c:1393
msgid "try to rebase merges instead of skipping them"
msgstr "intentar fusiones por rebase en lugar de saltarlas"
-#: builtin/rebase.c:1573
+#: builtin/rebase.c:1396
msgid "use 'merge-base --fork-point' to refine upstream"
msgstr "use 'merge-base --fork-point' para refinar upstream"
-#: builtin/rebase.c:1575
+#: builtin/rebase.c:1398
msgid "use the given merge strategy"
msgstr "usar la estrategia de merge dada"
-#: builtin/rebase.c:1577 builtin/revert.c:115
+#: builtin/rebase.c:1400 builtin/revert.c:115
msgid "option"
msgstr "opción"
-#: builtin/rebase.c:1578
+#: builtin/rebase.c:1401
msgid "pass the argument through to the merge strategy"
msgstr "pasar el argumento para la estrategia de fusión"
-#: builtin/rebase.c:1581
+#: builtin/rebase.c:1404
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:1598
+#: builtin/rebase.c:1409
+msgid "apply all changes, even those already present upstream"
+msgstr ""
+"aplicar todos los cambios, incluso aquellos que ya están presentes en "
+"upstream"
+
+#: builtin/rebase.c:1426
msgid ""
"the rebase.useBuiltin support has been removed!\n"
"See its entry in 'git help config' for details."
@@ -18520,38 +18729,42 @@ msgstr ""
"el soporte para rebase.useBuiltin ha sido eliminado!\n"
"Vea su entrada en 'git help config' para detalles."
-#: builtin/rebase.c:1604
+#: builtin/rebase.c:1432
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:1645
+#: builtin/rebase.c:1473
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:1650
+#: builtin/rebase.c:1478
msgid "cannot combine '--keep-base' with '--onto'"
msgstr "no se puede combinar '--keep-base' con '--onto'"
-#: builtin/rebase.c:1652
+#: builtin/rebase.c:1480
msgid "cannot combine '--keep-base' with '--root'"
msgstr "no se puede combinar '--keep-base' con '--root'"
-#: builtin/rebase.c:1656
+#: builtin/rebase.c:1484
+msgid "cannot combine '--root' with '--fork-point'"
+msgstr "no se puede combinar '--root' con '--fork-point'"
+
+#: builtin/rebase.c:1487
msgid "No rebase in progress?"
msgstr "¿No hay rebase en progreso?"
-#: builtin/rebase.c:1660
+#: builtin/rebase.c:1491
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:1683
+#: builtin/rebase.c:1514
msgid "Cannot read HEAD"
msgstr "No se puede leer el HEAD"
-#: builtin/rebase.c:1695
+#: builtin/rebase.c:1526
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
@@ -18559,16 +18772,16 @@ msgstr ""
"Tienes que editar todos los conflictos de fusión y luego\n"
"marcarlos como resueltos usando git add"
-#: builtin/rebase.c:1714
+#: builtin/rebase.c:1545
msgid "could not discard worktree changes"
msgstr "no se pudo descartar los cambios del árbol de trabajo"
-#: builtin/rebase.c:1733
+#: builtin/rebase.c:1564
#, c-format
msgid "could not move back to %s"
msgstr "no se puede regresar a %s"
-#: builtin/rebase.c:1778
+#: builtin/rebase.c:1610
#, c-format
msgid ""
"It seems that there is already a %s directory, and\n"
@@ -18589,167 +18802,144 @@ msgstr ""
"y ejecútame nuevamente. Me estoy deteniendo en caso de que tengas\n"
"algo de valor ahí.\n"
-#: builtin/rebase.c:1806
+#: builtin/rebase.c:1638
msgid "switch `C' expects a numerical value"
msgstr "switch `C' espera un valor numérico"
-#: builtin/rebase.c:1847
+#: builtin/rebase.c:1680
#, c-format
msgid "Unknown mode: %s"
msgstr "Modo desconocido: %s"
-#: builtin/rebase.c:1869
+#: builtin/rebase.c:1702
msgid "--strategy requires --merge or --interactive"
msgstr "--strategy requiere --merge o --interactive"
-#: builtin/rebase.c:1899
+#: builtin/rebase.c:1732
msgid "cannot combine apply options with merge options"
msgstr "no se pueden combinar opciones de apply con opciones de merge"
-#: builtin/rebase.c:1912
+#: builtin/rebase.c:1745
#, c-format
msgid "Unknown rebase backend: %s"
msgstr "Backend de rebase desconocido: %s"
-#: builtin/rebase.c:1937
+#: builtin/rebase.c:1770
msgid "--reschedule-failed-exec requires --exec or --interactive"
msgstr "--reschedule-failed-exec requiere --exec o --interactive"
-#: builtin/rebase.c:1957
+#: builtin/rebase.c:1790
msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
msgstr "no se puede combinar '--preserve-merges' con '--rebase-merges'"
-#: builtin/rebase.c:1961
+#: builtin/rebase.c:1794
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:1985
+#: builtin/rebase.c:1818
#, c-format
msgid "invalid upstream '%s'"
msgstr "upstream inválido '%s'"
-#: builtin/rebase.c:1991
+#: builtin/rebase.c:1824
msgid "Could not create new root commit"
msgstr "No se pudo crear commit raíz nuevo"
-#: builtin/rebase.c:2017
+#: builtin/rebase.c:1850
#, c-format
msgid "'%s': need exactly one merge base with branch"
msgstr "'%s': necesita exactamente una base de fusión con rama"
-#: builtin/rebase.c:2020
+#: builtin/rebase.c:1853
#, c-format
msgid "'%s': need exactly one merge base"
msgstr "'%s': necesita exactamente una base de fusión"
-#: builtin/rebase.c:2028
+#: builtin/rebase.c:1861
#, c-format
msgid "Does not point to a valid commit '%s'"
msgstr "No apunta a un commit válido '%s'"
-#: builtin/rebase.c:2054
+#: builtin/rebase.c:1887
#, c-format
msgid "fatal: no such branch/commit '%s'"
msgstr "fatal: no existe la rama/commit: '%s'"
-#: builtin/rebase.c:2062 builtin/submodule--helper.c:40
+#: builtin/rebase.c:1895 builtin/submodule--helper.c:40
#: builtin/submodule--helper.c:1990
#, c-format
msgid "No such ref: %s"
msgstr "No existe ref: %s"
-#: builtin/rebase.c:2073
+#: builtin/rebase.c:1906
msgid "Could not resolve HEAD to a revision"
msgstr "No se pudo resolver HEAD a una revisión"
-#: builtin/rebase.c:2111
-msgid "Cannot autostash"
-msgstr "No se puede ejecutar autostash"
-
-#: builtin/rebase.c:2114
-#, c-format
-msgid "Unexpected stash response: '%s'"
-msgstr "Respuesta de stash inesperada: '%s'"
-
-#: builtin/rebase.c:2120
-#, c-format
-msgid "Could not create directory for '%s'"
-msgstr "No se pudo crear el directorio para '%s'"
-
-#: builtin/rebase.c:2123
-#, c-format
-msgid "Created autostash: %s\n"
-msgstr "Autostash creado: %s\n"
-
-#: builtin/rebase.c:2126
-msgid "could not reset --hard"
-msgstr "no se pudo reset --hard"
-
-#: builtin/rebase.c:2135
+#: builtin/rebase.c:1927
msgid "Please commit or stash them."
msgstr "Por favor, confírmalos o guárdalos."
-#: builtin/rebase.c:2169
+#: builtin/rebase.c:1963
#, c-format
msgid "could not switch to %s"
msgstr "no se pudo cambiar a %s"
-#: builtin/rebase.c:2180
+#: builtin/rebase.c:1974
msgid "HEAD is up to date."
msgstr "HEAD está actualizado."
-#: builtin/rebase.c:2182
+#: builtin/rebase.c:1976
#, c-format
msgid "Current branch %s is up to date.\n"
msgstr "La rama actual %s está actualizada.\n"
-#: builtin/rebase.c:2190
+#: builtin/rebase.c:1984
msgid "HEAD is up to date, rebase forced."
msgstr "HEAD está actualizado, rebase forzado."
-#: builtin/rebase.c:2192
+#: builtin/rebase.c:1986
#, 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:2200
+#: builtin/rebase.c:1994
msgid "The pre-rebase hook refused to rebase."
msgstr "El hook pre-rebase rechazó el rebase."
-#: builtin/rebase.c:2207
+#: builtin/rebase.c:2001
#, c-format
msgid "Changes to %s:\n"
msgstr "Cambios a %s:\n"
-#: builtin/rebase.c:2210
+#: builtin/rebase.c:2004
#, c-format
msgid "Changes from %s to %s:\n"
msgstr "Cambios desde %s a %s:\n"
-#: builtin/rebase.c:2235
+#: builtin/rebase.c:2029
#, 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:2244
+#: builtin/rebase.c:2038
msgid "Could not detach HEAD"
msgstr "No se puede desacoplar HEAD"
-#: builtin/rebase.c:2253
+#: builtin/rebase.c:2047
#, 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:34
msgid "git receive-pack <git-dir>"
msgstr "git receive-pack <git-dir>"
-#: builtin/receive-pack.c:821
+#: builtin/receive-pack.c:843
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"
@@ -18782,7 +18972,7 @@ msgstr ""
"Para suprimir este mensaje y mantener el comportamiento predeterminado,\n"
"configura 'receive.denyCurrentBranch' a 'refuse'."
-#: builtin/receive-pack.c:841
+#: builtin/receive-pack.c:863
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"
@@ -18803,11 +18993,11 @@ msgstr ""
"\n"
"Para suprimir este mensaje, puedes configurarlo en 'refuse'."
-#: builtin/receive-pack.c:1938
+#: builtin/receive-pack.c:1960
msgid "quiet"
msgstr "tranquilo"
-#: builtin/receive-pack.c:1952
+#: builtin/receive-pack.c:1974
msgid "You must specify a directory."
msgstr "Se tiene que especificar un directorio."
@@ -19388,11 +19578,11 @@ msgstr "No se encontró URL: %s"
msgid "Will not delete all non-push URLs"
msgstr "No borrará todos los URLs de no-push"
-#: builtin/repack.c:23
+#: builtin/repack.c:25
msgid "git repack [<options>]"
msgstr "git repack [<opciones>]"
-#: builtin/repack.c:28
+#: builtin/repack.c:30
msgid ""
"Incremental repacks are incompatible with bitmap indexes. Use\n"
"--no-write-bitmap-index or disable the pack.writebitmaps configuration."
@@ -19400,115 +19590,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:191
+#: builtin/repack.c:193
msgid "could not start pack-objects to repack promisor objects"
msgstr "no se puede iniciar pack-objects para reempaquetar objetos promisores"
-#: builtin/repack.c:230 builtin/repack.c:416
+#: builtin/repack.c:232 builtin/repack.c:418
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:254
+#: builtin/repack.c:256
msgid "could not finish pack-objects to repack promisor objects"
msgstr ""
"no se puede finalizar pack-objects para reempaquetar objetos promisores"
-#: builtin/repack.c:292
+#: builtin/repack.c:294
msgid "pack everything in a single pack"
msgstr "empaquetar todo en un único paquete"
-#: builtin/repack.c:294
+#: builtin/repack.c:296
msgid "same as -a, and turn unreachable objects loose"
msgstr "lo mismo que -a, y pierde objetos inaccesibles"
-#: builtin/repack.c:297
+#: builtin/repack.c:299
msgid "remove redundant packs, and run git-prune-packed"
msgstr "eliminar paquetes redundantes, y ejecutar git-prune-packed"
-#: builtin/repack.c:299
+#: builtin/repack.c:301
msgid "pass --no-reuse-delta to git-pack-objects"
msgstr "pasar --no-reuse-delta a git-pack-objects"
-#: builtin/repack.c:301
+#: builtin/repack.c:303
msgid "pass --no-reuse-object to git-pack-objects"
msgstr "pasar --no-reuse-object a git-pack-objects"
-#: builtin/repack.c:303
+#: builtin/repack.c:305
msgid "do not run git-update-server-info"
msgstr "no ejecutar git-update-server-info"
-#: builtin/repack.c:306
+#: builtin/repack.c:308
msgid "pass --local to git-pack-objects"
msgstr "pasar --local a git-pack-objects"
-#: builtin/repack.c:308
+#: builtin/repack.c:310
msgid "write bitmap index"
msgstr "escribir un índice de bitmap"
-#: builtin/repack.c:310
+#: builtin/repack.c:312
msgid "pass --delta-islands to git-pack-objects"
msgstr "pasar --delta-islands a git-pack-objects"
-#: builtin/repack.c:311
+#: builtin/repack.c:313
msgid "approxidate"
msgstr "aproxime"
-#: builtin/repack.c:312
+#: builtin/repack.c:314
msgid "with -A, do not loosen objects older than this"
msgstr "con -A, no perder objetos más antiguos que este"
-#: builtin/repack.c:314
+#: builtin/repack.c:316
msgid "with -a, repack unreachable objects"
msgstr "con -a, re empaquetar objetos inalcanzables"
-#: builtin/repack.c:316
+#: builtin/repack.c:318
msgid "size of the window used for delta compression"
msgstr "tamaño de la ventana usado para la compresión delta"
-#: builtin/repack.c:317 builtin/repack.c:323
+#: builtin/repack.c:319 builtin/repack.c:325
msgid "bytes"
msgstr "bytes"
-#: builtin/repack.c:318
+#: builtin/repack.c:320
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:320
+#: builtin/repack.c:322
msgid "limits the maximum delta depth"
msgstr "limita la profundidad máxima del delta"
-#: builtin/repack.c:322
+#: builtin/repack.c:324
msgid "limits the maximum number of threads"
msgstr "limita el número máximo de hilos"
-#: builtin/repack.c:324
+#: builtin/repack.c:326
msgid "maximum size of each packfile"
msgstr "tamaño máximo de cada paquete"
-#: builtin/repack.c:326
+#: builtin/repack.c:328
msgid "repack objects in packs marked with .keep"
msgstr "re-empaquetar objetos en paquetes marcados con .keep"
-#: builtin/repack.c:328
+#: builtin/repack.c:330
msgid "do not repack this pack"
msgstr "no reempaquetar este paquete"
-#: builtin/repack.c:338
+#: builtin/repack.c:340
msgid "cannot delete packs in a precious-objects repo"
msgstr "no se pueden borrar paquetes en un repositorio de objetos-preciosos"
-#: builtin/repack.c:342
+#: builtin/repack.c:344
msgid "--keep-unreachable and -A are incompatible"
msgstr "--keep-unreachable y -A son incompatibles"
-#: builtin/repack.c:425
+#: builtin/repack.c:427
msgid "Nothing new to pack."
msgstr "Nada nuevo para empaquetar."
-#: builtin/repack.c:486
+#: builtin/repack.c:488
#, c-format
msgid ""
"WARNING: Some packs in use have been renamed by\n"
@@ -19527,7 +19717,7 @@ msgstr ""
"WARNING: también falló.\n"
"WARNING: Por favor renombralos en %s manualmente:\n"
-#: builtin/repack.c:534
+#: builtin/repack.c:536
#, c-format
msgid "failed to remove '%s'"
msgstr "falló al eliminar'%s'"
@@ -19837,93 +20027,93 @@ msgstr "fusionar"
msgid "keep"
msgstr "mantener"
-#: builtin/reset.c:82
+#: builtin/reset.c:83
msgid "You do not have a valid HEAD."
msgstr "No hay un HEAD válido."
-#: builtin/reset.c:84
+#: builtin/reset.c:85
msgid "Failed to find tree of HEAD."
msgstr "Falló al encontrar el HEAD del árbol."
-#: builtin/reset.c:90
+#: builtin/reset.c:91
#, c-format
msgid "Failed to find tree of %s."
msgstr "Falló al encontrar árbol de %s."
-#: builtin/reset.c:115
+#: builtin/reset.c:116
#, c-format
msgid "HEAD is now at %s"
msgstr "HEAD está ahora en %s"
-#: builtin/reset.c:194
+#: builtin/reset.c:195
#, c-format
msgid "Cannot do a %s reset in the middle of a merge."
msgstr "No se puede realziar un reset %s en medio de una fusión."
-#: builtin/reset.c:294 builtin/stash.c:520 builtin/stash.c:595
+#: builtin/reset.c:295 builtin/stash.c:520 builtin/stash.c:595
#: builtin/stash.c:619
msgid "be quiet, only report errors"
msgstr "ser silencioso, solo reportar errores"
-#: builtin/reset.c:296
+#: builtin/reset.c:297
msgid "reset HEAD and index"
msgstr "reiniciar HEAD e index"
-#: builtin/reset.c:297
+#: builtin/reset.c:298
msgid "reset only HEAD"
msgstr "reiniciar solo HEAD"
-#: builtin/reset.c:299 builtin/reset.c:301
+#: builtin/reset.c:300 builtin/reset.c:302
msgid "reset HEAD, index and working tree"
msgstr "reiniciar HEAD, índice y árbol de trabajo"
-#: builtin/reset.c:303
+#: builtin/reset.c:304
msgid "reset HEAD but keep local changes"
msgstr "reiniciar HEAD pero mantener cambios locales"
-#: builtin/reset.c:309
+#: builtin/reset.c:310
msgid "record only the fact that removed paths will be added later"
msgstr ""
"grabar solo el hecho de que las rutas eliminadas serán agregadas después"
-#: builtin/reset.c:343
+#: builtin/reset.c:344
#, c-format
msgid "Failed to resolve '%s' as a valid revision."
msgstr "Falló al resolver '%s' como una revisión válida."
-#: builtin/reset.c:351
+#: builtin/reset.c:352
#, c-format
msgid "Failed to resolve '%s' as a valid tree."
msgstr "Falló al resolver '%s' como un árbol válido."
-#: builtin/reset.c:360
+#: builtin/reset.c:361
msgid "--patch is incompatible with --{hard,mixed,soft}"
msgstr "--patch es incompatible con --{hard,mixed,soft}"
-#: builtin/reset.c:370
+#: builtin/reset.c:371
msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
msgstr ""
"--mixed con rutas ha sido deprecado; use 'git reset -- <rutas>' en cambio."
-#: builtin/reset.c:372
+#: builtin/reset.c:373
#, c-format
msgid "Cannot do %s reset with paths."
msgstr "No se puede hacer un reset %s con rutas."
-#: builtin/reset.c:387
+#: builtin/reset.c:388
#, c-format
msgid "%s reset is not allowed in a bare repository"
msgstr "%s reset no está permitido en un repositorio vacío"
-#: builtin/reset.c:391
+#: builtin/reset.c:392
msgid "-N can only be used with --mixed"
msgstr "-N sólo puede ser usada con --mixed"
-#: builtin/reset.c:412
+#: builtin/reset.c:413
msgid "Unstaged changes after reset:"
msgstr "Cambios fuera del área de stage tras el reset:"
-#: builtin/reset.c:415
+#: builtin/reset.c:416
#, c-format
msgid ""
"\n"
@@ -19937,12 +20127,12 @@ msgstr ""
"usar '--quiet' para evitar esto. Configura la opción reset.quiet a true\n"
"para volverlo en el default.\n"
-#: builtin/reset.c:425
+#: builtin/reset.c:434
#, c-format
msgid "Could not reset index file to revision '%s'."
msgstr "No se puede reiniciar el índice a la revisión '%s'."
-#: builtin/reset.c:429
+#: builtin/reset.c:439
msgid "Could not write new index file."
msgstr "No se puede escribir un nuevo archivo índice."
@@ -19962,23 +20152,23 @@ msgstr "rev-list no soporta mostrar notas"
msgid "marked counting is incompatible with --objects"
msgstr "conteo de marcas es incompatible con --objects"
-#: builtin/rev-parse.c:408
+#: builtin/rev-parse.c:409
msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
msgstr "git rev-parse --parseopt [<opciones>] -- [<args>...]"
-#: builtin/rev-parse.c:413
+#: builtin/rev-parse.c:414
msgid "keep the `--` passed as an arg"
msgstr "mantener el `--` pasado como un arg"
-#: builtin/rev-parse.c:415
+#: builtin/rev-parse.c:416
msgid "stop parsing after the first non-option argument"
msgstr "detener análisis tras el primer argumento que no es opción"
-#: builtin/rev-parse.c:418
+#: builtin/rev-parse.c:419
msgid "output in stuck long form"
msgstr "salida en formulario largo de atasco"
-#: builtin/rev-parse.c:551
+#: builtin/rev-parse.c:552
msgid ""
"git rev-parse --parseopt [<options>] -- [<args>...]\n"
" or: git rev-parse --sq-quote [<arg>...]\n"
@@ -20181,15 +20371,15 @@ msgstr ""
msgid "remote name"
msgstr "nombre remoto"
-#: builtin/send-pack.c:177
+#: builtin/send-pack.c:176
msgid "use stateless RPC protocol"
msgstr "usar protocolo RPC sin estado"
-#: builtin/send-pack.c:178
+#: builtin/send-pack.c:177
msgid "read refs from stdin"
msgstr "leer refs de stdin"
-#: builtin/send-pack.c:179
+#: builtin/send-pack.c:178
msgid "print status from remote helper"
msgstr "mostrar status del remote helper"
@@ -20409,8 +20599,8 @@ msgid "show refs from stdin that aren't in local repository"
msgstr "mostrar refs de stdin que no están en el repositorio local"
#: builtin/sparse-checkout.c:21
-msgid "git sparse-checkout (init|list|set|add|disable) <options>"
-msgstr "git sparse-checkout (init|list|set|add|disable) <opciones>"
+msgid "git sparse-checkout (init|list|set|add|reapply|disable) <options>"
+msgstr "git sparse-checkout (init|list|set|add|reapply|disable) <opciones>"
#: builtin/sparse-checkout.c:64
msgid "this worktree is not sparse (sparse-checkout file may not exist)"
@@ -20418,62 +20608,50 @@ msgstr ""
"este árbol de trabajo no tiene sparse (archivo sparese-checkout tal vez no "
"existe)"
-#: builtin/sparse-checkout.c:225
+#: builtin/sparse-checkout.c:212
msgid "failed to create directory for sparse-checkout file"
msgstr "falló al crear directorio para el archivo sparse-checkout"
-#: builtin/sparse-checkout.c:266
+#: builtin/sparse-checkout.c:253
msgid "failed to set extensions.worktreeConfig setting"
msgstr "falló al configurar opción extensions.worktreeConfig"
-#: builtin/sparse-checkout.c:283
+#: builtin/sparse-checkout.c:270
msgid "git sparse-checkout init [--cone]"
msgstr "git sparse-checkout init [--cone]"
-#: builtin/sparse-checkout.c:302
+#: builtin/sparse-checkout.c:289
msgid "initialize the sparse-checkout in cone mode"
msgstr "inicializa el sparse-checkout en modo cono"
-#: builtin/sparse-checkout.c:308
-msgid "initialize sparse-checkout"
-msgstr "inicializar sparse-checkout"
-
-#: builtin/sparse-checkout.c:341
+#: builtin/sparse-checkout.c:326
#, c-format
msgid "failed to open '%s'"
msgstr "falló al abrir '%s'"
-#: builtin/sparse-checkout.c:398
+#: builtin/sparse-checkout.c:383
#, c-format
msgid "could not normalize path %s"
msgstr "no se pudo normalizar la ruta %s"
-#: builtin/sparse-checkout.c:410
+#: builtin/sparse-checkout.c:395
msgid "git sparse-checkout (set|add) (--stdin | <patterns>)"
msgstr "git sparse-checkout (set|add) (--stdin | <patrones>)"
-#: builtin/sparse-checkout.c:435
+#: builtin/sparse-checkout.c:420
#, c-format
msgid "unable to unquote C-style string '%s'"
msgstr "no es posible dequote para la cadena de estilo C '%s'"
-#: builtin/sparse-checkout.c:489 builtin/sparse-checkout.c:513
+#: builtin/sparse-checkout.c:474 builtin/sparse-checkout.c:498
msgid "unable to load existing sparse-checkout patterns"
msgstr "no se pudo cargar patrones de sparse-checkout existentes"
-#: builtin/sparse-checkout.c:558
+#: builtin/sparse-checkout.c:543
msgid "read patterns from standard in"
msgstr "leer patrones de standard in"
-#: builtin/sparse-checkout.c:564
-msgid "set sparse-checkout patterns"
-msgstr "configurar patrones de sparse-checkout"
-
-#: builtin/sparse-checkout.c:581
-msgid "disable sparse-checkout"
-msgstr "deshabilitar sparse-checkout"
-
-#: builtin/sparse-checkout.c:593
+#: builtin/sparse-checkout.c:580
msgid "error while refreshing working directory"
msgstr "error al refrescar directorio de trabajo"
@@ -20553,7 +20731,7 @@ msgstr "'%s' no es un commit estilo stash"
msgid "Too many revisions specified:%s"
msgstr "Se especificaron demasiadas revisiones: %s"
-#: builtin/stash.c:162 git-legacy-stash.sh:549
+#: builtin/stash.c:162
msgid "No stash entries found."
msgstr "No se encontraron entradas de stash."
@@ -20562,7 +20740,7 @@ msgstr "No se encontraron entradas de stash."
msgid "%s is not a valid reference"
msgstr "%s no es una referencia válida"
-#: builtin/stash.c:225 git-legacy-stash.sh:75
+#: builtin/stash.c:225
msgid "git stash clear with parameters is unimplemented"
msgstr "git stash clear con parámetros no está implementado"
@@ -20592,7 +20770,7 @@ msgstr "no se pueden restaurar archivos no rastreados de la entrada stash"
msgid "Merging %s with %s"
msgstr "Fusionando %s con %s"
-#: builtin/stash.c:461 git-legacy-stash.sh:681
+#: builtin/stash.c:461
msgid "Index was not unstashed."
msgstr "El índice no fue sacado de stash."
@@ -20615,105 +20793,107 @@ msgstr "%s: No se pudo borrar entrada stash"
msgid "'%s' is not a stash reference"
msgstr "'%s' no es una referencia stash"
-#: builtin/stash.c:633 git-legacy-stash.sh:695
+#: builtin/stash.c:633
msgid "The stash entry is kept in case you need it again."
msgstr "La entrada de stash se guardó en caso de ser necesario nuevamente."
-#: builtin/stash.c:656 git-legacy-stash.sh:713
+#: builtin/stash.c:656
msgid "No branch name specified"
msgstr "No se especificó el nombre de la rama"
-#: builtin/stash.c:796 builtin/stash.c:833
+#: builtin/stash.c:800 builtin/stash.c:837
#, c-format
msgid "Cannot update %s with %s"
msgstr "No se puede actualizar %s con %s"
-#: builtin/stash.c:814 builtin/stash.c:1478 builtin/stash.c:1543
+#: builtin/stash.c:818 builtin/stash.c:1475 builtin/stash.c:1540
msgid "stash message"
msgstr "mensaje de stash"
-#: builtin/stash.c:824
+#: builtin/stash.c:828
msgid "\"git stash store\" requires one <commit> argument"
msgstr "\"git stash store\" requiere un argumento <commit>"
-#: builtin/stash.c:1049 git-legacy-stash.sh:218
+#: builtin/stash.c:1046
msgid "No changes selected"
msgstr "Sin cambios seleccionados"
-#: builtin/stash.c:1149 git-legacy-stash.sh:150
+#: builtin/stash.c:1146
msgid "You do not have the initial commit yet"
msgstr "Aún no tienes un commit inicial"
-#: builtin/stash.c:1176 git-legacy-stash.sh:165
+#: builtin/stash.c:1173
msgid "Cannot save the current index state"
msgstr "No se puede guardar el estado actual del índice"
-#: builtin/stash.c:1185 git-legacy-stash.sh:180
+#: builtin/stash.c:1182
msgid "Cannot save the untracked files"
msgstr "No se pueden guardar los archivos no rastreados"
-#: builtin/stash.c:1196 builtin/stash.c:1205 git-legacy-stash.sh:201
-#: git-legacy-stash.sh:214
+#: builtin/stash.c:1193 builtin/stash.c:1202
msgid "Cannot save the current worktree state"
msgstr "No se puede guardar el estado actual del árbol de trabajo"
-#: builtin/stash.c:1233 git-legacy-stash.sh:234
+#: builtin/stash.c:1230
msgid "Cannot record working tree state"
msgstr "No se puede grabar el estado del árbol de trabajo"
-#: builtin/stash.c:1282 git-legacy-stash.sh:338
+#: builtin/stash.c:1279
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:1298
+#: builtin/stash.c:1295
msgid "Did you forget to 'git add'?"
msgstr "¿Olvidaste 'git add'?"
-#: builtin/stash.c:1313 git-legacy-stash.sh:346
+#: builtin/stash.c:1310
msgid "No local changes to save"
msgstr "No hay cambios locales para guardar"
-#: builtin/stash.c:1320 git-legacy-stash.sh:351
+#: builtin/stash.c:1317
msgid "Cannot initialize stash"
msgstr "No se puede inicializar stash"
-#: builtin/stash.c:1335 git-legacy-stash.sh:355
+#: builtin/stash.c:1332
msgid "Cannot save the current status"
msgstr "No se puede guardar el estado actual"
-#: builtin/stash.c:1340
+#: builtin/stash.c:1337
#, 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:385
+#: builtin/stash.c:1427
msgid "Cannot remove worktree changes"
msgstr "No se pueden eliminar cambios del árbol de trabajo"
-#: builtin/stash.c:1469 builtin/stash.c:1534
+#: builtin/stash.c:1466 builtin/stash.c:1531
msgid "keep index"
msgstr "mantener index"
-#: builtin/stash.c:1471 builtin/stash.c:1536
+#: builtin/stash.c:1468 builtin/stash.c:1533
msgid "stash in patch mode"
msgstr "stash en modo patch"
-#: builtin/stash.c:1472 builtin/stash.c:1537
+#: builtin/stash.c:1469 builtin/stash.c:1534
msgid "quiet mode"
msgstr "modo tranquilo"
-#: builtin/stash.c:1474 builtin/stash.c:1539
+#: builtin/stash.c:1471 builtin/stash.c:1536
msgid "include untracked files in stash"
msgstr "incluir archivos sin seguimiento en stash"
-#: builtin/stash.c:1476 builtin/stash.c:1541
+#: builtin/stash.c:1473 builtin/stash.c:1538
msgid "include ignore files"
msgstr "incluir archivos ignorados"
-#: builtin/stash.c:1600
-#, c-format
-msgid "could not exec %s"
-msgstr "no se pudo ejecutar %s"
+#: builtin/stash.c:1573
+msgid ""
+"the stash.useBuiltin support has been removed!\n"
+"See its entry in 'git help config' for details."
+msgstr ""
+"el soporte para stash.useBuiltin ha sido eliminado!\n"
+"Vea su entrada en 'git help config' para detalles."
#: builtin/stripspace.c:18
msgid "git stripspace [-s | --strip-comments]"
@@ -21163,18 +21343,26 @@ msgstr "git submodule--helper config --unset <nombre>"
msgid "git submodule--helper config --check-writeable"
msgstr "git submodule--helper config --check-writeable"
-#: builtin/submodule--helper.c:2241 git-submodule.sh:174
+#: builtin/submodule--helper.c:2241 git-submodule.sh:176
#, sh-format
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:2291 git.c:433 git.c:684
+#: builtin/submodule--helper.c:2257
+msgid "Suppress output for setting url of a submodule"
+msgstr "Suprime la salida para inicializar la url de un submódulo"
+
+#: builtin/submodule--helper.c:2261
+msgid "git submodule--helper set-url [--quiet] <path> <newurl>"
+msgstr "git submodule--helper set-url [--quiet] <ruta> <nueva url>"
+
+#: builtin/submodule--helper.c:2323 git.c:436 git.c:683
#, c-format
msgid "%s doesn't support --super-prefix"
msgstr "%s no soporta --super-prefix"
-#: builtin/submodule--helper.c:2297
+#: builtin/submodule--helper.c:2329
#, c-format
msgid "'%s' is not a valid submodule--helper subcommand"
msgstr "'%s' no es un comando submodule--helper válido"
@@ -21199,11 +21387,11 @@ msgstr "eliminar referencia simbólica"
msgid "shorten ref output"
msgstr "salida de referencia más corta"
-#: builtin/symbolic-ref.c:43 builtin/update-ref.c:363
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:486
msgid "reason"
msgstr "razón"
-#: builtin/symbolic-ref.c:43 builtin/update-ref.c:363
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:486
msgid "reason of the update"
msgstr "razón de la actualización"
@@ -21296,134 +21484,134 @@ msgstr ""
msgid "bad object type."
msgstr "tipo de objeto erróneo."
-#: builtin/tag.c:284
+#: builtin/tag.c:285
msgid "no tag message?"
msgstr "¿Sin mensaje de tag?"
-#: builtin/tag.c:291
+#: builtin/tag.c:292
#, 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:402
+#: builtin/tag.c:403
msgid "list tag names"
msgstr "listar nombres de tags"
-#: builtin/tag.c:404
+#: builtin/tag.c:405
msgid "print <n> lines of each tag message"
msgstr "imprimir <n> líneas de cada mensaje de tag"
-#: builtin/tag.c:406
+#: builtin/tag.c:407
msgid "delete tags"
msgstr "eliminar tags"
-#: builtin/tag.c:407
+#: builtin/tag.c:408
msgid "verify tags"
msgstr "verificar tags"
-#: builtin/tag.c:409
+#: builtin/tag.c:410
msgid "Tag creation options"
msgstr "Opciones de creación de tags"
-#: builtin/tag.c:411
+#: builtin/tag.c:412
msgid "annotated tag, needs a message"
msgstr "tags anotadas necesitan un mensaje"
-#: builtin/tag.c:413
+#: builtin/tag.c:414
msgid "tag message"
msgstr "mensaje de tag"
-#: builtin/tag.c:415
+#: builtin/tag.c:416
msgid "force edit of tag message"
msgstr "forzar la edición del mensaje de tag"
-#: builtin/tag.c:416
+#: builtin/tag.c:417
msgid "annotated and GPG-signed tag"
msgstr "tag anotado y firmado con GPG"
-#: builtin/tag.c:419
+#: builtin/tag.c:420
msgid "use another key to sign the tag"
msgstr "usar otra clave para firmar el tag"
-#: builtin/tag.c:420
+#: builtin/tag.c:421
msgid "replace the tag if exists"
msgstr "remplazar tag si existe"
-#: builtin/tag.c:421 builtin/update-ref.c:369
+#: builtin/tag.c:422 builtin/update-ref.c:492
msgid "create a reflog"
msgstr "crear un reflog"
-#: builtin/tag.c:423
+#: builtin/tag.c:424
msgid "Tag listing options"
msgstr "Opciones de listado de tag"
-#: builtin/tag.c:424
+#: builtin/tag.c:425
msgid "show tag list in columns"
msgstr "mostrar lista de tags en columnas"
-#: builtin/tag.c:425 builtin/tag.c:427
+#: builtin/tag.c:426 builtin/tag.c:428
msgid "print only tags that contain the commit"
msgstr "mostrar solo tags que contienen el commit"
-#: builtin/tag.c:426 builtin/tag.c:428
+#: builtin/tag.c:427 builtin/tag.c:429
msgid "print only tags that don't contain the commit"
msgstr "mostrar solo tags que no contienen el commit"
-#: builtin/tag.c:429
+#: builtin/tag.c:430
msgid "print only tags that are merged"
msgstr "sólo imprimir las tags que están fusionadas"
-#: builtin/tag.c:430
+#: builtin/tag.c:431
msgid "print only tags that are not merged"
msgstr "sólo imprimir las tags que no están fusionadas"
-#: builtin/tag.c:434
+#: builtin/tag.c:435
msgid "print only tags of the object"
msgstr "sólo imprimir tags de el objeto"
-#: builtin/tag.c:482
+#: builtin/tag.c:483
msgid "--column and -n are incompatible"
msgstr "--column y -n son incompatibles"
-#: builtin/tag.c:504
+#: builtin/tag.c:505
msgid "-n option is only allowed in list mode"
msgstr "opción -n solo es permitida en modo lista"
-#: builtin/tag.c:506
+#: builtin/tag.c:507
msgid "--contains option is only allowed in list mode"
msgstr "opción --contains solo es permitido en modo lista"
-#: builtin/tag.c:508
+#: builtin/tag.c:509
msgid "--no-contains option is only allowed in list mode"
msgstr "opción --no-contains solo es permitida en modo lista"
-#: builtin/tag.c:510
+#: builtin/tag.c:511
msgid "--points-at option is only allowed in list mode"
msgstr "opción --points-at solo es permitida en modo lista"
-#: builtin/tag.c:512
+#: builtin/tag.c:513
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:523
+#: builtin/tag.c:524
msgid "only one -F or -m option is allowed."
msgstr "sólo se permite una de las opciones, -m ó -F."
-#: builtin/tag.c:542
+#: builtin/tag.c:543
msgid "too many params"
msgstr "demasiados parámetros"
-#: builtin/tag.c:548
+#: builtin/tag.c:549
#, c-format
msgid "'%s' is not a valid tag name."
msgstr "'%s' no es un nombre de tag válido."
-#: builtin/tag.c:553
+#: builtin/tag.c:554
#, c-format
msgid "tag '%s' already exists"
msgstr "el tag '%s' ya existe"
-#: builtin/tag.c:584
+#: builtin/tag.c:585
#, c-format
msgid "Updated tag '%s' (was %s)\n"
msgstr "Etiqueta '%s' actualizada (era %s)\n"
@@ -21708,19 +21896,19 @@ msgstr ""
msgid "git update-ref [<options>] --stdin [-z]"
msgstr "git update-ref [<opciones>] --stdin [-z]"
-#: builtin/update-ref.c:364
+#: builtin/update-ref.c:487
msgid "delete the reference"
msgstr "eliminar la referencia"
-#: builtin/update-ref.c:366
+#: builtin/update-ref.c:489
msgid "update <refname> not the one it points to"
msgstr "actualiza <refname> no a lo que apunta"
-#: builtin/update-ref.c:367
+#: builtin/update-ref.c:490
msgid "stdin has NUL-terminated arguments"
msgstr "stdin tiene argumentos terminados en NUL"
-#: builtin/update-ref.c:368
+#: builtin/update-ref.c:491
msgid "read updates from stdin"
msgstr "lee actualizaciones de stdin"
@@ -21812,7 +22000,7 @@ msgstr "git worktree remove [<opciones>] <worktree>"
msgid "git worktree unlock <path>"
msgstr "git worktree unlock <ruta>"
-#: builtin/worktree.c:60 builtin/worktree.c:891
+#: builtin/worktree.c:60 builtin/worktree.c:894
#, c-format
msgid "failed to delete '%s'"
msgstr "falló al borrar '%s'"
@@ -21894,119 +22082,119 @@ msgstr ""
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:435 builtin/worktree.c:441
#, c-format
msgid "Preparing worktree (new branch '%s')"
msgstr "Preparando árbol de trabajo (nueva rama '%s')"
-#: builtin/worktree.c:434
+#: builtin/worktree.c:437
#, 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:446
#, c-format
msgid "Preparing worktree (checking out '%s')"
msgstr "Preparando árbol de trabajo (haciendo checkout a '%s')"
-#: builtin/worktree.c:449
+#: builtin/worktree.c:452
#, c-format
msgid "Preparing worktree (detached HEAD %s)"
msgstr "Preparando árbol de trabajo (HEAD desacoplado %s)"
-#: builtin/worktree.c:490
+#: builtin/worktree.c:493
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:496
msgid "create a new branch"
msgstr "crear una nueva rama"
-#: builtin/worktree.c:495
+#: builtin/worktree.c:498
msgid "create or reset a branch"
msgstr "crear o restablecer una rama"
-#: builtin/worktree.c:497
+#: builtin/worktree.c:500
msgid "populate the new working tree"
msgstr "popular el nuevo árbol de trabajo"
-#: builtin/worktree.c:498
+#: builtin/worktree.c:501
msgid "keep the new working tree locked"
msgstr "mantener el nuevo árbol de trabajo bloqueado"
-#: builtin/worktree.c:501
+#: builtin/worktree.c:504
msgid "set up tracking mode (see git-branch(1))"
msgstr "configurando modo tracking (mirar git-branch(1))"
-#: builtin/worktree.c:504
+#: builtin/worktree.c:507
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:515
msgid "-b, -B, and --detach are mutually exclusive"
msgstr "-b, -B, y --detach son mutuamente exclusivas"
-#: builtin/worktree.c:573
+#: builtin/worktree.c:576
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:676
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:688 builtin/worktree.c:721 builtin/worktree.c:795
+#: builtin/worktree.c:922
#, 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:690 builtin/worktree.c:723
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:695
#, c-format
msgid "'%s' is already locked, reason: %s"
msgstr "'%s' ya está bloqueado; razón: %s"
-#: builtin/worktree.c:694
+#: builtin/worktree.c:697
#, c-format
msgid "'%s' is already locked"
msgstr "'%s' ya está bloqueado"
-#: builtin/worktree.c:722
+#: builtin/worktree.c:725
#, c-format
msgid "'%s' is not locked"
msgstr "'%s' no está bloqueado"
-#: builtin/worktree.c:763
+#: builtin/worktree.c:766
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:774
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:797 builtin/worktree.c:924
#, c-format
msgid "'%s' is a main working tree"
msgstr "'%s' es un árbol de trabajo principal"
-#: builtin/worktree.c:799
+#: builtin/worktree.c:802
#, 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:808
#, c-format
msgid "target '%s' already exists"
msgstr "el objetivo '%s' ya existe"
-#: builtin/worktree.c:813
+#: builtin/worktree.c:816
#, c-format
msgid ""
"cannot move a locked working tree, lock reason: %s\n"
@@ -22015,7 +22203,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:818
msgid ""
"cannot move a locked working tree;\n"
"use 'move -f -f' to override or unlock first"
@@ -22023,37 +22211,37 @@ 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:821
#, 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:826
#, c-format
msgid "failed to move '%s' to '%s'"
msgstr "falló al mover '%s' a '%s'"
-#: builtin/worktree.c:871
+#: builtin/worktree.c:874
#, 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:878
#, c-format
msgid "'%s' contains modified or untracked files, use --force to delete it"
msgstr ""
"'%s' contiene archivos no rastreados o modificados, use --force para borrarlo"
-#: builtin/worktree.c:880
+#: builtin/worktree.c:883
#, 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:906
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:929
#, c-format
msgid ""
"cannot remove a locked working tree, lock reason: %s\n"
@@ -22062,7 +22250,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:931
msgid ""
"cannot remove a locked working tree;\n"
"use 'remove -f -f' to override or unlock first"
@@ -22070,7 +22258,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:934
#, c-format
msgid "validation failed, cannot remove working tree: %s"
msgstr "falló validación, no se puede eliminar árbol de trabajo: %s"
@@ -22091,17 +22279,126 @@ msgstr "escribir objeto de árbol para un subdirectorio <prefijo>"
msgid "only useful for debugging"
msgstr "sólo útil para depurar"
-#: fast-import.c:3125
+#: bugreport.c:14
+msgid "git version:\n"
+msgstr "versión de git:\n"
+
+#: bugreport.c:20
+#, c-format
+msgid "uname() failed with error '%s' (%d)\n"
+msgstr "uname() falló con error '%s' (%d)\n"
+
+#: bugreport.c:30
+msgid "compiler info: "
+msgstr "información del compilador: "
+
+#: bugreport.c:32
+msgid "libc info: "
+msgstr "información de libc: "
+
+#: bugreport.c:74
+msgid "not run from a git repository - no hooks to show\n"
+msgstr "no ejecutado desde un repositorio git - no hay hooks para mostrar\n"
+
+#: bugreport.c:84
+msgid "git bugreport [-o|--output-directory <file>] [-s|--suffix <format>]"
+msgstr ""
+"git bugreport [-o|--output-directory <archivo>] [-s|--suffix <formato>]"
+
+#: bugreport.c:91
+msgid ""
+"Thank you for filling out a Git bug report!\n"
+"Please answer the following questions to help us understand your issue.\n"
+"\n"
+"What did you do before the bug happened? (Steps to reproduce your issue)\n"
+"\n"
+"What did you expect to happen? (Expected behavior)\n"
+"\n"
+"What happened instead? (Actual behavior)\n"
+"\n"
+"What's different between what you expected and what actually happened?\n"
+"\n"
+"Anything else you want to add:\n"
+"\n"
+"Please review the rest of the bug report below.\n"
+"You can delete any lines you don't wish to share.\n"
+msgstr ""
+"¡Gracias por prepara un reporte de bug de Git!\n"
+"Por favor responde las siguientes preguntas para ayudarnos a entender el "
+"problema.\n"
+"\n"
+"¿Qué hiciste antes de que sucediera el bug? (Pasos para reproducir el "
+"problema)\n"
+"\n"
+"¿Qué esperabas que sucediera? (Comportamiento esperado)\n"
+"\n"
+"¿Qué sucedio en lugar de eso? (Comportamiento real)\n"
+"\n"
+"¿Qué es diferente entre lo que esperabas y lo que pasó?\n"
+"\n"
+"Cualquier cosa que quieras agregar:\n"
+"\n"
+"Por favor revisa el resto del reporte abajo.\n"
+"Puedes borrar cualquier línea que no desees compartir.\n"
+
+#: bugreport.c:130
+msgid "specify a destination for the bugreport file"
+msgstr "especificar el destino para el archivo de reporte de bug"
+
+#: bugreport.c:132
+msgid "specify a strftime format suffix for the filename"
+msgstr "especificar el sufijo formato strftime para el nombre del archivo."
+
+#: bugreport.c:156
+#, c-format
+msgid "could not create leading directories for '%s'"
+msgstr "no se pudo crear directorios principales para '%s'"
+
+#: bugreport.c:163
+msgid "System Info"
+msgstr "Información del sistema"
+
+#: bugreport.c:166
+msgid "Enabled Hooks"
+msgstr "Activar Hooks"
+
+#: bugreport.c:174
+#, c-format
+msgid "couldn't create a new file at '%s'"
+msgstr "no se pudo crear un archivo en '%s'"
+
+#: bugreport.c:186
+#, c-format
+msgid "Created new report at '%s'.\n"
+msgstr "Crear un nuevo reporte en '%s'.\n"
+
+#: fast-import.c:3085
+#, c-format
+msgid "Missing from marks for submodule '%s'"
+msgstr "Faltan marcas from para el submódulo '%s'"
+
+#: fast-import.c:3087
+#, c-format
+msgid "Missing to marks for submodule '%s'"
+msgstr "Faltan marcas to para el submódulo '%s'"
+
+#: fast-import.c:3222
#, c-format
msgid "Expected 'mark' command, got %s"
msgstr "Se esperaba comando 'mark', se obtuvo %s"
-#: fast-import.c:3130
+#: fast-import.c:3227
#, c-format
msgid "Expected 'to' command, got %s"
msgstr "Se esperaba comando 'to', se obtuvo %s"
-#: fast-import.c:3254
+#: fast-import.c:3317
+msgid "Expected format name:filename for submodule rewrite option"
+msgstr ""
+"Formato esperado de nombre:nombre de archivo para la opción de sobreescribir "
+"submódulo"
+
+#: fast-import.c:3371
#, c-format
msgid "feature '%s' forbidden in input without --allow-unsafe-features"
msgstr "característica '%s' prohibida en input sin --allow-unsafe-features"
@@ -22141,7 +22438,7 @@ msgstr "test-tool serve-v2 [<opciones>]"
msgid "exit immediately after advertising capabilities"
msgstr "salir inmediatamente tras anunciar capacidades"
-#: git.c:27
+#: git.c:28
msgid ""
"git [--version] [--help] [-C <path>] [-c <name>=<value>]\n"
" [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n"
@@ -22157,7 +22454,7 @@ msgstr ""
" [--git-dir=<ruta>] [--work-tree=<ruta>] [--namespace=<nombre>]\n"
" <comando> [<args>]"
-#: git.c:34
+#: git.c:35
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"
@@ -22169,47 +22466,47 @@ msgstr ""
"para leer sobre un subcomando o concepto específico.\n"
"Mira 'git help git' para una vista general del sistema."
-#: git.c:186
+#: git.c:187
#, c-format
msgid "no directory given for --git-dir\n"
msgstr "no se entregó directorio para --git-dir\n"
-#: git.c:200
+#: git.c:201
#, c-format
msgid "no namespace given for --namespace\n"
msgstr "no se entregó namespace para --namespace\n"
-#: git.c:214
+#: git.c:215
#, c-format
msgid "no directory given for --work-tree\n"
msgstr "no se entregó directorio para --work-tree\n"
-#: git.c:228
+#: git.c:229
#, c-format
msgid "no prefix given for --super-prefix\n"
msgstr "no se entregó prefijo para --super-prefix\n"
-#: git.c:250
+#: git.c:251
#, c-format
msgid "-c expects a configuration string\n"
msgstr "-c espera un string de configuración\n"
-#: git.c:288
+#: git.c:289
#, c-format
msgid "no directory given for -C\n"
msgstr "no se entregó directorio para -C\n"
-#: git.c:314
+#: git.c:315
#, c-format
msgid "unknown option: %s\n"
msgstr "opción %s desconocida\n"
-#: git.c:360
+#: git.c:362
#, c-format
msgid "while expanding alias '%s': '%s'"
msgstr "al expandir el alias '%s':'%s'"
-#: git.c:369
+#: git.c:371
#, c-format
msgid ""
"alias '%s' changes environment variables.\n"
@@ -22218,39 +22515,39 @@ msgstr ""
"alias '%s' cambia las variables de entorno.\n"
"Puedes usar '!git' en el alias para hacer esto"
-#: git.c:376
+#: git.c:378
#, c-format
msgid "empty alias for %s"
msgstr "alias vacío para %s"
-#: git.c:379
+#: git.c:381
#, c-format
msgid "recursive alias: %s"
msgstr "alias recursivo: %s"
-#: git.c:459
+#: git.c:463
msgid "write failure on standard output"
msgstr "error de escritura en standard output"
-#: git.c:461
+#: git.c:465
msgid "unknown write failure on standard output"
msgstr "error desconocido de escritura en standard output"
-#: git.c:463
+#: git.c:467
msgid "close failed on standard output"
msgstr "cierre falló en standard output"
-#: git.c:793
+#: git.c:792
#, 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:843
+#: git.c:842
#, c-format
msgid "cannot handle %s as a builtin"
msgstr "no se puede manejar %s como un builtin"
-#: git.c:856
+#: git.c:855
#, c-format
msgid ""
"usage: %s\n"
@@ -22261,55 +22558,55 @@ msgstr ""
"\n"
"\n"
-#: git.c:876
+#: git.c:875
#, 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:888
+#: git.c:887
#, c-format
msgid "failed to run command '%s': %s\n"
msgstr "falló al ejecutar comando '%s': %s\n"
-#: http.c:378
+#: http.c:399
#, c-format
msgid "negative value for http.postbuffer; defaulting to %d"
msgstr "valor negativo para http.postbuffer; poniendo el default a %d"
-#: http.c:399
+#: http.c:420
msgid "Delegation control is not supported with cURL < 7.22.0"
msgstr "Delegación de control no es soportada con cURL < 7.22.0"
-#: http.c:408
+#: http.c:429
msgid "Public key pinning not supported with cURL < 7.44.0"
msgstr "Fijación de llave pública no es soportada con cURL < 7.44.0"
-#: http.c:876
+#: http.c:914
msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0"
msgstr "CURLSSLOPT_NO_REVOKE no soportado con cURL < 7.44.0"
-#: http.c:949
+#: http.c:993
msgid "Protocol restrictions not supported with cURL < 7.19.4"
msgstr "Restricción de protocolo no soportada con cURL < 7.19.4"
-#: http.c:1086
+#: http.c:1139
#, c-format
msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
msgstr "Backend SSL no soportado '%s'. Backends SSL soportados:"
-#: http.c:1093
+#: http.c:1146
#, c-format
msgid "Could not set SSL backend to '%s': cURL was built without SSL backends"
msgstr ""
"No se pudo configurar backend SSL a '%s': cURL fue construido sin backends "
"SSL"
-#: http.c:1097
+#: http.c:1150
#, c-format
msgid "Could not set SSL backend to '%s': already set"
msgstr "No se pudo configurar backend SSL para '%s': ya configurado"
-#: http.c:1966
+#: http.c:2032
#, c-format
msgid ""
"unable to update url base from redirection:\n"
@@ -22432,6 +22729,14 @@ msgstr "remote-curl: fetch intentado sin un repositorio local"
msgid "remote-curl: unknown command '%s' from git"
msgstr "remote-curl: comando '%s' desconocido de git"
+#: compat/compiler.h:26
+msgid "no compiler information available\n"
+msgstr "no hay información disponible del compilador\n"
+
+#: compat/compiler.h:38
+msgid "no libc information available\n"
+msgstr "no hay información disponible de libc\n"
+
#: list-objects-filter-options.h:85
msgid "args"
msgstr "args"
@@ -22489,11 +22794,11 @@ msgstr ""
"actualizar el índice con la resolución de conflictos reutilizada si es "
"posible"
-#: wt-status.h:67
+#: wt-status.h:80
msgid "HEAD detached at "
msgstr "HEAD desacoplada en "
-#: wt-status.h:68
+#: wt-status.h:81
msgid "HEAD detached from "
msgstr "HEAD desacoplada de "
@@ -22535,633 +22840,637 @@ msgid "List, create, or delete branches"
msgstr "Lista, crea, o borra ramas"
#: command-list.h:59
+msgid "Collect information for user to file a bug report"
+msgstr "Recolectar información para el usuario para generar un reporte de bug"
+
+#: command-list.h:60
msgid "Move objects and refs by archive"
msgstr "Mover objetos y referencias por archivo"
-#: command-list.h:60
+#: command-list.h:61
msgid "Provide content or type and size information for repository objects"
msgstr ""
"Proveer contenido o tipo y tamaño de información para objetos de repositorio"
-#: command-list.h:61
+#: command-list.h:62
msgid "Display gitattributes information"
msgstr "Mostrar información de gitattributes"
-#: command-list.h:62
+#: command-list.h:63
msgid "Debug gitignore / exclude files"
msgstr "Debug a gitignore / excluir archivos"
-#: command-list.h:63
+#: command-list.h:64
msgid "Show canonical names and email addresses of contacts"
msgstr "Mostrar nombres canónicos y direcciones de correo de contactos"
-#: command-list.h:64
+#: command-list.h:65
msgid "Switch branches or restore working tree files"
msgstr "Cambia ramas o restaura los archivos de tu árbol de trabajo"
-#: command-list.h:65
+#: command-list.h:66
msgid "Copy files from the index to the working tree"
msgstr "Copiar archivos del índice al árbol de trabajo"
-#: command-list.h:66
+#: command-list.h:67
msgid "Ensures that a reference name is well formed"
msgstr "Asegura que un nombre de referencia esté bien formado"
-#: command-list.h:67
+#: command-list.h:68
msgid "Find commits yet to be applied to upstream"
msgstr "Encuentra commits que faltan aplicar en upstream"
-#: command-list.h:68
+#: command-list.h:69
msgid "Apply the changes introduced by some existing commits"
msgstr "Aplica los cambios introducidos por algunos commits existentes"
-#: command-list.h:69
+#: command-list.h:70
msgid "Graphical alternative to git-commit"
msgstr "Opción gráfica a git-commit"
-#: command-list.h:70
+#: command-list.h:71
msgid "Remove untracked files from the working tree"
msgstr "Remueve archivos del árbol de trabajo no rastreados"
-#: command-list.h:71
+#: command-list.h:72
msgid "Clone a repository into a new directory"
msgstr "Clona un repositorio dentro de un nuevo directorio"
-#: command-list.h:72
+#: command-list.h:73
msgid "Display data in columns"
msgstr "Mostrar data en columnas"
-#: command-list.h:73
+#: command-list.h:74
msgid "Record changes to the repository"
msgstr "Graba los cambios en tu repositorio"
-#: command-list.h:74
+#: command-list.h:75
msgid "Write and verify Git commit-graph files"
msgstr "Escribe y verifica los archivos de Git commit-graph"
-#: command-list.h:75
+#: command-list.h:76
msgid "Create a new commit object"
msgstr "Crea un nuevo objeto commit"
-#: command-list.h:76
+#: command-list.h:77
msgid "Get and set repository or global options"
msgstr "Configurar repositorio u opciones globales"
-#: command-list.h:77
+#: command-list.h:78
msgid "Count unpacked number of objects and their disk consumption"
msgstr "Contar número de objetos no empaquetados y su consumo en disco"
-#: command-list.h:78
+#: command-list.h:79
msgid "Retrieve and store user credentials"
msgstr "Obtener y guardar credenciales de usuario"
-#: command-list.h:79
+#: command-list.h:80
msgid "Helper to temporarily store passwords in memory"
msgstr "Auxiliar para almacenar temporalmente claves en memoria"
-#: command-list.h:80
+#: command-list.h:81
msgid "Helper to store credentials on disk"
msgstr "Auxiliar para guardar credenciales en disco"
-#: command-list.h:81
+#: command-list.h:82
msgid "Export a single commit to a CVS checkout"
msgstr "Exporta un commit único a CVS checkout"
-#: command-list.h:82
+#: command-list.h:83
msgid "Salvage your data out of another SCM people love to hate"
msgstr "Salva tus datos de otro SCM que la gente adora odiar"
-#: command-list.h:83
+#: command-list.h:84
msgid "A CVS server emulator for Git"
msgstr "Un servidor emulador de CVS para Git"
-#: command-list.h:84
+#: command-list.h:85
msgid "A really simple server for Git repositories"
msgstr "Un servidor realmente simple para repositorios Git"
-#: command-list.h:85
+#: command-list.h:86
msgid "Give an object a human readable name based on an available ref"
msgstr ""
"Dar a un objeto un nombre legible por humanos basado en una referencia "
"disponible"
-#: command-list.h:86
+#: command-list.h:87
msgid "Show changes between commits, commit and working tree, etc"
msgstr "Muestra los cambios entre commits, commit y árbol de trabajo, etc"
-#: command-list.h:87
+#: command-list.h:88
msgid "Compares files in the working tree and the index"
msgstr "Compara archivos del árbol de trabajo y del índice"
-#: command-list.h:88
+#: command-list.h:89
msgid "Compare a tree to the working tree or index"
msgstr "Compara un árbol con el árbol de trabajo o índice"
-#: command-list.h:89
+#: command-list.h:90
msgid "Compares the content and mode of blobs found via two tree objects"
msgstr ""
"Compara el contenido y el modo de blobs encontrados a través de dos objetos "
"de árbol"
-#: command-list.h:90
+#: command-list.h:91
msgid "Show changes using common diff tools"
msgstr "Mostrar cambios usando herramientas de diff comunes"
-#: command-list.h:91
+#: command-list.h:92
msgid "Git data exporter"
msgstr "Exportador de data Git"
-#: command-list.h:92
+#: command-list.h:93
msgid "Backend for fast Git data importers"
msgstr "Backend para importadores de data de Git rápidos"
-#: command-list.h:93
+#: command-list.h:94
msgid "Download objects and refs from another repository"
msgstr "Descarga objetos y referencias de otro repositorio"
-#: command-list.h:94
+#: command-list.h:95
msgid "Receive missing objects from another repository"
msgstr "Descarga objetos faltantes de otro repositorio"
-#: command-list.h:95
+#: command-list.h:96
msgid "Rewrite branches"
msgstr "Reescribir ramas"
-#: command-list.h:96
+#: command-list.h:97
msgid "Produce a merge commit message"
msgstr "Produce un mensaje de commit para fusión"
-#: command-list.h:97
+#: command-list.h:98
msgid "Output information on each ref"
msgstr "Información de output en cada ref"
-#: command-list.h:98
+#: command-list.h:99
msgid "Prepare patches for e-mail submission"
msgstr "Prepara parches para ser enviados por e-mail"
-#: command-list.h:99
+#: command-list.h:100
msgid "Verifies the connectivity and validity of the objects in the database"
msgstr ""
"Verifica la conectividad y disponibilidad de los objetos en la base de datos"
-#: command-list.h:100
+#: command-list.h:101
msgid "Cleanup unnecessary files and optimize the local repository"
msgstr "Limpia archivos innecesarios y optimiza el repositorio local"
-#: command-list.h:101
+#: command-list.h:102
msgid "Extract commit ID from an archive created using git-archive"
msgstr "Extrae el ID de commit de un archivo creado usando git-archive"
-#: command-list.h:102
+#: command-list.h:103
msgid "Print lines matching a pattern"
msgstr "Imprime las líneas que concuerdan con el patron"
-#: command-list.h:103
+#: command-list.h:104
msgid "A portable graphical interface to Git"
msgstr "Una interfaz gráfica portátil para Git"
-#: command-list.h:104
+#: command-list.h:105
msgid "Compute object ID and optionally creates a blob from a file"
msgstr "Computa ID de objeto y, opcionalmente, crea un blob de un archivo"
-#: command-list.h:105
+#: command-list.h:106
msgid "Display help information about Git"
msgstr "Mostrar información sobre Git"
-#: command-list.h:106
+#: command-list.h:107
msgid "Server side implementation of Git over HTTP"
msgstr "Implementación de lado de servidor de Git por HTTP"
-#: command-list.h:107
+#: command-list.h:108
msgid "Download from a remote Git repository via HTTP"
msgstr "Descarga de un repositorio Git remoto vía HTTP"
-#: command-list.h:108
+#: command-list.h:109
msgid "Push objects over HTTP/DAV to another repository"
msgstr "Empuja objetos por HTTP/DAV a otro repositorio"
-#: command-list.h:109
+#: command-list.h:110
msgid "Send a collection of patches from stdin to an IMAP folder"
msgstr "Enviar una colección de parches de stdin a una carpeta IMAP"
-#: command-list.h:110
+#: command-list.h:111
msgid "Build pack index file for an existing packed archive"
msgstr "Constuye un archivo de índice para un archivo empaquetado existente"
-#: command-list.h:111
+#: command-list.h:112
msgid "Create an empty Git repository or reinitialize an existing one"
msgstr "Crea un repositorio de Git vacío o reinicia el que ya existe"
-#: command-list.h:112
+#: command-list.h:113
msgid "Instantly browse your working repository in gitweb"
msgstr "Buscar instantáneamente tu repositorio de trabajo en gitweb"
-#: command-list.h:113
+#: command-list.h:114
msgid "Add or parse structured information in commit messages"
msgstr "Agregar o analizar información estructurada en mensajes de commit"
-#: command-list.h:114
+#: command-list.h:115
msgid "The Git repository browser"
msgstr "El navegador de repositorio Git"
-#: command-list.h:115
+#: command-list.h:116
msgid "Show commit logs"
msgstr "Muestra los logs de los commits"
-#: command-list.h:116
+#: command-list.h:117
msgid "Show information about files in the index and the working tree"
msgstr "Muestra información sobre archivos in el índice y el árbol de trabajo"
-#: command-list.h:117
+#: command-list.h:118
msgid "List references in a remote repository"
msgstr "Lista referencias en un repositorio remoto"
-#: command-list.h:118
+#: command-list.h:119
msgid "List the contents of a tree object"
msgstr "Lista los contenidos de un objeto árbol"
-#: command-list.h:119
+#: command-list.h:120
msgid "Extracts patch and authorship from a single e-mail message"
msgstr "Extraer parche y autoría de un único mensaje de e-mail"
-#: command-list.h:120
+#: command-list.h:121
msgid "Simple UNIX mbox splitter program"
msgstr "Programa divisor de mbox simple de UNIX"
-#: command-list.h:121
+#: command-list.h:122
msgid "Join two or more development histories together"
msgstr "Junta dos o más historiales de desarrollo juntos"
-#: command-list.h:122
+#: command-list.h:123
msgid "Find as good common ancestors as possible for a merge"
msgstr "Encuentra un ancestro común bueno para una posible fusión"
-#: command-list.h:123
+#: command-list.h:124
msgid "Run a three-way file merge"
msgstr "Ejecuta una fusión de tres vías en un archivo"
-#: command-list.h:124
+#: command-list.h:125
msgid "Run a merge for files needing merging"
msgstr "Ejecuta una fusión para archivos que la necesitan"
-#: command-list.h:125
+#: command-list.h:126
msgid "The standard helper program to use with git-merge-index"
msgstr "El programa de ayuda estándar para usar con git-merge-index"
-#: command-list.h:126
+#: command-list.h:127
msgid "Run merge conflict resolution tools to resolve merge conflicts"
msgstr ""
"Ejecuta las herramientas de fusión de resolución de conflictos para resolver "
"conflictos de fusión"
-#: command-list.h:127
+#: command-list.h:128
msgid "Show three-way merge without touching index"
msgstr "Mostrar fusión de tres vías sin tocar el índice"
-#: command-list.h:128
+#: command-list.h:129
msgid "Write and verify multi-pack-indexes"
msgstr "Escribe y verifica archivos multi-pack-index"
-#: command-list.h:129
+#: command-list.h:130
msgid "Creates a tag object"
msgstr "Crea un objeto tag"
-#: command-list.h:130
+#: command-list.h:131
msgid "Build a tree-object from ls-tree formatted text"
msgstr "Construir un objeto árbol de un texto en formato ls-tree"
-#: command-list.h:131
+#: command-list.h:132
msgid "Move or rename a file, a directory, or a symlink"
msgstr "Mueve o cambia el nombre a archivos, directorios o enlaces simbólicos"
-#: command-list.h:132
+#: command-list.h:133
msgid "Find symbolic names for given revs"
msgstr "Encontrar nombres simbólicos para revs dados"
-#: command-list.h:133
+#: command-list.h:134
msgid "Add or inspect object notes"
msgstr "Agrega o inspecciona objetos nota"
-#: command-list.h:134
+#: command-list.h:135
msgid "Import from and submit to Perforce repositories"
msgstr "Importar desde y enviar a repositorios Perforce"
-#: command-list.h:135
+#: command-list.h:136
msgid "Create a packed archive of objects"
msgstr "Crea un archivo de objetos empaquetados"
-#: command-list.h:136
+#: command-list.h:137
msgid "Find redundant pack files"
msgstr "Encuentra archivos empaquetados de manera redundante"
-#: command-list.h:137
+#: command-list.h:138
msgid "Pack heads and tags for efficient repository access"
msgstr "Empaqueta heads y tags para un acceso eficiente al repositorio"
-#: command-list.h:138
+#: command-list.h:139
msgid "Routines to help parsing remote repository access parameters"
msgstr ""
"Rutinas para ayudar a analizar los parámetros de acceso del repositorio "
"remoto"
-#: command-list.h:139
+#: command-list.h:140
msgid "Compute unique ID for a patch"
msgstr "Calcular ID único para un parche"
-#: command-list.h:140
+#: command-list.h:141
msgid "Prune all unreachable objects from the object database"
msgstr "Limpia todos los objetos no alcanzables de la base de datos de objetos"
-#: command-list.h:141
+#: command-list.h:142
msgid "Remove extra objects that are already in pack files"
msgstr "Remover objetos extra que ya están en archivos empaquetados"
-#: command-list.h:142
+#: command-list.h:143
msgid "Fetch from and integrate with another repository or a local branch"
msgstr "Realiza un fetch e integra con otro repositorio o rama local"
-#: command-list.h:143
+#: command-list.h:144
msgid "Update remote refs along with associated objects"
msgstr "Actualiza referencias remotas junto con sus objetos asociados"
-#: command-list.h:144
+#: command-list.h:145
msgid "Applies a quilt patchset onto the current branch"
msgstr "Aplica un parche quilt en la rama actual"
-#: command-list.h:145
+#: command-list.h:146
msgid "Compare two commit ranges (e.g. two versions of a branch)"
msgstr "Compara dos rangos de commits (por ejemplo dos versions de un branch)"
-#: command-list.h:146
+#: command-list.h:147
msgid "Reads tree information into the index"
msgstr "Lee información del ábol en el índice"
-#: command-list.h:147
+#: command-list.h:148
msgid "Reapply commits on top of another base tip"
msgstr "Vuelve a aplicar commits en la punta de otra rama"
-#: command-list.h:148
+#: command-list.h:149
msgid "Receive what is pushed into the repository"
msgstr "Recibir lo que es empujado en el respositorio"
-#: command-list.h:149
+#: command-list.h:150
msgid "Manage reflog information"
msgstr "Gestionar información de reflog"
-#: command-list.h:150
+#: command-list.h:151
msgid "Manage set of tracked repositories"
msgstr "Gestiona un conjunto de repositorios rastreados"
-#: command-list.h:151
+#: command-list.h:152
msgid "Pack unpacked objects in a repository"
msgstr "Empaquetar objetos no empaquetados en un repositorio"
-#: command-list.h:152
+#: command-list.h:153
msgid "Create, list, delete refs to replace objects"
msgstr "Crea, lista, borra referencias para reemplazar objetos"
-#: command-list.h:153
+#: command-list.h:154
msgid "Generates a summary of pending changes"
msgstr "Genera un resumen de cambios pendientes"
-#: command-list.h:154
+#: command-list.h:155
msgid "Reuse recorded resolution of conflicted merges"
msgstr "Reutilizar la resolución registrada de fusiones conflictivas"
-#: command-list.h:155
+#: command-list.h:156
msgid "Reset current HEAD to the specified state"
msgstr "Reinicia el HEAD actual a un estado especifico"
-#: command-list.h:156
+#: command-list.h:157
msgid "Restore working tree files"
msgstr "Restaurar archivos de árboles de trabajo"
-#: command-list.h:157
+#: command-list.h:158
msgid "Revert some existing commits"
msgstr "Revierte algunos commits existentes"
-#: command-list.h:158
+#: command-list.h:159
msgid "Lists commit objects in reverse chronological order"
msgstr "Lista objetos commit en orden cronológico inverso"
-#: command-list.h:159
+#: command-list.h:160
msgid "Pick out and massage parameters"
msgstr "Seleccionar y masajear los parámetros"
-#: command-list.h:160
+#: command-list.h:161
msgid "Remove files from the working tree and from the index"
msgstr "Borra archivos del árbol de trabajo y del índice"
-#: command-list.h:161
+#: command-list.h:162
msgid "Send a collection of patches as emails"
msgstr "Envía una colección de parches como e-mails"
-#: command-list.h:162
+#: command-list.h:163
msgid "Push objects over Git protocol to another repository"
msgstr "Empujar objetos por protocolo Git a otro repositorio"
-#: command-list.h:163
+#: command-list.h:164
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:164
+#: command-list.h:165
msgid "Summarize 'git log' output"
msgstr "Resumir la salida 'git log'"
-#: command-list.h:165
+#: command-list.h:166
msgid "Show various types of objects"
msgstr "Muestra varios tipos de objetos"
-#: command-list.h:166
+#: command-list.h:167
msgid "Show branches and their commits"
msgstr "Mostrar ramas y sus commits"
-#: command-list.h:167
+#: command-list.h:168
msgid "Show packed archive index"
msgstr "Mostrar el índice de archivo empaquetado"
-#: command-list.h:168
+#: command-list.h:169
msgid "List references in a local repository"
msgstr "Listar referencias en el repositorio local"
-#: command-list.h:169
+#: command-list.h:170
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:170
+#: command-list.h:171
msgid "Common Git shell script setup code"
msgstr "Código de configuración de script de shell común de Git"
-#: command-list.h:171
+#: command-list.h:172
msgid "Initialize and modify the sparse-checkout"
msgstr "Inicializa y modifica el sparse-checkout"
-#: command-list.h:172
+#: command-list.h:173
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:173
+#: command-list.h:174
msgid "Add file contents to the staging area"
msgstr "Agrega contenidos de un archivo al área de staging"
-#: command-list.h:174
+#: command-list.h:175
msgid "Show the working tree status"
msgstr "Muestra el estado del árbol de trabajo"
-#: command-list.h:175
+#: command-list.h:176
msgid "Remove unnecessary whitespace"
msgstr "Eliminar el espacio en blanco innecesario"
-#: command-list.h:176
+#: command-list.h:177
msgid "Initialize, update or inspect submodules"
msgstr "Inicializa, actualiza o inspecciona submódulos"
-#: command-list.h:177
+#: command-list.h:178
msgid "Bidirectional operation between a Subversion repository and Git"
msgstr "Operación bidireccional entre un repositorio Subversion y Git"
-#: command-list.h:178
+#: command-list.h:179
msgid "Switch branches"
msgstr "Cambiar branches"
-#: command-list.h:179
+#: command-list.h:180
msgid "Read, modify and delete symbolic refs"
msgstr "Lee, modifica y borra referencias simbólicas"
-#: command-list.h:180
+#: command-list.h:181
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:181
+#: command-list.h:182
msgid "Creates a temporary file with a blob's contents"
msgstr "Crea un archivo temporal con contenidos de un blob"
-#: command-list.h:182
+#: command-list.h:183
msgid "Unpack objects from a packed archive"
msgstr "Desempaqueta objetos de un archivo empaquetado"
-#: command-list.h:183
+#: command-list.h:184
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:184
+#: command-list.h:185
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:185
+#: command-list.h:186
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:186
+#: command-list.h:187
msgid "Send archive back to git-archive"
msgstr "Enviar archivo a git-archive"
-#: command-list.h:187
+#: command-list.h:188
msgid "Send objects packed back to git-fetch-pack"
msgstr "Enviar objetos empaquetados a git-fetch-pack"
-#: command-list.h:188
+#: command-list.h:189
msgid "Show a Git logical variable"
msgstr "Mostrar una variable lógica de Git"
-#: command-list.h:189
+#: command-list.h:190
msgid "Check the GPG signature of commits"
msgstr "Verificar firma GPG de commits"
-#: command-list.h:190
+#: command-list.h:191
msgid "Validate packed Git archive files"
msgstr "Valida archivos Git empaquetados"
-#: command-list.h:191
+#: command-list.h:192
msgid "Check the GPG signature of tags"
msgstr "Verifica la firma GPG de etiquetas"
-#: command-list.h:192
+#: command-list.h:193
msgid "Git web interface (web frontend to Git repositories)"
msgstr "Interfaz web Git (interfaz web para repositorios Git)"
-#: command-list.h:193
+#: command-list.h:194
msgid "Show logs with difference each commit introduces"
msgstr "Muestra logs con las diferencias que cada commit introduce"
-#: command-list.h:194
+#: command-list.h:195
msgid "Manage multiple working trees"
msgstr "Gestiona múltiples árboles de trabajo"
-#: command-list.h:195
+#: command-list.h:196
msgid "Create a tree object from the current index"
msgstr "Crea un objeto árbol del índice actual"
-#: command-list.h:196
+#: command-list.h:197
msgid "Defining attributes per path"
msgstr "Definiendo atributos por ruta"
-#: command-list.h:197
+#: command-list.h:198
msgid "Git command-line interface and conventions"
msgstr "Interfaz y convenciones de línea de comandos de Git"
-#: command-list.h:198
+#: command-list.h:199
msgid "A Git core tutorial for developers"
msgstr "Un tutorial básico de Git para desarrolladores"
-#: command-list.h:199
+#: command-list.h:200
msgid "Git for CVS users"
msgstr "Git para usuarios CVS"
-#: command-list.h:200
+#: command-list.h:201
msgid "Tweaking diff output"
msgstr "Afinar la salida de diff"
-#: command-list.h:201
+#: command-list.h:202
msgid "A useful minimum set of commands for Everyday Git"
msgstr "Un conjunto mínimo útil de comandos diarios de Git"
-#: command-list.h:202
+#: command-list.h:203
msgid "A Git Glossary"
msgstr "Un Glosario de Git"
-#: command-list.h:203
+#: command-list.h:204
msgid "Hooks used by Git"
msgstr "Hooks utilizados por Git"
-#: command-list.h:204
+#: command-list.h:205
msgid "Specifies intentionally untracked files to ignore"
msgstr "Especifica de forma intencional archivos sin seguimiento a ignorar"
-#: command-list.h:205
+#: command-list.h:206
msgid "Defining submodule properties"
msgstr "Definiendo las propiedades del submódulo"
-#: command-list.h:206
+#: command-list.h:207
msgid "Git namespaces"
msgstr "Namespaces de Git"
-#: command-list.h:207
+#: command-list.h:208
msgid "Git Repository Layout"
msgstr "Disposición del repositorio Git"
-#: command-list.h:208
+#: command-list.h:209
msgid "Specifying revisions and ranges for Git"
msgstr "Especificando revisiones y rangos para Git"
-#: command-list.h:209
+#: command-list.h:210
msgid "Mounting one repository inside another"
msgstr "Montando un repositorio dentro de otro"
-#: command-list.h:210
+#: command-list.h:211
msgid "A tutorial introduction to Git: part two"
msgstr "Un tutorial de introducción a Git: parte dos"
-#: command-list.h:211
+#: command-list.h:212
msgid "A tutorial introduction to Git"
msgstr "Un tutorial de introducción para Git"
-#: command-list.h:212
+#: command-list.h:213
msgid "An overview of recommended workflows with Git"
msgstr "Una visión general de flujos de trabajo recomendados con Git"
@@ -23205,20 +23514,20 @@ msgstr "Ningún logfile proporcionado"
msgid "cannot read $file for replaying"
msgstr "no se puede leer $file para reproducir"
-#: git-bisect.sh:232
+#: git-bisect.sh:233
msgid "?? what are you talking about?"
msgstr "?? ¿De qué estás hablando?"
-#: git-bisect.sh:241
+#: git-bisect.sh:243
msgid "bisect run failed: no command provided."
msgstr "bisect falló: no se proveyó comando."
-#: git-bisect.sh:246
+#: git-bisect.sh:248
#, sh-format
msgid "running $command"
msgstr "ejecutando $command"
-#: git-bisect.sh:253
+#: git-bisect.sh:255
#, sh-format
msgid ""
"bisect run failed:\n"
@@ -23227,11 +23536,11 @@ msgstr ""
"bisect falló:\n"
"código de salida $res de '$command' es <0 o >=128"
-#: git-bisect.sh:279
+#: git-bisect.sh:281
msgid "bisect run cannot continue any more"
msgstr "bisect no puede seguir continuando"
-#: git-bisect.sh:285
+#: git-bisect.sh:287
#, sh-format
msgid ""
"bisect run failed:\n"
@@ -23240,11 +23549,11 @@ msgstr ""
"bisect falló:\n"
"'bisect_state $state' salió con código de error $res"
-#: git-bisect.sh:292
+#: git-bisect.sh:294
msgid "bisect run success"
msgstr "bisect exitoso"
-#: git-bisect.sh:300
+#: git-bisect.sh:302
msgid "We are not bisecting."
msgstr "No estamos bisecando."
@@ -23288,132 +23597,50 @@ msgstr "Intentando fusión simple con $pretty_name"
msgid "Simple merge did not work, trying automatic merge."
msgstr "Fusión simple no funcionó, intentando fusión automática."
-#: git-legacy-stash.sh:221
-msgid "Cannot remove temporary index (can't happen)"
-msgstr "No se puede eliminar el índice temporal (no puede suceder)"
-
-#: git-legacy-stash.sh:272
-#, sh-format
-msgid "Cannot update $ref_stash with $w_commit"
-msgstr "No se puede actualizar $ref_stash con $w_commit"
-
-#: git-legacy-stash.sh:324
-#, sh-format
-msgid "error: unknown option for 'stash push': $option"
-msgstr "error: opción desconocida para 'stash pus': $option"
-
-#: git-legacy-stash.sh:356
-#, sh-format
-msgid "Saved working directory and index state $stash_msg"
-msgstr "Directorio de trabajo guardado y estado de índice $stash_msg"
-
-#: git-legacy-stash.sh:536
-#, sh-format
-msgid "unknown option: $opt"
-msgstr "opción desconocida: $opt"
-
-#: git-legacy-stash.sh:556
-#, sh-format
-msgid "Too many revisions specified: $REV"
-msgstr "Se especificaron demasiadas revisiones: $REV"
-
-#: git-legacy-stash.sh:571
-#, sh-format
-msgid "$reference is not a valid reference"
-msgstr "$reference no es una referencia válida"
-
-#: git-legacy-stash.sh:599
-#, sh-format
-msgid "'$args' is not a stash-like commit"
-msgstr "'$args' no es un commit estilo stash"
-
-#: git-legacy-stash.sh:610
-#, sh-format
-msgid "'$args' is not a stash reference"
-msgstr "'$args' no es una referencia stash"
-
-#: git-legacy-stash.sh:618
-msgid "unable to refresh index"
-msgstr "incapaz de refrescar el índice"
-
-#: git-legacy-stash.sh:622
-msgid "Cannot apply a stash in the middle of a merge"
-msgstr "No se puede aplicar un stash en medio de una fusión"
-
-#: git-legacy-stash.sh:630
-msgid "Conflicts in index. Try without --index."
-msgstr "Conflictos en índice. Intente sin --index."
-
-#: git-legacy-stash.sh:632
-msgid "Could not save index tree"
-msgstr "No se puede guardar el índice del árbol"
-
-#: git-legacy-stash.sh:641
-msgid "Could not restore untracked files from stash entry"
-msgstr "No se pueden restaurar archivos no rastreados de la entrada stash"
-
-#: git-legacy-stash.sh:666
-msgid "Cannot unstage modified files"
-msgstr "No se puede sacar de stage archivos modificados"
-
-#: git-legacy-stash.sh:704
-#, sh-format
-msgid "Dropped ${REV} ($s)"
-msgstr "Botado ${REV} ($s)"
-
-#: git-legacy-stash.sh:705
-#, sh-format
-msgid "${REV}: Could not drop stash entry"
-msgstr "${REV}: No se pudo borrar entrada stash"
-
-#: git-legacy-stash.sh:792
-msgid "(To restore them type \"git stash apply\")"
-msgstr "(Para restaurarlos, escribe \"git stash apply\")"
-
-#: git-submodule.sh:203
+#: git-submodule.sh:205
msgid "Relative path can only be used from the toplevel of the working tree"
msgstr ""
"La ruta relativa sólo se puede usar desde el nivel superior del árbol de "
"trabajo"
-#: git-submodule.sh:213
+#: git-submodule.sh:215
#, sh-format
msgid "repo URL: '$repo' must be absolute or begin with ./|../"
msgstr "repo URL: '$repo' debe ser absoluta o iniciar con ./|../"
-#: git-submodule.sh:232
+#: git-submodule.sh:234
#, sh-format
msgid "'$sm_path' already exists in the index"
msgstr "'$sm_path' ya existe en el índice"
-#: git-submodule.sh:235
+#: git-submodule.sh:237
#, sh-format
msgid "'$sm_path' already exists in the index and is not a submodule"
msgstr "'$sm_path' ya existe en el índice y no es un submódulo"
-#: git-submodule.sh:242
+#: git-submodule.sh:244
#, sh-format
msgid "'$sm_path' does not have a commit checked out"
msgstr "'$sm_path' no tiene un commit checked out"
-#: git-submodule.sh:273
+#: git-submodule.sh:275
#, sh-format
msgid "Adding existing repo at '$sm_path' to the index"
msgstr "Agregando el repositorio existente en '$sm_path' al índice"
-#: git-submodule.sh:275
+#: git-submodule.sh:277
#, sh-format
msgid "'$sm_path' already exists and is not a valid git repo"
msgstr "'$sm_path' ya existe y no es un repositorio git válido"
-#: git-submodule.sh:283
+#: git-submodule.sh:285
#, sh-format
msgid "A git directory for '$sm_name' is found locally with remote(s):"
msgstr ""
"Se encontró localmente un directorio git para '$sm_name' con el(los) "
"remoto(s):"
-#: git-submodule.sh:285
+#: git-submodule.sh:287
#, sh-format
msgid ""
"If you want to reuse this local git directory instead of cloning again from\n"
@@ -23430,39 +23657,39 @@ msgstr ""
"o no estás seguro de lo que esto significa, escoge otro nombre con la opción "
"'--name'."
-#: git-submodule.sh:291
+#: git-submodule.sh:293
#, sh-format
msgid "Reactivating local git directory for submodule '$sm_name'."
msgstr "Reactivar directorio git local para el submódulo '$sm_name'."
-#: git-submodule.sh:303
+#: git-submodule.sh:305
#, sh-format
msgid "Unable to checkout submodule '$sm_path'"
msgstr "No es posible hacer checkout al submódulo '$sm_path'"
-#: git-submodule.sh:308
+#: git-submodule.sh:310
#, sh-format
msgid "Failed to add submodule '$sm_path'"
msgstr "Falló al agregar el submódulo '$sm_path'"
-#: git-submodule.sh:317
+#: git-submodule.sh:319
#, sh-format
msgid "Failed to register submodule '$sm_path'"
msgstr "Falló al registrar el submódulo '$sm_path'"
-#: git-submodule.sh:590
+#: git-submodule.sh:592
#, sh-format
msgid "Unable to find current revision in submodule path '$displaypath'"
msgstr ""
"No se pudo encontrar la revisión actual en la ruta de submódulo "
"'$displaypath'"
-#: git-submodule.sh:600
+#: git-submodule.sh:602
#, sh-format
msgid "Unable to fetch in submodule path '$sm_path'"
msgstr "No es posible realizar fetch en la ruta de submódulo '$sm_path'"
-#: git-submodule.sh:605
+#: git-submodule.sh:607
#, sh-format
msgid ""
"Unable to find current ${remote_name}/${branch} revision in submodule path "
@@ -23471,7 +23698,7 @@ msgstr ""
"No es posible encontrar revisión actual ${remote_name}/${branch} en la ruta "
"de submódulo '$sm_path'"
-#: git-submodule.sh:623
+#: git-submodule.sh:625
#, sh-format
msgid ""
"Unable to fetch in submodule path '$displaypath'; trying to directly fetch "
@@ -23480,7 +23707,7 @@ msgstr ""
"No es posible realizar fetch en la ruta de submódulo '$displaypath'; "
"intentando hacer un fetch directo $sha1:"
-#: git-submodule.sh:629
+#: git-submodule.sh:631
#, sh-format
msgid ""
"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
@@ -23489,75 +23716,75 @@ msgstr ""
"Fetch realizado en ruta de submódulo '$displaypath', pero no contenía $sha1. "
"Fetch directo del commit falló."
-#: git-submodule.sh:636
+#: git-submodule.sh:638
#, sh-format
msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
msgstr "No es posible revisar '$sha1' en la ruta de submódulo '$displaypath'"
-#: git-submodule.sh:637
+#: git-submodule.sh:639
#, sh-format
msgid "Submodule path '$displaypath': checked out '$sha1'"
msgstr "Ruta de submódulo '$displaypath': check out realizado a '$sha1'"
-#: git-submodule.sh:641
+#: git-submodule.sh:643
#, sh-format
msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
msgstr ""
"No se posible ejecutar rebase a '$sha1' en la ruta de submódulo "
"'$displaypath'"
-#: git-submodule.sh:642
+#: git-submodule.sh:644
#, sh-format
msgid "Submodule path '$displaypath': rebased into '$sha1'"
msgstr "Ruta de submódulo '$displaypath': rebasada en '$sha1'"
-#: git-submodule.sh:647
+#: git-submodule.sh:649
#, sh-format
msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
msgstr "Incapaz de fusionar '$sha1' en la ruta del submódulo '$displaypath'"
-#: git-submodule.sh:648
+#: git-submodule.sh:650
#, sh-format
msgid "Submodule path '$displaypath': merged in '$sha1'"
msgstr "Ruta de submódulo '$displaypath': fusionada en '$sha1'"
-#: git-submodule.sh:653
+#: git-submodule.sh:655
#, sh-format
msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
msgstr ""
"Falló la ejecución de '$command $sha1' en la ruta de submódulo "
"'$displaypath'"
-#: git-submodule.sh:654
+#: git-submodule.sh:656
#, sh-format
msgid "Submodule path '$displaypath': '$command $sha1'"
msgstr "Ruta de submódulo '$displaypath': '$command $sha1'"
-#: git-submodule.sh:685
+#: git-submodule.sh:687
#, sh-format
msgid "Failed to recurse into submodule path '$displaypath'"
msgstr "Falló al recurrir en la ruta de submódulo '$displaypath'"
-#: git-submodule.sh:896
+#: git-submodule.sh:878
msgid "The --cached option cannot be used with the --files option"
msgstr "La opción --cached no puede ser usada con la opción --files"
-#: git-submodule.sh:948
+#: git-submodule.sh:930
#, sh-format
msgid "unexpected mode $mod_dst"
msgstr "modo $mod_dst inesperado"
-#: git-submodule.sh:968
+#: git-submodule.sh:950
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_src"
msgstr " Advertencia: $display_name no contiene el commit $sha1_src"
-#: git-submodule.sh:971
+#: git-submodule.sh:953
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_dst"
msgstr " Advertencia: $display_name no contiene el commit $sha1_dst"
-#: git-submodule.sh:974
+#: git-submodule.sh:956
#, sh-format
msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
msgstr ""
@@ -23577,6 +23804,17 @@ msgstr "Autostash aplicado."
msgid "Cannot store $stash_sha1"
msgstr "No se puede almacenar $stash_sha1"
+#: git-rebase--preserve-merges.sh:113
+msgid ""
+"Applying autostash resulted in conflicts.\n"
+"Your changes are safe in the stash.\n"
+"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
+msgstr ""
+"Aplicando autostash resultó en conflictos.\n"
+"Tus cambios están seguros en el stash.\n"
+"Puedes ejecutar \"git stash pop\" o \"git stash drop\" en cualquier "
+"momento.\n"
+
#: git-rebase--preserve-merges.sh:191
#, sh-format
msgid "Rebasing ($new_count/$total)"
@@ -24652,6 +24890,133 @@ msgid "Do you really want to send %s? [y|N]: "
msgstr "¿Realmente deseas mandar %s?[y|N]: "
#, c-format
+#~ msgid ""
+#~ "Cannot update sparse checkout: the following entries are not up to date:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "No se puede actualizar el sparse checkout: las siguientes entradas no "
+#~ "están actualizadas:\n"
+#~ "%s"
+
+#, c-format
+#~ msgid ""
+#~ "The following working tree files would be overwritten by sparse checkout "
+#~ "update:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Los siguientes archivos del árbol de trabajo serán sobrescritos por la "
+#~ "actualización sparse checkout:\n"
+#~ "%s"
+
+#, c-format
+#~ msgid ""
+#~ "The following working tree files would be removed by sparse checkout "
+#~ "update:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Los siguientes archivos del árbol de trabajo serán eliminados por la "
+#~ "actualización sparse checkout:\n"
+#~ "%s"
+
+#, c-format
+#~ msgid "annotated tag %s has no embedded name"
+#~ msgstr "tag anotado %s no tiene nombre embebido"
+
+#~ msgid "automatically stash/stash pop before and after rebase"
+#~ msgstr "ejecutar automáticamente stash/stash pop antes y después de rebase"
+
+#~ msgid "--[no-]autostash option is only valid with --rebase."
+#~ msgstr "La opción --[no-]autostash sólo es válida con --rebase."
+
+#~ msgid "(DEPRECATED) keep empty commits"
+#~ msgstr "(DEPRECADO) mantener commits vacíos"
+
+#, c-format
+#~ msgid "Could not read '%s'"
+#~ msgstr "No se pudo leer '%s'"
+
+#, c-format
+#~ msgid "Cannot store %s"
+#~ msgstr "No se puede guardar %s"
+
+#~ msgid "initialize sparse-checkout"
+#~ msgstr "inicializar sparse-checkout"
+
+#~ msgid "set sparse-checkout patterns"
+#~ msgstr "configurar patrones de sparse-checkout"
+
+#~ msgid "disable sparse-checkout"
+#~ msgstr "deshabilitar sparse-checkout"
+
+#, c-format
+#~ msgid "could not exec %s"
+#~ msgstr "no se pudo ejecutar %s"
+
+#~ msgid "Cannot remove temporary index (can't happen)"
+#~ msgstr "No se puede eliminar el índice temporal (no puede suceder)"
+
+#, sh-format
+#~ msgid "Cannot update $ref_stash with $w_commit"
+#~ msgstr "No se puede actualizar $ref_stash con $w_commit"
+
+#, sh-format
+#~ msgid "error: unknown option for 'stash push': $option"
+#~ msgstr "error: opción desconocida para 'stash pus': $option"
+
+#, sh-format
+#~ msgid "Saved working directory and index state $stash_msg"
+#~ msgstr "Directorio de trabajo guardado y estado de índice $stash_msg"
+
+#, sh-format
+#~ msgid "unknown option: $opt"
+#~ msgstr "opción desconocida: $opt"
+
+#, sh-format
+#~ msgid "Too many revisions specified: $REV"
+#~ msgstr "Se especificaron demasiadas revisiones: $REV"
+
+#, sh-format
+#~ msgid "$reference is not a valid reference"
+#~ msgstr "$reference no es una referencia válida"
+
+#, sh-format
+#~ msgid "'$args' is not a stash-like commit"
+#~ msgstr "'$args' no es un commit estilo stash"
+
+#, sh-format
+#~ msgid "'$args' is not a stash reference"
+#~ msgstr "'$args' no es una referencia stash"
+
+#~ msgid "unable to refresh index"
+#~ msgstr "incapaz de refrescar el índice"
+
+#~ msgid "Cannot apply a stash in the middle of a merge"
+#~ msgstr "No se puede aplicar un stash en medio de una fusión"
+
+#~ msgid "Conflicts in index. Try without --index."
+#~ msgstr "Conflictos en índice. Intente sin --index."
+
+#~ msgid "Could not save index tree"
+#~ msgstr "No se puede guardar el índice del árbol"
+
+#~ msgid "Could not restore untracked files from stash entry"
+#~ msgstr "No se pueden restaurar archivos no rastreados de la entrada stash"
+
+#~ msgid "Cannot unstage modified files"
+#~ msgstr "No se puede sacar de stage archivos modificados"
+
+#, sh-format
+#~ msgid "Dropped ${REV} ($s)"
+#~ msgstr "Botado ${REV} ($s)"
+
+#, sh-format
+#~ msgid "${REV}: Could not drop stash entry"
+#~ msgstr "${REV}: No se pudo borrar entrada stash"
+
+#~ msgid "(To restore them type \"git stash apply\")"
+#~ msgstr "(Para restaurarlos, escribe \"git stash apply\")"
+
+#, c-format
#~ msgid "Stage mode change [y,n,a,q,d%s,?]? "
#~ msgstr "¿Cambio de modo de stage [y,n,a,q,d%s,?]? "
@@ -25029,9 +25394,6 @@ msgstr "¿Realmente deseas mandar %s?[y|N]: "
#~ msgid "make rebase script"
#~ msgstr "generar script de rebase"
-#~ msgid "No such remote: %s"
-#~ msgstr "No existe el remoto: %s"
-
#~ msgid "cannot move a locked working tree"
#~ msgstr "no se puede mover un árbol de trabajo encerrado"