msgstr ""
"Project-Id-Version: Git\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2020-05-15 09:11+0800\n"
-"PO-Revision-Date: 2020-05-17 18:49-0500\n"
+"POT-Creation-Date: 2020-07-10 09:53+0800\n"
+"PO-Revision-Date: 2020-07-26 10:11-0500\n"
"Last-Translator: christopher.diaz.riv@gmail.com\n"
"Language-Team: CodeLabora <codelabora@gmail.com>\n"
"Language: es\n"
msgid "ignoring unmerged: %s"
msgstr "ignorando lo no fusionado: %s"
-#: add-interactive.c:929 add-patch.c:1675 git-add--interactive.perl:1366
+#: add-interactive.c:929 add-patch.c:1691 git-add--interactive.perl:1368
#, c-format
msgid "Only binary files changed.\n"
msgstr "Solo cambiaron archivos binarios.\n"
-#: add-interactive.c:931 add-patch.c:1673 git-add--interactive.perl:1368
+#: add-interactive.c:931 add-patch.c:1689 git-add--interactive.perl:1370
#, c-format
msgid "No changes.\n"
msgstr "Sin cambios.\n"
-#: add-interactive.c:935 git-add--interactive.perl:1376
+#: add-interactive.c:935 git-add--interactive.perl:1378
msgid "Patch update"
msgstr "Actualización del parche"
-#: add-interactive.c:974 git-add--interactive.perl:1754
+#: add-interactive.c:974 git-add--interactive.perl:1771
msgid "Review diff"
msgstr "Revisión de diff"
msgid "(empty) select nothing"
msgstr "(vacío) selecciona nada"
-#: add-interactive.c:1083 builtin/clean.c:816 git-add--interactive.perl:1851
+#: add-interactive.c:1083 builtin/clean.c:816 git-add--interactive.perl:1868
msgid "*** Commands ***"
msgstr "*** Comandos ***"
-#: add-interactive.c:1084 builtin/clean.c:817 git-add--interactive.perl:1848
+#: add-interactive.c:1084 builtin/clean.c:817 git-add--interactive.perl:1865
msgid "What now"
msgstr "Ahora que"
#: 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 bugreport.c:129
+#: builtin/submodule--helper.c:2148 bugreport.c:135
#: git-add--interactive.perl:213
msgid "path"
msgstr "ruta"
msgid "could not refresh index"
msgstr "no se pudo refrescar el index"
-#: add-interactive.c:1157 builtin/clean.c:781 git-add--interactive.perl:1765
+#: add-interactive.c:1157 builtin/clean.c:781 git-add--interactive.perl:1782
#, c-format
msgid "Bye.\n"
msgstr "Adiós.\n"
-#: add-patch.c:34 git-add--interactive.perl:1428
+#: add-patch.c:34 git-add--interactive.perl:1430
#, 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:35 git-add--interactive.perl:1429
+#: add-patch.c:35 git-add--interactive.perl:1431
#, 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:36 git-add--interactive.perl:1430
+#: add-patch.c:36 git-add--interactive.perl:1432
+#, c-format, perl-format
+msgid "Stage addition [y,n,q,a,d%s,?]? "
+msgstr "¿Agregar al stage [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:37 git-add--interactive.perl:1433
#, 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:38
+#: add-patch.c:39
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be marked for "
"staging."
"Si el parche aplica limpiamente, el hunk editado sera marcado inmediatamente "
"para el área de stage."
-#: add-patch.c:41
+#: add-patch.c:42
msgid ""
"y - stage this hunk\n"
"n - do not stage this hunk\n"
"d - no aplicar stage a este hunk o a ninguno de los posteriores en este "
"archivo\n"
-#: add-patch.c:55 git-add--interactive.perl:1433
+#: add-patch.c:56 git-add--interactive.perl:1436
#, 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:56 git-add--interactive.perl:1434
+#: add-patch.c:57 git-add--interactive.perl:1437
#, 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:57 git-add--interactive.perl:1435
+#: add-patch.c:58 git-add--interactive.perl:1438
+#, c-format, perl-format
+msgid "Stash addition [y,n,q,a,d%s,?]? "
+msgstr "¿Agregar al stash [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:59 git-add--interactive.perl:1439
#, 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:59
+#: add-patch.c:61
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be marked for "
"stashing."
"Si el parche aplica limpiamente, el hunk editado sera marcado inmediatamente "
"para aplicar stash."
-#: add-patch.c:62
+#: add-patch.c:64
msgid ""
"y - stash this hunk\n"
"n - do not stash this hunk\n"
"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:78 git-add--interactive.perl:1438
+#: add-patch.c:80 git-add--interactive.perl:1442
#, 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:79 git-add--interactive.perl:1439
+#: add-patch.c:81 git-add--interactive.perl:1443
#, 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:80 git-add--interactive.perl:1440
+#: add-patch.c:82 git-add--interactive.perl:1444
+#, c-format, perl-format
+msgid "Unstage addition [y,n,q,a,d%s,?]? "
+msgstr "¿Quitar adición al stage [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:83 git-add--interactive.perl:1445
#, 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:82
+#: add-patch.c:85
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be marked for "
"unstaging."
"Si el parche aplica limpiamente, el hunk editado sera marcado inmediatamente "
"para sacar del área de stage."
-#: add-patch.c:85
+#: add-patch.c:88
msgid ""
"y - unstage this hunk\n"
"n - do not unstage this hunk\n"
"d - no sacar del area de stage este hunk o ninguno de los posteriores en el "
"archivo\n"
-#: add-patch.c:100 git-add--interactive.perl:1443
+#: add-patch.c:103 git-add--interactive.perl:1448
#, 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:101 git-add--interactive.perl:1444
+#: add-patch.c:104 git-add--interactive.perl:1449
#, 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:102 git-add--interactive.perl:1445
+#: add-patch.c:105 git-add--interactive.perl:1450
+#, c-format, perl-format
+msgid "Apply addition to index [y,n,q,a,d%s,?]? "
+msgstr "¿Aplicar adición al índice [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:106 git-add--interactive.perl:1451
#, 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:104 add-patch.c:169 add-patch.c:212
+#: add-patch.c:108 add-patch.c:176 add-patch.c:221
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be marked for "
"applying."
"Si el parche aplica de forma limpia, el hunk editado sera marcado "
"inmediatamente para aplicar."
-#: add-patch.c:107
+#: add-patch.c:111
msgid ""
"y - apply this hunk to index\n"
"n - do not apply this hunk to index\n"
"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:122 git-add--interactive.perl:1448
-#: git-add--interactive.perl:1463
+#: add-patch.c:126 git-add--interactive.perl:1454
+#: git-add--interactive.perl:1472
#, 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:123 git-add--interactive.perl:1449
-#: git-add--interactive.perl:1464
+#: add-patch.c:127 git-add--interactive.perl:1455
+#: git-add--interactive.perl:1473
#, 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:124 git-add--interactive.perl:1450
-#: git-add--interactive.perl:1465
+#: add-patch.c:128 git-add--interactive.perl:1456
+#: git-add--interactive.perl:1474
+#, c-format, perl-format
+msgid "Discard addition from worktree [y,n,q,a,d%s,?]? "
+msgstr "¿Descartar adición del árbol de trabajo [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:129 git-add--interactive.perl:1457
+#: git-add--interactive.perl:1475
#, 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:126 add-patch.c:148 add-patch.c:191
+#: add-patch.c:131 add-patch.c:154 add-patch.c:199
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be marked for "
"discarding."
"Si el parche aplica de forma limpia, el hunk editado sera marcado "
"inmediatamente para descarte."
-#: add-patch.c:129 add-patch.c:194
+#: add-patch.c:134 add-patch.c:202
msgid ""
"y - discard this hunk from worktree\n"
"n - do not discard this hunk from worktree\n"
"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:144 add-patch.c:187 git-add--interactive.perl:1453
+#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1460
#, 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:145 add-patch.c:188 git-add--interactive.perl:1454
+#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1461
#, 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:146 add-patch.c:189 git-add--interactive.perl:1455
+#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1462
+#, c-format, perl-format
+msgid "Discard addition from index and worktree [y,n,q,a,d%s,?]? "
+msgstr "¿Descartar adición del índice y el árbol de trabajo [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1463
#, 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:151
+#: add-patch.c:157
msgid ""
"y - discard this hunk from index and worktree\n"
"n - do not discard this hunk from index and worktree\n"
"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:165 add-patch.c:208 git-add--interactive.perl:1458
+#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1466
#, 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:166 add-patch.c:209 git-add--interactive.perl:1459
+#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1467
#, 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:167 add-patch.c:210 git-add--interactive.perl:1460
+#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1468
+#, c-format, perl-format
+msgid "Apply addition to index and worktree [y,n,q,a,d%s,?]? "
+msgstr "¿Aplicar adición al índice y al árbol de trabajo [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1469
#, 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:172
+#: add-patch.c:179
msgid ""
"y - apply this hunk to index and worktree\n"
"n - do not apply this hunk to index and worktree\n"
"a - aplicar este hunk y todos los posteriores en el archivo\n"
"d - no aplicar este hunk o ninguno de los siguientes en este archivo\n"
-#: add-patch.c:215
+#: add-patch.c:224
msgid ""
"y - apply this hunk to worktree\n"
"n - do not apply this hunk to worktree\n"
"a - aplicar este hunk y todos los posteriores en el archivo\n"
"d - no aplicar este hunk o ninguno de los siguientes en este archivo\n"
-#: add-patch.c:319
+#: add-patch.c:328
#, c-format
msgid "could not parse hunk header '%.*s'"
msgstr "no se puede analizar hunk header '%.*s'"
-#: add-patch.c:338 add-patch.c:342
+#: add-patch.c:347 add-patch.c:351
#, c-format
msgid "could not parse colored hunk header '%.*s'"
msgstr "no se puede analizar hunk header '%.*s'"
-#: add-patch.c:396
+#: add-patch.c:405
msgid "could not parse diff"
msgstr "no se puede analizar diff"
-#: add-patch.c:415
+#: add-patch.c:424
msgid "could not parse colored diff"
msgstr "no se pudo analizar diff a colores"
-#: add-patch.c:429
+#: add-patch.c:438
#, c-format
msgid "failed to run '%s'"
msgstr "falló al ejecutar '%s'"
-#: add-patch.c:588
+#: add-patch.c:602
msgid "mismatched output from interactive.diffFilter"
msgstr "output de interactive.diffFilter no concuerda"
-#: add-patch.c:589
+#: add-patch.c:603
msgid ""
"Your filter must maintain a one-to-one correspondence\n"
"between its input and output lines."
"Tu filtro tiene que mantener correspondencia de uno a uno\n"
"entre las líneas de entrada y salida."
-#: add-patch.c:762
+#: add-patch.c:776
#, c-format
msgid ""
"expected context line #%d in\n"
"se esperaba línea de contexto #%d en\n"
"%.*s"
-#: add-patch.c:777
+#: add-patch.c:791
#, c-format
msgid ""
"hunks do not overlap:\n"
"\tno acaba con:\n"
"%.*s"
-#: add-patch.c:1053 git-add--interactive.perl:1112
+#: add-patch.c:1067 git-add--interactive.perl:1114
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:1057
+#: add-patch.c:1071
#, c-format
msgid ""
"---\n"
"Lineas comenzando con %c serán eliminadas.\n"
#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
-#: add-patch.c:1071 git-add--interactive.perl:1126
+#: add-patch.c:1085 git-add--interactive.perl:1128
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"
"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:1104
+#: add-patch.c:1118
msgid "could not parse hunk header"
msgstr "no se puede analizar hunk header"
-#: add-patch.c:1149
+#: add-patch.c:1163
msgid "'git apply --cached' failed"
msgstr "falló 'git apply --cached'"
#. Consider translating (saying "no" discards!) as
#. (saying "n" for "no" discards!) if the translation
#. of the word "no" does not start with n.
-#: add-patch.c:1218 git-add--interactive.perl:1239
+#: add-patch.c:1232 git-add--interactive.perl:1241
msgid ""
"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
msgstr ""
"Tu hunk editado no aplica. ¿Editar nuevamente (¡decir \"no\" descarta!) [y/"
"n]? "
-#: add-patch.c:1261
+#: add-patch.c:1275
msgid "The selected hunks do not apply to the index!"
msgstr "¡Los hunks seleccionados no aplican al índice!"
-#: add-patch.c:1262 git-add--interactive.perl:1343
+#: add-patch.c:1276 git-add--interactive.perl:1345
msgid "Apply them to the worktree anyway? "
msgstr "¿Aplicarlos al árbol de trabajo de todas maneras? "
-#: add-patch.c:1269 git-add--interactive.perl:1346
+#: add-patch.c:1283 git-add--interactive.perl:1348
msgid "Nothing was applied.\n"
msgstr "Nada fue aplicado.\n"
-#: add-patch.c:1326
+#: add-patch.c:1340
msgid ""
"j - leave this hunk undecided, see next undecided hunk\n"
"J - leave this hunk undecided, see next hunk\n"
"e - editar manualmente el hunk actual\n"
"? - imprimir ayuda\n"
-#: add-patch.c:1447 add-patch.c:1457
+#: add-patch.c:1463 add-patch.c:1473
msgid "No previous hunk"
msgstr "No el anterior hunk"
-#: add-patch.c:1452 add-patch.c:1462
+#: add-patch.c:1468 add-patch.c:1478
msgid "No next hunk"
msgstr "No el siguiente hunk"
-#: add-patch.c:1468
+#: add-patch.c:1484
msgid "No other hunks to goto"
msgstr "No hay más pedazos para el ir"
-#: add-patch.c:1479 git-add--interactive.perl:1577
+#: add-patch.c:1495 git-add--interactive.perl:1594
msgid "go to which hunk (<ret> to see more)? "
msgstr "¿a que hunk ir (<enter> para ver más)? "
-#: add-patch.c:1480 git-add--interactive.perl:1579
+#: add-patch.c:1496 git-add--interactive.perl:1596
msgid "go to which hunk? "
msgstr "¿a que hunk ir? "
-#: add-patch.c:1491
+#: add-patch.c:1507
#, c-format
msgid "Invalid number: '%s'"
msgstr "Numero inválido: '%s'"
-#: add-patch.c:1496
+#: add-patch.c:1512
#, c-format
msgid "Sorry, only %d hunk available."
msgid_plural "Sorry, only %d hunks available."
msgstr[0] "Lo siento, solo %d hunk disponible."
msgstr[1] "Lo siento, solo %d hunks disponibles."
-#: add-patch.c:1505
+#: add-patch.c:1521
msgid "No other hunks to search"
msgstr "No hay más pedazos para buscar"
-#: add-patch.c:1511 git-add--interactive.perl:1623
+#: add-patch.c:1527 git-add--interactive.perl:1640
msgid "search for regex? "
msgstr "¿buscar para regexp? "
-#: add-patch.c:1526
+#: add-patch.c:1542
#, c-format
msgid "Malformed search regexp %s: %s"
msgstr "Regexp para la búsqueda mal formado %s: %s"
-#: add-patch.c:1543
+#: add-patch.c:1559
msgid "No hunk matches the given pattern"
msgstr "No hay hunks que concuerden con el patrón entregado."
-#: add-patch.c:1550
+#: add-patch.c:1566
msgid "Sorry, cannot split this hunk"
msgstr "Perdón, no se puede dividir este pedazo"
-#: add-patch.c:1554
+#: add-patch.c:1570
#, c-format
msgid "Split into %d hunks."
msgstr "Cortar en %d hunk."
-#: add-patch.c:1558
+#: add-patch.c:1574
msgid "Sorry, cannot edit this hunk"
msgstr "Perdón, no se puede editar este pedazo"
-#: add-patch.c:1609
+#: add-patch.c:1625
msgid "'git apply' failed"
msgstr "falló 'git apply'"
#: 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:3458 builtin/rebase.c:1332
+#: builtin/pack-objects.c:3530 builtin/rebase.c:1332
msgid "action"
msgstr "acción"
msgstr "permitir solapamiento de hunks"
#: apply.c:5025 builtin/add.c:323 builtin/check-ignore.c:22
-#: builtin/commit.c:1366 builtin/count-objects.c:98 builtin/fsck.c:774
+#: builtin/commit.c:1366 builtin/count-objects.c:98 builtin/fsck.c:775
#: builtin/log.c:2186 builtin/mv.c:123 builtin/read-tree.c:128
msgid "be verbose"
msgstr "ser verboso"
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
+#: archive-zip.c:480 builtin/pack-objects.c:243 builtin/pack-objects.c:246
#, c-format
msgid "deflate error (%d)"
msgstr "error al desinflar (%d)"
msgstr "anteponer prefijo a cada ruta en el archivo"
#: 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:907
+#: builtin/commit-tree.c:117 builtin/config.c:130 builtin/fast-export.c:1208
+#: builtin/fast-export.c:1210 builtin/fast-export.c:1214 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
msgstr ""
"--reverse y --first-parent juntos requieren especificar el último commit"
-#: blame.c:2821 bundle.c:167 ref-filter.c:2200 remote.c:1924 sequencer.c:2018
+#: blame.c:2821 bundle.c:187 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/merge.c:415 builtin/pack-objects.c:3348 builtin/pack-objects.c:3363
#: builtin/shortlog.c:192
msgid "revision walk setup failed"
msgstr "falló la configuración del camino de revisión"
msgid "HEAD of working tree %s is not updated"
msgstr "HEAD del árbol de trabajo %s no está actualizada"
-#: bundle.c:36
+#: bundle.c:47
#, c-format
msgid "'%s' does not look like a v2 bundle file"
msgstr "'%s' no se ve como un archivo bundle v2"
-#: bundle.c:64
+#: bundle.c:69
+msgid "unknown hash algorithm length"
+msgstr "largo del algoritmo hash desconocido"
+
+#: bundle.c:84
#, c-format
msgid "unrecognized header: %s%s (%d)"
msgstr "header no reconocido %s%s (%d)"
-#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2270 sequencer.c:3034
+#: bundle.c:110 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'"
-#: bundle.c:143
+#: bundle.c:163
msgid "Repository lacks these prerequisite commits:"
msgstr "Al repositorio le falta estos commits prerrequisito:"
-#: bundle.c:146
+#: bundle.c:166
msgid "need a repository to verify a bundle"
msgstr "se necesita un repositorio para verificar un bundle"
-#: bundle.c:197
+#: bundle.c:217
#, c-format
msgid "The bundle contains this ref:"
msgid_plural "The bundle contains these %d refs:"
msgstr[0] "El bundle contiene esta referencia:"
msgstr[1] "El bundle contiene estas %d referencias:"
-#: bundle.c:204
+#: bundle.c:224
msgid "The bundle records a complete history."
msgstr "El bundle registra una historia completa."
-#: bundle.c:206
+#: bundle.c:226
#, c-format
msgid "The bundle requires this ref:"
msgid_plural "The bundle requires these %d refs:"
msgstr[0] "El bundle requiere esta referencia:"
msgstr[1] "El bundle requiere estas %d referencias:"
-#: bundle.c:273
+#: bundle.c:293
msgid "unable to dup bundle descriptor"
msgstr "incapaz de duplicar bundle descriptor"
-#: bundle.c:280
+#: bundle.c:300
msgid "Could not spawn pack-objects"
msgstr "No se pudo crear los pack-objetcts"
-#: bundle.c:291
+#: bundle.c:311
msgid "pack-objects died"
msgstr "pack-objects murió"
-#: bundle.c:333
+#: bundle.c:353
msgid "rev-list died"
msgstr "rev-list murió"
-#: bundle.c:382
+#: bundle.c:402
#, c-format
msgid "ref '%s' is excluded by the rev-list options"
msgstr "referencia '%s' es excluida por las opciones de rev-list"
-#: bundle.c:461 builtin/log.c:208 builtin/log.c:1834 builtin/shortlog.c:306
+#: bundle.c:481 builtin/log.c:208 builtin/log.c:1834 builtin/shortlog.c:306
#, c-format
msgid "unrecognized argument: %s"
msgstr "argumento no reconocido: %s"
-#: bundle.c:469
+#: bundle.c:489
msgid "Refusing to create empty bundle."
msgstr "Rechazando crear un bundle vacío."
-#: bundle.c:479
+#: bundle.c:499
#, c-format
msgid "cannot create '%s'"
msgstr "no se puede crear '%s'"
-#: bundle.c:504
+#: bundle.c:524
msgid "index-pack died"
msgstr "index-pack murió"
msgid "invalid color value: %.*s"
msgstr "color inválido: %.*s"
-#: commit-graph.c:183
+#: commit-graph.c:238
msgid "commit-graph file is too small"
msgstr "archivo commit-graph es muy pequeño"
-#: commit-graph.c:248
+#: commit-graph.c:303
#, 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:255
+#: commit-graph.c:310
#, 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:262
+#: commit-graph.c:317
#, 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:284
+#: commit-graph.c:339
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:294
+#: commit-graph.c:349
#, c-format
msgid "commit-graph improper chunk offset %08x%08x"
msgstr "offset del chunk de commit-graph inapropiado %08x%08x"
-#: commit-graph.c:362
+#: commit-graph.c:417
#, 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:436
+#: commit-graph.c:491
msgid "commit-graph has no base graphs chunk"
msgstr "commit-graph no tiene una chunk base de graphs"
-#: commit-graph.c:446
+#: commit-graph.c:501
msgid "commit-graph chain does not match"
msgstr "cadena commit-graph no concuerda"
-#: commit-graph.c:494
+#: commit-graph.c:549
#, 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:518
+#: commit-graph.c:573
msgid "unable to find all commit-graph files"
msgstr "no es posible encontrar los archivos commit-graph"
-#: commit-graph.c:651 commit-graph.c:711
+#: commit-graph.c:706 commit-graph.c:770
msgid "invalid commit position. commit-graph is likely corrupt"
msgstr "posición de commit inválida. commit-graph está probablemente corrupto"
-#: commit-graph.c:672
+#: commit-graph.c:727
#, c-format
msgid "could not find commit %s"
msgstr "no se pudo encontrar commit %s"
-#: commit-graph.c:948 builtin/am.c:1292
+#: commit-graph.c:1009 builtin/am.c:1292
#, c-format
msgid "unable to parse commit %s"
msgstr "no es posible analizar el commit %s"
-#: commit-graph.c:1096
+#: commit-graph.c:1157
msgid "Writing changed paths Bloom filters index"
msgstr "Escribiendo cambios de ruta del índice de filtros Bloom"
-#: commit-graph.c:1121
+#: commit-graph.c:1182
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
+#: commit-graph.c:1221 builtin/pack-objects.c:2832
#, c-format
msgid "unable to get type of object %s"
msgstr "incapaz de obtener el tipo de objeto: %s"
-#: commit-graph.c:1196
+#: commit-graph.c:1257
msgid "Loading known commits in commit graph"
msgstr "Cargando commits conocidos en commit graph"
-#: commit-graph.c:1213
+#: commit-graph.c:1274
msgid "Expanding reachable commits in commit graph"
msgstr "Expandiendo commits alcanzables en commit graph"
-#: commit-graph.c:1233
+#: commit-graph.c:1294
msgid "Clearing commit marks in commit graph"
msgstr "Limpiando marcas de commits en commit graph"
-#: commit-graph.c:1252
+#: commit-graph.c:1313
msgid "Computing commit graph generation numbers"
msgstr "Calculando números de generación de commit graph"
-#: commit-graph.c:1300
+#: commit-graph.c:1367
msgid "Computing commit changed paths Bloom filters"
msgstr "Calculando números de generación de commit graph"
-#: commit-graph.c:1359
+#: commit-graph.c:1423
+msgid "Collecting referenced commits"
+msgstr "Recolectando commits referenciados"
+
+#: commit-graph.c:1447
#, 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:1372
+#: commit-graph.c:1460
#, c-format
msgid "error adding pack %s"
msgstr "error agregando pack %s"
-#: commit-graph.c:1376
+#: commit-graph.c:1464
#, c-format
msgid "error opening index for %s"
msgstr "error abriendo index para %s"
-#: 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:1426
-#, c-format
-msgid "invalid commit object id: %s"
-msgstr "id de objeto commit: %s inválido"
-
-#: commit-graph.c:1442
+#: commit-graph.c:1503
msgid "Finding commits for commit graph among packed objects"
msgstr "Encontrando commits para commit graph entre los objetos empaquetados"
-#: commit-graph.c:1457
+#: commit-graph.c:1518
msgid "Counting distinct commits in commit graph"
msgstr "Contando commits distintos en commit graph"
-#: commit-graph.c:1489
+#: commit-graph.c:1550
msgid "Finding extra edges in commit graph"
msgstr "Encontrando esquinas extra en commit graph"
-#: commit-graph.c:1538
+#: commit-graph.c:1599
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:1572 midx.c:812
+#: commit-graph.c:1633 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:1585
+#: commit-graph.c:1646
msgid "unable to create temporary graph layer"
msgstr "no es posible crear un una capa de gráfico temporal"
-#: commit-graph.c:1590
+#: commit-graph.c:1651
#, c-format
msgid "unable to adjust shared permissions for '%s'"
msgstr "no se pudo poner permisos a '%s'"
-#: commit-graph.c:1667
+#: commit-graph.c:1728
#, 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:1712
+#: commit-graph.c:1773
msgid "unable to open commit-graph chain file"
msgstr "no se pudo abrir la cadena de archivos commit-graph"
-#: commit-graph.c:1728
+#: commit-graph.c:1789
msgid "failed to rename base commit-graph file"
msgstr "no se pudo renombrar el archivo base commit-graph"
-#: commit-graph.c:1748
+#: commit-graph.c:1809
msgid "failed to rename temporary commit-graph file"
msgstr "falló al renombrar el archivo temporal commit-graph"
-#: commit-graph.c:1874
+#: commit-graph.c:1935
msgid "Scanning merged commits"
msgstr "Escaneando commits fusionados"
-#: commit-graph.c:1885
+#: commit-graph.c:1946
#, c-format
msgid "unexpected duplicate commit id %s"
msgstr "id de commit duplicado inesperado %s"
-#: commit-graph.c:1908
+#: commit-graph.c:1969
msgid "Merging commit-graph"
msgstr "Fusionando commit-graph"
-#: commit-graph.c:2096
+#: commit-graph.c:2156
#, 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:2107
+#: commit-graph.c:2167
msgid "too many commits to write graph"
msgstr "demasiados commits para escribir el gráfico"
-#: commit-graph.c:2200
+#: commit-graph.c:2260
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:2210
+#: commit-graph.c:2270
#, 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:2220 commit-graph.c:2235
+#: commit-graph.c:2280 commit-graph.c:2295
#, 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:2227
+#: commit-graph.c:2287
#, c-format
msgid "failed to parse commit %s from commit-graph"
msgstr "falló al analizar commit %s para commit-graph"
-#: commit-graph.c:2245
+#: commit-graph.c:2305
msgid "Verifying commits in commit graph"
msgstr "Verificando commits en commit graph"
-#: commit-graph.c:2259
+#: commit-graph.c:2320
#, 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:2266
+#: commit-graph.c:2327
#, 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:2276
+#: commit-graph.c:2337
#, 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:2285
+#: commit-graph.c:2346
#, c-format
msgid "commit-graph parent for %s is %s != %s"
msgstr "padre de commit-graph para %s es %s != %s"
-#: commit-graph.c:2298
+#: commit-graph.c:2360
#, 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:2303
+#: commit-graph.c:2365
#, 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:2307
+#: commit-graph.c:2369
#, 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:2322
+#: commit-graph.c:2385
#, 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:2328
+#: commit-graph.c:2391
#, c-format
msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
msgstr ""
"Apapa este mensaje ejecutando\n"
"\"git config advice.graftFileDeprecated false\""
-#: commit.c:1168
+#: commit.c:1172
#, 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
+#: commit.c:1176
#, 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
+#: commit.c:1179
#, c-format
msgid "Commit %s does not have a GPG signature."
msgstr "Commit %s no tiene una firma GPG."
-#: commit.c:1178
+#: commit.c:1182
#, 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
+#: commit.c:1436
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"
msgid "must be one of nothing, matching, simple, upstream or current"
msgstr "debe ser uno de nothing, matching, simple, upstream o current"
-#: config.c:1533 builtin/pack-objects.c:3542
+#: config.c:1533 builtin/pack-objects.c:3617
#, c-format
msgid "bad pack compression level %d"
msgstr "nivel de compresión de pack erróneo %d"
msgid "server doesn't support '%s'"
msgstr "servidor no soporta '%s'"
-#: connect.c:103
+#: connect.c:118
#, c-format
msgid "server doesn't support feature '%s'"
msgstr "servidor no soporta feature '%s'"
-#: connect.c:114
+#: connect.c:129
msgid "expected flush after capabilities"
msgstr "se espera flush tras capacidades"
-#: connect.c:233
+#: connect.c:263
#, c-format
msgid "ignoring capabilities after first line '%s'"
msgstr "ignorando capacidades tras primera línea '%s'"
-#: connect.c:252
+#: connect.c:284
msgid "protocol error: unexpected capabilities^{}"
msgstr "error de protocolo: capacidades imprevistas^{}"
-#: connect.c:273
+#: connect.c:306
#, c-format
msgid "protocol error: expected shallow sha-1, got '%s'"
msgstr "error de protocolo: sha-1 superficial esperado, se obtuvo '%s'"
-#: connect.c:275
+#: connect.c:308
msgid "repository on the other end cannot be shallow"
msgstr "el repositorio en el otro final no puede ser superficial"
-#: connect.c:313
+#: connect.c:347
msgid "invalid packet"
msgstr "paquete inválido"
-#: connect.c:333
+#: connect.c:367
#, c-format
msgid "protocol error: unexpected '%s'"
msgstr "error de protocolo: '%s' inesperado"
-#: connect.c:441
+#: connect.c:473
+#, c-format
+msgid "unknown object format '%s' specified by server"
+msgstr "formato de objeto desconocido '%s' ha sido provisto por el servidor"
+
+#: connect.c:500
#, c-format
msgid "invalid ls-refs response: %s"
msgstr "respuesta de referencias ls-refs inválida: %s"
-#: connect.c:445
+#: connect.c:504
msgid "expected flush after ref listing"
msgstr "flush esperado tras listado de refs"
-#: connect.c:544
+#: connect.c:507
+msgid "expected response end packet after ref listing"
+msgstr "se esperaba un paquete final luego del ref listing"
+
+#: connect.c:640
#, c-format
msgid "protocol '%s' is not supported"
msgstr "protocolo '%s' no es soportado"
-#: connect.c:595
+#: connect.c:691
msgid "unable to set SO_KEEPALIVE on socket"
msgstr "no es posible configurar SO_KEEPALIVE en el socket"
-#: connect.c:635 connect.c:698
+#: connect.c:731 connect.c:794
#, c-format
msgid "Looking up %s ... "
msgstr "Revisando %s... "
-#: connect.c:639
+#: connect.c:735
#, c-format
msgid "unable to look up %s (port %s) (%s)"
msgstr "no se puede revisar %s (puerto %s) (%s)"
#. TRANSLATORS: this is the end of "Looking up %s ... "
-#: connect.c:643 connect.c:714
+#: connect.c:739 connect.c:810
#, c-format
msgid ""
"done.\n"
"hecho.\n"
"Conectando a %s (puerto %s) ... "
-#: connect.c:665 connect.c:742
+#: connect.c:761 connect.c:838
#, c-format
msgid ""
"unable to connect to %s:\n"
"%s"
#. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
-#: connect.c:671 connect.c:748
+#: connect.c:767 connect.c:844
msgid "done."
msgstr "hecho."
-#: connect.c:702
+#: connect.c:798
#, c-format
msgid "unable to look up %s (%s)"
msgstr "no es posible revisar %s (%s)"
-#: connect.c:708
+#: connect.c:804
#, c-format
msgid "unknown port %s"
msgstr "puerto desconocido %s"
-#: connect.c:845 connect.c:1175
+#: connect.c:941 connect.c:1271
#, c-format
msgid "strange hostname '%s' blocked"
msgstr "hostname extraño '%s' bloqueado"
-#: connect.c:847
+#: connect.c:943
#, c-format
msgid "strange port '%s' blocked"
msgstr "puerto extraño '%s' bloqueado"
-#: connect.c:857
+#: connect.c:953
#, c-format
msgid "cannot start proxy %s"
msgstr "no se puede comenzar proxy %s"
-#: connect.c:928
+#: connect.c:1024
msgid "no path specified; see 'git help pull' for valid url syntax"
msgstr ""
"no hay ruta especificada; vea 'git help pull' para sintaxis de url válidas"
-#: connect.c:1123
+#: connect.c:1219
msgid "ssh variant 'simple' does not support -4"
msgstr "variante 'simple' de ssh no soporta -4"
-#: connect.c:1135
+#: connect.c:1231
msgid "ssh variant 'simple' does not support -6"
msgstr "variante 'simple' de ssh no soporta -6"
-#: connect.c:1152
+#: connect.c:1248
msgid "ssh variant 'simple' does not support setting port"
msgstr "variante ssh 'simple' no soporta configurar puerto"
-#: connect.c:1264
+#: connect.c:1360
#, c-format
msgid "strange pathname '%s' blocked"
msgstr "ruta extraña '%s' bloqueada"
-#: connect.c:1311
+#: connect.c:1407
msgid "unable to fork"
msgstr "no es posible hacer fork"
-#: connected.c:107 builtin/fsck.c:208 builtin/prune.c:45
+#: connected.c:109 builtin/fsck.c:209 builtin/prune.c:45
msgid "Checking connectivity"
msgstr "Verificando conectividad"
-#: connected.c:119
+#: connected.c:121
msgid "Could not run 'git rev-list'"
msgstr "No se pudo correr 'git rev-list'"
-#: connected.c:139
+#: connected.c:141
msgid "failed write to rev-list"
msgstr "falló escribir a rev-list"
-#: connected.c:146
+#: connected.c:148
msgid "failed to close rev-list's stdin"
msgstr "falló al cerrar la entrada standard de rev-list"
"No es un repositorio git. Use --no-index para comparar dos paths fuera del "
"árbol de trabajo"
-#: diff.c:155
+#: diff.c:156
#, c-format
msgid " Failed to parse dirstat cut-off percentage '%s'\n"
msgstr " Falló al analizar dirstat porcentaje de corte '%s'\n"
-#: diff.c:160
+#: diff.c:161
#, c-format
msgid " Unknown dirstat parameter '%s'\n"
msgstr " parámetro '%s' de dirstat desconocido\n"
-#: diff.c:296
+#: diff.c:297
msgid ""
"color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
"'dimmed-zebra', 'plain'"
"opción de color tiene que ser una de 'no', 'default', 'blocks', 'zebra', "
"'dimmed_zebra', 'plain'"
-#: diff.c:324
+#: diff.c:325
#, c-format
msgid ""
"unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', "
"change', 'ignore-space-at-eol', 'ignore-all-space', 'allow-indentation-"
"change'"
-#: diff.c:332
+#: diff.c:333
msgid ""
"color-moved-ws: allow-indentation-change cannot be combined with other "
"whitespace modes"
"color-moved-ws: allow-indentation-change no puede ser combinado con otros "
"modos de espacios en blanco"
-#: diff.c:405
+#: diff.c:410
#, c-format
msgid "Unknown value for 'diff.submodule' config variable: '%s'"
msgstr ""
"Valor para la variable de configuración 'diff.submodule' desconocido: '%s'"
-#: diff.c:465
+#: diff.c:470
#, c-format
msgid ""
"Found errors in 'diff.dirstat' config variable:\n"
"Errores en la variable de config 'diff.dirstat' encontrados:\n"
"%s"
-#: diff.c:4238
+#: diff.c:4243
#, c-format
msgid "external diff died, stopping at %s"
msgstr "diff externo murió, deteniendo en %s"
-#: diff.c:4583
+#: diff.c:4589
msgid "--name-only, --name-status, --check and -s are mutually exclusive"
msgstr "--name-only, --name-status, --check y -s son mutuamente exclusivas"
-#: diff.c:4586
+#: diff.c:4592
msgid "-G, -S and --find-object are mutually exclusive"
msgstr "-G, -S y --find-object son mutuamente exclusivas"
-#: diff.c:4664
+#: diff.c:4670
msgid "--follow requires exactly one pathspec"
msgstr "--follow requiere exactamente un pathspec"
-#: diff.c:4712
+#: diff.c:4718
#, c-format
msgid "invalid --stat value: %s"
msgstr "valor --stat inválido: %s"
-#: diff.c:4717 diff.c:4722 diff.c:4727 diff.c:4732 diff.c:5245
+#: diff.c:4723 diff.c:4728 diff.c:4733 diff.c:4738 diff.c:5250
#: 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:4749
+#: diff.c:4755
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
"Falló al analizar parámetro de opción --dirstat/-X:\n"
"%s"
-#: diff.c:4834
+#: diff.c:4840
#, c-format
msgid "unknown change class '%c' in --diff-filter=%s"
msgstr "cambio de clase desconocido '%c' en --diff-filter=%s"
-#: diff.c:4858
+#: diff.c:4864
#, c-format
msgid "unknown value after ws-error-highlight=%.*s"
msgstr "valor desconocido luego de ws-error-highlight=%.*s"
-#: diff.c:4872
+#: diff.c:4878
#, c-format
msgid "unable to resolve '%s'"
msgstr "no se puede resolver '%s'"
-#: diff.c:4922 diff.c:4928
+#: diff.c:4928 diff.c:4934
#, c-format
msgid "%s expects <n>/<m> form"
msgstr "%s espera forma <n>/<m>"
-#: diff.c:4940
+#: diff.c:4946
#, c-format
msgid "%s expects a character, got '%s'"
msgstr "%s esperaba un char, se obtuvo '%s'"
-#: diff.c:4961
+#: diff.c:4967
#, c-format
msgid "bad --color-moved argument: %s"
msgstr "mal argumento --color-moved: %s"
-#: diff.c:4980
+#: diff.c:4986
#, c-format
msgid "invalid mode '%s' in --color-moved-ws"
msgstr "modo inválido '%s' en --color-moved-ws"
-#: diff.c:5020
+#: diff.c:5026
msgid ""
"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
"\"histogram\""
"opción diff-algorithm acepta \"myers\", \"minimal\", \"patience\" e "
"\"histogram\""
-#: diff.c:5056 diff.c:5076
+#: diff.c:5062 diff.c:5082
#, c-format
msgid "invalid argument to %s"
msgstr "argumento inválido para %s"
-#: diff.c:5214
+#: diff.c:5219
#, c-format
msgid "failed to parse --submodule option parameter: '%s'"
msgstr "falló al analizar parámetro de opción --submodule: '%s'"
-#: diff.c:5270
+#: diff.c:5275
#, c-format
msgid "bad --word-diff argument: %s"
msgstr "mal argumento --word-diff: %s"
-#: diff.c:5293
+#: diff.c:5298
msgid "Diff output format options"
msgstr "Opciones de formato de salida para diff"
-#: diff.c:5295 diff.c:5301
+#: diff.c:5300 diff.c:5306
msgid "generate patch"
msgstr "generar parche"
-#: diff.c:5298 builtin/log.c:177
+#: diff.c:5303 builtin/log.c:177
msgid "suppress diff output"
msgstr "suprimir salida de diff"
-#: diff.c:5303 diff.c:5417 diff.c:5424
+#: diff.c:5308 diff.c:5422 diff.c:5429
msgid "<n>"
msgstr "<n>"
-#: diff.c:5304 diff.c:5307
+#: diff.c:5309 diff.c:5312
msgid "generate diffs with <n> lines context"
msgstr "genera diffs con <n> líneas de contexto"
-#: diff.c:5309
+#: diff.c:5314
msgid "generate the diff in raw format"
msgstr "genera el diff en formato raw"
-#: diff.c:5312
+#: diff.c:5317
msgid "synonym for '-p --raw'"
msgstr "sinónimo para '-p --stat'"
-#: diff.c:5316
+#: diff.c:5321
msgid "synonym for '-p --stat'"
msgstr "sinónimo para '-p --stat'"
-#: diff.c:5320
+#: diff.c:5325
msgid "machine friendly --stat"
msgstr "--stat amigable para máquina"
-#: diff.c:5323
+#: diff.c:5328
msgid "output only the last line of --stat"
msgstr "mostrar solo la última línea para --stat"
-#: diff.c:5325 diff.c:5333
+#: diff.c:5330 diff.c:5338
msgid "<param1,param2>..."
msgstr "<param1,param2>..."
-#: diff.c:5326
+#: diff.c:5331
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:5330
+#: diff.c:5335
msgid "synonym for --dirstat=cumulative"
msgstr "sinónimo para --dirstat=cumulative"
-#: diff.c:5334
+#: diff.c:5339
msgid "synonym for --dirstat=files,param1,param2..."
msgstr "sinonimo para --dirstat=archivos,param1,param2..."
-#: diff.c:5338
+#: diff.c:5343
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:5341
+#: diff.c:5346
msgid "condensed summary such as creations, renames and mode changes"
msgstr ""
"resumen condensado de creaciones, cambios de nombres y cambios de modos"
-#: diff.c:5344
+#: diff.c:5349
msgid "show only names of changed files"
msgstr "mostrar solo nombres de archivos cambiados"
-#: diff.c:5347
+#: diff.c:5352
msgid "show only names and status of changed files"
msgstr "mostrar solo nombres y estados de archivos cambiados"
-#: diff.c:5349
+#: diff.c:5354
msgid "<width>[,<name-width>[,<count>]]"
msgstr "<ancho>[,<nombre-ancho>[,<cantidad>]]"
-#: diff.c:5350
+#: diff.c:5355
msgid "generate diffstat"
msgstr "generar diffstat"
-#: diff.c:5352 diff.c:5355 diff.c:5358
+#: diff.c:5357 diff.c:5360 diff.c:5363
msgid "<width>"
msgstr "<ancho>"
-#: diff.c:5353
+#: diff.c:5358
msgid "generate diffstat with a given width"
msgstr "genera diffstat con un ancho dado"
-#: diff.c:5356
+#: diff.c:5361
msgid "generate diffstat with a given name width"
msgstr "genera diffstat con un nombre de ancho dado"
-#: diff.c:5359
+#: diff.c:5364
msgid "generate diffstat with a given graph width"
msgstr "genera diffstat con un ancho de graph dado"
-#: diff.c:5361
+#: diff.c:5366
msgid "<count>"
msgstr "<cantidad>"
-#: diff.c:5362
+#: diff.c:5367
msgid "generate diffstat with limited lines"
msgstr "genera diffstat con líneas limitadas"
-#: diff.c:5365
+#: diff.c:5370
msgid "generate compact summary in diffstat"
msgstr "genera un resumen compacto de diffstat"
-#: diff.c:5368
+#: diff.c:5373
msgid "output a binary diff that can be applied"
msgstr "muestra un diff binario que puede ser aplicado"
-#: diff.c:5371
+#: diff.c:5376
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:5373
+#: diff.c:5378
msgid "show colored diff"
msgstr "mostrar diff colorido"
-#: diff.c:5374
+#: diff.c:5379
msgid "<kind>"
msgstr "<tipo>"
-#: diff.c:5375
+#: diff.c:5380
msgid ""
"highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
"diff"
"resaltar errores de espacios en blanco en las líneas 'context', 'old' o "
"'new' del diff"
-#: diff.c:5378
+#: diff.c:5383
msgid ""
"do not munge pathnames and use NULs as output field terminators in --raw or "
"--numstat"
"no consolidar los pathnames y usar NULs como terminadores de campos en --raw "
"o --numstat"
-#: diff.c:5381 diff.c:5384 diff.c:5387 diff.c:5493
+#: diff.c:5386 diff.c:5389 diff.c:5392 diff.c:5498
msgid "<prefix>"
msgstr "<prefijo>"
-#: diff.c:5382
+#: diff.c:5387
msgid "show the given source prefix instead of \"a/\""
msgstr "mostrar el prefijo de fuente dado en lugar de \"a/\""
-#: diff.c:5385
+#: diff.c:5390
msgid "show the given destination prefix instead of \"b/\""
msgstr "mostrar el prefijo de destino en lugar de \"b/\""
-#: diff.c:5388
+#: diff.c:5393
msgid "prepend an additional prefix to every line of output"
msgstr "anteponer un prefijo adicional a cada línea mostrada"
-#: diff.c:5391
+#: diff.c:5396
msgid "do not show any source or destination prefix"
msgstr "no mostrar ningún prefijo de fuente o destino"
-#: diff.c:5394
+#: diff.c:5399
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:5398 diff.c:5403 diff.c:5408
+#: diff.c:5403 diff.c:5408 diff.c:5413
msgid "<char>"
msgstr "<char>"
-#: diff.c:5399
+#: diff.c:5404
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:5404
+#: diff.c:5409
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:5409
+#: diff.c:5414
msgid "specify the character to indicate a context instead of ' '"
msgstr "especifica el char para indicar un contexto en lugar de ' '"
-#: diff.c:5412
+#: diff.c:5417
msgid "Diff rename options"
msgstr "Opciones de diff rename"
-#: diff.c:5413
+#: diff.c:5418
msgid "<n>[/<m>]"
msgstr "<n>[/<m>]"
-#: diff.c:5414
+#: diff.c:5419
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:5418
+#: diff.c:5423
msgid "detect renames"
msgstr "detectar renombrados"
-#: diff.c:5422
+#: diff.c:5427
msgid "omit the preimage for deletes"
msgstr "omite la preimage para borrados"
-#: diff.c:5425
+#: diff.c:5430
msgid "detect copies"
msgstr "detectar copias"
-#: diff.c:5429
+#: diff.c:5434
msgid "use unmodified files as source to find copies"
msgstr "usa archivos no modificados como fuente para encontrar copias"
-#: diff.c:5431
+#: diff.c:5436
msgid "disable rename detection"
msgstr "deshabilita detección de renombres"
-#: diff.c:5434
+#: diff.c:5439
msgid "use empty blobs as rename source"
msgstr "usa blobs vacíos como fuente de renombre"
-#: diff.c:5436
+#: diff.c:5441
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:5439
+#: diff.c:5444
msgid ""
"prevent rename/copy detection if the number of rename/copy targets exceeds "
"given limit"
"previene detección de renombre/copias si el número de objetivos para "
"renombres/copias excede el límite dado"
-#: diff.c:5441
+#: diff.c:5446
msgid "Diff algorithm options"
msgstr "Opciones de algoritmos de diff"
-#: diff.c:5443
+#: diff.c:5448
msgid "produce the smallest possible diff"
msgstr "produce el diff más pequeño posible"
-#: diff.c:5446
+#: diff.c:5451
msgid "ignore whitespace when comparing lines"
msgstr "ignorar espacios en blanco cuando comparando líneas"
-#: diff.c:5449
+#: diff.c:5454
msgid "ignore changes in amount of whitespace"
msgstr "ignorar cambios en la cantidad de líneas en blanco"
-#: diff.c:5452
+#: diff.c:5457
msgid "ignore changes in whitespace at EOL"
msgstr "ignorar cambios en espacios en blanco en EOL"
-#: diff.c:5455
+#: diff.c:5460
msgid "ignore carrier-return at the end of line"
msgstr "ignora carrier-return al final de la línea"
-#: diff.c:5458
+#: diff.c:5463
msgid "ignore changes whose lines are all blank"
msgstr "ignora cambios cuyas líneas son todas en blanco"
-#: diff.c:5461
+#: diff.c:5466
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:5464
+#: diff.c:5469
msgid "generate diff using the \"patience diff\" algorithm"
msgstr "genera un diff usando algoritmo \"patience diff\""
-#: diff.c:5468
+#: diff.c:5473
msgid "generate diff using the \"histogram diff\" algorithm"
msgstr "genera un diff usando algoritmo \"histogram diff\""
-#: diff.c:5470
+#: diff.c:5475
msgid "<algorithm>"
msgstr "<algoritmo>"
-#: diff.c:5471
+#: diff.c:5476
msgid "choose a diff algorithm"
msgstr "escoge un algoritmo para diff"
-#: diff.c:5473
+#: diff.c:5478
msgid "<text>"
msgstr "<texto>"
-#: diff.c:5474
+#: diff.c:5479
msgid "generate diff using the \"anchored diff\" algorithm"
msgstr "genera un diff usando algoritmo \"anchored diff\""
-#: diff.c:5476 diff.c:5485 diff.c:5488
+#: diff.c:5481 diff.c:5490 diff.c:5493
msgid "<mode>"
msgstr "<modo>"
-#: diff.c:5477
+#: diff.c:5482
msgid "show word diff, using <mode> to delimit changed words"
msgstr ""
"muestra diff por palabras usando <modo> para delimitar las palabras cambiadas"
-#: diff.c:5479 diff.c:5482 diff.c:5527
+#: diff.c:5484 diff.c:5487 diff.c:5532
msgid "<regex>"
msgstr "<regex>"
-#: diff.c:5480
+#: diff.c:5485
msgid "use <regex> to decide what a word is"
msgstr "usa <regex> para decidir que palabra es"
-#: diff.c:5483
+#: diff.c:5488
msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
msgstr "equivalente a --word-diff=color --word-diff-regex=<regex>"
-#: diff.c:5486
+#: diff.c:5491
msgid "moved lines of code are colored differently"
msgstr "líneas movidas de código están coloreadas diferente"
-#: diff.c:5489
+#: diff.c:5494
msgid "how white spaces are ignored in --color-moved"
msgstr "como espacios en blanco son ignorados en --color-moved"
-#: diff.c:5492
+#: diff.c:5497
msgid "Other diff options"
msgstr "Otras opciones de diff"
-#: diff.c:5494
+#: diff.c:5499
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:5498
+#: diff.c:5503
msgid "treat all files as text"
msgstr "tratar todos los archivos como texto"
-#: diff.c:5500
+#: diff.c:5505
msgid "swap two inputs, reverse the diff"
msgstr "cambia dos inputs, invierte el diff"
-#: diff.c:5502
+#: diff.c:5507
msgid "exit with 1 if there were differences, 0 otherwise"
msgstr "termina con 1 si hubieron diferencias, de lo contrario con 0"
-#: diff.c:5504
+#: diff.c:5509
msgid "disable all output of the program"
msgstr "deshabilita todo el output del programa"
-#: diff.c:5506
+#: diff.c:5511
msgid "allow an external diff helper to be executed"
msgstr "permite la ejecución de un diff helper externo"
-#: diff.c:5508
+#: diff.c:5513
msgid "run external text conversion filters when comparing binary files"
msgstr ""
"ejecuta filtros de conversión de texto externos cuando comparando binarios"
-#: diff.c:5510
+#: diff.c:5515
msgid "<when>"
msgstr "<cuando>"
-#: diff.c:5511
+#: diff.c:5516
msgid "ignore changes to submodules in the diff generation"
msgstr "ignorar cambios a submódulos en la generación de diff"
-#: diff.c:5514
+#: diff.c:5519
msgid "<format>"
msgstr "<formato>"
-#: diff.c:5515
+#: diff.c:5520
msgid "specify how differences in submodules are shown"
msgstr "especifica como son mostradas las diferencias en submódulos"
-#: diff.c:5519
+#: diff.c:5524
msgid "hide 'git add -N' entries from the index"
msgstr "ocultar entradas 'git add -N' del index"
-#: diff.c:5522
+#: diff.c:5527
msgid "treat 'git add -N' entries as real in the index"
msgstr "trata entradas 'git add -N' como reales en el index"
-#: diff.c:5524
+#: diff.c:5529
msgid "<string>"
msgstr "<string>"
-#: diff.c:5525
+#: diff.c:5530
msgid ""
"look for differences that change the number of occurrences of the specified "
"string"
"busca por diferencias que cambien el número de ocurrencias para el string "
"especificado"
-#: diff.c:5528
+#: diff.c:5533
msgid ""
"look for differences that change the number of occurrences of the specified "
"regex"
"busca por diferencias que cambien el número de ocurrencias para el regex "
"especificado"
-#: diff.c:5531
+#: diff.c:5536
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:5534
+#: diff.c:5539
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:5537
+#: diff.c:5542
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:5538
+#: diff.c:5543
msgid "<object-id>"
msgstr "<id-objeto>"
-#: diff.c:5539
+#: diff.c:5544
msgid ""
"look for differences that change the number of occurrences of the specified "
"object"
"busca por diferencias que cambien el número de ocurrencias para el objeto "
"especificado"
-#: diff.c:5541
+#: diff.c:5546
msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"
-#: diff.c:5542
+#: diff.c:5547
msgid "select files by diff type"
msgstr "selecciona archivos por tipo de diff"
-#: diff.c:5544
+#: diff.c:5549
msgid "<file>"
msgstr "<archivo>"
-#: diff.c:5545
+#: diff.c:5550
msgid "Output to a specific file"
msgstr "Output a un archivo específico"
-#: diff.c:6200
+#: diff.c:6205
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:6203
+#: diff.c:6208
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:6206
+#: diff.c:6211
#, c-format
msgid ""
"you may want to set your %s variable to at least %d and retry the command."
msgid "Performing inexact rename detection"
msgstr "Realizando una detección de cambios de nombre inexacta"
-#: dir.c:555
+#: dir.c:573
#, c-format
msgid "pathspec '%s' did not match any file(s) known to git"
msgstr ""
"ruta especificada '%s' no concordó con ningún archivo(s) conocido por git"
-#: dir.c:695 dir.c:724 dir.c:737
+#: dir.c:713 dir.c:742 dir.c:755
#, c-format
msgid "unrecognized pattern: '%s'"
msgstr "patrón desconocido: '%s'"
-#: dir.c:754 dir.c:768
+#: dir.c:772 dir.c:786
#, c-format
msgid "unrecognized negative pattern: '%s'"
msgstr "patrón negativo no reconocido: '%s'"
-#: dir.c:786
+#: dir.c:804
#, c-format
msgid "your sparse-checkout file may have issues: pattern '%s' is repeated"
msgstr ""
"tu archivo sparse-checkout tal vez tenga errores: patrón '%s' está repetido"
-#: dir.c:796
+#: dir.c:814
msgid "disabling cone pattern matching"
msgstr "deshabilitar coincidencia de patrónes cono"
-#: dir.c:1173
+#: dir.c:1191
#, c-format
msgid "cannot use %s as an exclude file"
msgstr "no se puede usar %s como archivo de exclusión"
-#: dir.c:2275
+#: dir.c:2296
#, c-format
msgid "could not open directory '%s'"
msgstr "no se pudo abrir el directorio '%s'"
-#: dir.c:2575
+#: dir.c:2596
msgid "failed to get kernel name and information"
msgstr "falló al conseguir la información y nombre del kernel"
-#: dir.c:2699
+#: dir.c:2720
msgid "untracked cache is disabled on this system or location"
msgstr "untracked cache está desactivado en este sistema o ubicación"
-#: dir.c:3481
+#: dir.c:3502
#, c-format
msgid "index file corrupt in repo %s"
msgstr "archivo índice corrompido en repositorio %s"
-#: dir.c:3526 dir.c:3531
+#: dir.c:3547 dir.c:3552
#, c-format
msgid "could not create directories for %s"
msgstr "no se pudo crear directorios para %s"
-#: dir.c:3560
+#: dir.c:3581
#, c-format
msgid "could not migrate git directory from '%s' to '%s'"
msgstr "no se pudo migrar el directorio git de '%s' a '%s'"
msgid "hint: Waiting for your editor to close the file...%c"
msgstr "ayuda: Esperando que tu editor cierre el archivo ...%c"
-#: entry.c:178
+#: entry.c:177
msgid "Filtering content"
msgstr "Filtrando contenido"
-#: entry.c:479
+#: entry.c:478
#, c-format
msgid "could not stat file '%s'"
msgstr "no se pudo establecer el archivo '%s'"
msgid "too many args to run %s"
msgstr "demasiados argumentos para correr %s"
-#: fetch-pack.c:151
+#: fetch-pack.c:152
msgid "git fetch-pack: expected shallow list"
msgstr "git fetch-pack: lista poco profunda esperada"
-#: fetch-pack.c:154
+#: fetch-pack.c:155
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:165
+#: fetch-pack.c:166
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:185
+#: fetch-pack.c:186
#, 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:196
+#: fetch-pack.c:197
msgid "unable to write to remote"
msgstr "no se puede escribir al remoto"
-#: fetch-pack.c:258
+#: fetch-pack.c:259
msgid "--stateless-rpc requires multi_ack_detailed"
msgstr "--stateless-rpc requiere multi_ack_detailed"
-#: fetch-pack.c:357 fetch-pack.c:1364
+#: fetch-pack.c:358 fetch-pack.c:1408
#, c-format
msgid "invalid shallow line: %s"
msgstr "línea poco profunda inválida: %s"
-#: fetch-pack.c:363 fetch-pack.c:1370
+#: fetch-pack.c:364 fetch-pack.c:1414
#, c-format
msgid "invalid unshallow line: %s"
msgstr "línea superficial inválida: %s"
-#: fetch-pack.c:365 fetch-pack.c:1372
+#: fetch-pack.c:366 fetch-pack.c:1416
#, c-format
msgid "object not found: %s"
msgstr "objeto no encontrado: %s"
-#: fetch-pack.c:368 fetch-pack.c:1375
+#: fetch-pack.c:369 fetch-pack.c:1419
#, c-format
msgid "error in object: %s"
msgstr "error en objeto: %s"
-#: fetch-pack.c:370 fetch-pack.c:1377
+#: fetch-pack.c:371 fetch-pack.c:1421
#, c-format
msgid "no shallow found: %s"
msgstr "superficie no encontrada: %s"
-#: fetch-pack.c:373 fetch-pack.c:1381
+#: fetch-pack.c:374 fetch-pack.c:1425
#, c-format
msgid "expected shallow/unshallow, got %s"
msgstr "se esperaba shallow/unshallow, se obtuvo %s"
-#: fetch-pack.c:415
+#: fetch-pack.c:416
#, c-format
msgid "got %s %d %s"
msgstr "se obtuvo %s %d %s"
-#: fetch-pack.c:432
+#: fetch-pack.c:433
#, c-format
msgid "invalid commit %s"
msgstr "commit inválido %s"
-#: fetch-pack.c:463
+#: fetch-pack.c:464
msgid "giving up"
msgstr "rindiéndose"
-#: fetch-pack.c:476 progress.c:340
+#: fetch-pack.c:477 progress.c:336
msgid "done"
msgstr "listo"
-#: fetch-pack.c:488
+#: fetch-pack.c:489
#, c-format
msgid "got %s (%d) %s"
msgstr "se obtuvo %s (%d) %s"
-#: fetch-pack.c:534
+#: fetch-pack.c:535
#, c-format
msgid "Marking %s as complete"
msgstr "Marcando %s como completa"
-#: fetch-pack.c:755
+#: fetch-pack.c:756
#, c-format
msgid "already have %s (%s)"
msgstr "ya se tiene %s (%s)"
-#: fetch-pack.c:819
+#: fetch-pack.c:821
msgid "fetch-pack: unable to fork off sideband demultiplexer"
msgstr "fetch-pack: no se puede extraer un demultiplexor de banda lateral"
-#: fetch-pack.c:827
+#: fetch-pack.c:829
msgid "protocol error: bad pack header"
msgstr "error de protocolo: paquete de header erróneo"
-#: fetch-pack.c:901
+#: fetch-pack.c:910
#, c-format
msgid "fetch-pack: unable to fork off %s"
msgstr "fetch-pack: no se puede quitar %s"
-#: fetch-pack.c:917
+#: fetch-pack.c:927
#, c-format
msgid "%s failed"
msgstr "%s falló"
-#: fetch-pack.c:919
+#: fetch-pack.c:929
msgid "error in sideband demultiplexer"
msgstr "error en demultiplexor de banda lateral"
-#: fetch-pack.c:966
+#: fetch-pack.c:976
#, c-format
msgid "Server version is %.*s"
msgstr "Versión de servidor es %.*s"
-#: 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
+#: fetch-pack.c:981 fetch-pack.c:987 fetch-pack.c:990 fetch-pack.c:996
+#: fetch-pack.c:1000 fetch-pack.c:1004 fetch-pack.c:1008 fetch-pack.c:1012
+#: fetch-pack.c:1016 fetch-pack.c:1020 fetch-pack.c:1024 fetch-pack.c:1028
+#: fetch-pack.c:1034 fetch-pack.c:1040 fetch-pack.c:1045 fetch-pack.c:1050
#, c-format
msgid "Server supports %s"
msgstr "El servidor soporta %s"
-#: fetch-pack.c:973
+#: fetch-pack.c:983
msgid "Server does not support shallow clients"
msgstr "El servidor no soporta clientes superficiales"
-#: fetch-pack.c:1033
+#: fetch-pack.c:1043
msgid "Server does not support --shallow-since"
msgstr "El servidor no soporta --shalow-since"
-#: fetch-pack.c:1038
+#: fetch-pack.c:1048
msgid "Server does not support --shallow-exclude"
msgstr "El servidor no soporta --shalow-exclude"
-#: fetch-pack.c:1042
+#: fetch-pack.c:1052
msgid "Server does not support --deepen"
msgstr "El servidor no soporta --deepen"
-#: fetch-pack.c:1059
+#: fetch-pack.c:1054
+msgid "Server does not support this repository's object format"
+msgstr "El servidor no soporta el formato de objetos de este repositorio"
+
+#: fetch-pack.c:1071
msgid "no common commits"
msgstr "no hay commits comunes"
-#: fetch-pack.c:1071 fetch-pack.c:1563
+#: fetch-pack.c:1083 fetch-pack.c:1639
msgid "git fetch-pack: fetch failed."
msgstr "git fetch-pack: fetch falló."
#: fetch-pack.c:1211
+#, c-format
+msgid "mismatched algorithms: client %s; server %s"
+msgstr "algoritmos no compatibles: cliente %s; servidor %s"
+
+#: fetch-pack.c:1215
+#, c-format
+msgid "the server does not support algorithm '%s'"
+msgstr "servidor no soporta el algoritmo '%s'"
+
+#: fetch-pack.c:1235
msgid "Server does not support shallow requests"
msgstr "El servidor no soporta peticiones superficiales"
-#: fetch-pack.c:1218
+#: fetch-pack.c:1242
msgid "Server supports filter"
msgstr "El servidor soporta filtro"
-#: fetch-pack.c:1242
+#: fetch-pack.c:1286
msgid "unable to write request to remote"
msgstr "no se puede escribir request al remoto"
-#: fetch-pack.c:1260
+#: fetch-pack.c:1304
#, c-format
msgid "error reading section header '%s'"
msgstr "error leyendo sección header '%s'"
-#: fetch-pack.c:1266
+#: fetch-pack.c:1310
#, c-format
msgid "expected '%s', received '%s'"
msgstr "se esperaba '%s', se recibió '%s'"
-#: fetch-pack.c:1327
+#: fetch-pack.c:1371
#, c-format
msgid "unexpected acknowledgment line: '%s'"
msgstr "línea de confirmación inesperada: '%s'"
-#: fetch-pack.c:1332
+#: fetch-pack.c:1376
#, c-format
msgid "error processing acks: %d"
msgstr "error procesando acks: %d"
-#: fetch-pack.c:1342
+#: fetch-pack.c:1386
msgid "expected packfile to be sent after 'ready'"
msgstr "espere que el packfile sea mandado luego del 'listo'"
-#: fetch-pack.c:1344
+#: fetch-pack.c:1388
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:1386
+#: fetch-pack.c:1430
#, c-format
msgid "error processing shallow info: %d"
msgstr "error procesando información superficial: %d"
-#: fetch-pack.c:1433
+#: fetch-pack.c:1477
#, c-format
msgid "expected wanted-ref, got '%s'"
msgstr "se esperaba wanted-ref, se obtuvo '%s'"
-#: fetch-pack.c:1438
+#: fetch-pack.c:1482
#, c-format
msgid "unexpected wanted-ref: '%s'"
msgstr "wanted-ref inesperado: '%s'"
-#: fetch-pack.c:1443
+#: fetch-pack.c:1487
#, c-format
msgid "error processing wanted refs: %d"
msgstr "error procesando refs deseadas: %d"
-#: fetch-pack.c:1789
+#: fetch-pack.c:1517
+msgid "git fetch-pack: expected response end packet"
+msgstr "git fetch-pack: se espera un paquete final de respuesta"
+
+#: fetch-pack.c:1921
msgid "no matching remote head"
msgstr "no concuerda el head remoto"
-#: fetch-pack.c:1812 builtin/clone.c:692
+#: fetch-pack.c:1944 builtin/clone.c:692
msgid "remote did not send all necessary objects"
msgstr "remoto no mando todos los objetos necesarios"
-#: fetch-pack.c:1839
+#: fetch-pack.c:1971
#, c-format
msgid "no such remote ref %s"
msgstr "no existe ref remota %s"
-#: fetch-pack.c:1842
+#: fetch-pack.c:1974
#, c-format
msgid "Server does not allow request for unadvertised object %s"
msgstr "El servidor no permite solicitudes de objetos inadvertidos %s"
msgid "'%s': unable to read %s"
msgstr "'%s': no es posible leer %s"
-#: grep.c:2145 setup.c:176 builtin/clone.c:411 builtin/diff.c:82
+#: grep.c:2145 setup.c:176 builtin/clone.c:411 builtin/diff.c:89
#: builtin/rm.c:135
#, c-format
msgid "failed to stat '%s'"
"\n"
"Los comandos más similares son"
-#: help.c:653
+#: help.c:654
msgid "git version [<options>]"
msgstr "git versión [<opciones>]"
-#: help.c:708
+#: help.c:709
#, c-format
msgid "%s: %s - %s"
msgstr "%s: %s - %s"
-#: help.c:712
+#: help.c:713
msgid ""
"\n"
"Did you mean this?"
msgid "multiple filter-specs cannot be combined"
msgstr "no se pueden combinar múltiples tipos de especificaciones de filtro"
+#: list-objects-filter-options.c:330
+msgid "unable to upgrade repository format to support partial clone"
+msgstr ""
+"no es posible actualizar el formato del repositorio para soportar clonado "
+"parcial"
+
#: list-objects-filter.c:492
#, c-format
msgid "unable to access sparse blob in '%s'"
msgid "renamed"
msgstr "renombrado"
-#: merge-recursive.c:1577 merge-recursive.c:2472 merge-recursive.c:3117
+#: merge-recursive.c:1577 merge-recursive.c:2484 merge-recursive.c:3129
#, c-format
msgid "Refusing to lose dirty file at %s"
msgstr "Rehusando perder el archivo sucio en %s"
msgid " (left unresolved)"
msgstr " (dejado sin resolver)"
-#: merge-recursive.c:1793
+#: merge-recursive.c:1805
#, c-format
msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
msgstr ""
"CONFLICTO (renombrar/renombrar): Renombrar %s->%s en %s. Renombrar %s->%s en "
"%s"
-#: merge-recursive.c:2056
+#: merge-recursive.c:2068
#, c-format
msgid ""
"CONFLICT (directory rename split): Unclear where to place %s because "
"colocar %s porque el directorio %s fue renombrado a otros múltiples "
"directorios, sin ningún que contenga la mayoría de archivos."
-#: merge-recursive.c:2088
+#: merge-recursive.c:2100
#, c-format
msgid ""
"CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "
"existente en %s se interpone con el cambio de nombres implícito, poniendo "
"la(s) siguiente(s) ruta(s) aquí: %s."
-#: merge-recursive.c:2098
+#: merge-recursive.c:2110
#, c-format
msgid ""
"CONFLICT (implicit dir rename): Cannot map more than one path to %s; "
"CONFLICTO (cambio de nombre implícito): No se puede mapear más de una ruta "
"para %s; cambio de nombre implícito intentó poner estas rutas: %s"
-#: merge-recursive.c:2190
+#: merge-recursive.c:2202
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
"CONFLICTO (renombrar/renombrar): Renombrar directorio %s->%s en %s. "
"Renombrar directorio %s->%s en %s"
-#: merge-recursive.c:2435
+#: merge-recursive.c:2447
#, c-format
msgid ""
"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
"PELIGRO: Evitando aplicar %s -> %s renombrado a %s, porque %s mismo fue "
"renombrado."
-#: merge-recursive.c:2961
+#: merge-recursive.c:2973
#, c-format
msgid "cannot read object %s"
msgstr "no se pudo leer el objeto %s"
-#: merge-recursive.c:2964
+#: merge-recursive.c:2976
#, c-format
msgid "object %s is not a blob"
msgstr "objeto %s no es un blob"
-#: merge-recursive.c:3028
+#: merge-recursive.c:3040
msgid "modify"
msgstr "modificar"
-#: merge-recursive.c:3028
+#: merge-recursive.c:3040
msgid "modified"
msgstr "modificado"
-#: merge-recursive.c:3040
+#: merge-recursive.c:3052
msgid "content"
msgstr "contenido"
-#: merge-recursive.c:3044
+#: merge-recursive.c:3056
msgid "add/add"
msgstr "agregar/agregar"
-#: merge-recursive.c:3067
+#: merge-recursive.c:3079
#, c-format
msgid "Skipped %s (merged same as existing)"
msgstr "Saltado %s (fusionado como existente)"
-#: merge-recursive.c:3089 git-submodule.sh:985
+#: merge-recursive.c:3101 git-submodule.sh:959
msgid "submodule"
msgstr "submódulo"
-#: merge-recursive.c:3090
+#: merge-recursive.c:3102
#, c-format
msgid "CONFLICT (%s): Merge conflict in %s"
msgstr "CONFLICTO (%s): Conflicto de fusión en %s"
-#: merge-recursive.c:3120
+#: merge-recursive.c:3132
#, c-format
msgid "Adding as %s instead"
msgstr "Agregando más bien como %s"
-#: merge-recursive.c:3203
+#: merge-recursive.c:3215
#, c-format
msgid ""
"Path updated: %s added in %s inside a directory that was renamed in %s; "
"Path actualizado: %s agregado en %s dentro de un directorio que fue "
"renombrado en %s; moviéndolo a %s."
-#: merge-recursive.c:3206
+#: merge-recursive.c:3218
#, c-format
msgid ""
"CONFLICT (file location): %s added in %s inside a directory that was renamed "
"CONFLICTO (ubicación de archivo): %s agregado en %s dentro de un directorio "
"que fue renombrado en %s, sugerimos que debería ser movido a %s."
-#: merge-recursive.c:3210
+#: merge-recursive.c:3222
#, c-format
msgid ""
"Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
"Path actualizado: %s renombrado a %s en %s, dentro de un directorio que fue "
"renombrado en %s; moviéndolo a %s."
-#: merge-recursive.c:3213
+#: merge-recursive.c:3225
#, c-format
msgid ""
"CONFLICT (file location): %s renamed to %s in %s, inside a directory that "
"directorio que fue renombrado en %s, sugiriendo que tal vez debería ser "
"movido a %s."
-#: merge-recursive.c:3327
+#: merge-recursive.c:3339
#, c-format
msgid "Removing %s"
msgstr "Eliminando %s"
-#: merge-recursive.c:3350
+#: merge-recursive.c:3362
msgid "file/directory"
msgstr "archivo/directorio"
-#: merge-recursive.c:3355
+#: merge-recursive.c:3367
msgid "directory/file"
msgstr "directorio/archivo"
-#: merge-recursive.c:3362
+#: merge-recursive.c:3374
#, c-format
msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
msgstr ""
"CONFLICTO (%s): Hay un directorio con el nombre %s en %s. Agregando %s como "
"%s"
-#: merge-recursive.c:3371
+#: merge-recursive.c:3383
#, c-format
msgid "Adding %s"
msgstr "Agregando %s"
-#: merge-recursive.c:3380
+#: merge-recursive.c:3392
#, c-format
msgid "CONFLICT (add/add): Merge conflict in %s"
msgstr "CONFLICTO (add/add): Conflicto de merge en %s"
-#: merge-recursive.c:3424
+#: merge-recursive.c:3436
msgid "Already up to date!"
msgstr "¡Ya está actualizado!"
-#: merge-recursive.c:3433
+#: merge-recursive.c:3445
#, c-format
msgid "merging of trees %s and %s failed"
msgstr "falló la fusión de los árboles %s y %s"
-#: merge-recursive.c:3537
+#: merge-recursive.c:3549
msgid "Merging:"
msgstr "Fusionando:"
-#: merge-recursive.c:3550
+#: merge-recursive.c:3562
#, c-format
msgid "found %u common ancestor:"
msgid_plural "found %u common ancestors:"
msgstr[0] "se encontró %u ancestro común:"
msgstr[1] "se encontraron %u ancestros comunes:"
-#: merge-recursive.c:3600
+#: merge-recursive.c:3612
msgid "merge returned no commit"
msgstr "la fusión no devolvió ningún commit"
-#: merge-recursive.c:3659
+#: merge-recursive.c:3671
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
"merge:\n"
" %s"
-#: merge-recursive.c:3756
+#: merge-recursive.c:3768
#, c-format
msgid "Could not parse object '%s'"
msgstr "No se pudo analizar el objeto '%s'"
-#: merge-recursive.c:3774 builtin/merge.c:705 builtin/merge.c:885
+#: merge-recursive.c:3786 builtin/merge.c:705 builtin/merge.c:885
msgid "Unable to write index."
msgstr "Incapaz de escribir el índice."
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/checkout.c:559 builtin/checkout.c:822 builtin/clone.c:816
#: builtin/stash.c:265
msgid "unable to write new index file"
msgstr "no es posible escribir el archivo índice"
msgid "hash mismatch %s"
msgstr "hash no concuerda %s"
-#: pack-bitmap.c:815 pack-bitmap.c:821 builtin/pack-objects.c:2135
+#: pack-bitmap.c:815 pack-bitmap.c:821 builtin/pack-objects.c:2184
#, c-format
msgid "unable to get size of %s"
msgstr "no se pudo obtener el tamaño de %s"
-#: packfile.c:629
+#: packfile.c:630
msgid "offset before end of packfile (broken .idx?)"
msgstr "offset antes del final del paquete (broken .idx?)"
-#: packfile.c:1899
+#: packfile.c:1900
#, c-format
msgid "offset before start of pack index for %s (corrupt index?)"
msgstr ""
"offset antes del comienzo del índice del paquete para %s (¿índice corrupto?)"
-#: packfile.c:1903
+#: packfile.c:1904
#, c-format
msgid "offset beyond end of pack index for %s (truncated index?)"
msgstr ""
msgstr "no es posible escribir delim packet"
#: pkt-line.c:106
+msgid "unable to write stateless separator packet"
+msgstr "no es posible escribir un paquete separador sin estado (stateless)"
+
+#: pkt-line.c:113
msgid "flush packet write failed"
msgstr "limpieza de escritura de paquetes falló"
-#: pkt-line.c:146 pkt-line.c:232
+#: pkt-line.c:153 pkt-line.c:239
msgid "protocol error: impossibly long line"
msgstr "error de protocolo: línea imposiblemente larga"
-#: pkt-line.c:162 pkt-line.c:164
+#: pkt-line.c:169 pkt-line.c:171
msgid "packet write with format failed"
msgstr "escritura de paquetes con formato falló"
-#: pkt-line.c:196
+#: pkt-line.c:203
msgid "packet write failed - data exceeds max packet size"
msgstr "fallo al escribir paquete - la data excede al tamaño máximo de paquete"
-#: pkt-line.c:203 pkt-line.c:210
+#: pkt-line.c:210 pkt-line.c:217
msgid "packet write failed"
msgstr "escritura de paquetes falló"
-#: pkt-line.c:295
+#: pkt-line.c:302
msgid "read error"
msgstr "error de lectura"
-#: pkt-line.c:303
+#: pkt-line.c:310
msgid "the remote end hung up unexpectedly"
msgstr "el remoto se colgó de manera inesperada"
-#: pkt-line.c:331
+#: pkt-line.c:338
#, c-format
msgid "protocol error: bad line length character: %.4s"
msgstr "error de protocolo: mal caracter de largo de línea: %.4s"
-#: pkt-line.c:341 pkt-line.c:346
+#: pkt-line.c:352 pkt-line.c:357
#, c-format
msgid "protocol error: bad line length %d"
msgstr "error de protocolo: mal largo de línea %d"
-#: pkt-line.c:362
+#: pkt-line.c:373
#, c-format
msgid "remote error: %s"
msgstr "error remoto: %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:488 builtin/checkout.c:676 builtin/clean.c:961
+#: builtin/checkout.c:488 builtin/checkout.c:674 builtin/clean.c:991
#: 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 "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:1176 wrapper.c:622 builtin/merge.c:1130
+#: read-cache.c:3026 strbuf.c:1171 wrapper.c:630 builtin/merge.c:1130
#, c-format
msgid "could not close '%s'"
msgstr "no se pudo cerrar '%s'"
"\n"
#: 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
+#: sequencer.c:3489 sequencer.c:5248 builtin/fsck.c:347 builtin/rebase.c:258
#, c-format
msgid "could not write '%s'"
msgstr "no se pudo escribir '%s'"
msgid "could not read '%s'."
msgstr "no se puede leer '%s'."
-#: ref-filter.c:42 wt-status.c:1936
+#: ref-filter.c:42 wt-status.c:1977
msgid "gone"
msgstr "desaparecido"
msgid "ignoring ref with broken name %s"
msgstr "ignorando referencia con nombre roto %s"
-#: ref-filter.c:2095 refs.c:625
+#: ref-filter.c:2095 refs.c:657
#, c-format
msgid "ignoring broken ref %s"
msgstr "ignorando referencia rota %s"
msgid "option `%s' must point to a commit"
msgstr "opción '%s' debe apuntar a un commit"
-#: refs.c:262
+#: refs.c:264
#, c-format
msgid "%s does not point to a valid object!"
msgstr "¡%s no apunta a ningún objeto válido!"
-#: refs.c:623
+#: refs.c:572
+#, c-format
+msgid "could not retrieve `%s`"
+msgstr "no se pudo recibir `%s`"
+
+#: refs.c:579
+#, c-format
+msgid "invalid branch name: %s = %s"
+msgstr "Nombre de rama inválido: %s = %s"
+
+#: refs.c:655
#, c-format
msgid "ignoring dangling symref %s"
msgstr "ignorando referencia rota %s"
-#: refs.c:760
+#: refs.c:792
#, 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
+#: refs.c:802 refs.c:853
#, c-format
msgid "could not read ref '%s'"
msgstr "no se pudo leer la referencia '%s'"
-#: refs.c:776
+#: refs.c:808
#, c-format
msgid "ref '%s' already exists"
msgstr "ref '%s' ya existe"
-#: refs.c:781
+#: refs.c:813
#, 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
+#: refs.c:821 sequencer.c:408 sequencer.c:2721 sequencer.c:2925
+#: sequencer.c:2939 sequencer.c:3195 sequencer.c:5159 strbuf.c:1168
+#: wrapper.c:628
#, 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
+#: refs.c:848 strbuf.c:1166 wrapper.c:196 wrapper.c:366 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
+#: refs.c:855
#, c-format
msgid "unexpected object ID when deleting '%s'"
msgstr "ID de objecto inesperado al borrar '%s'"
-#: refs.c:954
+#: refs.c:986
#, 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
+#: refs.c:992
#, c-format
msgid "log for ref %s unexpectedly ended on %s"
msgstr "log de ref %s finalizado inesperadamente en %s"
-#: refs.c:1019
+#: refs.c:1051
#, c-format
msgid "log for %s is empty"
msgstr "log de %s está vacío"
-#: refs.c:1111
+#: refs.c:1143
#, c-format
msgid "refusing to update ref with bad name '%s'"
msgstr "rehusando actualizar ref con mal nombre '%s'"
-#: refs.c:1187
+#: refs.c:1219
#, c-format
msgid "update_ref failed for ref '%s': %s"
msgstr "update_ref falló para ref '%s': %s"
-#: refs.c:1979
+#: refs.c:2011
#, c-format
msgid "multiple updates for ref '%s' not allowed"
msgstr "múltiples actualizaciones para ref '%s' no permitidas"
-#: refs.c:2011
+#: refs.c:2098
msgid "ref updates forbidden inside quarantine environment"
msgstr "actualizaciones de ref prohibidas dentro de ambiente de cuarentena"
-#: refs.c:2107 refs.c:2137
+#: refs.c:2109
+msgid "ref updates aborted by hook"
+msgstr "ref update abortado por el hook"
+
+#: refs.c:2209 refs.c:2239
#, c-format
msgid "'%s' exists; cannot create '%s'"
msgstr "'%s' existe; no se puede crear '%s'"
-#: refs.c:2113 refs.c:2148
+#: refs.c:2215 refs.c:2250
#, c-format
msgid "cannot process '%s' and '%s' at the same time"
msgstr "no se puede procesar '%s' y '%s' al mismo tiempo"
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:2233
+#: remote.c:2241
#, c-format
msgid "cannot parse expected object name '%s'"
msgstr "no se puede leer el nombre de objeto '%s'"
msgid "failed to find tree of %s"
msgstr "falló al encontrar árbol de %s"
-#: revision.c:2655
+#: revision.c:2661
msgid "your current branch appears to be broken"
msgstr "tu rama actual parece estar rota"
-#: revision.c:2658
+#: revision.c:2664
#, 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:2866
+#: revision.c:2873
msgid "--first-parent is incompatible with --bisect"
msgstr "--first-parent es incompatible con --bisect"
-#: revision.c:2870
+#: revision.c:2877
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"
msgid "failed to sign the push certificate"
msgstr "falló al firmar el certificado de push"
-#: send-pack.c:399
+#: send-pack.c:394
+msgid "the receiving end does not support this repository's hash algorithm"
+msgstr "el destino no soporta el algoritmo de hash de este repositorio"
+
+#: send-pack.c:403
msgid "the receiving end does not support --signed push"
msgstr "el final receptor no soporta --signed push"
-#: send-pack.c:401
+#: send-pack.c:405
msgid ""
"not sending a push certificate since the receiving end does not support --"
"signed push"
"no se manda un certificado de push ya que el destino no soporta push firmado "
"(--signed )"
-#: send-pack.c:413
+#: send-pack.c:417
msgid "the receiving end does not support --atomic push"
msgstr "el destino no soporta push atómicos (--atomic)"
-#: send-pack.c:418
+#: send-pack.c:422
msgid "the receiving end does not support push options"
msgstr "el destino no soporta opciones de push"
msgid "unable to dequote value of '%s'"
msgstr "no es posible dequote para '%s'"
-#: sequencer.c:785 wrapper.c:190 wrapper.c:360 builtin/am.c:710
+#: sequencer.c:785 wrapper.c:198 wrapper.c:368 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"
msgid "this operation must be run in a work tree"
msgstr "esta operación debe ser realizada en un árbol de trabajo"
-#: setup.c:569
+#: setup.c:604
#, c-format
msgid "Expected git repo version <= %d, found %d"
msgstr "Se esperaba versión de git repo <= %d, encontrada %d"
-#: setup.c:577
+#: setup.c:612
msgid "unknown repository extensions found:"
msgstr "se encontró extensión de repositorio desconocida:"
-#: setup.c:596
+#: setup.c:631
#, c-format
msgid "error opening '%s'"
msgstr "error abriendo '%s'"
-#: setup.c:598
+#: setup.c:633
#, c-format
msgid "too large to be a .git file: '%s'"
msgstr "muy grande para ser un archivo .git: '%s'"
-#: setup.c:600
+#: setup.c:635
#, c-format
msgid "error reading %s"
msgstr "error leyendo %s"
-#: setup.c:602
+#: setup.c:637
#, c-format
msgid "invalid gitfile format: %s"
msgstr "formato gitfile inválido: %s"
-#: setup.c:604
+#: setup.c:639
#, c-format
msgid "no path in gitfile: %s"
msgstr "no hay ruta en gitfile: %s"
-#: setup.c:606
+#: setup.c:641
#, c-format
msgid "not a git repository: %s"
msgstr "no es un repositorio git: %s"
-#: setup.c:708
+#: setup.c:743
#, c-format
msgid "'$%s' too big"
msgstr "'$%s' muy grande"
-#: setup.c:722
+#: setup.c:757
#, c-format
msgid "not a git repository: '%s'"
msgstr "no es un repositorio git: '%s'"
-#: setup.c:751 setup.c:753 setup.c:784
+#: setup.c:786 setup.c:788 setup.c:819
#, c-format
msgid "cannot chdir to '%s'"
msgstr "no se puede aplicar chdir a '%s'"
-#: setup.c:756 setup.c:812 setup.c:822 setup.c:861 setup.c:869
+#: setup.c:791 setup.c:847 setup.c:857 setup.c:896 setup.c:904
msgid "cannot come back to cwd"
msgstr "no se puede volver a cwd"
-#: setup.c:883
+#: setup.c:918
#, c-format
msgid "failed to stat '%*s%s%s'"
msgstr "falló al determinar '%*s%s%s'"
-#: setup.c:1121
+#: setup.c:1156
msgid "Unable to read current working directory"
msgstr "Incapaz de leer el directorio de trabajo actual"
-#: setup.c:1130 setup.c:1136
+#: setup.c:1165 setup.c:1171
#, c-format
msgid "cannot change to '%s'"
msgstr "no se puede cambiar a '%s'"
-#: setup.c:1141
+#: setup.c:1176
#, 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:1147
+#: setup.c:1182
#, c-format
msgid ""
"not a git repository (or any parent up to mount point %s)\n"
"Parando en el límite del sistema de archivos "
"(GIT_DISCOVERY_ACROSS_FILESYSTEM no establecido)."
-#: setup.c:1258
+#: setup.c:1293
#, c-format
msgid ""
"problem with core.sharedRepository filemode value (0%.3o).\n"
"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:1304
+#: setup.c:1340
msgid "open /dev/null or dup failed"
msgstr "falló al abrir /dev/null o dup"
-#: setup.c:1319
+#: setup.c:1355
msgid "fork failed"
msgstr "falló fork"
-#: setup.c:1324
+#: setup.c:1360
msgid "setsid failed"
msgstr "falló setsid"
msgid "confused by unstable object source data for %s"
msgstr "confundido por fuente de data de objetos inestable para %s"
-#: sha1-file.c:1906 builtin/pack-objects.c:1055
+#: sha1-file.c:1906 builtin/pack-objects.c:1085
#, c-format
msgid "failed utime() on %s"
msgstr "falló utime() en %s"
msgstr "nombre de objeto no válido: '%.*s'."
#. TRANSLATORS: IEC 80000-13:2008 gibibyte
-#: strbuf.c:853
+#: strbuf.c:848
#, c-format
msgid "%u.%2.2u GiB"
msgstr "%u.%2.2u GiB"
#. TRANSLATORS: IEC 80000-13:2008 gibibyte/second
-#: strbuf.c:855
+#: strbuf.c:850
#, c-format
msgid "%u.%2.2u GiB/s"
msgstr "%u.%2.2u GiB/s"
#. TRANSLATORS: IEC 80000-13:2008 mebibyte
-#: strbuf.c:863
+#: strbuf.c:858
#, c-format
msgid "%u.%2.2u MiB"
msgstr "%u.%2.2u MiB"
#. TRANSLATORS: IEC 80000-13:2008 mebibyte/second
-#: strbuf.c:865
+#: strbuf.c:860
#, c-format
msgid "%u.%2.2u MiB/s"
msgstr "%u.%2.2u MiB/s"
#. TRANSLATORS: IEC 80000-13:2008 kibibyte
-#: strbuf.c:872
+#: strbuf.c:867
#, c-format
msgid "%u.%2.2u KiB"
msgstr "%u.%2.2u KiB"
#. TRANSLATORS: IEC 80000-13:2008 kibibyte/second
-#: strbuf.c:874
+#: strbuf.c:869
#, c-format
msgid "%u.%2.2u KiB/s"
msgstr "%u.%2.2u KiB/s"
#. TRANSLATORS: IEC 80000-13:2008 byte
-#: strbuf.c:880
+#: strbuf.c:875
#, c-format
msgid "%u byte"
msgid_plural "%u bytes"
msgstr[1] "%u bytes"
#. TRANSLATORS: IEC 80000-13:2008 byte/second
-#: strbuf.c:882
+#: strbuf.c:877
#, c-format
msgid "%u byte/s"
msgid_plural "%u bytes/s"
msgstr[0] "%u bytes/s"
msgstr[1] "%u bytes/s"
-#: strbuf.c:1180
+#: strbuf.c:1175
#, c-format
msgid "could not edit '%s'"
msgstr "no se pudo editar '%s'"
msgid "could not read from stdin"
msgstr "no se pudo leer desde stdin"
-#: trailer.c:1011 wrapper.c:665
+#: trailer.c:1011 wrapper.c:673
#, c-format
msgid "could not stat %s"
msgstr "no se pudo definir %s"
msgid "could not rename temporary file to %s"
msgstr "no se pudo renombrar el archivo temporal a %s"
-#: transport-helper.c:61 transport-helper.c:90
+#: transport-helper.c:62 transport-helper.c:91
msgid "full write to remote helper failed"
msgstr "escritura total al helper remoto falló"
-#: transport-helper.c:144
+#: transport-helper.c:145
#, c-format
msgid "unable to find remote helper for '%s'"
msgstr "no es posible encontrar helper remoto para '%s'"
-#: transport-helper.c:160 transport-helper.c:571
+#: transport-helper.c:161 transport-helper.c:575
msgid "can't dup helper output fd"
msgstr "no se puede duplicar output de fd del helper"
-#: transport-helper.c:211
+#: transport-helper.c:214
#, c-format
msgid ""
"unknown mandatory capability %s; this remote helper probably needs newer "
"capacidad mandatoria desconocida %s; este helper remoto probablemente "
"necesita una nueva versión de Git"
-#: transport-helper.c:217
+#: transport-helper.c:220
msgid "this remote helper should implement refspec capability"
msgstr "este helper remoto debería implementar capacidad refspec"
-#: transport-helper.c:284 transport-helper.c:425
+#: transport-helper.c:287 transport-helper.c:429
#, c-format
msgid "%s unexpectedly said: '%s'"
msgstr "%s dijo inesperadamente: '%s'"
-#: transport-helper.c:414
+#: transport-helper.c:417
#, c-format
msgid "%s also locked %s"
msgstr "%s también bloqueó %s"
-#: transport-helper.c:493
+#: transport-helper.c:497
msgid "couldn't run fast-import"
msgstr "no se pudo ejecutar fast-import"
-#: transport-helper.c:516
+#: transport-helper.c:520
msgid "error while running fast-import"
msgstr "error al ejecutar fast-import"
-#: transport-helper.c:545 transport-helper.c:1135
+#: transport-helper.c:549 transport-helper.c:1156
#, c-format
msgid "could not read ref %s"
msgstr "no se pudo leer la referencia %s"
-#: transport-helper.c:590
+#: transport-helper.c:594
#, c-format
msgid "unknown response to connect: %s"
msgstr "respuesta para conectar desconocida: %s"
-#: transport-helper.c:612
+#: transport-helper.c:616
msgid "setting remote service path not supported by protocol"
msgstr "configurando servicio de ruta remota no soportado por el protocolo"
-#: transport-helper.c:614
+#: transport-helper.c:618
msgid "invalid remote service path"
msgstr "ruta de servicio remoto inválida"
-#: transport-helper.c:657 transport.c:1339
+#: transport-helper.c:661 transport.c:1347
msgid "operation not supported by protocol"
msgstr "operación no soportada por protocolo"
-#: transport-helper.c:660
+#: transport-helper.c:664
#, c-format
msgid "can't connect to subservice %s"
msgstr "no se puede conectar al subservicio %s"
-#: transport-helper.c:736
+#: transport-helper.c:740
#, c-format
msgid "expected ok/error, helper said '%s'"
msgstr "se esperaba ok/error, helper dijo '%s'"
-#: transport-helper.c:789
+#: transport-helper.c:793
#, c-format
msgid "helper reported unexpected status of %s"
msgstr "helper reportó estado inesperado de %s"
-#: transport-helper.c:850
+#: transport-helper.c:854
#, c-format
msgid "helper %s does not support dry-run"
msgstr "helper %s no soporta dry-run"
-#: transport-helper.c:853
+#: transport-helper.c:857
#, c-format
msgid "helper %s does not support --signed"
msgstr "helper %s no soporta --signed"
-#: transport-helper.c:856
+#: transport-helper.c:860
#, c-format
msgid "helper %s does not support --signed=if-asked"
msgstr "helper %s no soporta --signed=if-asked"
-#: transport-helper.c:861
+#: transport-helper.c:865
#, c-format
msgid "helper %s does not support --atomic"
msgstr "helper %s no soporta --atomic"
-#: transport-helper.c:867
+#: transport-helper.c:871
#, c-format
msgid "helper %s does not support 'push-option'"
msgstr "helper %s no soporta 'push-option'"
-#: transport-helper.c:966
+#: transport-helper.c:970
msgid "remote-helper doesn't support push; refspec needed"
msgstr "remote-helper no soporta push; se necesita refspec"
-#: transport-helper.c:971
+#: transport-helper.c:975
#, c-format
msgid "helper %s does not support 'force'"
msgstr "helper %s no soporta 'force'"
-#: transport-helper.c:1018
+#: transport-helper.c:1022
msgid "couldn't run fast-export"
msgstr "no se pudo ejecutar fast-export"
-#: transport-helper.c:1023
+#: transport-helper.c:1027
msgid "error while running fast-export"
msgstr "error al ejecutar fast-export"
-#: transport-helper.c:1048
+#: transport-helper.c:1052
#, c-format
msgid ""
"No refs in common and none specified; doing nothing.\n"
-"Perhaps you should specify a branch such as 'master'.\n"
+"Perhaps you should specify a branch.\n"
msgstr ""
"No hay refs comunes y ninguno especificado; no se hace nada.\n"
-"Tal vez deberías especificar un branch como 'master'.\n"
+"Tal vez deberías especificar un branch.\n"
+
+#: transport-helper.c:1133
+#, c-format
+msgid "unsupported object format '%s'"
+msgstr "formado de objeto no soportado '%s'"
-#: transport-helper.c:1121
+#: transport-helper.c:1142
#, c-format
msgid "malformed response in ref list: %s"
msgstr "respuesta malformada en lista de refs: %s"
-#: transport-helper.c:1273
+#: transport-helper.c:1294
#, c-format
msgid "read(%s) failed"
msgstr "leer(%s) falló"
-#: transport-helper.c:1300
+#: transport-helper.c:1321
#, c-format
msgid "write(%s) failed"
msgstr "escribir(%s) falló"
-#: transport-helper.c:1349
+#: transport-helper.c:1370
#, c-format
msgid "%s thread failed"
msgstr "hilo %s falló"
-#: transport-helper.c:1353
+#: transport-helper.c:1374
#, c-format
msgid "%s thread failed to join: %s"
msgstr "hilo %s falló al unirse: %s"
-#: transport-helper.c:1372 transport-helper.c:1376
+#: transport-helper.c:1393 transport-helper.c:1397
#, 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:1413
+#: transport-helper.c:1434
#, c-format
msgid "%s process failed to wait"
msgstr "proceso %s falló al esperar"
-#: transport-helper.c:1417
+#: transport-helper.c:1438
#, c-format
msgid "%s process failed"
msgstr "proceso %s falló"
-#: transport-helper.c:1435 transport-helper.c:1444
+#: transport-helper.c:1456 transport-helper.c:1465
msgid "can't start thread for copying data"
msgstr "no se puede iniciar hilo para copiar data"
msgid "could not read bundle '%s'"
msgstr "no se pudo leer el conjunto '%s'"
-#: transport.c:214
+#: transport.c:220
#, c-format
msgid "transport: invalid depth option '%s'"
msgstr "transport: opción inválida '%s'"
-#: transport.c:266
+#: transport.c:272
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
+#: transport.c:273
msgid "server options require protocol version 2 or later"
msgstr "opciones del servidor requieren protocolo versión 2 o posterior"
-#: transport.c:632
+#: transport.c:631
msgid "could not parse transport.color.* config"
msgstr "no se pudo analizar valor de configuración transport.color.*"
-#: transport.c:705
+#: transport.c:704
msgid "support for protocol v2 not implemented yet"
msgstr "soporte para protocolo v2 no implementado todavía"
-#: transport.c:839
+#: transport.c:838
#, c-format
msgid "unknown value for config '%s': %s"
msgstr "valor desconocido para configuración '%s': %s"
-#: transport.c:905
+#: transport.c:904
#, c-format
msgid "transport '%s' not allowed"
msgstr "transporte '%s' no permitido"
msgid "git-over-rsync is no longer supported"
msgstr "git-over-rsync ya no es soportado"
-#: transport.c:1052
+#: transport.c:1059
#, c-format
msgid ""
"The following submodule paths contain changes that can\n"
"La siguiente ruta de submódulo contiene cambios que no\n"
"pueden ser encontrados en ningún remoto:\n"
-#: transport.c:1056
+#: transport.c:1063
#, c-format
msgid ""
"\n"
"para hacer un push al remoto.\n"
"\n"
-#: transport.c:1064
+#: transport.c:1071
msgid "Aborting."
msgstr "Abortando."
-#: transport.c:1209
+#: transport.c:1216
msgid "failed to push all needed submodules"
msgstr "falló al hacer push a todos los submódulos necesarios"
msgid "Updating index flags"
msgstr "Actualizando flags del index"
-#: upload-pack.c:1337
+#: upload-pack.c:1415
msgid "expected flush after fetch arguments"
msgstr "se espera flush tras argumentos fetch"
msgid "Fetching objects"
msgstr "Haciendo fetch a objetos"
-#: worktree.c:262 builtin/am.c:2098
+#: worktree.c:248 builtin/am.c:2098
#, c-format
msgid "failed to read '%s'"
msgstr "falló al leer '%s'"
-#: worktree.c:309
+#: worktree.c:295
#, 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:320
+#: worktree.c:306
#, 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:332
+#: worktree.c:318
#, c-format
msgid "'%s' does not exist"
msgstr "'%s' no existe"
-#: worktree.c:338
+#: worktree.c:324
#, 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:347
+#: worktree.c:333
#, c-format
msgid "'%s' does not point back to '%s'"
msgstr "'%s' no apunta de vuelta a '%s'"
-#: wrapper.c:186 wrapper.c:356
+#: wrapper.c:194 wrapper.c:364
#, c-format
msgid "could not open '%s' for reading and writing"
msgstr "no se pudo abrir '%s' para lectura y escritura"
-#: wrapper.c:387 wrapper.c:588
+#: wrapper.c:395 wrapper.c:596
#, c-format
msgid "unable to access '%s'"
msgstr "no es posible acceder '%s'"
-#: wrapper.c:596
+#: wrapper.c:604
msgid "unable to get current working directory"
msgstr "no es posible obtener el directorio de trabajo actual"
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:1692
+#: wt-status.c:1494
+#, c-format
+msgid "You are in a sparse checkout with %d%% of tracked files present."
+msgstr "Estas en un checkout de sparse con %d%% archivos rastreados presentes."
+
+#: wt-status.c:1733
msgid "On branch "
msgstr "En la rama "
-#: wt-status.c:1699
+#: wt-status.c:1740
msgid "interactive rebase in progress; onto "
msgstr "rebase interactivo en progreso; en "
-#: wt-status.c:1701
+#: wt-status.c:1742
msgid "rebase in progress; onto "
msgstr "rebase en progreso; en "
-#: wt-status.c:1711
+#: wt-status.c:1752
msgid "Not currently on any branch."
msgstr "Actualmente no estás en ninguna rama."
-#: wt-status.c:1728
+#: wt-status.c:1769
msgid "Initial commit"
msgstr "Confirmación inicial"
-#: wt-status.c:1729
+#: wt-status.c:1770
msgid "No commits yet"
msgstr "No hay commits todavía"
-#: wt-status.c:1743
+#: wt-status.c:1784
msgid "Untracked files"
msgstr "Archivos sin seguimiento"
-#: wt-status.c:1745
+#: wt-status.c:1786
msgid "Ignored files"
msgstr "Archivos ignorados"
-#: wt-status.c:1749
+#: wt-status.c:1790
#, c-format
msgid ""
"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
"puede acelerarlo, pero tienes que ser cuidadoso de no olvidar agregar\n"
"nuevos archivos tú mismo (vea 'git help status')."
-#: wt-status.c:1755
+#: wt-status.c:1796
#, c-format
msgid "Untracked files not listed%s"
msgstr "Archivos no rastreados no son mostrados %s"
-#: wt-status.c:1757
+#: wt-status.c:1798
msgid " (use -u option to show untracked files)"
msgstr " (usa la opción -u para mostrar los archivos sin seguimiento)"
-#: wt-status.c:1763
+#: wt-status.c:1804
msgid "No changes"
msgstr "Sin cambios"
-#: wt-status.c:1768
+#: wt-status.c:1809
#, 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:1771
+#: wt-status.c:1812
#, c-format
msgid "no changes added to commit\n"
msgstr "no se agregaron cambios al commit\n"
-#: wt-status.c:1774
+#: wt-status.c:1815
#, c-format
msgid ""
"nothing added to commit but untracked files present (use \"git add\" to "
"no hay nada agregado al commit pero hay archivos sin seguimiento presentes "
"(usa \"git add\" para hacerles seguimiento)\n"
-#: wt-status.c:1777
+#: wt-status.c:1818
#, 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:1780
+#: wt-status.c:1821
#, 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:1783 wt-status.c:1788
+#: wt-status.c:1824 wt-status.c:1829
#, c-format
msgid "nothing to commit\n"
msgstr "nada para hacer commit\n"
-#: wt-status.c:1786
+#: wt-status.c:1827
#, 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:1790
+#: wt-status.c:1831
#, 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:1903
+#: wt-status.c:1944
msgid "No commits yet on "
msgstr "No hay commits todavía en "
-#: wt-status.c:1907
+#: wt-status.c:1948
msgid "HEAD (no branch)"
msgstr "HEAD (sin rama)"
-#: wt-status.c:1938
+#: wt-status.c:1979
msgid "different"
msgstr "diferente"
-#: wt-status.c:1940 wt-status.c:1948
+#: wt-status.c:1981 wt-status.c:1989
msgid "behind "
msgstr "detrás "
-#: wt-status.c:1943 wt-status.c:1946
+#: wt-status.c:1984 wt-status.c:1987
msgid "ahead "
msgstr "adelante "
#. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2468
+#: wt-status.c:2509
#, c-format
msgid "cannot %s: You have unstaged changes."
msgstr "no se puede %s: Tienes cambios sin marcar."
-#: wt-status.c:2474
+#: wt-status.c:2515
msgid "additionally, your index contains uncommitted changes."
msgstr "adicionalmente, tu índice contiene cambios que no están en un commit."
-#: wt-status.c:2476
+#: wt-status.c:2517
#, 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."
msgid "interactive picking"
msgstr "selección interactiva"
-#: builtin/add.c:326 builtin/checkout.c:1535 builtin/reset.c:308
+#: builtin/add.c:326 builtin/checkout.c:1533 builtin/reset.c:308
msgid "select hunks interactively"
msgstr "elegir hunks de forma interactiva"
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:1703 builtin/commit.c:351
+#: builtin/add.c:501 builtin/checkout.c:1701 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:1715 builtin/commit.c:357
+#: builtin/add.c:508 builtin/checkout.c:1713 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"
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:2218 builtin/init-db.c:541 builtin/prune-packed.c:16
+#: builtin/am.c:2218 builtin/init-db.c:559 builtin/prune-packed.c:16
#: builtin/repack.c:306 builtin/stash.c:816
msgid "be quiet"
msgstr "ser silencioso"
#: 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
+#: bugreport.c:137
msgid "format"
msgstr "formato"
"argumento inválido %s para 'git bisect terms'.\n"
"Las opciones soportadas son: --term-good|--term-old y --term-bad|--term-new."
-#: builtin/bisect--helper.c:478
+#: builtin/bisect--helper.c:460 builtin/bisect--helper.c:473
+msgid "'' is not a valid term"
+msgstr "'' no es un término válido"
+
+#: builtin/bisect--helper.c:483
#, c-format
msgid "unrecognized option: '%s'"
msgstr "opción desconocida: '%s'"
-#: builtin/bisect--helper.c:482
+#: builtin/bisect--helper.c:487
#, c-format
msgid "'%s' does not appear to be a valid revision"
msgstr "'%s' no parece ser una revisión válida"
-#: builtin/bisect--helper.c:514
+#: builtin/bisect--helper.c:519
msgid "bad HEAD - I need a HEAD"
msgstr "mal HEAD - Necesito un HEAD"
-#: builtin/bisect--helper.c:529
+#: builtin/bisect--helper.c:534
#, c-format
msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'."
msgstr ""
"error al hacer checkout '%s'. Intente 'git bisect start <rama-válida>'."
-#: builtin/bisect--helper.c:550
+#: builtin/bisect--helper.c:555
msgid "won't bisect on cg-seek'ed tree"
msgstr "no se bisecará en un árbol con cg-seek"
-#: builtin/bisect--helper.c:553
+#: builtin/bisect--helper.c:558
msgid "bad HEAD - strange symbolic ref"
msgstr "mal HEAD - ref simbólico extraño"
-#: builtin/bisect--helper.c:577
+#: builtin/bisect--helper.c:582
#, c-format
msgid "invalid ref: '%s'"
msgstr "ref inválido: '%s'"
-#: builtin/bisect--helper.c:633
+#: builtin/bisect--helper.c:638
msgid "perform 'git bisect next'"
msgstr "realiza 'git bisect next'"
-#: builtin/bisect--helper.c:635
+#: builtin/bisect--helper.c:640
msgid "write the terms to .git/BISECT_TERMS"
msgstr "escribe los términos a .git/BISECT_TERMS"
-#: builtin/bisect--helper.c:637
+#: builtin/bisect--helper.c:642
msgid "cleanup the bisection state"
msgstr "limpiar el estado de bisección"
-#: builtin/bisect--helper.c:639
+#: builtin/bisect--helper.c:644
msgid "check for expected revs"
msgstr "revisar por revs esperados"
-#: builtin/bisect--helper.c:641
+#: builtin/bisect--helper.c:646
msgid "reset the bisection state"
msgstr "reiniciar el estado de bisect"
-#: builtin/bisect--helper.c:643
+#: builtin/bisect--helper.c:648
msgid "write out the bisection state in BISECT_LOG"
msgstr "escribir el estado de bisect en BISECT_LOG"
-#: builtin/bisect--helper.c:645
+#: builtin/bisect--helper.c:650
msgid "check and set terms in a bisection state"
msgstr "revisar y configurar los terms en el estado de bisect"
-#: builtin/bisect--helper.c:647
+#: builtin/bisect--helper.c:652
msgid "check whether bad or good terms exist"
msgstr "revisar si existen términos malos o buenos"
-#: builtin/bisect--helper.c:649
+#: builtin/bisect--helper.c:654
msgid "print out the bisect terms"
msgstr "imprimir los terms del bisect"
-#: builtin/bisect--helper.c:651
+#: builtin/bisect--helper.c:656
msgid "start the bisect session"
msgstr "comenzar la sesión de bisect"
-#: builtin/bisect--helper.c:653
+#: builtin/bisect--helper.c:658
msgid "update BISECT_HEAD instead of checking out the current commit"
msgstr "actualiza BISECT_HEAD en lugar de revisar el commit actual"
-#: builtin/bisect--helper.c:655
+#: builtin/bisect--helper.c:660
msgid "no log for BISECT_WRITE"
msgstr "no hay log para BISECT_WRITE"
-#: builtin/bisect--helper.c:673
+#: builtin/bisect--helper.c:678
msgid "--write-terms requires two arguments"
msgstr "--write-terms requiere dos argumentos"
-#: builtin/bisect--helper.c:677
+#: builtin/bisect--helper.c:682
msgid "--bisect-clean-state requires no arguments"
msgstr "--bisect-clean-state no requiere argumentos"
-#: builtin/bisect--helper.c:684
+#: builtin/bisect--helper.c:689
msgid "--bisect-reset requires either no argument or a commit"
msgstr "--bisect-reset requiere un commit o ningún argumento"
-#: builtin/bisect--helper.c:688
+#: builtin/bisect--helper.c:693
msgid "--bisect-write requires either 4 or 5 arguments"
msgstr "--bisect-write requiere entre 4 o 5 argumentos"
-#: builtin/bisect--helper.c:694
+#: builtin/bisect--helper.c:699
msgid "--check-and-set-terms requires 3 arguments"
msgstr "--bisect-clean-state no requiere argumentos"
-#: builtin/bisect--helper.c:700
+#: builtin/bisect--helper.c:705
msgid "--bisect-next-check requires 2 or 3 arguments"
msgstr "--bisect-next-check requiere 2 o 3 argumentos"
-#: builtin/bisect--helper.c:706
+#: builtin/bisect--helper.c:711
msgid "--bisect-terms requires 0 or 1 argument"
msgstr "--bisect-terms requiere 0 o 1 argumentos"
msgid "git bundle unbundle <file> [<refname>...]"
msgstr "git bundle unbundle <archivo> [<nombre-de-ref>...]"
-#: builtin/bundle.c:66 builtin/pack-objects.c:3376
+#: builtin/bundle.c:66 builtin/pack-objects.c:3448
msgid "do not show progress meter"
msgstr "no mostrar medidor de progreso"
-#: builtin/bundle.c:68 builtin/pack-objects.c:3378
+#: builtin/bundle.c:68 builtin/pack-objects.c:3450
msgid "show progress meter"
msgstr "mostrar medidor de progreso"
-#: builtin/bundle.c:70 builtin/pack-objects.c:3380
+#: builtin/bundle.c:70 builtin/pack-objects.c:3452
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:3383
+#: builtin/bundle.c:73 builtin/pack-objects.c:3455
msgid "similar to --all-progress when progress meter is shown"
msgstr "similar a --all-progress cuando medidor de progreso es mostrado"
#: builtin/cat-file.c:599
msgid ""
-"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
-"filters]"
+"git cat-file (--batch[=<format>] | --batch-check[=<format>]) [--follow-"
+"symlinks] [--textconv | --filters]"
msgstr ""
-"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
-"filters]"
+"git cat-file (--batch[=<formato>] | --batch-check[=<formato>]) [--follow-"
+"symlinks] [--textconv | --filters]"
#: builtin/cat-file.c:620
msgid "only one batch option may be specified"
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:648 git-submodule.sh:984
+#: builtin/cat-file.c:648 git-submodule.sh:958
msgid "blob"
msgstr "blob"
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:1488 builtin/gc.c:537
-#: builtin/worktree.c:502
+#: builtin/check-ignore.c:21 builtin/checkout.c:1486 builtin/gc.c:537
+#: builtin/worktree.c:561
msgid "suppress progress reporting"
msgstr "suprimir el reporte de progreso"
#: 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:675
+#: builtin/worktree.c:754
msgid "string"
msgstr "string"
msgid "path '%s' is unmerged"
msgstr "ruta '%s' no esta fusionada"
-#: builtin/checkout.c:704
+#: builtin/checkout.c:702
msgid "you need to resolve your current index first"
msgstr "necesitas resolver tu índice actual primero"
-#: builtin/checkout.c:758
+#: builtin/checkout.c:756
#, c-format
msgid ""
"cannot continue with staged changes in the following files:\n"
"no se puede continuar con los cambios en stage en los siguientes archivos:\n"
"%s"
-#: builtin/checkout.c:861
+#: builtin/checkout.c:859
#, c-format
msgid "Can not do reflog for '%s': %s\n"
msgstr "No se puede hacer reflog para '%s': %s\n"
-#: builtin/checkout.c:903
+#: builtin/checkout.c:901
msgid "HEAD is now at"
msgstr "HEAD está ahora en"
-#: builtin/checkout.c:907 builtin/clone.c:720
+#: builtin/checkout.c:905 builtin/clone.c:720
msgid "unable to update HEAD"
msgstr "no es posible actualizar HEAD"
-#: builtin/checkout.c:911
+#: builtin/checkout.c:909
#, c-format
msgid "Reset branch '%s'\n"
msgstr "Reiniciar rama '%s'\n"
-#: builtin/checkout.c:914
+#: builtin/checkout.c:912
#, c-format
msgid "Already on '%s'\n"
msgstr "Ya en '%s'\n"
-#: builtin/checkout.c:918
+#: builtin/checkout.c:916
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr "Rama reiniciada y cambiada a '%s'\n"
-#: builtin/checkout.c:920 builtin/checkout.c:1344
+#: builtin/checkout.c:918 builtin/checkout.c:1342
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr "Cambiado a nueva rama '%s'\n"
-#: builtin/checkout.c:922
+#: builtin/checkout.c:920
#, c-format
msgid "Switched to branch '%s'\n"
msgstr "Cambiado a rama '%s'\n"
-#: builtin/checkout.c:973
+#: builtin/checkout.c:971
#, c-format
msgid " ... and %d more.\n"
msgstr " ... y %d más.\n"
-#: builtin/checkout.c:979
+#: builtin/checkout.c:977
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
"\n"
"%s\n"
-#: builtin/checkout.c:998
+#: builtin/checkout.c:996
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
" git branch <nombre-de-rama> %s\n"
"\n"
-#: builtin/checkout.c:1033
+#: builtin/checkout.c:1031
msgid "internal error in revision walk"
msgstr "error interno en camino de revisión"
-#: builtin/checkout.c:1037
+#: builtin/checkout.c:1035
msgid "Previous HEAD position was"
msgstr "La posición previa de HEAD era"
-#: builtin/checkout.c:1077 builtin/checkout.c:1339
+#: builtin/checkout.c:1075 builtin/checkout.c:1337
msgid "You are on a branch yet to be born"
msgstr "Estás en una rama por nacer"
-#: builtin/checkout.c:1152
+#: builtin/checkout.c:1150
#, c-format
msgid ""
"'%s' could be both a local file and a tracking branch.\n"
"'%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:1159
+#: builtin/checkout.c:1157
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"
"de nombre <nombre> remota, como 'origin', considera configurar\n"
"checkout.defaultRemote=origin en tu configuración."
-#: builtin/checkout.c:1169
+#: builtin/checkout.c:1167
#, c-format
msgid "'%s' matched multiple (%d) remote tracking branches"
msgstr "'%s' concordó con multiples (%d) ramas de rastreo remoto"
-#: builtin/checkout.c:1235
+#: builtin/checkout.c:1233
msgid "only one reference expected"
msgstr "solo una referencia esperada"
-#: builtin/checkout.c:1252
+#: builtin/checkout.c:1250
#, c-format
msgid "only one reference expected, %d given."
msgstr "solo una referencia esperada, %d entregadas."
-#: builtin/checkout.c:1298 builtin/worktree.c:283 builtin/worktree.c:451
+#: builtin/checkout.c:1296 builtin/worktree.c:342 builtin/worktree.c:510
#, c-format
msgid "invalid reference: %s"
msgstr "referencia inválida: %s"
-#: builtin/checkout.c:1311 builtin/checkout.c:1677
+#: builtin/checkout.c:1309 builtin/checkout.c:1675
#, c-format
msgid "reference is not a tree: %s"
msgstr "la referencia no es n árbol: %s"
-#: builtin/checkout.c:1358
+#: builtin/checkout.c:1356
#, c-format
msgid "a branch is expected, got tag '%s'"
msgstr "se esperaba un branch, se obtuvo tag '%s'"
-#: builtin/checkout.c:1360
+#: builtin/checkout.c:1358
#, 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:1361 builtin/checkout.c:1369
+#: builtin/checkout.c:1359 builtin/checkout.c:1367
#, c-format
msgid "a branch is expected, got '%s'"
msgstr "se esperaba branch, se obuto '%s'"
-#: builtin/checkout.c:1364
+#: builtin/checkout.c:1362
#, c-format
msgid "a branch is expected, got commit '%s'"
msgstr "se espera una rama, se obtuvo commit '%s'"
-#: builtin/checkout.c:1380
+#: builtin/checkout.c:1378
msgid ""
"cannot switch branch while merging\n"
"Consider \"git merge --quit\" or \"git worktree add\"."
"no se puede cambiar de branch durante un merge\n"
"Considera \"git merge --quit\" o \"git worktree add\"."
-#: builtin/checkout.c:1384
+#: builtin/checkout.c:1382
msgid ""
"cannot switch branch in the middle of an am session\n"
"Consider \"git am --quit\" or \"git worktree add\"."
"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:1388
+#: builtin/checkout.c:1386
msgid ""
"cannot switch branch while rebasing\n"
"Consider \"git rebase --quit\" or \"git worktree add\"."
"no se puede cambiar de branch durante un rebase\n"
"Considera \"git rebase --quit\" o \"git worktree add\"."
-#: builtin/checkout.c:1392
+#: builtin/checkout.c:1390
msgid ""
"cannot switch branch while cherry-picking\n"
"Consider \"git cherry-pick --quit\" or \"git worktree add\"."
"no se puede cambiar de branch durante un cherry-pick\n"
"Considera \"git cherry-pick --quit\" o \"git worktree add\"."
-#: builtin/checkout.c:1396
+#: builtin/checkout.c:1394
msgid ""
"cannot switch branch while reverting\n"
"Consider \"git revert --quit\" or \"git worktree add\"."
"no se puede cambiar de branch durante un revert\n"
"Considera \"git revert --quit\" o \"git worktree add\"."
-#: builtin/checkout.c:1400
+#: builtin/checkout.c:1398
msgid "you are switching branch while bisecting"
msgstr "estás cambiando ramas durante un bisect"
-#: builtin/checkout.c:1407
+#: builtin/checkout.c:1405
msgid "paths cannot be used with switching branches"
msgstr "rutas no pueden ser usadas con cambios de rama"
-#: builtin/checkout.c:1410 builtin/checkout.c:1414 builtin/checkout.c:1418
+#: builtin/checkout.c:1408 builtin/checkout.c:1412 builtin/checkout.c:1416
#, c-format
msgid "'%s' cannot be used with switching branches"
msgstr "'%s' no puede ser usado con cambios de ramas"
-#: builtin/checkout.c:1422 builtin/checkout.c:1425 builtin/checkout.c:1428
-#: builtin/checkout.c:1433 builtin/checkout.c:1438
+#: builtin/checkout.c:1420 builtin/checkout.c:1423 builtin/checkout.c:1426
+#: builtin/checkout.c:1431 builtin/checkout.c:1436
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "'%s' no puede ser usado con '%s'"
-#: builtin/checkout.c:1435
+#: builtin/checkout.c:1433
#, c-format
msgid "'%s' cannot take <start-point>"
msgstr "'%s' no puede tomar <punto de partida>"
-#: builtin/checkout.c:1443
+#: builtin/checkout.c:1441
#, 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:1450
+#: builtin/checkout.c:1448
msgid "missing branch or commit argument"
msgstr "falta branch o commit como argumento"
-#: 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/checkout.c:1490 builtin/clone.c:91 builtin/commit-graph.c:82
+#: builtin/commit-graph.c:189 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:1493
+#: builtin/checkout.c:1491
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:1494 builtin/log.c:1709 parse-options.h:322
+#: builtin/checkout.c:1492 builtin/log.c:1709 parse-options.h:322
msgid "style"
msgstr "estilo"
-#: builtin/checkout.c:1495
+#: builtin/checkout.c:1493
msgid "conflict style (merge or diff3)"
msgstr "conflicto de estilos (merge o diff3)"
-#: builtin/checkout.c:1507 builtin/worktree.c:499
+#: builtin/checkout.c:1505 builtin/worktree.c:558
msgid "detach HEAD at named commit"
msgstr "desacoplar HEAD en el commit nombrado"
-#: builtin/checkout.c:1508
+#: builtin/checkout.c:1506
msgid "set upstream info for new branch"
msgstr "configurar info de upstream para una rama nueva"
-#: builtin/checkout.c:1510
+#: builtin/checkout.c:1508
msgid "force checkout (throw away local modifications)"
msgstr "forzar el checkout (descartar modificaciones locales)"
-#: builtin/checkout.c:1512
+#: builtin/checkout.c:1510
msgid "new-branch"
msgstr "nueva-rama"
-#: builtin/checkout.c:1512
+#: builtin/checkout.c:1510
msgid "new unparented branch"
msgstr "nueva rama no emparentada"
-#: builtin/checkout.c:1514 builtin/merge.c:292
+#: builtin/checkout.c:1512 builtin/merge.c:292
msgid "update ignored files (default)"
msgstr "actualizar archivos ignorados (default)"
-#: builtin/checkout.c:1517
+#: builtin/checkout.c:1515
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:1530
+#: builtin/checkout.c:1528
msgid "checkout our version for unmerged files"
msgstr "hacer checkout a nuestra versión para archivos sin fusionar"
-#: builtin/checkout.c:1533
+#: builtin/checkout.c:1531
msgid "checkout their version for unmerged files"
msgstr "hacer checkout a su versión para los archivos sin fusionar"
-#: builtin/checkout.c:1537
+#: builtin/checkout.c:1535
msgid "do not limit pathspecs to sparse entries only"
msgstr "no limitar pathspecs a dispersar entradas solamente"
-#: builtin/checkout.c:1592
+#: builtin/checkout.c:1590
#, c-format
msgid "-%c, -%c and --orphan are mutually exclusive"
msgstr "-%c, -%c y --orphan son mutuamente exclusivas"
-#: builtin/checkout.c:1596
+#: builtin/checkout.c:1594
msgid "-p and --overlay are mutually exclusive"
msgstr "-p y --overlay son mutuamente exclusivas"
-#: builtin/checkout.c:1633
+#: builtin/checkout.c:1631
msgid "--track needs a branch name"
msgstr "--track necesita el nombre de una rama"
-#: builtin/checkout.c:1638
+#: builtin/checkout.c:1636
#, c-format
msgid "missing branch name; try -%c"
msgstr "falta nombre de rama; prueba -%c"
-#: builtin/checkout.c:1670
+#: builtin/checkout.c:1668
#, c-format
msgid "could not resolve %s"
msgstr "no se pudo resolver %s"
-#: builtin/checkout.c:1686
+#: builtin/checkout.c:1684
msgid "invalid path specification"
msgstr "especificación de ruta inválida"
-#: builtin/checkout.c:1693
+#: builtin/checkout.c:1691
#, 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:1697
+#: builtin/checkout.c:1695
#, 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:1706
+#: builtin/checkout.c:1704
msgid "--pathspec-from-file is incompatible with --detach"
msgstr "--pathspec-from-file es incompatible con --detach"
-#: builtin/checkout.c:1709 builtin/reset.c:325 builtin/stash.c:1503
+#: builtin/checkout.c:1707 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:1720
+#: builtin/checkout.c:1718
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
"git checkout: --ours/--theirs, --force y --merge son incompatibles cuando\n"
"se revisa fuera del índice."
-#: builtin/checkout.c:1725
+#: builtin/checkout.c:1723
msgid "you must specify path(s) to restore"
msgstr "debes especificar path(s) para restaurar"
-#: 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
+#: builtin/checkout.c:1749 builtin/checkout.c:1751 builtin/checkout.c:1800
+#: builtin/checkout.c:1802 builtin/clone.c:121 builtin/remote.c:170
+#: builtin/remote.c:172 builtin/submodule--helper.c:2295 builtin/worktree.c:554
+#: builtin/worktree.c:556
msgid "branch"
msgstr "rama"
-#: builtin/checkout.c:1752
+#: builtin/checkout.c:1750
msgid "create and checkout a new branch"
msgstr "crear y hacer checkout a una nueva rama"
-#: builtin/checkout.c:1754
+#: builtin/checkout.c:1752
msgid "create/reset and checkout a branch"
msgstr "crear/reiniciar y hacer checkout a una rama"
-#: builtin/checkout.c:1755
+#: builtin/checkout.c:1753
msgid "create reflog for new branch"
msgstr "crear un reflog para una nueva rama"
-#: builtin/checkout.c:1757
+#: builtin/checkout.c:1755
msgid "second guess 'git checkout <no-such-branch>' (default)"
msgstr "adivinar segunda opción 'git checkout <no-hay-tal-rama>' (default)"
-#: builtin/checkout.c:1758
+#: builtin/checkout.c:1756
msgid "use overlay mode (default)"
msgstr "usar modo overlay (default)"
-#: builtin/checkout.c:1803
+#: builtin/checkout.c:1801
msgid "create and switch to a new branch"
msgstr "crear y hacer switch a una nueva rama"
-#: builtin/checkout.c:1805
+#: builtin/checkout.c:1803
msgid "create/reset and switch to a branch"
msgstr "crear/reiniciar y hacer switch a una rama"
-#: builtin/checkout.c:1807
+#: builtin/checkout.c:1805
msgid "second guess 'git switch <no-such-branch>'"
msgstr "adivinar segunda opción 'git checkout <no-hay-tal-rama>'"
-#: builtin/checkout.c:1809
+#: builtin/checkout.c:1807
msgid "throw away local modifications"
msgstr "descartar modificaciones locales"
-#: builtin/checkout.c:1843
+#: builtin/checkout.c:1841
msgid "which tree-ish to checkout from"
msgstr "de qué árbol hacer el checkout"
-#: builtin/checkout.c:1845
+#: builtin/checkout.c:1843
msgid "restore the index"
msgstr "restaurar el index"
-#: builtin/checkout.c:1847
+#: builtin/checkout.c:1845
msgid "restore the working tree (default)"
msgstr "restaurar el árbol de trabajo (default)"
-#: builtin/checkout.c:1849
+#: builtin/checkout.c:1847
msgid "ignore unmerged entries"
msgstr "ignorar entradas no fusionadas"
-#: builtin/checkout.c:1850
+#: builtin/checkout.c:1848
msgid "use overlay mode"
msgstr "usar modo overlay"
msgid "remove only ignored files"
msgstr "borrar solo archivos ignorados"
-#: builtin/clean.c:931
-msgid "-x and -X cannot be used together"
-msgstr "-x y -X no pueden ser usadas juntas"
-
-#: builtin/clean.c:935
+#: builtin/clean.c:929
msgid ""
"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
"clean"
"clean.requireForce configurado como true y ninguno -i, -n, ni -f entregados; "
"rehusando el clean"
-#: builtin/clean.c:938
+#: builtin/clean.c:932
msgid ""
"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
"refusing to clean"
"clean.requireForce default en true y ninguno -i, -n, ni -f entregados; "
"rehusando el clean"
+#: builtin/clean.c:944
+msgid "-x and -X cannot be used together"
+msgstr "-x y -X no pueden ser usadas juntas"
+
#: builtin/clone.c:45
msgid "git clone [<options>] [--] <repo> [<dir>]"
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:536
+#: builtin/clone.c:94 builtin/clone.c:96 builtin/init-db.c:554
msgid "create a bare repository"
msgstr "crear un repositorio vacío"
msgid "number of submodules cloned in parallel"
msgstr "numero de submódulos clonados en paralelo"
-#: builtin/clone.c:111 builtin/init-db.c:533
+#: builtin/clone.c:111 builtin/init-db.c:551
msgid "template-directory"
msgstr "directorio-template"
-#: builtin/clone.c:112 builtin/init-db.c:534
+#: builtin/clone.c:112 builtin/init-db.c:552
msgid "directory from which templates will be used"
msgstr "directorio del cual los templates serán usados"
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:3442 builtin/repack.c:329
+#: builtin/clone.c:119 builtin/column.c:27 builtin/init-db.c:562
+#: builtin/merge-file.c:46 builtin/pack-objects.c:3514 builtin/repack.c:329
msgid "name"
msgstr "nombre"
msgid "create a shallow clone of that depth"
msgstr "crear un clon superficial para esa profundidad"
-#: builtin/clone.c:127 builtin/fetch.c:171 builtin/pack-objects.c:3431
+#: builtin/clone.c:127 builtin/fetch.c:171 builtin/pack-objects.c:3503
#: builtin/pull.c:211
msgid "time"
msgstr "tiempo"
msgid "any cloned submodules will be shallow"
msgstr "cualquier submódulo clonado será superficial"
-#: builtin/clone.c:137 builtin/init-db.c:542
+#: builtin/clone.c:137 builtin/init-db.c:560
msgid "gitdir"
msgstr "gitdir"
-#: builtin/clone.c:138 builtin/init-db.c:543
+#: builtin/clone.c:138 builtin/init-db.c:561
msgid "separate git dir from working tree"
msgstr "separa git dir del árbol de trabajo"
msgid "cannot unlink temporary alternates file"
msgstr "no se puede desvincular archivos alternos temporales"
-#: builtin/clone.c:971 builtin/receive-pack.c:1972
+#: builtin/clone.c:971 builtin/receive-pack.c:1982
msgid "Too many arguments."
msgstr "Muchos argumentos."
msgid "--bare and --separate-git-dir are incompatible."
msgstr "--bare y --separate-git-dir son incompatibles."
-#: builtin/clone.c:1004
+#: builtin/clone.c:1007
#, c-format
msgid "repository '%s' does not exist"
msgstr "repositorio '%s' no existe"
-#: builtin/clone.c:1010 builtin/fetch.c:1789
+#: builtin/clone.c:1011 builtin/fetch.c:1794
#, c-format
msgid "depth %s is not a positive number"
msgstr "profundidad %s no es un numero positivo"
-#: builtin/clone.c:1020
+#: builtin/clone.c:1021
#, 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:1030
+#: builtin/clone.c:1033
#, c-format
msgid "working tree '%s' already exists."
msgstr "directorio de trabajo '%s' ya existe."
-#: builtin/clone.c:1045 builtin/clone.c:1066 builtin/difftool.c:271
-#: builtin/log.c:1886 builtin/worktree.c:295 builtin/worktree.c:327
+#: builtin/clone.c:1048 builtin/clone.c:1069 builtin/difftool.c:271
+#: builtin/log.c:1886 builtin/worktree.c:354 builtin/worktree.c:386
#, c-format
msgid "could not create leading directories of '%s'"
msgstr "no se pudo crear directorios principales de '%s'"
-#: builtin/clone.c:1050
+#: builtin/clone.c:1053
#, c-format
msgid "could not create work tree dir '%s'"
msgstr "no se pudo crear un árbol de trabajo '%s'"
-#: builtin/clone.c:1070
+#: builtin/clone.c:1073
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr "Clonando en un repositorio vacío '%s'...\n"
-#: builtin/clone.c:1072
+#: builtin/clone.c:1075
#, c-format
msgid "Cloning into '%s'...\n"
msgstr "Clonando en '%s'...\n"
-#: builtin/clone.c:1096
+#: builtin/clone.c:1099
msgid ""
"clone --recursive is not compatible with both --reference and --reference-if-"
"able"
"clone --recursive no es compatible con --reference y --reference-if-able al "
"mismo tiempo"
-#: builtin/clone.c:1160
+#: builtin/clone.c:1164
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:1162
+#: builtin/clone.c:1166
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:1164
+#: builtin/clone.c:1168
msgid "--shallow-exclude is ignored in local clones; use file:// instead."
msgstr "--shallow-exclude es ignorado en clones locales; use file://."
-#: builtin/clone.c:1166
+#: builtin/clone.c:1170
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:1169
+#: builtin/clone.c:1173
msgid "source repository is shallow, ignoring --local"
msgstr "repositorio fuente es superficial, ignorando --local"
-#: builtin/clone.c:1174
+#: builtin/clone.c:1178
msgid "--local is ignored"
msgstr "--local es ignorado"
-#: builtin/clone.c:1249 builtin/clone.c:1257
+#: builtin/clone.c:1262 builtin/clone.c:1270
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr "Rama remota %s no encontrada en upstream %s"
-#: builtin/clone.c:1260
+#: builtin/clone.c:1273
msgid "You appear to have cloned an empty repository."
msgstr "Pareces haber clonado un repositorio sin contenido."
msgid "--command must be the first argument"
msgstr "--command debe ser el primer argumento"
-#: builtin/commit-graph.c:11 builtin/commit-graph.c:19
+#: builtin/commit-graph.c:13 builtin/commit-graph.c:21
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
+#: builtin/commit-graph.c:14 builtin/commit-graph.c:26
msgid ""
"git commit-graph write [--object-dir <objdir>] [--append] [--"
"split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-"
"split[=<estrategia>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-"
"paths] [--[no-]progress] <opciones de split>"
-#: builtin/commit-graph.c:60
+#: builtin/commit-graph.c:62
#, 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
+#: builtin/commit-graph.c:78 builtin/commit-graph.c:177
+#: builtin/commit-graph.c:276 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
+#: builtin/commit-graph.c:79 builtin/commit-graph.c:178
+#: builtin/commit-graph.c:277
msgid "The object directory to store the graph"
msgstr "El directorio de objetos para guardar el gráfico"
-#: builtin/commit-graph.c:79
+#: builtin/commit-graph.c:81
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
+#: builtin/commit-graph.c:104
#, c-format
msgid "Could not open commit-graph '%s'"
msgstr "No se pudo abrir commit-graph '%s'"
-#: builtin/commit-graph.c:136
+#: builtin/commit-graph.c:138
#, c-format
msgid "unrecognized --split argument, %s"
msgstr "argumento --split no reconocido, %s"
-#: builtin/commit-graph.c:155
+#: builtin/commit-graph.c:151
+#, c-format
+msgid "unexpected non-hex object ID: %s"
+msgstr "ID de objeto no hex inesperado :%s"
+
+#: builtin/commit-graph.c:156
+#, c-format
+msgid "invalid object: %s"
+msgstr "no es un objeto válido: %s"
+
+#: builtin/commit-graph.c:180
msgid "start walk at all refs"
msgstr "comenzar caminata en todas las refs"
-#: builtin/commit-graph.c:157
+#: builtin/commit-graph.c:182
msgid "scan pack-indexes listed by stdin for commits"
msgstr "escanear paquete de índices por stdin por commits"
-#: builtin/commit-graph.c:159
+#: builtin/commit-graph.c:184
msgid "start walk at commits listed by stdin"
msgstr "comenzar a caminar a los commits listados por stdin"
-#: builtin/commit-graph.c:161
+#: builtin/commit-graph.c:186
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
+#: builtin/commit-graph.c:188
msgid "enable computation for changed paths"
msgstr "habilitar computación para rutas cambiadas"
-#: builtin/commit-graph.c:166
+#: builtin/commit-graph.c:191
msgid "allow writing an incremental commit-graph file"
msgstr "permitir escribir un archivo commit-graph incremental"
-#: builtin/commit-graph.c:170
+#: builtin/commit-graph.c:195
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
+#: builtin/commit-graph.c:197
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
+#: builtin/commit-graph.c:199
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
+#: builtin/commit-graph.c:215
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-graph.c:245
+msgid "Collecting commits from input"
+msgstr "Recolectando commits del input"
#: builtin/commit-tree.c:18
msgid ""
msgstr "version"
#: builtin/commit.c:1376 builtin/commit.c:1535 builtin/push.c:549
-#: builtin/worktree.c:646
+#: builtin/worktree.c:722
msgid "machine-readable output"
msgstr "output formato-maquina"
msgstr "terminar entradas con NUL"
#: 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:1392 parse-options.h:336
+#: builtin/fast-export.c:1199 builtin/fast-export.c:1202
+#: builtin/fast-export.c:1205 builtin/rebase.c:1392 parse-options.h:336
msgid "mode"
msgstr "modo"
msgid "--broken is incompatible with commit-ishes"
msgstr "--broken es incompatible con commit-ismos"
-#: builtin/diff.c:84
+#: builtin/diff.c:91
#, c-format
msgid "'%s': not a regular file or symlink"
msgstr "'%s': no es un archivo regular o un enlace simbólico"
-#: builtin/diff.c:235
+#: builtin/diff.c:242
#, c-format
msgid "invalid option: %s"
msgstr "opción inválida: %s"
-#: builtin/diff.c:350
+#: builtin/diff.c:359
+#, c-format
+msgid "%s...%s: no merge base"
+msgstr "%s...%s: se neceista una base de fusión"
+
+#: builtin/diff.c:469
msgid "Not a git repository"
msgstr "No es un repositorio git"
-#: builtin/diff.c:394
+#: builtin/diff.c:514
#, c-format
msgid "invalid object '%s' given."
msgstr "objeto '%s' entregado no es válido."
-#: builtin/diff.c:403
+#: builtin/diff.c:525
#, c-format
msgid "more than two blobs given: '%s'"
msgstr "más de dos blobs entregados: '%s'"
-#: builtin/diff.c:408
+#: builtin/diff.c:530
#, c-format
msgid "unhandled object '%s' given."
msgstr "objeto no manejado '%s' entregado."
+#: builtin/diff.c:564
+#, c-format
+msgid "%s...%s: multiple merge bases, using %s"
+msgstr "%s...%s: múltiples bases de fusión, usando %s"
+
#: builtin/difftool.c:30
msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
msgstr "git difftool [<opciones>] [<commit> [<commit>]] [--] [<ruta>...]"
msgid "git fast-export [rev-list-opts]"
msgstr "git fast-export [rev-list-opts]"
-#: builtin/fast-export.c:853
+#: builtin/fast-export.c:868
msgid "Error: Cannot export nested tags unless --mark-tags is specified."
msgstr ""
"Error: No se puede exportar los tags anidados a menos que --mark-tags sea "
"especificado."
-#: builtin/fast-export.c:1152
+#: builtin/fast-export.c:1178
+msgid "--anonymize-map token cannot be empty"
+msgstr "token --anonymize-map no puede estar vacío"
+
+#: builtin/fast-export.c:1198
msgid "show progress after <n> objects"
msgstr "mostrar progreso después de <n> objetos"
-#: builtin/fast-export.c:1154
+#: builtin/fast-export.c:1200
msgid "select handling of signed tags"
msgstr "seleccionar el manejo de tags firmados"
-#: builtin/fast-export.c:1157
+#: builtin/fast-export.c:1203
msgid "select handling of tags that tag filtered objects"
msgstr "seleccionar el manejo de tags que son tags de objetos filtrados"
-#: builtin/fast-export.c:1160
+#: builtin/fast-export.c:1206
msgid "select handling of commit messages in an alternate encoding"
msgstr "seleccionar el manejo de mensajes de commit en un encoding diferente"
-#: builtin/fast-export.c:1163
+#: builtin/fast-export.c:1209
msgid "Dump marks to this file"
msgstr "Volcar marcas a este archivo"
-#: builtin/fast-export.c:1165
+#: builtin/fast-export.c:1211
msgid "Import marks from this file"
msgstr "Importar marcas de este archivo"
-#: builtin/fast-export.c:1169
+#: builtin/fast-export.c:1215
msgid "Import marks from this file if it exists"
msgstr "Importar marcas de este archivo si existe"
-#: builtin/fast-export.c:1171
+#: builtin/fast-export.c:1217
msgid "Fake a tagger when tags lack one"
msgstr "Falsificar un tagger cuando les falta uno"
-#: builtin/fast-export.c:1173
+#: builtin/fast-export.c:1219
msgid "Output full tree for each commit"
msgstr "Mostrar todo el árbol para cada commit"
-#: builtin/fast-export.c:1175
+#: builtin/fast-export.c:1221
msgid "Use the done feature to terminate the stream"
msgstr "Use el feature done para terminar el stream"
-#: builtin/fast-export.c:1176
+#: builtin/fast-export.c:1222
msgid "Skip output of blob data"
msgstr "Saltar el output de data blob"
-#: builtin/fast-export.c:1177 builtin/log.c:1724
+#: builtin/fast-export.c:1223 builtin/log.c:1724
msgid "refspec"
msgstr "refspec"
-#: builtin/fast-export.c:1178
+#: builtin/fast-export.c:1224
msgid "Apply refspec to exported refs"
msgstr "Aplicar refspec para los refs exportados"
-#: builtin/fast-export.c:1179
+#: builtin/fast-export.c:1225
msgid "anonymize output"
msgstr "anonimizar la salida"
-#: builtin/fast-export.c:1181
+#: builtin/fast-export.c:1226
+msgid "from:to"
+msgstr "de:para"
+
+#: builtin/fast-export.c:1227
+msgid "convert <from> to <to> in anonymized output"
+msgstr "convertir <de> a <para> en output anonimizado"
+
+#: builtin/fast-export.c:1230
msgid "Reference parents which are not in fast-export stream by object id"
msgstr ""
"Padres de la referencia que no estan en fast-export stream por id de objeto"
-#: builtin/fast-export.c:1183
+#: builtin/fast-export.c:1232
msgid "Show original object ids of blobs/commits"
msgstr "Mostrar ids de objetos originales para blobs/commits"
-#: builtin/fast-export.c:1185
+#: builtin/fast-export.c:1234
msgid "Label tags with mark ids"
msgstr "Marcar tags con ids de mark"
-#: builtin/fast-export.c:1220
+#: builtin/fast-export.c:1257
+msgid "--anonymize-map without --anonymize does not make sense"
+msgstr "--anonymize-map sin --anonymize no tiene sentido"
+
+#: builtin/fast-export.c:1272
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-pack.c:245
+#, c-format
+msgid "Lockfile created but not reported: %s"
+msgstr "Lockfile creado pero no reportado: %s"
+
#: builtin/fetch.c:35
msgid "git fetch [<options>] [<repository> [<refspec>...]]"
msgstr "git fetch [<opciones>] [<repositorio> [<refspec>...]]"
msgid "You need to specify a tag name."
msgstr "Tienes que especificar un nombre de tag."
-#: builtin/fetch.c:1773
+#: builtin/fetch.c:1778
msgid "Negative depth in --deepen is not supported"
msgstr "Profundidad negativa en --deepen no soportada"
-#: builtin/fetch.c:1775
+#: builtin/fetch.c:1780
msgid "--deepen and --depth are mutually exclusive"
msgstr "--deepen y --depth son mutuamente exclusivas"
-#: builtin/fetch.c:1780
+#: builtin/fetch.c:1785
msgid "--depth and --unshallow cannot be used together"
msgstr "--depth y --unshallow no pueden ser usadas juntas"
-#: builtin/fetch.c:1782
+#: builtin/fetch.c:1787
msgid "--unshallow on a complete repository does not make sense"
msgstr "--unshallow no tiene sentido en un repositorio completo"
-#: builtin/fetch.c:1798
+#: builtin/fetch.c:1800
msgid "fetch --all does not take a repository argument"
msgstr "fetch --all no toma un argumento de repositorio"
-#: builtin/fetch.c:1800
+#: builtin/fetch.c:1802
msgid "fetch --all does not make sense with refspecs"
msgstr "fetch --all no tiene sentido con refspecs"
-#: builtin/fetch.c:1809
+#: builtin/fetch.c:1811
#, c-format
msgid "No such remote or remote group: %s"
msgstr "No existe el remoto o grupo remoto: %s"
-#: builtin/fetch.c:1816
+#: builtin/fetch.c:1818
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:1834
+#: builtin/fetch.c:1836
msgid ""
"--filter can only be used with the remote configured in extensions."
"partialclone"
msgid "print only refs which don't contain the commit"
msgstr "mostrar solo refs que no contienen el commit"
-#: builtin/fsck.c:68 builtin/fsck.c:147 builtin/fsck.c:148
+#: builtin/fsck.c:69 builtin/fsck.c:148 builtin/fsck.c:149
msgid "unknown"
msgstr "desconocido"
#. TRANSLATORS: e.g. error in tree 01bfda: <more explanation>
-#: builtin/fsck.c:100 builtin/fsck.c:120
+#: builtin/fsck.c:101 builtin/fsck.c:121
#, c-format
msgid "error in %s %s: %s"
msgstr "error en %s %s: %s"
#. TRANSLATORS: e.g. warning in tree 01bfda: <more explanation>
-#: builtin/fsck.c:114
+#: builtin/fsck.c:115
#, c-format
msgid "warning in %s %s: %s"
msgstr "peligro en %s %s: %s"
-#: builtin/fsck.c:143 builtin/fsck.c:146
+#: builtin/fsck.c:144 builtin/fsck.c:147
#, c-format
msgid "broken link from %7s %s"
msgstr "link roto de %7s %s"
-#: builtin/fsck.c:155
+#: builtin/fsck.c:156
msgid "wrong object type in link"
msgstr "tipo de objeto equivocado en link"
-#: builtin/fsck.c:171
+#: builtin/fsck.c:172
#, c-format
msgid ""
"broken link from %7s %s\n"
"link roto de %7s %s\n"
" a %7s %s"
-#: builtin/fsck.c:282
+#: builtin/fsck.c:283
#, c-format
msgid "missing %s %s"
msgstr "faltan %s %s"
-#: builtin/fsck.c:309
+#: builtin/fsck.c:310
#, c-format
msgid "unreachable %s %s"
msgstr "inalcanzable %s %s"
-#: builtin/fsck.c:329
+#: builtin/fsck.c:330
#, c-format
msgid "dangling %s %s"
msgstr "actualizando %s %s"
-#: builtin/fsck.c:339
+#: builtin/fsck.c:340
msgid "could not create lost-found"
msgstr "no se pudo crear lost-found"
-#: builtin/fsck.c:350
+#: builtin/fsck.c:351
#, c-format
msgid "could not finish '%s'"
msgstr "no se pudo finalizar '%s'"
-#: builtin/fsck.c:367
+#: builtin/fsck.c:368
#, c-format
msgid "Checking %s"
msgstr "Revisando %s"
-#: builtin/fsck.c:405
+#: builtin/fsck.c:406
#, c-format
msgid "Checking connectivity (%d objects)"
msgstr "Verificando conectividad (%d objetos)"
-#: builtin/fsck.c:424
+#: builtin/fsck.c:425
#, c-format
msgid "Checking %s %s"
msgstr "Revisando %s %s"
-#: builtin/fsck.c:429
+#: builtin/fsck.c:430
msgid "broken links"
msgstr "links rotos"
-#: builtin/fsck.c:438
+#: builtin/fsck.c:439
#, c-format
msgid "root %s"
msgstr "raíz %s"
-#: builtin/fsck.c:446
+#: builtin/fsck.c:447
#, c-format
msgid "tagged %s %s (%s) in %s"
msgstr "tag %s %s (%s) en %s"
-#: builtin/fsck.c:475
+#: builtin/fsck.c:476
#, c-format
msgid "%s: object corrupt or missing"
msgstr "%s: objecto corrupto o faltante"
-#: builtin/fsck.c:500
+#: builtin/fsck.c:501
#, c-format
msgid "%s: invalid reflog entry %s"
msgstr "%s: referencia inválida %s"
-#: builtin/fsck.c:514
+#: builtin/fsck.c:515
#, c-format
msgid "Checking reflog %s->%s"
msgstr "Revisando reflog %s->%s"
-#: builtin/fsck.c:548
+#: builtin/fsck.c:549
#, c-format
msgid "%s: invalid sha1 pointer %s"
msgstr "%s: puntero sha1 inválido %s"
-#: builtin/fsck.c:555
+#: builtin/fsck.c:556
#, c-format
msgid "%s: not a commit"
msgstr "%s: no es un commit"
-#: builtin/fsck.c:609
+#: builtin/fsck.c:610
msgid "notice: No default references"
msgstr "aviso: No hay referencias por defecto"
-#: builtin/fsck.c:624
+#: builtin/fsck.c:625
#, c-format
msgid "%s: object corrupt or missing: %s"
msgstr "%s: objeto corrupto o no encontrado: %s"
-#: builtin/fsck.c:637
+#: builtin/fsck.c:638
#, c-format
msgid "%s: object could not be parsed: %s"
msgstr "%s: no se puede analizar objeto: %s"
-#: builtin/fsck.c:657
+#: builtin/fsck.c:658
#, c-format
msgid "bad sha1 file: %s"
msgstr "mal sha1 de archivo: %s"
-#: builtin/fsck.c:672
+#: builtin/fsck.c:673
msgid "Checking object directory"
msgstr "Revisando directorio de objetos"
-#: builtin/fsck.c:675
+#: builtin/fsck.c:676
msgid "Checking object directories"
msgstr "Revisando objetos directorios"
-#: builtin/fsck.c:690
+#: builtin/fsck.c:691
#, c-format
msgid "Checking %s link"
msgstr "Revisando link %s"
-#: builtin/fsck.c:695 builtin/index-pack.c:843
+#: builtin/fsck.c:696 builtin/index-pack.c:843
#, c-format
msgid "invalid %s"
msgstr "%s inválido"
-#: builtin/fsck.c:702
+#: builtin/fsck.c:703
#, c-format
msgid "%s points to something strange (%s)"
msgstr "%s apunta a algo extraño (%s)"
-#: builtin/fsck.c:708
+#: builtin/fsck.c:709
#, c-format
msgid "%s: detached HEAD points at nothing"
msgstr "%s: HEAD desacoplado apunta a nada"
-#: builtin/fsck.c:712
+#: builtin/fsck.c:713
#, c-format
msgid "notice: %s points to an unborn branch (%s)"
msgstr "aviso: %s apunta a un branch no nacido (%s)"
-#: builtin/fsck.c:724
+#: builtin/fsck.c:725
msgid "Checking cache tree"
msgstr "Revisando el cache tree"
-#: builtin/fsck.c:729
+#: builtin/fsck.c:730
#, c-format
msgid "%s: invalid sha1 pointer in cache-tree"
msgstr "%s: puntero inválido sha1 en cache-tree"
-#: builtin/fsck.c:738
+#: builtin/fsck.c:739
msgid "non-tree in cache-tree"
msgstr "non-tree en cache-tree"
-#: builtin/fsck.c:769
+#: builtin/fsck.c:770
msgid "git fsck [<options>] [<object>...]"
msgstr "git fsck [<opciones>] [<objeto>...]"
-#: builtin/fsck.c:775
+#: builtin/fsck.c:776
msgid "show unreachable objects"
msgstr "mostrar objetos ilegibles"
-#: builtin/fsck.c:776
+#: builtin/fsck.c:777
msgid "show dangling objects"
msgstr "mostrar objetos colgados"
-#: builtin/fsck.c:777
+#: builtin/fsck.c:778
msgid "report tags"
msgstr "reportar tags"
-#: builtin/fsck.c:778
+#: builtin/fsck.c:779
msgid "report root nodes"
msgstr "reportar nodos raíz"
-#: builtin/fsck.c:779
+#: builtin/fsck.c:780
msgid "make index objects head nodes"
msgstr "hacer objetos índices cabezas de nodos"
-#: builtin/fsck.c:780
+#: builtin/fsck.c:781
msgid "make reflogs head nodes (default)"
msgstr "hacer reflogs cabeza de nodos (default)"
-#: builtin/fsck.c:781
+#: builtin/fsck.c:782
msgid "also consider packs and alternate objects"
msgstr "también considerar paquetes y objetos alternos"
-#: builtin/fsck.c:782
+#: builtin/fsck.c:783
msgid "check only connectivity"
msgstr "revisar solo conectividad"
-#: builtin/fsck.c:783
+#: builtin/fsck.c:784
msgid "enable more strict checking"
msgstr "habilitar revisión más estricta"
-#: builtin/fsck.c:785
+#: builtin/fsck.c:786
msgid "write dangling objects in .git/lost-found"
msgstr "escribir objetos colgados en .git/lost-found"
-#: builtin/fsck.c:786 builtin/prune.c:134
+#: builtin/fsck.c:787 builtin/prune.c:134
msgid "show progress"
msgstr "mostrar progreso"
-#: builtin/fsck.c:787
+#: builtin/fsck.c:788
msgid "show verbose names for reachable objects"
msgstr "mostrar nombres verboso para objetos alcanzables"
-#: builtin/fsck.c:846 builtin/index-pack.c:225
+#: builtin/fsck.c:847 builtin/index-pack.c:225
msgid "Checking objects"
msgstr "Revisando objetos"
-#: builtin/fsck.c:874
+#: builtin/fsck.c:875
#, c-format
msgid "%s: object missing"
msgstr "%s: objeto faltante"
-#: builtin/fsck.c:885
+#: builtin/fsck.c:886
#, c-format
msgid "invalid parameter: expected sha1, got '%s'"
msgstr "parámetro inválido: sha1 esperado, se obtuvo '%s'"
#. variable for tweaking threads, currently
#. grep.threads
#.
-#: builtin/grep.c:287 builtin/index-pack.c:1537 builtin/index-pack.c:1730
-#: builtin/pack-objects.c:2855
+#: builtin/grep.c:287 builtin/index-pack.c:1537 builtin/index-pack.c:1727
+#: builtin/pack-objects.c:2904
#, c-format
msgid "no threads support, ignoring %s"
msgstr "no hay soporte para hilos, ignorando %s"
msgid "invalid option combination, ignoring --threads"
msgstr "combinación de opciones inválida, ignorando --threads"
-#: builtin/grep.c:1084 builtin/pack-objects.c:3548
+#: builtin/grep.c:1084 builtin/pack-objects.c:3623
msgid "no threads support, ignoring --threads"
msgstr "no se soportan hilos, ignorando --threads"
-#: builtin/grep.c:1087 builtin/index-pack.c:1534 builtin/pack-objects.c:2852
+#: builtin/grep.c:1087 builtin/index-pack.c:1534 builtin/pack-objects.c:2901
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr "número inválido de hilos especificado (%d)"
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:607
+#: builtin/index-pack.c:288 builtin/pack-objects.c:618
msgid "pack too large for current definition of off_t"
msgstr "paquete muy grande para la definición actual de off_t"
msgid "SHA1 COLLISION FOUND WITH %s !"
msgstr "¡COLISIÓN DE TIPO SHA1 ENCONTRADA CON %s !"
-#: builtin/index-pack.c:738 builtin/pack-objects.c:159
-#: builtin/pack-objects.c:219 builtin/pack-objects.c:314
+#: builtin/index-pack.c:738 builtin/pack-objects.c:170
+#: builtin/pack-objects.c:230 builtin/pack-objects.c:325
#, c-format
msgid "unable to read %s"
msgstr "no se posible leer %s"
msgid "Resolving deltas"
msgstr "Resolviendo deltas"
-#: builtin/index-pack.c:1208 builtin/pack-objects.c:2616
+#: builtin/index-pack.c:1208 builtin/pack-objects.c:2665
#, c-format
msgid "unable to create thread: %s"
msgstr "no es posible crear hilo: %s"
msgid "cannot store index file"
msgstr "no se puede guardar el archivo índice"
-#: builtin/index-pack.c:1528 builtin/pack-objects.c:2863
+#: builtin/index-pack.c:1528 builtin/pack-objects.c:2912
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr "mal pack.indexversion=%<PRIu32>"
-#: builtin/index-pack.c:1596
+#: builtin/index-pack.c:1592
#, c-format
msgid "Cannot open existing pack file '%s'"
msgstr "No se puede abrir el archivo paquete existente '%s'"
-#: builtin/index-pack.c:1598
+#: builtin/index-pack.c:1594
#, 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:1646
+#: builtin/index-pack.c:1642
#, 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:1653
+#: builtin/index-pack.c:1649
#, 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:1692
+#: builtin/index-pack.c:1689
msgid "Cannot come back to cwd"
msgstr "No se puede regresar a cwd"
-#: builtin/index-pack.c:1741 builtin/index-pack.c:1744
-#: builtin/index-pack.c:1760 builtin/index-pack.c:1764
+#: builtin/index-pack.c:1738 builtin/index-pack.c:1741
+#: builtin/index-pack.c:1757 builtin/index-pack.c:1761
#, c-format
msgid "bad %s"
msgstr "mal %s"
-#: builtin/index-pack.c:1780
+#: builtin/index-pack.c:1767 builtin/init-db.c:392 builtin/init-db.c:621
+#, c-format
+msgid "unknown hash algorithm '%s'"
+msgstr "algoritmo hash desconocido '%s'"
+
+#: builtin/index-pack.c:1782
msgid "--fix-thin cannot be used without --stdin"
msgstr "--fix-thin no puede ser usada sin --stdin"
-#: builtin/index-pack.c:1782
+#: builtin/index-pack.c:1784
msgid "--stdin requires a git repository"
msgstr "--stdin requiere un repositorio git"
-#: builtin/index-pack.c:1788
+#: builtin/index-pack.c:1786
+msgid "--object-format cannot be used with --stdin"
+msgstr "--object-format no se puede usar con --stdin"
+
+#: builtin/index-pack.c:1792
msgid "--verify with no packfile name given"
msgstr "--verify no recibió ningún nombre de archivo de paquete"
-#: builtin/index-pack.c:1836 builtin/unpack-objects.c:582
+#: builtin/index-pack.c:1840 builtin/unpack-objects.c:582
msgid "fsck error in pack objects"
msgstr "error de fsck en objetos paquete"
msgid "not copying templates from '%s': %s"
msgstr "no se copian templates de '%s': %s"
-#: builtin/init-db.c:356
+#: builtin/init-db.c:276
+#, c-format
+msgid "invalid initial branch name: '%s'"
+msgstr "nombre de rama inicial inválido: '%s'"
+
+#: builtin/init-db.c:368
#, c-format
msgid "unable to handle file type %d"
msgstr "no es posible manejar el tipo de archivo %d"
-#: builtin/init-db.c:359
+#: builtin/init-db.c:371
#, c-format
msgid "unable to move %s to %s"
msgstr "no se puede mover %s a %s"
-#: builtin/init-db.c:374
+#: builtin/init-db.c:386
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
+#: builtin/init-db.c:410 builtin/init-db.c:413
#, c-format
msgid "%s already exists"
msgstr "%s ya existe"
-#: builtin/init-db.c:458
+#: builtin/init-db.c:444
+#, c-format
+msgid "re-init: ignored --initial-branch=%s"
+msgstr "re-init: ignorando --initial-branch=%s"
+
+#: builtin/init-db.c:475
#, 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:459
+#: builtin/init-db.c:476
#, 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:463
+#: builtin/init-db.c:480
#, 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:464
+#: builtin/init-db.c:481
#, 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:513
+#: builtin/init-db.c:530
msgid ""
"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
"shared[=<permissions>]] [<directory>]"
"git init [-q | --quiet] [--bare] [--template=<directorio-template>] [--"
"shared[=<permisos>]] [<directorio>]"
-#: builtin/init-db.c:538
+#: builtin/init-db.c:556
msgid "permissions"
msgstr "permisos"
-#: builtin/init-db.c:539
+#: builtin/init-db.c:557
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:544
+#: builtin/init-db.c:563
+msgid "override the name of the initial branch"
+msgstr "sobrescribir el nombre de la rama inicial"
+
+#: builtin/init-db.c:564
msgid "hash"
msgstr "hash"
-#: builtin/init-db.c:545
+#: builtin/init-db.c:565 builtin/show-index.c:22
msgid "specify the hash algorithm to use"
msgstr "especificar el algoritmo hash a usar"
-#: builtin/init-db.c:578 builtin/init-db.c:583
+#: builtin/init-db.c:598 builtin/init-db.c:603
#, c-format
msgid "cannot mkdir %s"
msgstr "no se pude crear directorio %s"
-#: builtin/init-db.c:587
+#: builtin/init-db.c:607
#, c-format
msgid "cannot chdir to %s"
msgstr "no se puede aplicar chdir a %s"
-#: builtin/init-db.c:614
+#: builtin/init-db.c:634
#, c-format
msgid ""
"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
"%s (o --work-tree=<directorio>) no se permite sin especificar %s (o --git-"
"dir=<directorio>)"
-#: builtin/init-db.c:642
+#: builtin/init-db.c:662
#, c-format
msgid "Cannot access work tree '%s'"
msgstr "No se puede acceder al árbol de trabajo '%s'"
msgid "read object names from the standard input"
msgstr "leer nombres de objetos de standard input"
-#: builtin/notes.c:954 builtin/prune.c:132 builtin/worktree.c:164
+#: builtin/notes.c:954 builtin/prune.c:132 builtin/worktree.c:220
msgid "do not remove, show only"
msgstr "no eliminar, solo mostrar"
"git pack-objects [<opciones>...] <nombre-base> [< <lista-de-refs> | < <lista-"
"de-objetos>]"
-#: builtin/pack-objects.c:431
+#: builtin/pack-objects.c:442
#, c-format
msgid "bad packed object CRC for %s"
msgstr "mal paquete de objeto CRC para %s"
-#: builtin/pack-objects.c:442
+#: builtin/pack-objects.c:453
#, c-format
msgid "corrupt packed object for %s"
msgstr "objeto empaquetado corrupto para %s"
-#: builtin/pack-objects.c:573
+#: builtin/pack-objects.c:584
#, c-format
msgid "recursive delta detected for object %s"
msgstr "delta recursivo encontrado para objeto %s"
-#: builtin/pack-objects.c:784
+#: builtin/pack-objects.c:795
#, c-format
msgid "ordered %u objects, expected %<PRIu32>"
msgstr "%u objetos ordenados, esperados %<PRIu32>"
-#: builtin/pack-objects.c:973
+#: builtin/pack-objects.c:1003
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:986
+#: builtin/pack-objects.c:1016
msgid "Writing objects"
msgstr "Escribiendo objetos"
-#: builtin/pack-objects.c:1047 builtin/update-index.c:90
+#: builtin/pack-objects.c:1077 builtin/update-index.c:90
#, c-format
msgid "failed to stat %s"
msgstr "falló al iniciar %s"
-#: builtin/pack-objects.c:1100
+#: builtin/pack-objects.c:1130
#, c-format
msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
msgstr "%<PRIu32> objetos escritos mientras se esperaban %<PRIu32>"
-#: builtin/pack-objects.c:1298
+#: builtin/pack-objects.c:1347
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:1725
+#: builtin/pack-objects.c:1774
#, 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:1734
+#: builtin/pack-objects.c:1783
#, 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:2005
+#: builtin/pack-objects.c:2054
msgid "Counting objects"
msgstr "Contando objetos"
-#: builtin/pack-objects.c:2150
+#: builtin/pack-objects.c:2199
#, c-format
msgid "unable to parse object header of %s"
msgstr "incapaz de analizar header del objeto %s"
-#: builtin/pack-objects.c:2220 builtin/pack-objects.c:2236
-#: builtin/pack-objects.c:2246
+#: builtin/pack-objects.c:2269 builtin/pack-objects.c:2285
+#: builtin/pack-objects.c:2295
#, c-format
msgid "object %s cannot be read"
msgstr "objeto %s no puede ser leído"
-#: builtin/pack-objects.c:2223 builtin/pack-objects.c:2250
+#: builtin/pack-objects.c:2272 builtin/pack-objects.c:2299
#, 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:2260
+#: builtin/pack-objects.c:2309
msgid "suboptimal pack - out of memory"
msgstr "suboptimal pack - fuera de memoria"
-#: builtin/pack-objects.c:2575
+#: builtin/pack-objects.c:2624
#, c-format
msgid "Delta compression using up to %d threads"
msgstr "Compresión delta usando hasta %d hilos"
-#: builtin/pack-objects.c:2714
+#: builtin/pack-objects.c:2763
#, 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:2802
+#: builtin/pack-objects.c:2851
msgid "Compressing objects"
msgstr "Comprimiendo objetos"
-#: builtin/pack-objects.c:2808
+#: builtin/pack-objects.c:2857
msgid "inconsistency with delta count"
msgstr "inconsistencia con la cuenta de delta"
-#: builtin/pack-objects.c:2889
+#: builtin/pack-objects.c:2929
+#, c-format
+msgid ""
+"value of uploadpack.blobpackfileuri must be of the form '<object-hash> <pack-"
+"hash> <uri>' (got '%s')"
+msgstr ""
+"valor para uploadpack.blobpackfileuri tiene que ser de la forma '<hash-de-"
+"objeto> <hash-de-pack> <uri>' (se tuvo '%s')"
+
+#: builtin/pack-objects.c:2932
+#, c-format
+msgid ""
+"object already configured in another uploadpack.blobpackfileuri (got '%s')"
+msgstr ""
+"objeto ya está configurado en otro uploadpack.blobpackfileuri (se obtuvo "
+"'%s')"
+
+#: builtin/pack-objects.c:2961
#, c-format
msgid ""
"expected edge object ID, got garbage:\n"
"se espseraba ID de objeto al borde, se obtuvo basura:\n"
"%s"
-#: builtin/pack-objects.c:2895
+#: builtin/pack-objects.c:2967
#, c-format
msgid ""
"expected object ID, got garbage:\n"
"se esperaba ID de objeto, se obtuvo basuta:\n"
"%s"
-#: builtin/pack-objects.c:2993
+#: builtin/pack-objects.c:3065
msgid "invalid value for --missing"
msgstr "valor inválido para --missing"
-#: builtin/pack-objects.c:3052 builtin/pack-objects.c:3160
+#: builtin/pack-objects.c:3124 builtin/pack-objects.c:3232
msgid "cannot open pack index"
msgstr "no se puede abrir índice de paquetes"
-#: builtin/pack-objects.c:3083
+#: builtin/pack-objects.c:3155
#, c-format
msgid "loose object at %s could not be examined"
msgstr "objeto perdido en %s no pudo ser examinado"
-#: builtin/pack-objects.c:3168
+#: builtin/pack-objects.c:3240
msgid "unable to force loose object"
msgstr "incapaz de forzar un objeto perdido"
-#: builtin/pack-objects.c:3261
+#: builtin/pack-objects.c:3333
#, c-format
msgid "not a rev '%s'"
msgstr "no es una rev '%s'"
-#: builtin/pack-objects.c:3264
+#: builtin/pack-objects.c:3336
#, c-format
msgid "bad revision '%s'"
msgstr "mala revisión '%s'"
-#: builtin/pack-objects.c:3289
+#: builtin/pack-objects.c:3361
msgid "unable to add recent objects"
msgstr "incapaz de añadir objetos recientes"
-#: builtin/pack-objects.c:3342
+#: builtin/pack-objects.c:3414
#, c-format
msgid "unsupported index version %s"
msgstr "versión de índice no soportada %s"
-#: builtin/pack-objects.c:3346
+#: builtin/pack-objects.c:3418
#, c-format
msgid "bad index version '%s'"
msgstr "mala versión del índice '%s'"
-#: builtin/pack-objects.c:3384
+#: builtin/pack-objects.c:3456
msgid "<version>[,<offset>]"
msgstr "<versión>[,<offset>]"
-#: builtin/pack-objects.c:3385
+#: builtin/pack-objects.c:3457
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:3388
+#: builtin/pack-objects.c:3460
msgid "maximum size of each output pack file"
msgstr "tamaño máximo de cada paquete resultante"
-#: builtin/pack-objects.c:3390
+#: builtin/pack-objects.c:3462
msgid "ignore borrowed objects from alternate object store"
msgstr "ignorar objetos prestados de otros almacenes de objetos"
-#: builtin/pack-objects.c:3392
+#: builtin/pack-objects.c:3464
msgid "ignore packed objects"
msgstr "ignorar objetos paquete"
-#: builtin/pack-objects.c:3394
+#: builtin/pack-objects.c:3466
msgid "limit pack window by objects"
msgstr "limitar ventana de paquete por objetos"
-#: builtin/pack-objects.c:3396
+#: builtin/pack-objects.c:3468
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:3398
+#: builtin/pack-objects.c:3470
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:3400
+#: builtin/pack-objects.c:3472
msgid "reuse existing deltas"
msgstr "reusar deltas existentes"
-#: builtin/pack-objects.c:3402
+#: builtin/pack-objects.c:3474
msgid "reuse existing objects"
msgstr "reutilizar objetos existentes"
-#: builtin/pack-objects.c:3404
+#: builtin/pack-objects.c:3476
msgid "use OFS_DELTA objects"
msgstr "usar objetos OFS_DELTA"
-#: builtin/pack-objects.c:3406
+#: builtin/pack-objects.c:3478
msgid "use threads when searching for best delta matches"
msgstr "usar hilos cuando se busque para mejores concordancias de delta"
-#: builtin/pack-objects.c:3408
+#: builtin/pack-objects.c:3480
msgid "do not create an empty pack output"
msgstr "no crear un paquete resultante vacío"
-#: builtin/pack-objects.c:3410
+#: builtin/pack-objects.c:3482
msgid "read revision arguments from standard input"
msgstr "leer argumentos de revisión de standard input"
-#: builtin/pack-objects.c:3412
+#: builtin/pack-objects.c:3484
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:3415
+#: builtin/pack-objects.c:3487
msgid "include objects reachable from any reference"
msgstr "incluir objetos alcanzables por cualquier referencia"
-#: builtin/pack-objects.c:3418
+#: builtin/pack-objects.c:3490
msgid "include objects referred by reflog entries"
msgstr "incluir objetos referidos por entradas de reflog"
-#: builtin/pack-objects.c:3421
+#: builtin/pack-objects.c:3493
msgid "include objects referred to by the index"
msgstr "incluir objetos referidos por el índice"
-#: builtin/pack-objects.c:3424
+#: builtin/pack-objects.c:3496
msgid "output pack to stdout"
msgstr "mostrar paquete en stdout"
-#: builtin/pack-objects.c:3426
+#: builtin/pack-objects.c:3498
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:3428
+#: builtin/pack-objects.c:3500
msgid "keep unreachable objects"
msgstr "mantener objetos inalcanzables"
-#: builtin/pack-objects.c:3430
+#: builtin/pack-objects.c:3502
msgid "pack loose unreachable objects"
msgstr "empaquetar objetos sueltos inalcanzables"
-#: builtin/pack-objects.c:3432
+#: builtin/pack-objects.c:3504
msgid "unpack unreachable objects newer than <time>"
msgstr "desempaquetar objetos inalcanzables más nuevos que <tiempo>"
-#: builtin/pack-objects.c:3435
+#: builtin/pack-objects.c:3507
msgid "use the sparse reachability algorithm"
msgstr "usar el algoritmo sparse reachability"
-#: builtin/pack-objects.c:3437
+#: builtin/pack-objects.c:3509
msgid "create thin packs"
msgstr "crear paquetes delgados"
-#: builtin/pack-objects.c:3439
+#: builtin/pack-objects.c:3511
msgid "create packs suitable for shallow fetches"
msgstr "crear paquetes adecuados para fetches superficiales"
-#: builtin/pack-objects.c:3441
+#: builtin/pack-objects.c:3513
msgid "ignore packs that have companion .keep file"
msgstr "ignorar paquetes que tienen un archivo .keep acompañante"
-#: builtin/pack-objects.c:3443
+#: builtin/pack-objects.c:3515
msgid "ignore this pack"
msgstr "ignorar este paquete"
-#: builtin/pack-objects.c:3445
+#: builtin/pack-objects.c:3517
msgid "pack compression level"
msgstr "nivel de compresión del paquete"
-#: builtin/pack-objects.c:3447
+#: builtin/pack-objects.c:3519
msgid "do not hide commits by grafts"
msgstr "no ocultar commits por injertos"
-#: builtin/pack-objects.c:3449
+#: builtin/pack-objects.c:3521
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:3451
+#: builtin/pack-objects.c:3523
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:3455
+#: builtin/pack-objects.c:3527
msgid "write a bitmap index if possible"
msgstr "escribir un índice de bitmap si es posible"
-#: builtin/pack-objects.c:3459
+#: builtin/pack-objects.c:3531
msgid "handling for missing objects"
msgstr "manejo de objetos perdidos"
-#: builtin/pack-objects.c:3462
+#: builtin/pack-objects.c:3534
msgid "do not pack objects in promisor packfiles"
msgstr "no se puede empaquetar objetos en packfiles promisores"
-#: builtin/pack-objects.c:3464
+#: builtin/pack-objects.c:3536
msgid "respect islands during delta compression"
msgstr "respetar islas durante la compresión delta"
-#: builtin/pack-objects.c:3493
+#: builtin/pack-objects.c:3538
+msgid "protocol"
+msgstr "protocolo"
+
+#: builtin/pack-objects.c:3539
+msgid "exclude any configured uploadpack.blobpackfileuri with this protocol"
+msgstr ""
+"excluyendo cualquier uploadpack.blobpackfileuri configurado con este "
+"protocolo"
+
+#: builtin/pack-objects.c:3568
#, 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:3498
+#: builtin/pack-objects.c:3573
#, c-format
msgid "pack.deltaCacheLimit is too high, forcing %d"
msgstr "pack.deltaCacheLimit es muy grande, forzando %d"
-#: builtin/pack-objects.c:3552
+#: builtin/pack-objects.c:3627
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:3554
+#: builtin/pack-objects.c:3629
msgid "minimum pack size limit is 1 MiB"
msgstr "tamaño mínimo del paquete es 1 MiB"
-#: builtin/pack-objects.c:3559
+#: builtin/pack-objects.c:3634
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:3562
+#: builtin/pack-objects.c:3637
msgid "--keep-unreachable and --unpack-unreachable are incompatible"
msgstr "--keep-unreachable y --unpack-unreachable son incompatibles"
-#: builtin/pack-objects.c:3568
+#: builtin/pack-objects.c:3643
msgid "cannot use --filter without --stdout"
msgstr "no se puede usar--filter sin --stdout"
-#: builtin/pack-objects.c:3628
+#: builtin/pack-objects.c:3703
msgid "Enumerating objects"
msgstr "Enumerando objetos"
-#: builtin/pack-objects.c:3658
+#: builtin/pack-objects.c:3734
#, c-format
msgid ""
"Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-"
msgid "git receive-pack <git-dir>"
msgstr "git receive-pack <git-dir>"
-#: builtin/receive-pack.c:843
+#: builtin/receive-pack.c:844
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"
"Para suprimir este mensaje y mantener el comportamiento predeterminado,\n"
"configura 'receive.denyCurrentBranch' a 'refuse'."
-#: builtin/receive-pack.c:863
+#: builtin/receive-pack.c:864
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"
"\n"
"Para suprimir este mensaje, puedes configurarlo en 'refuse'."
-#: builtin/receive-pack.c:1960
+#: builtin/receive-pack.c:1970
msgid "quiet"
msgstr "tranquilo"
-#: builtin/receive-pack.c:1974
+#: builtin/receive-pack.c:1984
msgid "You must specify a directory."
msgstr "Se tiene que especificar un directorio."
msgid "cannot find commit %s (%s)"
msgstr "no se puede encontrar el commit %s (%s)"
+#: builtin/show-index.c:21
+msgid "hash-algorithm"
+msgstr "algoritmo-hash"
+
+#: builtin/show-index.c:31
+msgid "Unknown hash algorithm"
+msgstr "Algoritmo hash desconocido"
+
#: builtin/show-ref.c:12
msgid ""
"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
"este árbol de trabajo no tiene sparse (archivo sparese-checkout tal vez no "
"existe)"
-#: builtin/sparse-checkout.c:212
+#: builtin/sparse-checkout.c:216
msgid "failed to create directory for sparse-checkout file"
msgstr "falló al crear directorio para el archivo sparse-checkout"
-#: builtin/sparse-checkout.c:253
+#: builtin/sparse-checkout.c:257
+msgid "unable to upgrade repository format to enable worktreeConfig"
+msgstr ""
+"no es posible actualizar el formato de repositorio para habilitar "
+"worktreeConfig"
+
+#: builtin/sparse-checkout.c:259
msgid "failed to set extensions.worktreeConfig setting"
msgstr "falló al configurar opción extensions.worktreeConfig"
-#: builtin/sparse-checkout.c:270
+#: builtin/sparse-checkout.c:276
msgid "git sparse-checkout init [--cone]"
msgstr "git sparse-checkout init [--cone]"
-#: builtin/sparse-checkout.c:289
+#: builtin/sparse-checkout.c:295
msgid "initialize the sparse-checkout in cone mode"
msgstr "inicializa el sparse-checkout en modo cono"
-#: builtin/sparse-checkout.c:326
+#: builtin/sparse-checkout.c:332
#, c-format
msgid "failed to open '%s'"
msgstr "falló al abrir '%s'"
-#: builtin/sparse-checkout.c:383
+#: builtin/sparse-checkout.c:389
#, c-format
msgid "could not normalize path %s"
msgstr "no se pudo normalizar la ruta %s"
-#: builtin/sparse-checkout.c:395
+#: builtin/sparse-checkout.c:401
msgid "git sparse-checkout (set|add) (--stdin | <patterns>)"
msgstr "git sparse-checkout (set|add) (--stdin | <patrones>)"
-#: builtin/sparse-checkout.c:420
+#: builtin/sparse-checkout.c:426
#, 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:474 builtin/sparse-checkout.c:498
+#: builtin/sparse-checkout.c:480 builtin/sparse-checkout.c:504
msgid "unable to load existing sparse-checkout patterns"
msgstr "no se pudo cargar patrones de sparse-checkout existentes"
-#: builtin/sparse-checkout.c:543
+#: builtin/sparse-checkout.c:549
msgid "read patterns from standard in"
msgstr "leer patrones de standard in"
-#: builtin/sparse-checkout.c:580
+#: builtin/sparse-checkout.c:586
msgid "error while refreshing working directory"
msgstr "error al refrescar directorio de trabajo"
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
+#: builtin/submodule--helper.c:2294
+msgid "set the default tracking branch to master"
+msgstr "configurar la rama de rastreo por defecto a master"
+
+#: builtin/submodule--helper.c:2296
+msgid "set the default tracking branch"
+msgstr "configurar la rama de rastreo por defecto"
+
+#: builtin/submodule--helper.c:2300
+msgid "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>"
+msgstr "git submodule--helper set-branch [-q|--quiet] (-d|--default) <ruta>"
+
+#: builtin/submodule--helper.c:2301
+msgid ""
+"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>"
+msgstr ""
+"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <rama> <ruta>"
+
+#: builtin/submodule--helper.c:2308
+msgid "--branch or --default required"
+msgstr "--branch o --default requeridos"
+
+#: builtin/submodule--helper.c:2311
+msgid "--branch and --default are mutually exclusive"
+msgstr "--branch y --default son mutuamente exclusivos"
+
+#: builtin/submodule--helper.c:2367 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:2329
+#: builtin/submodule--helper.c:2373
#, c-format
msgid "'%s' is not a valid submodule--helper subcommand"
msgstr "'%s' no es un comando submodule--helper válido"
msgid "git worktree unlock <path>"
msgstr "git worktree unlock <ruta>"
-#: builtin/worktree.c:60 builtin/worktree.c:894
+#: builtin/worktree.c:60 builtin/worktree.c:972
#, c-format
msgid "failed to delete '%s'"
msgstr "falló al borrar '%s'"
-#: builtin/worktree.c:79
-#, c-format
-msgid "Removing worktrees/%s: not a valid directory"
-msgstr "Removiendo el worktrees/%s: no es un directorio válido"
-
#: builtin/worktree.c:85
-#, c-format
-msgid "Removing worktrees/%s: gitdir file does not exist"
-msgstr "Removiendo worktrees/%s: archivo gitdir no existe"
+msgid "not a valid directory"
+msgstr "no en un directorio válido"
-#: builtin/worktree.c:90 builtin/worktree.c:99
-#, c-format
-msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
-msgstr "Removiendo worktrees/%s: no es posible leer el archivo gitdir (%s)"
+#: builtin/worktree.c:91
+msgid "gitdir file does not exist"
+msgstr "archivo gitdir no existe"
-#: builtin/worktree.c:109
+#: builtin/worktree.c:96 builtin/worktree.c:105
#, c-format
-msgid ""
-"Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read "
-"%<PRIuMAX>)"
-msgstr ""
-"Removiendo árboles de trabajo/%s: lectura corta (se esperan %<PRIuMAX> "
-"bytes, %<PRIuMAX> leídos)"
+msgid "unable to read gitdir file (%s)"
+msgstr "no es posible leer archivo gitdir (%s)"
-#: builtin/worktree.c:117
+#: builtin/worktree.c:115
#, c-format
-msgid "Removing worktrees/%s: invalid gitdir file"
-msgstr "Removiendo worktrees/%s: archivo gitdir inválido"
+msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)"
+msgstr "lectura corta (se esperaba %<PRIuMAX> bytes, se leyó %<PRIuMAX>)"
+
+#: builtin/worktree.c:123
+msgid "invalid gitdir file"
+msgstr "archivo gitdir inválido"
+
+#: builtin/worktree.c:131
+msgid "gitdir file points to non-existent location"
+msgstr "archivo gitdir apunta a una ubicación inexistente"
-#: builtin/worktree.c:126
+#: builtin/worktree.c:146
#, c-format
-msgid "Removing worktrees/%s: gitdir file points to non-existent location"
-msgstr ""
-"Removiendo worktrees/%s: archivo gitdir apunta a una ubicación no existente"
+msgid "Removing %s/%s: %s"
+msgstr "Eliminando %s/%s: %s"
-#: builtin/worktree.c:165
+#: builtin/worktree.c:221
msgid "report pruned working trees"
msgstr "reporta árboles de trabajo recortados"
-#: builtin/worktree.c:167
+#: builtin/worktree.c:223
msgid "expire working trees older than <time>"
msgstr "expirar árboles de trabajo más viejos a <tiempo>"
-#: builtin/worktree.c:234
+#: builtin/worktree.c:293
#, c-format
msgid "'%s' already exists"
msgstr "'%s' ya existe"
-#: builtin/worktree.c:244
+#: builtin/worktree.c:302
#, c-format
-msgid "unable to re-add worktree '%s'"
-msgstr "no es posible volver a agregar el árbol '%s'"
+msgid "unusable worktree destination '%s'"
+msgstr "destino de worktree inutilizable '%s'"
-#: builtin/worktree.c:249
+#: builtin/worktree.c:307
#, c-format
msgid ""
"'%s' is a missing but locked worktree;\n"
-"use 'add -f -f' to override, or 'unlock' and 'prune' or 'remove' to clear"
+"use '%s -f -f' to override, or 'unlock' and 'prune' or 'remove' to clear"
msgstr ""
"'%s' es un árbol de trabajo faltante pero bloqueado;\n"
-"usa 'add -f -f' para sobreescribir, o 'unlock' y 'prune' o 'remove' para "
+"usa '%s -f -f' para sobreescribir, o 'unlock' y 'prune' o 'remove' para "
"limpiar"
-#: builtin/worktree.c:251
+#: builtin/worktree.c:309
#, c-format
msgid ""
"'%s' is a missing but already registered worktree;\n"
-"use 'add -f' to override, or 'prune' or 'remove' to clear"
+"use '%s -f' to override, or 'prune' or 'remove' to clear"
msgstr ""
"'%s' es un árbol de trabajo faltante pero ya registrado;\n"
-"usa 'add -f' para sobreescribir, o 'prune' o 'remove' para limpiar"
+"usa '%s -f' para sobreescribir, o 'prune' o 'remove' para limpiar"
-#: builtin/worktree.c:301
+#: builtin/worktree.c:360
#, c-format
msgid "could not create directory of '%s'"
msgstr "no se pudo crear directorio de '%s'"
-#: builtin/worktree.c:435 builtin/worktree.c:441
+#: builtin/worktree.c:494 builtin/worktree.c:500
#, c-format
msgid "Preparing worktree (new branch '%s')"
msgstr "Preparando árbol de trabajo (nueva rama '%s')"
-#: builtin/worktree.c:437
+#: builtin/worktree.c:496
#, 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:446
+#: builtin/worktree.c:505
#, c-format
msgid "Preparing worktree (checking out '%s')"
msgstr "Preparando árbol de trabajo (haciendo checkout a '%s')"
-#: builtin/worktree.c:452
+#: builtin/worktree.c:511
#, c-format
msgid "Preparing worktree (detached HEAD %s)"
msgstr "Preparando árbol de trabajo (HEAD desacoplado %s)"
-#: builtin/worktree.c:493
+#: builtin/worktree.c:552
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:496
+#: builtin/worktree.c:555
msgid "create a new branch"
msgstr "crear una nueva rama"
-#: builtin/worktree.c:498
+#: builtin/worktree.c:557
msgid "create or reset a branch"
msgstr "crear o restablecer una rama"
-#: builtin/worktree.c:500
+#: builtin/worktree.c:559
msgid "populate the new working tree"
msgstr "popular el nuevo árbol de trabajo"
-#: builtin/worktree.c:501
+#: builtin/worktree.c:560
msgid "keep the new working tree locked"
msgstr "mantener el nuevo árbol de trabajo bloqueado"
-#: builtin/worktree.c:504
+#: builtin/worktree.c:563
msgid "set up tracking mode (see git-branch(1))"
msgstr "configurando modo tracking (mirar git-branch(1))"
-#: builtin/worktree.c:507
+#: builtin/worktree.c:566
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:515
+#: builtin/worktree.c:574
msgid "-b, -B, and --detach are mutually exclusive"
msgstr "-b, -B, y --detach son mutuamente exclusivas"
-#: builtin/worktree.c:576
+#: builtin/worktree.c:635
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:676
+#: builtin/worktree.c:755
msgid "reason for locking"
msgstr "razón para bloquear"
-#: builtin/worktree.c:688 builtin/worktree.c:721 builtin/worktree.c:795
-#: builtin/worktree.c:922
+#: builtin/worktree.c:767 builtin/worktree.c:800 builtin/worktree.c:874
+#: builtin/worktree.c:1000
#, c-format
msgid "'%s' is not a working tree"
msgstr "'%s' no es un árbol de trabajo"
-#: builtin/worktree.c:690 builtin/worktree.c:723
+#: builtin/worktree.c:769 builtin/worktree.c:802
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:695
+#: builtin/worktree.c:774
#, c-format
msgid "'%s' is already locked, reason: %s"
msgstr "'%s' ya está bloqueado; razón: %s"
-#: builtin/worktree.c:697
+#: builtin/worktree.c:776
#, c-format
msgid "'%s' is already locked"
msgstr "'%s' ya está bloqueado"
-#: builtin/worktree.c:725
+#: builtin/worktree.c:804
#, c-format
msgid "'%s' is not locked"
msgstr "'%s' no está bloqueado"
-#: builtin/worktree.c:766
+#: builtin/worktree.c:845
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:774
+#: builtin/worktree.c:853
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:797 builtin/worktree.c:924
+#: builtin/worktree.c:876 builtin/worktree.c:1002
#, c-format
msgid "'%s' is a main working tree"
msgstr "'%s' es un árbol de trabajo principal"
-#: builtin/worktree.c:802
+#: builtin/worktree.c:881
#, 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:808
-#, c-format
-msgid "target '%s' already exists"
-msgstr "el objetivo '%s' ya existe"
-
-#: builtin/worktree.c:816
+#: builtin/worktree.c:894
#, c-format
msgid ""
"cannot move a locked working tree, lock reason: %s\n"
"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:818
+#: builtin/worktree.c:896
msgid ""
"cannot move a locked working tree;\n"
"use 'move -f -f' to override or unlock first"
"no se puede mover un árbol de trabajo bloqueado;\n"
"use 'move -f -f' para sobreescribir o desbloquear primero"
-#: builtin/worktree.c:821
+#: builtin/worktree.c:899
#, 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:826
+#: builtin/worktree.c:904
#, c-format
msgid "failed to move '%s' to '%s'"
msgstr "falló al mover '%s' a '%s'"
-#: builtin/worktree.c:874
+#: builtin/worktree.c:952
#, c-format
msgid "failed to run 'git status' on '%s'"
msgstr "falló al ejecutar 'git status' en '%s'"
-#: builtin/worktree.c:878
+#: builtin/worktree.c:956
#, 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:883
+#: builtin/worktree.c:961
#, 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:906
+#: builtin/worktree.c:984
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:929
+#: builtin/worktree.c:1007
#, c-format
msgid ""
"cannot remove a locked working tree, lock reason: %s\n"
"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:931
+#: builtin/worktree.c:1009
msgid ""
"cannot remove a locked working tree;\n"
"use 'remove -f -f' to override or unlock first"
"no se pueden eliminar árbol de trabajo bloqueado;\n"
"use 'remove -f -f' para sobreescribir o desbloquear primero"
-#: builtin/worktree.c:934
+#: builtin/worktree.c:1012
#, c-format
msgid "validation failed, cannot remove working tree: %s"
msgstr "falló validación, no se puede eliminar árbol de trabajo: %s"
msgid "only useful for debugging"
msgstr "sólo útil para depurar"
-#: bugreport.c:14
+#: bugreport.c:15
msgid "git version:\n"
msgstr "versión de git:\n"
-#: bugreport.c:20
+#: bugreport.c:21
#, c-format
msgid "uname() failed with error '%s' (%d)\n"
msgstr "uname() falló con error '%s' (%d)\n"
-#: bugreport.c:30
+#: bugreport.c:31
msgid "compiler info: "
msgstr "información del compilador: "
-#: bugreport.c:32
+#: bugreport.c:34
msgid "libc info: "
msgstr "información de libc: "
-#: bugreport.c:74
+#: bugreport.c:80
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
+#: bugreport.c:90
msgid "git bugreport [-o|--output-directory <file>] [-s|--suffix <format>]"
msgstr ""
"git bugreport [-o|--output-directory <archivo>] [-s|--suffix <formato>]"
-#: bugreport.c:91
+#: bugreport.c:97
msgid ""
"Thank you for filling out a Git bug report!\n"
"Please answer the following questions to help us understand your issue.\n"
"Por favor revisa el resto del reporte abajo.\n"
"Puedes borrar cualquier línea que no desees compartir.\n"
-#: bugreport.c:130
+#: bugreport.c:136
msgid "specify a destination for the bugreport file"
msgstr "especificar el destino para el archivo de reporte de bug"
-#: bugreport.c:132
+#: bugreport.c:138
msgid "specify a strftime format suffix for the filename"
msgstr "especificar el sufijo formato strftime para el nombre del archivo."
-#: bugreport.c:156
+#: bugreport.c:162
#, c-format
msgid "could not create leading directories for '%s'"
msgstr "no se pudo crear directorios principales para '%s'"
-#: bugreport.c:163
+#: bugreport.c:169
msgid "System Info"
msgstr "Información del sistema"
-#: bugreport.c:166
+#: bugreport.c:172
msgid "Enabled Hooks"
msgstr "Activar Hooks"
-#: bugreport.c:174
+#: bugreport.c:180
#, c-format
msgid "couldn't create a new file at '%s'"
msgstr "no se pudo crear un archivo en '%s'"
-#: bugreport.c:186
+#: bugreport.c:184
+#, c-format
+msgid "unable to write to %s"
+msgstr "no es posible escribir en %s"
+
+#: bugreport.c:194
#, c-format
msgid "Created new report at '%s'.\n"
msgstr "Crear un nuevo reporte en '%s'.\n"
-#: fast-import.c:3085
+#: fast-import.c:3100
#, c-format
msgid "Missing from marks for submodule '%s'"
msgstr "Faltan marcas from para el submódulo '%s'"
-#: fast-import.c:3087
+#: fast-import.c:3102
#, c-format
msgid "Missing to marks for submodule '%s'"
msgstr "Faltan marcas to para el submódulo '%s'"
-#: fast-import.c:3222
+#: fast-import.c:3237
#, c-format
msgid "Expected 'mark' command, got %s"
msgstr "Se esperaba comando 'mark', se obtuvo %s"
-#: fast-import.c:3227
+#: fast-import.c:3242
#, c-format
msgid "Expected 'to' command, got %s"
msgstr "Se esperaba comando 'to', se obtuvo %s"
-#: fast-import.c:3317
+#: fast-import.c:3334
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
+#: fast-import.c:3388
#, c-format
msgid "feature '%s' forbidden in input without --allow-unsafe-features"
msgstr "característica '%s' prohibida en input sin --allow-unsafe-features"
+#: http-fetch.c:111
+#, c-format
+msgid "argument to --packfile must be a valid hash (got '%s')"
+msgstr "argumento para --packfile tiene que se un hash válido (se obtuvo '%s')"
+
#: credential-cache--daemon.c:223
#, c-format
msgid ""
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:914
+#: http.c:910
msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0"
msgstr "CURLSSLOPT_NO_REVOKE no soportado con cURL < 7.44.0"
-#: http.c:993
+#: http.c:989
msgid "Protocol restrictions not supported with cURL < 7.19.4"
msgstr "Restricción de protocolo no soportada con cURL < 7.19.4"
-#: http.c:1139
+#: http.c:1132
#, c-format
msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
msgstr "Backend SSL no soportado '%s'. Backends SSL soportados:"
-#: http.c:1146
+#: http.c:1139
#, 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:1150
+#: http.c:1143
#, 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:2032
+#: http.c:2025
#, c-format
msgid ""
"unable to update url base from redirection:\n"
" preguntaba por: %s\n"
" redireccionamiento: %s"
-#: remote-curl.c:166
+#: remote-curl.c:168
#, c-format
msgid "invalid quoting in push-option value: '%s'"
msgstr "quoting inválido en valor de push-option: '%s'"
-#: remote-curl.c:263
+#: remote-curl.c:295
#, c-format
msgid "%sinfo/refs not valid: is this a git repository?"
msgstr "%sinfo/refs no es válido: ¿es este un repositorio git?"
-#: remote-curl.c:364
+#: remote-curl.c:396
msgid "invalid server response; expected service, got flush packet"
msgstr ""
"respuesta de servidor inválida; se esperaba servicio, se obtuvo un flush "
"packet"
-#: remote-curl.c:395
+#: remote-curl.c:427
#, c-format
msgid "invalid server response; got '%s'"
msgstr "respuesta de servidor inválida; se obtuvo '%s'"
-#: remote-curl.c:455
+#: remote-curl.c:487
#, c-format
msgid "repository '%s' not found"
msgstr "repositorio '%s' no encontrado"
-#: remote-curl.c:459
+#: remote-curl.c:491
#, c-format
msgid "Authentication failed for '%s'"
msgstr "Autenticación falló para '%s'"
-#: remote-curl.c:463
+#: remote-curl.c:495
#, c-format
msgid "unable to access '%s': %s"
msgstr "no es posible acceder '%s':%s"
-#: remote-curl.c:469
+#: remote-curl.c:501
#, c-format
msgid "redirecting to %s"
msgstr "redirigiendo a %s"
-#: remote-curl.c:593
+#: remote-curl.c:630
msgid "shouldn't have EOF when not gentle on EOF"
msgstr "no debería tener EOF cuando no es gentil en EOF"
-#: remote-curl.c:673
+#: remote-curl.c:642
+msgid "remote server sent stateless separator"
+msgstr "el servidor remoto envió un separador sin estado (stateless)"
+
+#: remote-curl.c:712
msgid "unable to rewind rpc post data - try increasing http.postBuffer"
msgstr ""
"no es posible rebobinar rpc post data - intenta incrementando http.postBuffer"
-#: remote-curl.c:733
+#: remote-curl.c:742
+#, c-format
+msgid "remote-curl: bad line length character: %.4s"
+msgstr "remote-curl: mal caracter de largo de línea: %.4s"
+
+#: remote-curl.c:744
+msgid "remote-curl: unexpected response end packet"
+msgstr "remote-curl: packet de respuesta final inesperado"
+
+#: remote-curl.c:820
#, c-format
msgid "RPC failed; %s"
msgstr "RPC falló; %s"
-#: remote-curl.c:773
+#: remote-curl.c:860
msgid "cannot handle pushes this big"
msgstr "no se puede manejar pushes tan grandes"
-#: remote-curl.c:888
+#: remote-curl.c:975
#, c-format
msgid "cannot deflate request; zlib deflate error %d"
msgstr "no se puede desinflar el request; zlib deflate error %d"
-#: remote-curl.c:892
+#: remote-curl.c:979
#, c-format
msgid "cannot deflate request; zlib end error %d"
msgstr "no se puede desinflar el request; zlib end error %d"
-#: remote-curl.c:1023
+#: remote-curl.c:1029
+#, c-format
+msgid "%d bytes of length header were received"
+msgstr "%d bytes de header de longitud fueron recibidos"
+
+#: remote-curl.c:1031
+#, c-format
+msgid "%d bytes of body are still expected"
+msgstr "%d bytes de cuerpo se siguen esperando"
+
+#: remote-curl.c:1120
msgid "dumb http transport does not support shallow capabilities"
msgstr "dump http transport no soporta capacidades superficiales"
-#: remote-curl.c:1038
+#: remote-curl.c:1135
msgid "fetch failed."
msgstr "fetch falló."
-#: remote-curl.c:1086
+#: remote-curl.c:1183
msgid "cannot fetch by sha1 over smart http"
msgstr "no se puede hacer fetch por sha1 sobre smart http"
-#: remote-curl.c:1130 remote-curl.c:1136
+#: remote-curl.c:1227 remote-curl.c:1233
#, c-format
msgid "protocol error: expected sha/ref, got '%s'"
msgstr "error de protocolo: se esperaba sha/ref, se obtuvo '%s'"
-#: remote-curl.c:1148 remote-curl.c:1263
+#: remote-curl.c:1245 remote-curl.c:1360
#, c-format
msgid "http transport does not support %s"
msgstr "http transport no soporta %s"
-#: remote-curl.c:1184
+#: remote-curl.c:1281
msgid "git-http-push failed"
msgstr "git-http-push falló"
-#: remote-curl.c:1369
+#: remote-curl.c:1466
msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
msgstr "remote-curl: uso: git remote-curl <remote> [<url>]"
-#: remote-curl.c:1401
+#: remote-curl.c:1498
msgid "remote-curl: error reading command stream from git"
msgstr "remote-curl: error leyendo command stream de git"
-#: remote-curl.c:1408
+#: remote-curl.c:1505
msgid "remote-curl: fetch attempted without a local repo"
msgstr "remote-curl: fetch intentado sin un repositorio local"
-#: remote-curl.c:1448
+#: remote-curl.c:1546
#, c-format
msgid "remote-curl: unknown command '%s' from git"
msgstr "remote-curl: comando '%s' desconocido de git"
msgstr "Un conjunto mínimo útil de comandos diarios de Git"
#: command-list.h:203
+msgid "Frequently asked questions about using Git"
+msgstr "Preguntas frecuentes sobre el uso de Git"
+
+#: command-list.h:204
msgid "A Git Glossary"
msgstr "Un Glosario de Git"
-#: command-list.h:204
+#: command-list.h:205
msgid "Hooks used by Git"
msgstr "Hooks utilizados por Git"
-#: command-list.h:205
+#: command-list.h:206
msgid "Specifies intentionally untracked files to ignore"
msgstr "Especifica de forma intencional archivos sin seguimiento a ignorar"
-#: command-list.h:206
+#: command-list.h:207
msgid "Defining submodule properties"
msgstr "Definiendo las propiedades del submódulo"
-#: command-list.h:207
+#: command-list.h:208
msgid "Git namespaces"
msgstr "Namespaces de Git"
-#: command-list.h:208
+#: command-list.h:209
msgid "Git Repository Layout"
msgstr "Disposición del repositorio Git"
-#: command-list.h:209
+#: command-list.h:210
msgid "Specifying revisions and ranges for Git"
msgstr "Especificando revisiones y rangos para Git"
-#: command-list.h:210
+#: command-list.h:211
msgid "Mounting one repository inside another"
msgstr "Montando un repositorio dentro de otro"
-#: command-list.h:211
+#: command-list.h:212
msgid "A tutorial introduction to Git: part two"
msgstr "Un tutorial de introducción a Git: parte dos"
-#: command-list.h:212
+#: command-list.h:213
msgid "A tutorial introduction to Git"
msgstr "Un tutorial de introducción para Git"
-#: command-list.h:213
+#: command-list.h:214
msgid "An overview of recommended workflows with Git"
msgstr "Una visión general de flujos de trabajo recomendados con Git"
msgid "Failed to recurse into submodule path '$displaypath'"
msgstr "Falló al recurrir en la ruta de submódulo '$displaypath'"
-#: git-submodule.sh:878
+#: git-submodule.sh:852
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:930
+#: git-submodule.sh:904
#, sh-format
msgid "unexpected mode $mod_dst"
msgstr "modo $mod_dst inesperado"
-#: git-submodule.sh:950
+#: git-submodule.sh:924
#, 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:953
+#: git-submodule.sh:927
#, 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:956
+#: git-submodule.sh:930
#, sh-format
msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
msgstr ""
msgstr[0] "touch hecho a %d ruta\n"
msgstr[1] "touch hecho a %d rutas\n"
-#: git-add--interactive.perl:1053
+#: git-add--interactive.perl:1055
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for staging."
"Si el parche aplica limpiamente, el hunk editado sera marcado\n"
"inmediatamente para el área de stage."
-#: git-add--interactive.perl:1056
+#: git-add--interactive.perl:1058
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for stashing."
"Si el parche aplica limpiamente, el hunk editado sera marcado\n"
"inmediatamente para aplicar stash."
-#: git-add--interactive.perl:1059
+#: git-add--interactive.perl:1061
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for unstaging."
"Si el parche aplica limpiamente, el hunk editado sera marcado\n"
"inmediatamente para sacar del área de stage."
-#: git-add--interactive.perl:1062 git-add--interactive.perl:1071
-#: git-add--interactive.perl:1077
+#: git-add--interactive.perl:1064 git-add--interactive.perl:1073
+#: git-add--interactive.perl:1079
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for applying."
"Si el parche aplica de forma limpia, el hunk editado sera marcado \n"
"inmediatamente para aplicar."
-#: git-add--interactive.perl:1065 git-add--interactive.perl:1068
-#: git-add--interactive.perl:1074
+#: git-add--interactive.perl:1067 git-add--interactive.perl:1070
+#: git-add--interactive.perl:1076
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for discarding."
"Si el parche aplica de forma limpia, el hunk editado sera marcado\n"
"inmediatamente para descarte."
-#: git-add--interactive.perl:1111
+#: git-add--interactive.perl:1113
#, perl-format
msgid "failed to open hunk edit file for writing: %s"
msgstr "falló al abrir el archivo de adición del hunk para escritura: %s"
-#: git-add--interactive.perl:1118
+#: git-add--interactive.perl:1120
#, perl-format
msgid ""
"---\n"
"Para eliminar '%s' líneas, bórrelas.\n"
"Lineas comenzando con %s serán eliminadas.\n"
-#: git-add--interactive.perl:1140
+#: git-add--interactive.perl:1142
#, perl-format
msgid "failed to open hunk edit file for reading: %s"
msgstr "falló al abrir el archivo de edición del hunk para lectura: %s"
-#: git-add--interactive.perl:1248
+#: git-add--interactive.perl:1250
msgid ""
"y - stage this hunk\n"
"n - do not stage this hunk\n"
"d - no aplicar stage a este hunk o a ninguno de los posteriores en este "
"archivo"
-#: git-add--interactive.perl:1254
+#: git-add--interactive.perl:1256
msgid ""
"y - stash this hunk\n"
"n - do not stash this hunk\n"
"a - aplicar stash a este hunk y a todos los posteriores en el archivo\n"
"d - no aplicar stash a este hunk o ninguno de los posteriores en el archivo"
-#: git-add--interactive.perl:1260
+#: git-add--interactive.perl:1262
msgid ""
"y - unstage this hunk\n"
"n - do not unstage this hunk\n"
"d - no sacar del area de stage este hunk o ninguno de los posteriores en el "
"archivo"
-#: git-add--interactive.perl:1266
+#: git-add--interactive.perl:1268
msgid ""
"y - apply this hunk to index\n"
"n - do not apply this hunk to index\n"
"a - aplicar este hunk y todos los posteriores en el archivo\n"
"d - no aplicar este hunko ninguno de los posteriores en el archivo"
-#: git-add--interactive.perl:1272 git-add--interactive.perl:1290
+#: git-add--interactive.perl:1274 git-add--interactive.perl:1292
msgid ""
"y - discard this hunk from worktree\n"
"n - do not discard this hunk from worktree\n"
"a - descartar este hunk y todos los posteriores en este archivo\n"
"d - no descartar este hunk o ninguno de los posteriores en el archivo"
-#: git-add--interactive.perl:1278
+#: git-add--interactive.perl:1280
msgid ""
"y - discard this hunk from index and worktree\n"
"n - do not discard this hunk from index and worktree\n"
"a - descartar este hunk y todos los posteriores en este archivo\n"
"d - no descartar este hunk o ninguno posterior en el archivo"
-#: git-add--interactive.perl:1284
+#: git-add--interactive.perl:1286
msgid ""
"y - apply this hunk to index and worktree\n"
"n - do not apply this hunk to index and worktree\n"
"a - aplicar este hunk y todos los posteriores en el archivo\n"
"d - no aplicar este hunk o ninguno de los siguientes en este archivo"
-#: git-add--interactive.perl:1296
+#: git-add--interactive.perl:1298
msgid ""
"y - apply this hunk to worktree\n"
"n - do not apply this hunk to worktree\n"
"a - aplicar este hunk y todos los posteriores en el archivo\n"
"d - no aplicar este hunk o ninguno de los siguientes en este archivo"
-#: git-add--interactive.perl:1311
+#: git-add--interactive.perl:1313
msgid ""
"g - select a hunk to go to\n"
"/ - search for a hunk matching the given regex\n"
"e - editar manualmente el hunk actual\n"
"? - imprimir ayuda\n"
-#: git-add--interactive.perl:1342
+#: git-add--interactive.perl:1344
msgid "The selected hunks do not apply to the index!\n"
msgstr "¡Los hunks seleccionados no aplican al índice!\n"
-#: git-add--interactive.perl:1357
+#: git-add--interactive.perl:1359
#, perl-format
msgid "ignoring unmerged: %s\n"
msgstr "ignorando lo no fusionado: %s\n"
-#: git-add--interactive.perl:1468
+#: git-add--interactive.perl:1478
#, perl-format
msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? "
msgstr "¿Aplicar cambio de modo para el árbol de trabajo [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1469
+#: git-add--interactive.perl:1479
#, perl-format
msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? "
msgstr "¿Aplicar borrado al árbol de trabajo [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1470
+#: git-add--interactive.perl:1480
+#, perl-format
+msgid "Apply addition to worktree [y,n,q,a,d%s,?]? "
+msgstr "¿Aplicar adición al árbol de trabajo [y,n,q,a,d%s,?]? "
+
+#: git-add--interactive.perl:1481
#, perl-format
msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? "
msgstr "¿Aplicar este hunk al árbol de trabajo [y,n,q,a,d,/%s,?]? "
-#: git-add--interactive.perl:1570
+#: git-add--interactive.perl:1587
msgid "No other hunks to goto\n"
msgstr "No hay más pedazos para el ir\n"
-#: git-add--interactive.perl:1588
+#: git-add--interactive.perl:1605
#, perl-format
msgid "Invalid number: '%s'\n"
msgstr "Numero inválido: '%s'\n"
-#: git-add--interactive.perl:1593
+#: git-add--interactive.perl:1610
#, perl-format
msgid "Sorry, only %d hunk available.\n"
msgid_plural "Sorry, only %d hunks available.\n"
msgstr[0] "Lo siento, solo %d hunk disponible.\n"
msgstr[1] "Lo siento, solo %d hunks disponibles.\n"
-#: git-add--interactive.perl:1619
+#: git-add--interactive.perl:1636
msgid "No other hunks to search\n"
msgstr "No hay más pedazos para buscar\n"
-#: git-add--interactive.perl:1636
+#: git-add--interactive.perl:1653
#, perl-format
msgid "Malformed search regexp %s: %s\n"
msgstr "Regexp para la búsqueda mal formado %s: %s\n"
-#: git-add--interactive.perl:1646
+#: git-add--interactive.perl:1663
msgid "No hunk matches the given pattern\n"
msgstr "No hay hunks que concuerden con el patrón entregado.\n"
-#: git-add--interactive.perl:1658 git-add--interactive.perl:1680
+#: git-add--interactive.perl:1675 git-add--interactive.perl:1697
msgid "No previous hunk\n"
msgstr "No el anterior hunk\n"
-#: git-add--interactive.perl:1667 git-add--interactive.perl:1686
+#: git-add--interactive.perl:1684 git-add--interactive.perl:1703
msgid "No next hunk\n"
msgstr "No el siguiente hunk\n"
-#: git-add--interactive.perl:1692
+#: git-add--interactive.perl:1709
msgid "Sorry, cannot split this hunk\n"
msgstr "Perdón, no se puede dividir este pedazo\n"
-#: git-add--interactive.perl:1698
+#: git-add--interactive.perl:1715
#, perl-format
msgid "Split into %d hunk.\n"
msgid_plural "Split into %d hunks.\n"
msgstr[0] "Cortar en %d hunk.\n"
msgstr[1] "Cortar en %d hunks.\n"
-#: git-add--interactive.perl:1708
+#: git-add--interactive.perl:1725
msgid "Sorry, cannot edit this hunk\n"
msgstr "Perdón, no se puede editar este pedazo\n"
#. TRANSLATORS: please do not translate the command names
#. 'status', 'update', 'revert', etc.
-#: git-add--interactive.perl:1773
+#: git-add--interactive.perl:1790
msgid ""
"status - show paths with changes\n"
"update - add working tree state to the staged set of changes\n"
"add untracked - agrega contenidos de archivos no rastreados al grupo de "
"cambios del area de stage\n"
-#: git-add--interactive.perl:1790 git-add--interactive.perl:1795
-#: git-add--interactive.perl:1798 git-add--interactive.perl:1805
-#: git-add--interactive.perl:1808 git-add--interactive.perl:1815
-#: git-add--interactive.perl:1819 git-add--interactive.perl:1825
+#: git-add--interactive.perl:1807 git-add--interactive.perl:1812
+#: git-add--interactive.perl:1815 git-add--interactive.perl:1822
+#: git-add--interactive.perl:1825 git-add--interactive.perl:1832
+#: git-add--interactive.perl:1836 git-add--interactive.perl:1842
msgid "missing --"
msgstr "falta --"
-#: git-add--interactive.perl:1821
+#: git-add--interactive.perl:1838
#, perl-format
msgid "unknown --patch mode: %s"
msgstr "modo --patch desconocido: %s"
-#: git-add--interactive.perl:1827 git-add--interactive.perl:1833
+#: git-add--interactive.perl:1844 git-add--interactive.perl:1850
#, perl-format
msgid "invalid argument %s, expecting --"
msgstr "argumento inválido %s, se esperaba --"
msgid "(mbox) Adding to: %s from line '%s'\n"
msgstr "(mbox) Agregando para: %s de la línea '%s'\n"
-#: git-send-email.perl:1718
+#: git-send-email.perl:1722
#, perl-format
msgid "(non-mbox) Adding cc: %s from line '%s'\n"
msgstr "(non-mbox) Agregando cc: %s de la línea '%s'\n"
-#: git-send-email.perl:1753
+#: git-send-email.perl:1757
#, perl-format
msgid "(body) Adding cc: %s from line '%s'\n"
msgstr "(body) Agregando cc: %s de la línea '%s'\n"
-#: git-send-email.perl:1864
+#: git-send-email.perl:1868
#, perl-format
msgid "(%s) Could not execute '%s'"
msgstr "(%s) no se pudo ejecutar '%s'"
-#: git-send-email.perl:1871
+#: git-send-email.perl:1875
#, perl-format
msgid "(%s) Adding %s: %s from: '%s'\n"
msgstr "(%s) Agregando %s: %s de: '%s'\n"
-#: git-send-email.perl:1875
+#: git-send-email.perl:1879
#, perl-format
msgid "(%s) failed to close pipe to '%s'"
msgstr "(%s) falló al cerrar el pipe para '%s'"
-#: git-send-email.perl:1905
+#: git-send-email.perl:1909
msgid "cannot send message as 7bit"
msgstr "no se puede mandar mensaje como 7bit"
-#: git-send-email.perl:1913
+#: git-send-email.perl:1917
msgid "invalid transfer encoding"
msgstr "codificación de transferencia inválida"
-#: git-send-email.perl:1954 git-send-email.perl:2006 git-send-email.perl:2016
+#: git-send-email.perl:1958 git-send-email.perl:2010 git-send-email.perl:2020
#, perl-format
msgid "unable to open %s: %s\n"
msgstr "no es posible abrir %s: %s\n"
-#: git-send-email.perl:1957
+#: git-send-email.perl:1961
#, perl-format
msgid "%s: patch contains a line longer than 998 characters"
msgstr "%s: el parche contiene una línea con más de 998 caracteres"
-#: git-send-email.perl:1974
+#: git-send-email.perl:1978
#, perl-format
msgid "Skipping %s with backup suffix '%s'.\n"
msgstr "Saltando %s con el sufijo de backup '%s'.\n"
#. TRANSLATORS: please keep "[y|N]" as is.
-#: git-send-email.perl:1978
+#: git-send-email.perl:1982
#, perl-format
msgid "Do you really want to send %s? [y|N]: "
msgstr "¿Realmente deseas mandar %s?[y|N]: "
+#, 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"
+
+#, c-format
+#~ msgid "invalid commit object id: %s"
+#~ msgstr "id de objeto commit: %s inválido"
+
+#, c-format
+#~ msgid "Removing worktrees/%s: not a valid directory"
+#~ msgstr "Removiendo el worktrees/%s: no es un directorio válido"
+
+#, c-format
+#~ msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
+#~ msgstr "Removiendo worktrees/%s: no es posible leer el archivo gitdir (%s)"
+
+#, c-format
+#~ msgid "Removing worktrees/%s: invalid gitdir file"
+#~ msgstr "Removiendo worktrees/%s: archivo gitdir inválido"
+
+#, c-format
+#~ msgid "unable to re-add worktree '%s'"
+#~ msgstr "no es posible volver a agregar el árbol '%s'"
+
+#, c-format
+#~ msgid "target '%s' already exists"
+#~ msgstr "el objetivo '%s' ya existe"
+
#, c-format
#~ msgid ""
#~ "Cannot update sparse checkout: the following entries are not up to date:\n"
projects / thirdparty / git.git / commitdiff
