@matheusbsbs / matheus-bagliano / commits / b0adcc311b

l10n: es: 2.31.0 round 2

Signed-off-by: Christopher Diaz Riveros <christopher.diaz.riv@gmail.com>

Christopher Diaz Riveros committed Mar 7, 2021 at 18:31 UTC b0adcc311bab2d91337ac70c2b19cde11a1ad441
1 file changed +6698 -5596
po/es.po
+6698 -5596
@@ -7,8 +7,8 @@ msgid ""
7 msgstr ""
8 "Project-Id-Version: Git\n"
9 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
10 -"POT-Creation-Date: 2020-07-10 09:53+0800\n"
11 -"PO-Revision-Date: 2020-07-26 10:11-0500\n"
10 +"POT-Creation-Date: 2021-03-04 22:41+0800\n"
11 +"PO-Revision-Date: 2021-03-07 18:29-0500\n"
12 "Last-Translator: christopher.diaz.riv@gmail.com\n"
13 "Language-Team: CodeLabora <codelabora@gmail.com>\n"
14 "Language: es\n"
@@ -16,235 +16,235 @@ msgstr ""
16 "Content-Type: text/plain; charset=UTF-8\n"
17 "Content-Transfer-Encoding: 8bit\n"
18 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
19 -"X-Generator: Poedit 2.3\n"
19 +"X-Generator: Poedit 2.4.1\n"
20
21 -#: add-interactive.c:368
21 +#: add-interactive.c:376
22 #, c-format
23 msgid "Huh (%s)?"
24 msgstr "¿Ahh (%s)?"
25
26 -#: add-interactive.c:521 add-interactive.c:822 reset.c:65 sequencer.c:3142
27 -#: sequencer.c:3581 sequencer.c:3723 builtin/rebase.c:1518
28 -#: builtin/rebase.c:1919
26 +#: add-interactive.c:529 add-interactive.c:830 reset.c:65 sequencer.c:3292
27 +#: sequencer.c:3743 sequencer.c:3898 builtin/rebase.c:1538
28 +#: builtin/rebase.c:1963
29 msgid "could not read index"
30 msgstr "no se pudo leer índice"
31
32 -#: add-interactive.c:576 git-add--interactive.perl:269
32 +#: add-interactive.c:584 git-add--interactive.perl:269
33 #: git-add--interactive.perl:294
34 msgid "binary"
35 msgstr "binario"
36
37 -#: add-interactive.c:634 git-add--interactive.perl:278
37 +#: add-interactive.c:642 git-add--interactive.perl:278
38 #: git-add--interactive.perl:332
39 msgid "nothing"
40 msgstr "nada"
41
42 -#: add-interactive.c:635 git-add--interactive.perl:314
42 +#: add-interactive.c:643 git-add--interactive.perl:314
43 #: git-add--interactive.perl:329
44 msgid "unchanged"
45 msgstr "sin cambios"
46
47 -#: add-interactive.c:672 git-add--interactive.perl:643
47 +#: add-interactive.c:680 git-add--interactive.perl:641
48 msgid "Update"
49 msgstr "Actualizar"
50
51 -#: add-interactive.c:689 add-interactive.c:877
51 +#: add-interactive.c:697 add-interactive.c:885
52 #, c-format
53 msgid "could not stage '%s'"
54 msgstr "no se pudo poner en stage '%s'"
55
56 -#: add-interactive.c:695 add-interactive.c:884 reset.c:89 sequencer.c:3336
56 +#: add-interactive.c:703 add-interactive.c:892 reset.c:89 sequencer.c:3486
57 msgid "could not write index"
58 msgstr "no se pudo escribir índice"
59
60 -#: add-interactive.c:698 git-add--interactive.perl:628
60 +#: add-interactive.c:706 git-add--interactive.perl:626
61 #, c-format, perl-format
62 msgid "updated %d path\n"
63 msgid_plural "updated %d paths\n"
64 msgstr[0] "actualizada %d ruta\n"
65 msgstr[1] "actualizadas %d rutas\n"
66
67 -#: add-interactive.c:716 git-add--interactive.perl:678
67 +#: add-interactive.c:724 git-add--interactive.perl:676
68 #, c-format, perl-format
69 msgid "note: %s is untracked now.\n"
70 msgstr "nota: %s no es rastreado ahora.\n"
71
72 -#: add-interactive.c:721 apply.c:4110 builtin/checkout.c:294
72 +#: add-interactive.c:729 apply.c:4125 builtin/checkout.c:295
73 #: builtin/reset.c:145
74 #, c-format
75 msgid "make_cache_entry failed for path '%s'"
76 msgstr "make_cache_entry falló para la ruta '%s'"
77
78 -#: add-interactive.c:751 git-add--interactive.perl:655
78 +#: add-interactive.c:759 git-add--interactive.perl:653
79 msgid "Revert"
80 msgstr "Revertir"
81
82 -#: add-interactive.c:767
82 +#: add-interactive.c:775
83 msgid "Could not parse HEAD^{tree}"
84 -msgstr "no se pudo analizar HEAD^{tree}"
84 +msgstr "No se pudo analizar HEAD^{tree}"
85
86 -#: add-interactive.c:805 git-add--interactive.perl:631
86 +#: add-interactive.c:813 git-add--interactive.perl:629
87 #, c-format, perl-format
88 msgid "reverted %d path\n"
89 msgid_plural "reverted %d paths\n"
90 msgstr[0] "revertida %d ruta\n"
91 msgstr[1] "revertidas %d rutas\n"
92
93 -#: add-interactive.c:856 git-add--interactive.perl:695
93 +#: add-interactive.c:864 git-add--interactive.perl:693
94 #, c-format
95 msgid "No untracked files.\n"
96 msgstr "No hay archivos sin rastrear.\n"
97
98 -#: add-interactive.c:860 git-add--interactive.perl:689
98 +#: add-interactive.c:868 git-add--interactive.perl:687
99 msgid "Add untracked"
100 msgstr "Agregar no rastreados"
101
102 -#: add-interactive.c:887 git-add--interactive.perl:625
102 +#: add-interactive.c:895 git-add--interactive.perl:623
103 #, c-format, perl-format
104 msgid "added %d path\n"
105 msgid_plural "added %d paths\n"
106 msgstr[0] "agregada %d ruta\n"
107 msgstr[1] "agregadas %d rutas\n"
108
109 -#: add-interactive.c:917
109 +#: add-interactive.c:925
110 #, c-format
111 msgid "ignoring unmerged: %s"
112 msgstr "ignorando lo no fusionado: %s"
113
114 -#: add-interactive.c:929 add-patch.c:1691 git-add--interactive.perl:1368
114 +#: add-interactive.c:937 add-patch.c:1751 git-add--interactive.perl:1369
115 #, c-format
116 msgid "Only binary files changed.\n"
117 msgstr "Solo cambiaron archivos binarios.\n"
118
119 -#: add-interactive.c:931 add-patch.c:1689 git-add--interactive.perl:1370
119 +#: add-interactive.c:939 add-patch.c:1749 git-add--interactive.perl:1371
120 #, c-format
121 msgid "No changes.\n"
122 msgstr "Sin cambios.\n"
123
124 -#: add-interactive.c:935 git-add--interactive.perl:1378
124 +#: add-interactive.c:943 git-add--interactive.perl:1379
125 msgid "Patch update"
126 msgstr "Actualización del parche"
127
128 -#: add-interactive.c:974 git-add--interactive.perl:1771
128 +#: add-interactive.c:982 git-add--interactive.perl:1792
129 msgid "Review diff"
130 msgstr "Revisión de diff"
131
132 -#: add-interactive.c:1002
132 +#: add-interactive.c:1010
133 msgid "show paths with changes"
134 msgstr "mostrar rutas con cambios"
135
136 -#: add-interactive.c:1004
136 +#: add-interactive.c:1012
137 msgid "add working tree state to the staged set of changes"
138 msgstr "agregar estado del árbol de trabajo al conjunto de cambios en stage"
139
140 -#: add-interactive.c:1006
140 +#: add-interactive.c:1014
141 msgid "revert staged set of changes back to the HEAD version"
142 msgstr "revertir conjunto de cambios en stage a la versión de HEAD"
143
144 -#: add-interactive.c:1008
144 +#: add-interactive.c:1016
145 msgid "pick hunks and update selectively"
146 msgstr "elegir hunks y actualizar de forma selectiva"
147
148 -#: add-interactive.c:1010
148 +#: add-interactive.c:1018
149 msgid "view diff between HEAD and index"
150 msgstr "ver diff entre HEAD e index"
151
152 -#: add-interactive.c:1012
152 +#: add-interactive.c:1020
153 msgid "add contents of untracked files to the staged set of changes"
154 msgstr ""
155 "agregar contenidos de archivos sin rastrear al conjunto de cambios de stage"
156
157 -#: add-interactive.c:1020 add-interactive.c:1069
157 +#: add-interactive.c:1028 add-interactive.c:1077
158 msgid "Prompt help:"
159 msgstr "Mostrar ayuda:"
160
161 -#: add-interactive.c:1022
161 +#: add-interactive.c:1030
162 msgid "select a single item"
163 msgstr "selecciona un único objeto"
164
165 -#: add-interactive.c:1024
165 +#: add-interactive.c:1032
166 msgid "select a range of items"
167 msgstr "selecciona un rango de objetos"
168
169 -#: add-interactive.c:1026
169 +#: add-interactive.c:1034
170 msgid "select multiple ranges"
171 msgstr "selecciona multiples rangos"
172
173 -#: add-interactive.c:1028 add-interactive.c:1073
173 +#: add-interactive.c:1036 add-interactive.c:1081
174 msgid "select item based on unique prefix"
175 msgstr "seleccionar objeto basado en prefijo único"
176
177 -#: add-interactive.c:1030
177 +#: add-interactive.c:1038
178 msgid "unselect specified items"
179 msgstr "quitar objetos especificados"
180
181 -#: add-interactive.c:1032
181 +#: add-interactive.c:1040
182 msgid "choose all items"
183 msgstr "escoger todos los objetos"
184
185 -#: add-interactive.c:1034
185 +#: add-interactive.c:1042
186 msgid "(empty) finish selecting"
187 msgstr "(vacío) finalizar selección"
188
189 -#: add-interactive.c:1071
189 +#: add-interactive.c:1079
190 msgid "select a numbered item"
191 msgstr "selecciona un objeto numerado"
192
193 -#: add-interactive.c:1075
193 +#: add-interactive.c:1083
194 msgid "(empty) select nothing"
195 msgstr "(vacío) selecciona nada"
196
197 -#: add-interactive.c:1083 builtin/clean.c:816 git-add--interactive.perl:1868
197 +#: add-interactive.c:1091 builtin/clean.c:816 git-add--interactive.perl:1896
198 msgid "*** Commands ***"
199 msgstr "*** Comandos ***"
200
201 -#: add-interactive.c:1084 builtin/clean.c:817 git-add--interactive.perl:1865
201 +#: add-interactive.c:1092 builtin/clean.c:817 git-add--interactive.perl:1893
202 msgid "What now"
203 msgstr "Ahora que"
204
205 -#: add-interactive.c:1136 git-add--interactive.perl:213
205 +#: add-interactive.c:1144 git-add--interactive.perl:213
206 msgid "staged"
207 msgstr "rastreado"
208
209 -#: add-interactive.c:1136 git-add--interactive.perl:213
209 +#: add-interactive.c:1144 git-add--interactive.perl:213
210 msgid "unstaged"
211 msgstr "no rastreado"
212
213 -#: add-interactive.c:1136 apply.c:4967 apply.c:4970 builtin/am.c:2250
214 -#: builtin/am.c:2253 builtin/clone.c:123 builtin/fetch.c:145
215 -#: builtin/merge.c:276 builtin/pull.c:190 builtin/submodule--helper.c:409
216 -#: builtin/submodule--helper.c:1394 builtin/submodule--helper.c:1397
217 -#: builtin/submodule--helper.c:1902 builtin/submodule--helper.c:1905
218 -#: builtin/submodule--helper.c:2148 bugreport.c:135
213 +#: add-interactive.c:1144 apply.c:4987 apply.c:4990 builtin/am.c:2257
214 +#: builtin/am.c:2260 builtin/bugreport.c:134 builtin/clone.c:124
215 +#: builtin/fetch.c:150 builtin/merge.c:285 builtin/pull.c:190
216 +#: builtin/submodule--helper.c:409 builtin/submodule--helper.c:1818
217 +#: builtin/submodule--helper.c:1821 builtin/submodule--helper.c:2326
218 +#: builtin/submodule--helper.c:2329 builtin/submodule--helper.c:2572
219 #: git-add--interactive.perl:213
220 msgid "path"
221 msgstr "ruta"
222
223 -#: add-interactive.c:1143
223 +#: add-interactive.c:1151
224 msgid "could not refresh index"
225 msgstr "no se pudo refrescar el index"
226
227 -#: add-interactive.c:1157 builtin/clean.c:781 git-add--interactive.perl:1782
227 +#: add-interactive.c:1165 builtin/clean.c:781 git-add--interactive.perl:1803
228 #, c-format
229 msgid "Bye.\n"
230 msgstr "Adiós.\n"
231
232 -#: add-patch.c:34 git-add--interactive.perl:1430
232 +#: add-patch.c:34 git-add--interactive.perl:1431
233 #, c-format, perl-format
234 msgid "Stage mode change [y,n,q,a,d%s,?]? "
235 msgstr "¿Cambio de modo de stage [y,n,q,a,d%s,?]? "
236
237 -#: add-patch.c:35 git-add--interactive.perl:1431
237 +#: add-patch.c:35 git-add--interactive.perl:1432
238 #, c-format, perl-format
239 msgid "Stage deletion [y,n,q,a,d%s,?]? "
240 msgstr "¿Aplicar stage al borrado [y,n,q,a,d%s,?]? "
241
242 -#: add-patch.c:36 git-add--interactive.perl:1432
242 +#: add-patch.c:36 git-add--interactive.perl:1433
243 #, c-format, perl-format
244 msgid "Stage addition [y,n,q,a,d%s,?]? "
245 msgstr "¿Agregar al stage [y,n,q,a,d%s,?]? "
246
247 -#: add-patch.c:37 git-add--interactive.perl:1433
247 +#: add-patch.c:37 git-add--interactive.perl:1434
248 #, c-format, perl-format
249 msgid "Stage this hunk [y,n,q,a,d%s,?]? "
250 msgstr "¿Aplicar stage a este hunk [y,n,q,a,d%s,?]? "
@@ -272,22 +272,22 @@ msgstr ""
272 "d - no aplicar stage a este hunk o a ninguno de los posteriores en este "
273 "archivo\n"
274
275 -#: add-patch.c:56 git-add--interactive.perl:1436
275 +#: add-patch.c:56 git-add--interactive.perl:1437
276 #, c-format, perl-format
277 msgid "Stash mode change [y,n,q,a,d%s,?]? "
278 msgstr "¿Aplicar stash al cambio de modo [y,n,q,a,d%s,?]? "
279
280 -#: add-patch.c:57 git-add--interactive.perl:1437
280 +#: add-patch.c:57 git-add--interactive.perl:1438
281 #, c-format, perl-format
282 msgid "Stash deletion [y,n,q,a,d%s,?]? "
283 msgstr "¿Aplicar stash al borrado [y,n,q,a,d%s,?]? "
284
285 -#: add-patch.c:58 git-add--interactive.perl:1438
285 +#: add-patch.c:58 git-add--interactive.perl:1439
286 #, c-format, perl-format
287 msgid "Stash addition [y,n,q,a,d%s,?]? "
288 msgstr "¿Agregar al stash [y,n,q,a,d%s,?]? "
289
290 -#: add-patch.c:59 git-add--interactive.perl:1439
290 +#: add-patch.c:59 git-add--interactive.perl:1440
291 #, c-format, perl-format
292 msgid "Stash this hunk [y,n,q,a,d%s,?]? "
293 msgstr "¿Aplicar stash a este hunk [y,n,q,a,d%s,?]? "
@@ -314,22 +314,22 @@ msgstr ""
314 "a - aplicar stash a este hunk y a todos los posteriores en el archivo\n"
315 "d - no aplicar stash a este hunk o ninguno de los posteriores en el archivo\n"
316
317 -#: add-patch.c:80 git-add--interactive.perl:1442
317 +#: add-patch.c:80 git-add--interactive.perl:1443
318 #, c-format, perl-format
319 msgid "Unstage mode change [y,n,q,a,d%s,?]? "
320 msgstr "¿Sacar cambio de modo del stage [y,n,q,a,d%s,?]? "
321
322 -#: add-patch.c:81 git-add--interactive.perl:1443
322 +#: add-patch.c:81 git-add--interactive.perl:1444
323 #, c-format, perl-format
324 msgid "Unstage deletion [y,n,q,a,d%s,?]? "
325 msgstr "¿Sacar borrado del stage [y,n,q,a,d%s,?]? "
326
327 -#: add-patch.c:82 git-add--interactive.perl:1444
327 +#: add-patch.c:82 git-add--interactive.perl:1445
328 #, c-format, perl-format
329 msgid "Unstage addition [y,n,q,a,d%s,?]? "
330 msgstr "¿Quitar adición al stage [y,n,q,a,d%s,?]? "
331
332 -#: add-patch.c:83 git-add--interactive.perl:1445
332 +#: add-patch.c:83 git-add--interactive.perl:1446
333 #, c-format, perl-format
334 msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
335 msgstr "¿Sacar este hunk del stage [y,n,q,a,d%s,?]? "
@@ -357,22 +357,22 @@ msgstr ""
357 "d - no sacar del area de stage este hunk o ninguno de los posteriores en el "
358 "archivo\n"
359
360 -#: add-patch.c:103 git-add--interactive.perl:1448
360 +#: add-patch.c:103 git-add--interactive.perl:1449
361 #, c-format, perl-format
362 msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
363 msgstr "¿Aplicar cambio de modo al índice [y,n,q,a,d%s,?]? "
364
365 -#: add-patch.c:104 git-add--interactive.perl:1449
365 +#: add-patch.c:104 git-add--interactive.perl:1450
366 #, c-format, perl-format
367 msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
368 msgstr "¿Aplicar borrado al índice [y,n,q,a,d%s,?]? "
369
370 -#: add-patch.c:105 git-add--interactive.perl:1450
370 +#: add-patch.c:105 git-add--interactive.perl:1451
371 #, c-format, perl-format
372 msgid "Apply addition to index [y,n,q,a,d%s,?]? "
373 msgstr "¿Aplicar adición al índice [y,n,q,a,d%s,?]? "
374
375 -#: add-patch.c:106 git-add--interactive.perl:1451
375 +#: add-patch.c:106 git-add--interactive.perl:1452
376 #, c-format, perl-format
377 msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
378 msgstr "¿Aplicar este hunk al índice [y,n,q,a,d%s,?]? "
@@ -399,26 +399,26 @@ msgstr ""
399 "a - aplicar este hunk y todos los posteriores en el archivo\n"
400 "d - no aplicar este hunko ninguno de los posteriores en el archivo\n"
401
402 -#: add-patch.c:126 git-add--interactive.perl:1454
403 -#: git-add--interactive.perl:1472
402 +#: add-patch.c:126 git-add--interactive.perl:1455
403 +#: git-add--interactive.perl:1473
404 #, c-format, perl-format
405 msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
406 msgstr "¿Descartar cambio de modo del árbol de trabajo [y,n,q,a,d%s,?]? "
407
408 -#: add-patch.c:127 git-add--interactive.perl:1455
409 -#: git-add--interactive.perl:1473
408 +#: add-patch.c:127 git-add--interactive.perl:1456
409 +#: git-add--interactive.perl:1474
410 #, c-format, perl-format
411 msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
412 msgstr "¿Descartar borrado del árbol de trabajo [y,n,q,a,d%s,?]? "
413
414 -#: add-patch.c:128 git-add--interactive.perl:1456
415 -#: git-add--interactive.perl:1474
414 +#: add-patch.c:128 git-add--interactive.perl:1457
415 +#: git-add--interactive.perl:1475
416 #, c-format, perl-format
417 msgid "Discard addition from worktree [y,n,q,a,d%s,?]? "
418 msgstr "¿Descartar adición del árbol de trabajo [y,n,q,a,d%s,?]? "
419
420 -#: add-patch.c:129 git-add--interactive.perl:1457
421 -#: git-add--interactive.perl:1475
420 +#: add-patch.c:129 git-add--interactive.perl:1458
421 +#: git-add--interactive.perl:1476
422 #, c-format, perl-format
423 msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
424 msgstr "¿Descartar este hunk del árbol de trabajo [y,n,q,a,d%s,?]? "
@@ -445,23 +445,23 @@ msgstr ""
445 "a - descartar este hunk y todos los posteriores en este archivo\n"
446 "d - no descartar este hunk o ninguno de los posteriores en el archivo\n"
447
448 -#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1460
448 +#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1461
449 #, c-format, perl-format
450 msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
451 msgstr ""
452 "¿Descartar cambio de modo del índice y el árbol de trabajo [y,n,q,a,d%s,?]? "
453
454 -#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1461
454 +#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1462
455 #, c-format, perl-format
456 msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
457 msgstr "¿Descartar borrado del índice y el árbol de trabajo [y,n,q,a,d%s,?]? "
458
459 -#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1462
459 +#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1463
460 #, c-format, perl-format
461 msgid "Discard addition from index and worktree [y,n,q,a,d%s,?]? "
462 msgstr "¿Descartar adición del índice y el árbol de trabajo [y,n,q,a,d%s,?]? "
463
464 -#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1463
464 +#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1464
465 #, c-format, perl-format
466 msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
467 msgstr ""
@@ -481,24 +481,24 @@ msgstr ""
481 "a - descartar este hunk y todos los posteriores en este archivo\n"
482 "d - no descartar este hunk o ninguno posterior en el archivo\n"
483
484 -#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1466
484 +#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1467
485 #, c-format, perl-format
486 msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
487 msgstr ""
488 "¿Aplicar cambio de modo para el índice y el árbol de trabajo [y,n,q,a,d"
489 "%s,?]? "
490
491 -#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1467
491 +#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1468
492 #, c-format, perl-format
493 msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
494 msgstr "¿Aplicar borrado al índice y al árbol de trabajo [y,n,q,a,d%s,?]? "
495
496 -#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1468
496 +#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1469
497 #, c-format, perl-format
498 msgid "Apply addition to index and worktree [y,n,q,a,d%s,?]? "
499 msgstr "¿Aplicar adición al índice y al árbol de trabajo [y,n,q,a,d%s,?]? "
500
501 -#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1469
501 +#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1470
502 #, c-format, perl-format
503 msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
504 msgstr "¿Aplicar este hunk al índice y árbol de trabajo [y,n,q,a,d,/%s,?]? "
@@ -531,34 +531,34 @@ msgstr ""
531 "a - aplicar este hunk y todos los posteriores en el archivo\n"
532 "d - no aplicar este hunk o ninguno de los siguientes en este archivo\n"
533
534 -#: add-patch.c:328
534 +#: add-patch.c:342
535 #, c-format
536 msgid "could not parse hunk header '%.*s'"
537 msgstr "no se puede analizar hunk header '%.*s'"
538
539 -#: add-patch.c:347 add-patch.c:351
539 +#: add-patch.c:361 add-patch.c:365
540 #, c-format
541 msgid "could not parse colored hunk header '%.*s'"
542 msgstr "no se puede analizar hunk header '%.*s'"
543
544 -#: add-patch.c:405
544 +#: add-patch.c:419
545 msgid "could not parse diff"
546 msgstr "no se puede analizar diff"
547
548 -#: add-patch.c:424
548 +#: add-patch.c:438
549 msgid "could not parse colored diff"
550 msgstr "no se pudo analizar diff a colores"
551
552 -#: add-patch.c:438
552 +#: add-patch.c:452
553 #, c-format
554 msgid "failed to run '%s'"
555 msgstr "falló al ejecutar '%s'"
556
557 -#: add-patch.c:602
557 +#: add-patch.c:611
558 msgid "mismatched output from interactive.diffFilter"
559 msgstr "output de interactive.diffFilter no concuerda"
560
561 -#: add-patch.c:603
561 +#: add-patch.c:612
562 msgid ""
563 "Your filter must maintain a one-to-one correspondence\n"
564 "between its input and output lines."
@@ -566,7 +566,7 @@ msgstr ""
566 "Tu filtro tiene que mantener correspondencia de uno a uno\n"
567 "entre las líneas de entrada y salida."
568
569 -#: add-patch.c:776
569 +#: add-patch.c:790
570 #, c-format
571 msgid ""
572 "expected context line #%d in\n"
@@ -575,7 +575,7 @@ msgstr ""
575 "se esperaba línea de contexto #%d en\n"
576 "%.*s"
577
578 -#: add-patch.c:791
578 +#: add-patch.c:805
579 #, c-format
580 msgid ""
581 "hunks do not overlap:\n"
@@ -588,11 +588,11 @@ msgstr ""
588 "\tno acaba con:\n"
589 "%.*s"
590
591 -#: add-patch.c:1067 git-add--interactive.perl:1114
591 +#: add-patch.c:1081 git-add--interactive.perl:1115
592 msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
593 msgstr "Modo de edición manual de hunk -- vea abajo para una guía rápida.\n"
594
595 -#: add-patch.c:1071
595 +#: add-patch.c:1085
596 #, c-format
597 msgid ""
598 "---\n"
@@ -606,7 +606,7 @@ msgstr ""
606 "Lineas comenzando con %c serán eliminadas.\n"
607
608 #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
609 -#: add-patch.c:1085 git-add--interactive.perl:1128
609 +#: add-patch.c:1099 git-add--interactive.perl:1129
610 msgid ""
611 "If it does not apply cleanly, you will be given an opportunity to\n"
612 "edit again. If all lines of the hunk are removed, then the edit is\n"
@@ -616,11 +616,11 @@ msgstr ""
616 "editar nuevamente. Si todas las líneas del hunk son eliminadas, entonces \n"
617 "la edición es abortada y el hunk queda sin cambios.\n"
618
619 -#: add-patch.c:1118
619 +#: add-patch.c:1132
620 msgid "could not parse hunk header"
621 msgstr "no se puede analizar hunk header"
622
623 -#: add-patch.c:1163
623 +#: add-patch.c:1177
624 msgid "'git apply --cached' failed"
625 msgstr "falló 'git apply --cached'"
626
@@ -636,26 +636,26 @@ msgstr "falló 'git apply --cached'"
636 #. Consider translating (saying "no" discards!) as
637 #. (saying "n" for "no" discards!) if the translation
638 #. of the word "no" does not start with n.
639 -#: add-patch.c:1232 git-add--interactive.perl:1241
639 +#: add-patch.c:1246 git-add--interactive.perl:1242
640 msgid ""
641 "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
642 msgstr ""
643 "Tu hunk editado no aplica. ¿Editar nuevamente (¡decir \"no\" descarta!) [y/"
644 "n]? "
645
646 -#: add-patch.c:1275
646 +#: add-patch.c:1289
647 msgid "The selected hunks do not apply to the index!"
648 msgstr "¡Los hunks seleccionados no aplican al índice!"
649
650 -#: add-patch.c:1276 git-add--interactive.perl:1345
650 +#: add-patch.c:1290 git-add--interactive.perl:1346
651 msgid "Apply them to the worktree anyway? "
652 msgstr "¿Aplicarlos al árbol de trabajo de todas maneras? "
653
654 -#: add-patch.c:1283 git-add--interactive.perl:1348
654 +#: add-patch.c:1297 git-add--interactive.perl:1349
655 msgid "Nothing was applied.\n"
656 msgstr "Nada fue aplicado.\n"
657
658 -#: add-patch.c:1340
658 +#: add-patch.c:1354
659 msgid ""
660 "j - leave this hunk undecided, see next undecided hunk\n"
661 "J - leave this hunk undecided, see next hunk\n"
@@ -677,73 +677,73 @@ msgstr ""
677 "e - editar manualmente el hunk actual\n"
678 "? - imprimir ayuda\n"
679
680 -#: add-patch.c:1463 add-patch.c:1473
680 +#: add-patch.c:1516 add-patch.c:1526
681 msgid "No previous hunk"
682 msgstr "No el anterior hunk"
683
684 -#: add-patch.c:1468 add-patch.c:1478
684 +#: add-patch.c:1521 add-patch.c:1531
685 msgid "No next hunk"
686 msgstr "No el siguiente hunk"
687
688 -#: add-patch.c:1484
688 +#: add-patch.c:1537
689 msgid "No other hunks to goto"
690 msgstr "No hay más pedazos para el ir"
691
692 -#: add-patch.c:1495 git-add--interactive.perl:1594
692 +#: add-patch.c:1548 git-add--interactive.perl:1606
693 msgid "go to which hunk (<ret> to see more)? "
694 msgstr "¿a que hunk ir (<enter> para ver más)? "
695
696 -#: add-patch.c:1496 git-add--interactive.perl:1596
696 +#: add-patch.c:1549 git-add--interactive.perl:1608
697 msgid "go to which hunk? "
698 msgstr "¿a que hunk ir? "
699
700 -#: add-patch.c:1507
700 +#: add-patch.c:1560
701 #, c-format
702 msgid "Invalid number: '%s'"
703 msgstr "Numero inválido: '%s'"
704
705 -#: add-patch.c:1512
705 +#: add-patch.c:1565
706 #, c-format
707 msgid "Sorry, only %d hunk available."
708 msgid_plural "Sorry, only %d hunks available."
709 msgstr[0] "Lo siento, solo %d hunk disponible."
710 msgstr[1] "Lo siento, solo %d hunks disponibles."
711
712 -#: add-patch.c:1521
712 +#: add-patch.c:1574
713 msgid "No other hunks to search"
714 msgstr "No hay más pedazos para buscar"
715
716 -#: add-patch.c:1527 git-add--interactive.perl:1640
716 +#: add-patch.c:1580 git-add--interactive.perl:1661
717 msgid "search for regex? "
718 msgstr "¿buscar para regexp? "
719
720 -#: add-patch.c:1542
720 +#: add-patch.c:1595
721 #, c-format
722 msgid "Malformed search regexp %s: %s"
723 msgstr "Regexp para la búsqueda mal formado %s: %s"
724
725 -#: add-patch.c:1559
725 +#: add-patch.c:1612
726 msgid "No hunk matches the given pattern"
727 -msgstr "No hay hunks que concuerden con el patrón entregado."
727 +msgstr "No hay hunks que concuerden con el patrón entregado"
728
729 -#: add-patch.c:1566
729 +#: add-patch.c:1619
730 msgid "Sorry, cannot split this hunk"
731 msgstr "Perdón, no se puede dividir este pedazo"
732
733 -#: add-patch.c:1570
733 +#: add-patch.c:1623
734 #, c-format
735 msgid "Split into %d hunks."
736 msgstr "Cortar en %d hunk."
737
738 -#: add-patch.c:1574
738 +#: add-patch.c:1627
739 msgid "Sorry, cannot edit this hunk"
740 msgstr "Perdón, no se puede editar este pedazo"
741
742 -#: add-patch.c:1625
742 +#: add-patch.c:1679
743 msgid "'git apply' failed"
744 msgstr "falló 'git apply'"
745
746 -#: advice.c:140
746 +#: advice.c:143
747 #, c-format
748 msgid ""
749 "\n"
@@ -752,38 +752,38 @@ msgstr ""
752 "\n"
753 "Desactivar este mensaje con \"git config advice.%s false\""
754
755 -#: advice.c:156
755 +#: advice.c:159
756 #, c-format
757 msgid "%shint: %.*s%s\n"
758 msgstr "%sayuda: %.*s%s\n"
759
760 -#: advice.c:247
760 +#: advice.c:250
761 msgid "Cherry-picking is not possible because you have unmerged files."
762 msgstr ""
763 "No es posible ejecutar cherry-picking porque tienes archivos sin fusionar."
764
765 -#: advice.c:249
765 +#: advice.c:252
766 msgid "Committing is not possible because you have unmerged files."
767 msgstr "No es posible realizar un commit porque tienes archivos sin fusionar."
768
769 -#: advice.c:251
769 +#: advice.c:254
770 msgid "Merging is not possible because you have unmerged files."
771 msgstr "No es posible hacer merge porque tienes archivos sin fusionar."
772
773 -#: advice.c:253
773 +#: advice.c:256
774 msgid "Pulling is not possible because you have unmerged files."
775 msgstr "No es posible hacer pull porque tienes archivos sin fusionar."
776
777 -#: advice.c:255
777 +#: advice.c:258
778 msgid "Reverting is not possible because you have unmerged files."
779 msgstr "No es posible revertir porque tienes archivos sin fusionar."
780
781 -#: advice.c:257
781 +#: advice.c:260
782 #, c-format
783 msgid "It is not possible to %s because you have unmerged files."
784 msgstr "No es posible %s porque tienes archivos sin fusionar."
785
786 -#: advice.c:265
786 +#: advice.c:268
787 msgid ""
788 "Fix them up in the work tree, and then use 'git add/rm <file>'\n"
789 "as appropriate to mark resolution and make a commit."
@@ -791,23 +791,23 @@ msgstr ""
791 "Corrígelos en el árbol de trabajo y entonces usa 'git add/rm <archivo>',\n"
792 "como sea apropiado, para marcar la resolución y realizar un commit."
793
794 -#: advice.c:273
794 +#: advice.c:276
795 msgid "Exiting because of an unresolved conflict."
796 msgstr "Saliendo porque existe un conflicto sin resolver."
797
798 -#: advice.c:278 builtin/merge.c:1353
798 +#: advice.c:281 builtin/merge.c:1370
799 msgid "You have not concluded your merge (MERGE_HEAD exists)."
800 msgstr "No has concluido tu fusión (MERGE_HEAD existe)."
801
802 -#: advice.c:280
802 +#: advice.c:283
803 msgid "Please, commit your changes before merging."
804 msgstr "Por favor, realiza un commit antes de fusionar."
805
806 -#: advice.c:281
806 +#: advice.c:284
807 msgid "Exiting because of unfinished merge."
808 msgstr "Saliendo por una fusión inconclusa."
809
810 -#: advice.c:287
810 +#: advice.c:290
811 #, c-format
812 msgid ""
813 "Note: switching to '%s'.\n"
@@ -1107,7 +1107,8 @@ msgstr "el parche falló: %s:%ld"
1107 msgid "cannot checkout %s"
1108 msgstr "no se puede hacer checkout a %s"
1109
1110 -#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:61 setup.c:308
1110 +#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:86 pack-revindex.c:213
1111 +#: setup.c:308
1112 #, c-format
1113 msgid "failed to read %s"
1114 msgstr "no se pudo leer %s"
@@ -1127,7 +1128,7 @@ msgstr "la ruta %s ha sido renombrada/suprimida"
1128 msgid "%s: does not exist in index"
1129 msgstr "%s: no existe en el índice"
1130
1130 -#: apply.c:3537 apply.c:3708
1131 +#: apply.c:3537 apply.c:3708 apply.c:3952
1132 #, c-format
1133 msgid "%s: does not match index"
1134 msgstr "%s: no concuerda con el índice"
@@ -1177,182 +1178,182 @@ msgstr "%s: tipo incorrecto"
1178 msgid "%s has type %o, expected %o"
1179 msgstr "%s tiene tipo %o, se esperaba %o"
1180
1180 -#: apply.c:3878 apply.c:3880 read-cache.c:830 read-cache.c:856
1181 -#: read-cache.c:1325
1181 +#: apply.c:3892 apply.c:3894 read-cache.c:832 read-cache.c:858
1182 +#: read-cache.c:1313
1183 #, c-format
1184 msgid "invalid path '%s'"
1185 msgstr "ruta inválida '%s'"
1186
1186 -#: apply.c:3936
1187 +#: apply.c:3950
1188 #, c-format
1189 msgid "%s: already exists in index"
1190 msgstr "%s: ya existe en el índice"
1191
1191 -#: apply.c:3939
1192 +#: apply.c:3954
1193 #, c-format
1194 msgid "%s: already exists in working directory"
1195 msgstr "%s: ya existe en el directorio de trabajo"
1196
1196 -#: apply.c:3959
1197 +#: apply.c:3974
1198 #, c-format
1199 msgid "new mode (%o) of %s does not match old mode (%o)"
1200 msgstr "nuevo modo (%o) de %s no concuerda con el viejo modo (%o)"
1201
1201 -#: apply.c:3964
1202 +#: apply.c:3979
1203 #, c-format
1204 msgid "new mode (%o) of %s does not match old mode (%o) of %s"
1205 msgstr "nuevo modo (%o) de %s no concuerda con el viejo modo (%o) de %s"
1206
1206 -#: apply.c:3984
1207 +#: apply.c:3999
1208 #, c-format
1209 msgid "affected file '%s' is beyond a symbolic link"
1210 msgstr "archivo afectado '%s' está tras un enlace simbólico"
1211
1211 -#: apply.c:3988
1212 +#: apply.c:4003
1213 #, c-format
1214 msgid "%s: patch does not apply"
1215 msgstr "%s: el parche no aplica"
1216
1216 -#: apply.c:4003
1217 +#: apply.c:4018
1218 #, c-format
1219 msgid "Checking patch %s..."
1220 msgstr "Revisando el parche %s..."
1221
1221 -#: apply.c:4095
1222 +#: apply.c:4110
1223 #, c-format
1224 msgid "sha1 information is lacking or useless for submodule %s"
1225 msgstr "falta información del sha1 o es inútil para el submódulo %s"
1226
1226 -#: apply.c:4102
1227 +#: apply.c:4117
1228 #, c-format
1229 msgid "mode change for %s, which is not in current HEAD"
1230 msgstr "modo cambiado para %s, el cual no se encuentra en el HEAD actual"
1231
1231 -#: apply.c:4105
1232 +#: apply.c:4120
1233 #, c-format
1234 msgid "sha1 information is lacking or useless (%s)."
1235 msgstr "falta información sha1 o es inútil (%s)."
1236
1236 -#: apply.c:4114
1237 +#: apply.c:4129
1238 #, c-format
1239 msgid "could not add %s to temporary index"
1240 msgstr "no se pudo añadir %s al índice temporal"
1241
1241 -#: apply.c:4124
1242 +#: apply.c:4139
1243 #, c-format
1244 msgid "could not write temporary index to %s"
1245 msgstr "no se pudo escribir un índice temporal para %s"
1246
1246 -#: apply.c:4262
1247 +#: apply.c:4277
1248 #, c-format
1249 msgid "unable to remove %s from index"
1250 msgstr "no se puede eliminar %s del índice"
1251
1251 -#: apply.c:4296
1252 +#: apply.c:4311
1253 #, c-format
1254 msgid "corrupt patch for submodule %s"
1255 msgstr "parche corrupto para el submódulo %s"
1256
1256 -#: apply.c:4302
1257 +#: apply.c:4317
1258 #, c-format
1259 msgid "unable to stat newly created file '%s'"
1260 msgstr "no es posible establecer el archivo recién creado '%s'"
1261
1261 -#: apply.c:4310
1262 +#: apply.c:4325
1263 #, c-format
1264 msgid "unable to create backing store for newly created file %s"
1265 msgstr ""
1266 "no es posible crear una copia de seguridad para el archivo recién creado %s"
1267
1267 -#: apply.c:4316 apply.c:4461
1268 +#: apply.c:4331 apply.c:4476
1269 #, c-format
1270 msgid "unable to add cache entry for %s"
1271 msgstr "no es posible agregar una entrada en el cache para %s"
1272
1272 -#: apply.c:4359
1273 +#: apply.c:4374 builtin/bisect--helper.c:523
1274 #, c-format
1275 msgid "failed to write to '%s'"
1276 msgstr "falló escribir para '%s'"
1277
1277 -#: apply.c:4363
1278 +#: apply.c:4378
1279 #, c-format
1280 msgid "closing file '%s'"
1281 msgstr "cerrando archivo '%s'"
1282
1282 -#: apply.c:4433
1283 +#: apply.c:4448
1284 #, c-format
1285 msgid "unable to write file '%s' mode %o"
1286 msgstr "no es posible escribir el archivo '%s' modo %o"
1287
1287 -#: apply.c:4531
1288 +#: apply.c:4546
1289 #, c-format
1290 msgid "Applied patch %s cleanly."
1291 msgstr "Parche %s aplicado limpiamente."
1292
1292 -#: apply.c:4539
1293 +#: apply.c:4554
1294 msgid "internal error"
1295 msgstr "error interno"
1296
1296 -#: apply.c:4542
1297 +#: apply.c:4557
1298 #, c-format
1299 msgid "Applying patch %%s with %d reject..."
1300 msgid_plural "Applying patch %%s with %d rejects..."
1301 msgstr[0] "Aplicando parche %%s con %d rechazo..."
1302 msgstr[1] "Aplicando parche %%s con %d rechazos..."
1303
1303 -#: apply.c:4553
1304 +#: apply.c:4568
1305 #, c-format
1306 msgid "truncating .rej filename to %.*s.rej"
1307 msgstr "truncando el nombre de archivo .rej a %.*s.rej"
1308
1308 -#: apply.c:4561 builtin/fetch.c:902 builtin/fetch.c:1195
1309 +#: apply.c:4576 builtin/fetch.c:933 builtin/fetch.c:1334
1310 #, c-format
1311 msgid "cannot open %s"
1312 msgstr "no se puede abrir %s"
1313
1313 -#: apply.c:4575
1314 +#: apply.c:4590
1315 #, c-format
1316 msgid "Hunk #%d applied cleanly."
1317 msgstr "Hunk #%d aplicado limpiamente."
1318
1318 -#: apply.c:4579
1319 +#: apply.c:4594
1320 #, c-format
1321 msgid "Rejected hunk #%d."
1322 msgstr "Hunk #%d rechazado."
1323
1323 -#: apply.c:4698
1324 +#: apply.c:4718
1325 #, c-format
1326 msgid "Skipped patch '%s'."
1327 msgstr "Parche '%s' saltado."
1328
1328 -#: apply.c:4706
1329 +#: apply.c:4726
1330 msgid "unrecognized input"
1331 msgstr "input no reconocido"
1332
1332 -#: apply.c:4726
1333 +#: apply.c:4746
1334 msgid "unable to read index file"
1335 msgstr "no es posible leer el archivo índice"
1336
1336 -#: apply.c:4883
1337 +#: apply.c:4903
1338 #, c-format
1339 msgid "can't open patch '%s': %s"
1340 msgstr "no se puede abrir el parche '%s': %s"
1341
1341 -#: apply.c:4910
1342 +#: apply.c:4930
1343 #, c-format
1344 msgid "squelched %d whitespace error"
1345 msgid_plural "squelched %d whitespace errors"
1346 msgstr[0] "%d error de espacios en blanco aplastado"
1347 msgstr[1] "%d errores de espacios en blanco aplastados"
1348
1348 -#: apply.c:4916 apply.c:4931
1349 +#: apply.c:4936 apply.c:4951
1350 #, c-format
1351 msgid "%d line adds whitespace errors."
1352 msgid_plural "%d lines add whitespace errors."
1353 msgstr[0] "%d línea agrega errores de espacios en blanco."
1354 msgstr[1] "%d líneas agregan errores de espacios en blanco."
1355
1355 -#: apply.c:4924
1356 +#: apply.c:4944
1357 #, c-format
1358 msgid "%d line applied after fixing whitespace errors."
1359 msgid_plural "%d lines applied after fixing whitespace errors."
@@ -1361,185 +1362,180 @@ msgstr[0] ""
1362 msgstr[1] ""
1363 "%d líneas aplicadas después de arreglar los errores de espacios en blanco."
1364
1364 -#: apply.c:4940 builtin/add.c:612 builtin/mv.c:301 builtin/rm.c:406
1365 +#: apply.c:4960 builtin/add.c:626 builtin/mv.c:304 builtin/rm.c:406
1366 msgid "Unable to write new index file"
1367 msgstr "No es posible escribir el archivo índice"
1368
1368 -#: apply.c:4968
1369 +#: apply.c:4988
1370 msgid "don't apply changes matching the given path"
1371 msgstr "no aplicar cambios que concuerden con la ruta suministrada"
1372
1372 -#: apply.c:4971
1373 +#: apply.c:4991
1374 msgid "apply changes matching the given path"
1375 msgstr "aplicar cambios que concuerden con la ruta suministrada"
1376
1376 -#: apply.c:4973 builtin/am.c:2259
1377 +#: apply.c:4993 builtin/am.c:2266
1378 msgid "num"
1379 msgstr "num"
1380
1380 -#: apply.c:4974
1381 +#: apply.c:4994
1382 msgid "remove <num> leading slashes from traditional diff paths"
1383 msgstr "eliminar <num> slashes iniciales de las rutas diff tradicionales"
1384
1384 -#: apply.c:4977
1385 +#: apply.c:4997
1386 msgid "ignore additions made by the patch"
1387 msgstr "ignorar adiciones hechas por el parche"
1388
1388 -#: apply.c:4979
1389 +#: apply.c:4999
1390 msgid "instead of applying the patch, output diffstat for the input"
1391 msgstr "en lugar de aplicar el parche, mostrar diffstat para la entrada"
1392
1392 -#: apply.c:4983
1393 +#: apply.c:5003
1394 msgid "show number of added and deleted lines in decimal notation"
1395 msgstr "mostrar el numero de líneas agregadas y eliminadas en notación decimal"
1396
1396 -#: apply.c:4985
1397 +#: apply.c:5005
1398 msgid "instead of applying the patch, output a summary for the input"
1399 msgstr "en lugar de aplicar el parche, mostrar un resumen para la entrada"
1400
1400 -#: apply.c:4987
1401 +#: apply.c:5007
1402 msgid "instead of applying the patch, see if the patch is applicable"
1403 msgstr "en lugar de aplicar el parche, ver si el parche es aplicable"
1404
1404 -#: apply.c:4989
1405 +#: apply.c:5009
1406 msgid "make sure the patch is applicable to the current index"
1407 msgstr "asegurar que el parche es aplicable al índice actual"
1408
1408 -#: apply.c:4991
1409 +#: apply.c:5011
1410 msgid "mark new files with `git add --intent-to-add`"
1411 msgstr "marca los nuevos archivos con `git add --intent-to-add`"
1412
1412 -#: apply.c:4993
1413 +#: apply.c:5013
1414 msgid "apply a patch without touching the working tree"
1415 msgstr "aplicar un parche sin tocar el árbol de trabajo"
1416
1416 -#: apply.c:4995
1417 +#: apply.c:5015
1418 msgid "accept a patch that touches outside the working area"
1419 msgstr "aceptar un parche que toca fuera del área de trabajo"
1420
1420 -#: apply.c:4998
1421 +#: apply.c:5018
1422 msgid "also apply the patch (use with --stat/--summary/--check)"
1423 msgstr "también aplicar el parche ( usar con --stat/--summary/--check"
1424
1424 -#: apply.c:5000
1425 +#: apply.c:5020
1426 msgid "attempt three-way merge if a patch does not apply"
1427 msgstr "intentar merge de tres-vías si el parche no aplica"
1428
1428 -#: apply.c:5002
1429 +#: apply.c:5022
1430 msgid "build a temporary index based on embedded index information"
1431 msgstr ""
1432 "construir un índice temporal basado en la información del índice incrustado"
1433
1433 -#: apply.c:5005 builtin/checkout-index.c:173 builtin/ls-files.c:525
1434 +#: apply.c:5025 builtin/checkout-index.c:195 builtin/ls-files.c:540
1435 msgid "paths are separated with NUL character"
1436 msgstr "rutas están separadas con un carácter NULL"
1437
1437 -#: apply.c:5007
1438 +#: apply.c:5027
1439 msgid "ensure at least <n> lines of context match"
1440 msgstr "asegurar que al menos concuerden <n> líneas del contexto concuerden"
1441
1441 -#: apply.c:5008 builtin/am.c:2238 builtin/interpret-trailers.c:98
1442 +#: apply.c:5028 builtin/am.c:2245 builtin/interpret-trailers.c:98
1443 #: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102
1443 -#: builtin/pack-objects.c:3530 builtin/rebase.c:1332
1444 +#: builtin/pack-objects.c:3577 builtin/rebase.c:1352
1445 msgid "action"
1446 msgstr "acción"
1447
1447 -#: apply.c:5009
1448 +#: apply.c:5029
1449 msgid "detect new or modified lines that have whitespace errors"
1450 msgstr ""
1451 "detectar líneas nuevas o modificadas que contienen errores de espacios en "
1452 "blanco"
1453
1453 -#: apply.c:5012 apply.c:5015
1454 +#: apply.c:5032 apply.c:5035
1455 msgid "ignore changes in whitespace when finding context"
1456 msgstr ""
1457 "ignorar cambios en los espacios en blanco cuando se encuentra el contexto"
1458
1458 -#: apply.c:5018
1459 +#: apply.c:5038
1460 msgid "apply the patch in reverse"
1461 msgstr "aplicar el parche en reversa"
1462
1462 -#: apply.c:5020
1463 +#: apply.c:5040
1464 msgid "don't expect at least one line of context"
1465 msgstr "no espera al menos una línea del contexto"
1466
1466 -#: apply.c:5022
1467 +#: apply.c:5042
1468 msgid "leave the rejected hunks in corresponding *.rej files"
1469 msgstr "dejar los hunks rechazados en los archivos *.rej correspontientes"
1470
1470 -#: apply.c:5024
1471 +#: apply.c:5044
1472 msgid "allow overlapping hunks"
1473 msgstr "permitir solapamiento de hunks"
1474
1474 -#: apply.c:5025 builtin/add.c:323 builtin/check-ignore.c:22
1475 -#: builtin/commit.c:1366 builtin/count-objects.c:98 builtin/fsck.c:775
1476 -#: builtin/log.c:2186 builtin/mv.c:123 builtin/read-tree.c:128
1475 +#: apply.c:5045 builtin/add.c:337 builtin/check-ignore.c:22
1476 +#: builtin/commit.c:1364 builtin/count-objects.c:98 builtin/fsck.c:757
1477 +#: builtin/log.c:2286 builtin/mv.c:123 builtin/read-tree.c:128
1478 msgid "be verbose"
1479 msgstr "ser verboso"
1480
1480 -#: apply.c:5027
1481 +#: apply.c:5047
1482 msgid "tolerate incorrectly detected missing new-line at the end of file"
1483 msgstr ""
1484 "tolerar nuevas líneas faltantes detectadas incorrectamente al final del "
1485 "archivo"
1486
1486 -#: apply.c:5030
1487 +#: apply.c:5050
1488 msgid "do not trust the line counts in the hunk headers"
1489 msgstr "no confiar en el conteo de líneas en los headers del hunk"
1490
1490 -#: apply.c:5032 builtin/am.c:2247
1491 +#: apply.c:5052 builtin/am.c:2254
1492 msgid "root"
1493 msgstr "raíz"
1494
1494 -#: apply.c:5033
1495 +#: apply.c:5053
1496 msgid "prepend <root> to all filenames"
1497 msgstr "anteponer <root> a todos los nombres de archivos"
1498
1498 -#: archive-tar.c:125 archive-zip.c:351
1499 +#: archive-tar.c:125 archive-zip.c:345
1500 #, c-format
1501 msgid "cannot stream blob %s"
1502 msgstr "no se puede transmitir el blob %s"
1503
1503 -#: archive-tar.c:266 archive-zip.c:369
1504 +#: archive-tar.c:265 archive-zip.c:358
1505 #, c-format
1506 msgid "unsupported file mode: 0%o (SHA1: %s)"
1507 msgstr "modo de archivo no soportado: 0%o (SHA1: %s)"
1508
1508 -#: archive-tar.c:293 archive-zip.c:359
1509 -#, c-format
1510 -msgid "cannot read %s"
1511 -msgstr "no se puede leer %s"
1512 -
1513 -#: archive-tar.c:465
1509 +#: archive-tar.c:450
1510 #, c-format
1511 msgid "unable to start '%s' filter"
1512 msgstr "no se puede comenzar filtro '%s'"
1513
1518 -#: archive-tar.c:468
1514 +#: archive-tar.c:453
1515 msgid "unable to redirect descriptor"
1516 msgstr "incapaz de redirigir descriptor"
1517
1522 -#: archive-tar.c:475
1518 +#: archive-tar.c:460
1519 #, c-format
1520 msgid "'%s' filter reported error"
1521 msgstr "filtro '%s' reportó un error"
1522
1527 -#: archive-zip.c:319
1523 +#: archive-zip.c:318
1524 #, c-format
1525 msgid "path is not valid UTF-8: %s"
1526 msgstr "ruta no válida UTF-8: %s"
1527
1532 -#: archive-zip.c:323
1528 +#: archive-zip.c:322
1529 #, c-format
1530 msgid "path too long (%d chars, SHA1: %s): %s"
1531 msgstr "ruta muy larga (%d chars, SHA1: %s): %s"
1532
1537 -#: archive-zip.c:480 builtin/pack-objects.c:243 builtin/pack-objects.c:246
1533 +#: archive-zip.c:469 builtin/pack-objects.c:244 builtin/pack-objects.c:247
1534 #, c-format
1535 msgid "deflate error (%d)"
1536 msgstr "error al desinflar (%d)"
1537
1542 -#: archive-zip.c:615
1538 +#: archive-zip.c:603
1539 #, c-format
1540 msgid "timestamp too large for this system: %<PRIuMAX>"
1541 msgstr "timestamp muy largo para este sistema: %<PRIuMAX>"
@@ -1563,134 +1559,156 @@ msgstr ""
1559 msgid "git archive --remote <repo> [--exec <cmd>] --list"
1560 msgstr "git archive --remote <repo> [--exec <comando>] --list"
1561
1566 -#: archive.c:377 builtin/add.c:181 builtin/add.c:588 builtin/rm.c:315
1562 +#: archive.c:192
1563 +#, c-format
1564 +msgid "cannot read %s"
1565 +msgstr "no se puede leer %s"
1566 +
1567 +#: archive.c:345 sequencer.c:459 sequencer.c:1744 sequencer.c:2894
1568 +#: sequencer.c:3335 sequencer.c:3444 builtin/am.c:249 builtin/commit.c:786
1569 +#: builtin/merge.c:1139
1570 +#, c-format
1571 +msgid "could not read '%s'"
1572 +msgstr "no se pudo leer '%s'"
1573 +
1574 +#: archive.c:430 builtin/add.c:189 builtin/add.c:602 builtin/rm.c:315
1575 #, c-format
1576 msgid "pathspec '%s' did not match any files"
1577 msgstr "ruta especificada '%s' no concordó con ninguna carpeta"
1578
1571 -#: archive.c:401
1579 +#: archive.c:454
1580 #, c-format
1581 msgid "no such ref: %.*s"
1582 msgstr "no existe el ref: %.*s"
1583
1576 -#: archive.c:407
1584 +#: archive.c:460
1585 #, c-format
1586 msgid "not a valid object name: %s"
1587 msgstr "nombre de objeto no válido: %s"
1588
1581 -#: archive.c:420
1589 +#: archive.c:473
1590 #, c-format
1591 msgid "not a tree object: %s"
1592 msgstr "no es un objeto tree: %s"
1593
1586 -#: archive.c:432
1594 +#: archive.c:485
1595 msgid "current working directory is untracked"
1596 msgstr "directorio de trabajo actual no rastreado"
1597
1590 -#: archive.c:464
1598 +#: archive.c:526
1599 +#, c-format
1600 +msgid "File not found: %s"
1601 +msgstr "Archivo no encontrado: %s"
1602 +
1603 +#: archive.c:528
1604 +#, c-format
1605 +msgid "Not a regular file: %s"
1606 +msgstr "No es un archivo regular: %s"
1607 +
1608 +#: archive.c:555
1609 msgid "fmt"
1610 msgstr "fmt"
1611
1594 -#: archive.c:464
1612 +#: archive.c:555
1613 msgid "archive format"
1614 msgstr "formato del archivo"
1615
1598 -#: archive.c:465 builtin/log.c:1674
1616 +#: archive.c:556 builtin/log.c:1764
1617 msgid "prefix"
1618 msgstr "prefijo"
1619
1602 -#: archive.c:466
1620 +#: archive.c:557
1621 msgid "prepend prefix to each pathname in the archive"
1622 msgstr "anteponer prefijo a cada ruta en el archivo"
1623
1606 -#: archive.c:467 builtin/blame.c:861 builtin/blame.c:865 builtin/blame.c:866
1607 -#: builtin/commit-tree.c:117 builtin/config.c:130 builtin/fast-export.c:1208
1608 -#: builtin/fast-export.c:1210 builtin/fast-export.c:1214 builtin/grep.c:907
1609 -#: builtin/hash-object.c:105 builtin/ls-files.c:561 builtin/ls-files.c:564
1610 -#: builtin/notes.c:412 builtin/notes.c:578 builtin/read-tree.c:123
1611 -#: parse-options.h:190
1624 +#: archive.c:558 archive.c:561 builtin/blame.c:884 builtin/blame.c:888
1625 +#: builtin/blame.c:889 builtin/commit-tree.c:117 builtin/config.c:135
1626 +#: builtin/fast-export.c:1207 builtin/fast-export.c:1209
1627 +#: builtin/fast-export.c:1213 builtin/grep.c:920 builtin/hash-object.c:105
1628 +#: builtin/ls-files.c:576 builtin/ls-files.c:579 builtin/notes.c:412
1629 +#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:190
1630 msgid "file"
1631 msgstr "carpeta"
1632
1615 -#: archive.c:468 builtin/archive.c:90
1633 +#: archive.c:559
1634 +msgid "add untracked file to archive"
1635 +msgstr "incluir archivos sin seguimiento al archivo"
1636 +
1637 +#: archive.c:562 builtin/archive.c:90
1638 msgid "write the archive to this file"
1639 msgstr "escribe el archivo en esta carpeta"
1640
1619 -#: archive.c:470
1641 +#: archive.c:564
1642 msgid "read .gitattributes in working directory"
1643 msgstr "leer .gitattributes en el directorio de trabajo"
1644
1623 -#: archive.c:471
1645 +#: archive.c:565
1646 msgid "report archived files on stderr"
1647 msgstr "reportar archivos archivados por stderr"
1648
1627 -#: archive.c:472
1628 -msgid "store only"
1629 -msgstr "solo guardar"
1630 -
1631 -#: archive.c:473
1632 -msgid "compress faster"
1633 -msgstr "comprimir más rápido"
1634 -
1635 -#: archive.c:481
1636 -msgid "compress better"
1637 -msgstr "comprimir mejor"
1649 +#: archive.c:567
1650 +msgid "set compression level"
1651 +msgstr "configurar nivel de compresión"
1652
1639 -#: archive.c:484
1653 +#: archive.c:570
1654 msgid "list supported archive formats"
1655 msgstr "listar los formatos de carpeta soportados"
1656
1643 -#: archive.c:486 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116
1644 -#: builtin/submodule--helper.c:1406 builtin/submodule--helper.c:1911
1657 +#: archive.c:572 builtin/archive.c:91 builtin/clone.c:114 builtin/clone.c:117
1658 +#: builtin/submodule--helper.c:1830 builtin/submodule--helper.c:2335
1659 msgid "repo"
1660 msgstr "repo"
1661
1648 -#: archive.c:487 builtin/archive.c:92
1662 +#: archive.c:573 builtin/archive.c:92
1663 msgid "retrieve the archive from remote repository <repo>"
1664 msgstr "obtener la carpeta del repositorio remoto <repo>"
1665
1652 -#: archive.c:488 builtin/archive.c:93 builtin/difftool.c:715
1666 +#: archive.c:574 builtin/archive.c:93 builtin/difftool.c:714
1667 #: builtin/notes.c:498
1668 msgid "command"
1669 msgstr "comando"
1670
1657 -#: archive.c:489 builtin/archive.c:94
1671 +#: archive.c:575 builtin/archive.c:94
1672 msgid "path to the remote git-upload-archive command"
1673 msgstr "ruta para el comando git-upload-archivo remoto"
1674
1661 -#: archive.c:496
1675 +#: archive.c:582
1676 msgid "Unexpected option --remote"
1677 msgstr "Opción inesperada --remote"
1678
1665 -#: archive.c:498
1679 +#: archive.c:584
1680 msgid "Option --exec can only be used together with --remote"
1681 msgstr "Opción --exec solo puede ser utilizada con --remote"
1682
1669 -#: archive.c:500
1683 +#: archive.c:586
1684 msgid "Unexpected option --output"
1685 msgstr "Opción inesperada --output"
1686
1673 -#: archive.c:522
1687 +#: archive.c:588
1688 +msgid "Options --add-file and --remote cannot be used together"
1689 +msgstr "Opciones --add-file y --remote no pueden ser usadas juntas"
1690 +
1691 +#: archive.c:610
1692 #, c-format
1693 msgid "Unknown archive format '%s'"
1694 msgstr "Formato de carpeta desconocido '%s'"
1695
1678 -#: archive.c:529
1696 +#: archive.c:619
1697 #, c-format
1698 msgid "Argument not supported for format '%s': -%d"
1699 msgstr "Argumento no soportado para formato '%s': -%d"
1700
1683 -#: attr.c:212
1701 +#: attr.c:202
1702 #, c-format
1703 msgid "%.*s is not a valid attribute name"
1704 msgstr "%.*s no es un nombre de atributo válido"
1705
1688 -#: attr.c:369
1706 +#: attr.c:359
1707 #, c-format
1708 msgid "%s not allowed: %s:%d"
1709 msgstr "%s no permitido: %s:%d"
1710
1693 -#: attr.c:409
1711 +#: attr.c:399
1712 msgid ""
1713 "Negative patterns are ignored in git attributes\n"
1714 "Use '\\!' for literal leading exclamation."
@@ -1698,22 +1716,22 @@ msgstr ""
1716 "Los patrones negativos son ignorados en los atributos de git\n"
1717 "Usa '\\!' para comenzar literalmente con exclamación."
1718
1701 -#: bisect.c:468
1719 +#: bisect.c:489
1720 #, c-format
1721 msgid "Badly quoted content in file '%s': %s"
1722 msgstr "Revisa las comillas en el archivo '%s': %s"
1723
1706 -#: bisect.c:678
1724 +#: bisect.c:699
1725 #, c-format
1726 msgid "We cannot bisect more!\n"
1727 msgstr "¡No podemos biseccionar más!\n"
1728
1711 -#: bisect.c:745
1729 +#: bisect.c:766
1730 #, c-format
1731 msgid "Not a valid commit name %s"
1732 msgstr "No es un nombre de commit válido %s"
1733
1716 -#: bisect.c:770
1734 +#: bisect.c:791
1735 #, c-format
1736 msgid ""
1737 "The merge base %s is bad.\n"
@@ -1722,7 +1740,7 @@ msgstr ""
1740 "La base de fisión %s está mal.\n"
1741 "Esto quiere decir que el bug ha sido arreglado entre %s y [%s].\n"
1742
1725 -#: bisect.c:775
1743 +#: bisect.c:796
1744 #, c-format
1745 msgid ""
1746 "The merge base %s is new.\n"
@@ -1731,7 +1749,7 @@ msgstr ""
1749 "La base de fisión %s es nueva.\n"
1750 "Esta propiedad ha cambiado entre %s y [%s].\n"
1751
1734 -#: bisect.c:780
1752 +#: bisect.c:801
1753 #, c-format
1754 msgid ""
1755 "The merge base %s is %s.\n"
@@ -1740,7 +1758,7 @@ msgstr ""
1758 "La base de fisión %s es %s.\n"
1759 "Esto quiere decir que el primer '%s' commit está entre %s y [%s].\n"
1760
1743 -#: bisect.c:788
1761 +#: bisect.c:809
1762 #, c-format
1763 msgid ""
1764 "Some %s revs are not ancestors of the %s rev.\n"
@@ -1751,7 +1769,7 @@ msgstr ""
1769 "git bisect no puede trabajar bien en este caso.\n"
1770 "¿Tal vez confundiste la revisión %s y %s?\n"
1771
1754 -#: bisect.c:801
1772 +#: bisect.c:822
1773 #, c-format
1774 msgid ""
1775 "the merge base between %s and [%s] must be skipped.\n"
@@ -1762,45 +1780,45 @@ msgstr ""
1780 "Así que no podemos estar seguros que el primer %s commit está entre%s y %s.\n"
1781 "Vamos a continuar de todas maneras."
1782
1765 -#: bisect.c:840
1783 +#: bisect.c:861
1784 #, c-format
1785 msgid "Bisecting: a merge base must be tested\n"
1786 msgstr "Biseccionando: una base de fisión debe ser probada\n"
1787
1770 -#: bisect.c:890
1788 +#: bisect.c:911
1789 #, c-format
1790 msgid "a %s revision is needed"
1791 msgstr "una %s revisión es necesaria"
1792
1775 -#: bisect.c:920 builtin/notes.c:177 builtin/tag.c:255
1793 +#: bisect.c:941 builtin/notes.c:177 builtin/tag.c:287
1794 #, c-format
1795 msgid "could not create file '%s'"
1796 msgstr "no se pudo crear el archivo '%s'"
1797
1780 -#: bisect.c:966 builtin/merge.c:151
1798 +#: bisect.c:987 builtin/merge.c:153
1799 #, c-format
1800 msgid "could not read file '%s'"
1801 msgstr "no se pudo leer el archivo '%s'"
1802
1785 -#: bisect.c:997
1803 +#: bisect.c:1027
1804 msgid "reading bisect refs failed"
1805 msgstr "falló leer las refs de bisect"
1806
1789 -#: bisect.c:1019
1807 +#: bisect.c:1057
1808 #, c-format
1809 msgid "%s was both %s and %s\n"
1810 msgstr "%s fue tanto %s como %s\n"
1811
1794 -#: bisect.c:1028
1812 +#: bisect.c:1066
1813 #, c-format
1814 msgid ""
1815 "No testable commit found.\n"
1798 -"Maybe you started with bad path parameters?\n"
1816 +"Maybe you started with bad path arguments?\n"
1817 msgstr ""
1818 "No se encontró commit que se pueda probar.\n"
1819 "¿Quizás iniciaste con parámetros de rutas incorrectos?\n"
1820
1803 -#: bisect.c:1057
1821 +#: bisect.c:1095
1822 #, c-format
1823 msgid "(roughly %d step)"
1824 msgid_plural "(roughly %d steps)"
@@ -1810,7 +1828,7 @@ msgstr[1] "(aproximadamente %d pasos)"
1828 #. TRANSLATORS: the last %s will be replaced with "(roughly %d
1829 #. steps)" translation.
1830 #.
1813 -#: bisect.c:1063
1831 +#: bisect.c:1101
1832 #, c-format
1833 msgid "Bisecting: %d revision left to test after this %s\n"
1834 msgid_plural "Bisecting: %d revisions left to test after this %s\n"
@@ -1830,11 +1848,11 @@ msgid "--reverse and --first-parent together require specified latest commit"
1848 msgstr ""
1849 "--reverse y --first-parent juntos requieren especificar el último commit"
1850
1833 -#: blame.c:2821 bundle.c:187 ref-filter.c:2200 remote.c:1924 sequencer.c:2018
1834 -#: sequencer.c:4466 submodule.c:847 builtin/commit.c:1047 builtin/log.c:405
1835 -#: builtin/log.c:1012 builtin/log.c:1541 builtin/log.c:1945 builtin/log.c:2235
1836 -#: builtin/merge.c:415 builtin/pack-objects.c:3348 builtin/pack-objects.c:3363
1837 -#: builtin/shortlog.c:192
1851 +#: blame.c:2821 bundle.c:213 ref-filter.c:2206 remote.c:2041 sequencer.c:2146
1852 +#: sequencer.c:4641 submodule.c:856 builtin/commit.c:1045 builtin/log.c:411
1853 +#: builtin/log.c:1016 builtin/log.c:1624 builtin/log.c:2045 builtin/log.c:2335
1854 +#: builtin/merge.c:424 builtin/pack-objects.c:3395 builtin/pack-objects.c:3410
1855 +#: builtin/shortlog.c:255
1856 msgid "revision walk setup failed"
1857 msgstr "falló la configuración del camino de revisión"
1858
@@ -2004,366 +2022,384 @@ msgstr "'%s' ya ha sido marcado en '%s'"
2022 msgid "HEAD of working tree %s is not updated"
2023 msgstr "HEAD del árbol de trabajo %s no está actualizada"
2024
2007 -#: bundle.c:47
2025 +#: bundle.c:41
2026 +#, c-format
2027 +msgid "unrecognized bundle hash algorithm: %s"
2028 +msgstr "algoritmo bundle hash desconocido %s"
2029 +
2030 +#: bundle.c:45
2031 #, c-format
2009 -msgid "'%s' does not look like a v2 bundle file"
2010 -msgstr "'%s' no se ve como un archivo bundle v2"
2032 +msgid "unknown capability '%s'"
2033 +msgstr "capacidad desconocida '%s'"
2034
2012 -#: bundle.c:69
2013 -msgid "unknown hash algorithm length"
2014 -msgstr "largo del algoritmo hash desconocido"
2035 +#: bundle.c:71
2036 +#, c-format
2037 +msgid "'%s' does not look like a v2 or v3 bundle file"
2038 +msgstr "'%s' no se ve como un archivo bundle v2 o v3"
2039
2016 -#: bundle.c:84
2040 +#: bundle.c:110
2041 #, c-format
2042 msgid "unrecognized header: %s%s (%d)"
2043 msgstr "header no reconocido %s%s (%d)"
2044
2021 -#: bundle.c:110 rerere.c:480 rerere.c:690 sequencer.c:2270 sequencer.c:3034
2045 +#: bundle.c:136 rerere.c:464 rerere.c:674 sequencer.c:2398 sequencer.c:3184
2046 #: builtin/commit.c:814
2047 #, c-format
2048 msgid "could not open '%s'"
2049 msgstr "no se pudo abrir '%s'"
2050
2027 -#: bundle.c:163
2051 +#: bundle.c:189
2052 msgid "Repository lacks these prerequisite commits:"
2053 msgstr "Al repositorio le falta estos commits prerrequisito:"
2054
2031 -#: bundle.c:166
2055 +#: bundle.c:192
2056 msgid "need a repository to verify a bundle"
2057 msgstr "se necesita un repositorio para verificar un bundle"
2058
2035 -#: bundle.c:217
2059 +#: bundle.c:243
2060 #, c-format
2061 msgid "The bundle contains this ref:"
2062 msgid_plural "The bundle contains these %d refs:"
2063 msgstr[0] "El bundle contiene esta referencia:"
2064 msgstr[1] "El bundle contiene estas %d referencias:"
2065
2042 -#: bundle.c:224
2066 +#: bundle.c:250
2067 msgid "The bundle records a complete history."
2068 msgstr "El bundle registra una historia completa."
2069
2046 -#: bundle.c:226
2070 +#: bundle.c:252
2071 #, c-format
2072 msgid "The bundle requires this ref:"
2073 msgid_plural "The bundle requires these %d refs:"
2074 msgstr[0] "El bundle requiere esta referencia:"
2075 msgstr[1] "El bundle requiere estas %d referencias:"
2076
2053 -#: bundle.c:293
2077 +#: bundle.c:319
2078 msgid "unable to dup bundle descriptor"
2079 msgstr "incapaz de duplicar bundle descriptor"
2080
2057 -#: bundle.c:300
2081 +#: bundle.c:326
2082 msgid "Could not spawn pack-objects"
2083 msgstr "No se pudo crear los pack-objetcts"
2084
2061 -#: bundle.c:311
2085 +#: bundle.c:337
2086 msgid "pack-objects died"
2087 msgstr "pack-objects murió"
2088
2065 -#: bundle.c:353
2066 -msgid "rev-list died"
2067 -msgstr "rev-list murió"
2068 -
2069 -#: bundle.c:402
2089 +#: bundle.c:386
2090 #, c-format
2091 msgid "ref '%s' is excluded by the rev-list options"
2092 msgstr "referencia '%s' es excluida por las opciones de rev-list"
2093
2074 -#: bundle.c:481 builtin/log.c:208 builtin/log.c:1834 builtin/shortlog.c:306
2094 +#: bundle.c:490
2095 +#, c-format
2096 +msgid "unsupported bundle version %d"
2097 +msgstr "versión de bundle no soportada %d"
2098 +
2099 +#: bundle.c:492
2100 +#, c-format
2101 +msgid "cannot write bundle version %d with algorithm %s"
2102 +msgstr "no se puede escribir la versión de paquete %d con el algoritmo %s"
2103 +
2104 +#: bundle.c:510 builtin/log.c:210 builtin/log.c:1926 builtin/shortlog.c:396
2105 #, c-format
2106 msgid "unrecognized argument: %s"
2107 msgstr "argumento no reconocido: %s"
2108
2079 -#: bundle.c:489
2109 +#: bundle.c:539
2110 msgid "Refusing to create empty bundle."
2111 msgstr "Rechazando crear un bundle vacío."
2112
2083 -#: bundle.c:499
2113 +#: bundle.c:549
2114 #, c-format
2115 msgid "cannot create '%s'"
2116 msgstr "no se puede crear '%s'"
2117
2088 -#: bundle.c:524
2118 +#: bundle.c:574
2119 msgid "index-pack died"
2120 msgstr "index-pack murió"
2121
2122 +#: chunk-format.c:113
2123 +msgid "terminating chunk id appears earlier than expected"
2124 +msgstr "terminando porque el id del chunk aparece antes de lo esperado"
2125 +
2126 +#: chunk-format.c:122
2127 +#, c-format
2128 +msgid "improper chunk offset(s) %<PRIx64> and %<PRIx64>"
2129 +msgstr "offset para chunk incorrecto %<PRIx64> y %<PRIx64>"
2130 +
2131 +#: chunk-format.c:129
2132 +#, c-format
2133 +msgid "duplicate chunk ID %<PRIx32> found"
2134 +msgstr "se encontró ID de chuck %<PRIx32> duplicado"
2135 +
2136 +#: chunk-format.c:143
2137 +#, c-format
2138 +msgid "final chunk has non-zero id %<PRIx32>"
2139 +msgstr "chunk final tiene un id distinto de cero %<PRIx32>"
2140 +
2141 #: color.c:329
2142 #, c-format
2143 msgid "invalid color value: %.*s"
2144 msgstr "color inválido: %.*s"
2145
2097 -#: commit-graph.c:238
2146 +#: commit-graph.c:197 midx.c:46
2147 +msgid "invalid hash version"
2148 +msgstr "versión de hash inválida"
2149 +
2150 +#: commit-graph.c:255
2151 msgid "commit-graph file is too small"
2152 msgstr "archivo commit-graph es muy pequeño"
2153
2101 -#: commit-graph.c:303
2154 +#: commit-graph.c:348
2155 #, c-format
2156 msgid "commit-graph signature %X does not match signature %X"
2157 msgstr "firma %X en commit-graph no concuerda con firma %X"
2158
2106 -#: commit-graph.c:310
2159 +#: commit-graph.c:355
2160 #, c-format
2161 msgid "commit-graph version %X does not match version %X"
2162 msgstr "versión de commit-graph %X no concuerda con versión %X"
2163
2111 -#: commit-graph.c:317
2164 +#: commit-graph.c:362
2165 #, c-format
2166 msgid "commit-graph hash version %X does not match version %X"
2167 msgstr "versión de hash de commit-graph %X no concuerda con versión %X"
2168
2116 -#: commit-graph.c:339
2117 -msgid "commit-graph chunk lookup table entry missing; file may be incomplete"
2118 -msgstr ""
2119 -"falta tabla de lookup del chunk en commit-graph; el archivo puede estar "
2120 -"incompleto"
2121 -
2122 -#: commit-graph.c:349
2123 -#, c-format
2124 -msgid "commit-graph improper chunk offset %08x%08x"
2125 -msgstr "offset del chunk de commit-graph inapropiado %08x%08x"
2126 -
2127 -#: commit-graph.c:417
2169 +#: commit-graph.c:379
2170 #, c-format
2129 -msgid "commit-graph chunk id %08x appears multiple times"
2130 -msgstr "id de chunk de commit-graph %08x parece tener múltiples tiempos"
2171 +msgid "commit-graph file is too small to hold %u chunks"
2172 +msgstr "commit-graph file es demasiado pequeño para almacenar %u chunks"
2173
2132 -#: commit-graph.c:491
2174 +#: commit-graph.c:472
2175 msgid "commit-graph has no base graphs chunk"
2176 msgstr "commit-graph no tiene una chunk base de graphs"
2177
2136 -#: commit-graph.c:501
2178 +#: commit-graph.c:482
2179 msgid "commit-graph chain does not match"
2180 msgstr "cadena commit-graph no concuerda"
2181
2140 -#: commit-graph.c:549
2182 +#: commit-graph.c:530
2183 #, c-format
2184 msgid "invalid commit-graph chain: line '%s' not a hash"
2185 msgstr "cadena de commit-graph inválida: línea '%s' no es un hash"
2186
2145 -#: commit-graph.c:573
2187 +#: commit-graph.c:554
2188 msgid "unable to find all commit-graph files"
2189 msgstr "no es posible encontrar los archivos commit-graph"
2190
2149 -#: commit-graph.c:706 commit-graph.c:770
2191 +#: commit-graph.c:735 commit-graph.c:772
2192 msgid "invalid commit position. commit-graph is likely corrupt"
2193 msgstr "posición de commit inválida. commit-graph está probablemente corrupto"
2194
2153 -#: commit-graph.c:727
2195 +#: commit-graph.c:756
2196 #, c-format
2197 msgid "could not find commit %s"
2198 msgstr "no se pudo encontrar commit %s"
2199
2158 -#: commit-graph.c:1009 builtin/am.c:1292
2200 +#: commit-graph.c:789
2201 +msgid "commit-graph requires overflow generation data but has none"
2202 +msgstr ""
2203 +"commit-graph requiere datos de generación de desbordamiento pero no tiene "
2204 +"ninguno"
2205 +
2206 +#: commit-graph.c:1065 builtin/am.c:1292
2207 #, c-format
2208 msgid "unable to parse commit %s"
2209 msgstr "no es posible analizar el commit %s"
2210
2163 -#: commit-graph.c:1157
2164 -msgid "Writing changed paths Bloom filters index"
2165 -msgstr "Escribiendo cambios de ruta del índice de filtros Bloom"
2166 -
2167 -#: commit-graph.c:1182
2168 -msgid "Writing changed paths Bloom filters data"
2169 -msgstr "Escribiendo cambios de ruta de datos de filtros Bloom"
2170 -
2171 -#: commit-graph.c:1221 builtin/pack-objects.c:2832
2211 +#: commit-graph.c:1327 builtin/pack-objects.c:2872
2212 #, c-format
2213 msgid "unable to get type of object %s"
2214 msgstr "incapaz de obtener el tipo de objeto: %s"
2215
2176 -#: commit-graph.c:1257
2216 +#: commit-graph.c:1358
2217 msgid "Loading known commits in commit graph"
2218 msgstr "Cargando commits conocidos en commit graph"
2219
2180 -#: commit-graph.c:1274
2220 +#: commit-graph.c:1375
2221 msgid "Expanding reachable commits in commit graph"
2222 msgstr "Expandiendo commits alcanzables en commit graph"
2223
2184 -#: commit-graph.c:1294
2224 +#: commit-graph.c:1395
2225 msgid "Clearing commit marks in commit graph"
2226 msgstr "Limpiando marcas de commits en commit graph"
2227
2188 -#: commit-graph.c:1313
2228 +#: commit-graph.c:1414
2229 +msgid "Computing commit graph topological levels"
2230 +msgstr "Calculando niveles topológicos de commit graph"
2231 +
2232 +#: commit-graph.c:1467
2233 msgid "Computing commit graph generation numbers"
2234 msgstr "Calculando números de generación de commit graph"
2235
2192 -#: commit-graph.c:1367
2236 +#: commit-graph.c:1548
2237 msgid "Computing commit changed paths Bloom filters"
2238 msgstr "Calculando números de generación de commit graph"
2239
2196 -#: commit-graph.c:1423
2240 +#: commit-graph.c:1625
2241 msgid "Collecting referenced commits"
2242 msgstr "Recolectando commits referenciados"
2243
2200 -#: commit-graph.c:1447
2244 +#: commit-graph.c:1650
2245 #, c-format
2246 msgid "Finding commits for commit graph in %d pack"
2247 msgid_plural "Finding commits for commit graph in %d packs"
2248 msgstr[0] "Encontrando commits para commit graph en %d pack"
2249 msgstr[1] "Encontrando commits para commit graph en %d packs"
2250
2207 -#: commit-graph.c:1460
2251 +#: commit-graph.c:1663
2252 #, c-format
2253 msgid "error adding pack %s"
2254 msgstr "error agregando pack %s"
2255
2212 -#: commit-graph.c:1464
2256 +#: commit-graph.c:1667
2257 #, c-format
2258 msgid "error opening index for %s"
2259 msgstr "error abriendo index para %s"
2260
2217 -#: commit-graph.c:1503
2261 +#: commit-graph.c:1704
2262 msgid "Finding commits for commit graph among packed objects"
2263 msgstr "Encontrando commits para commit graph entre los objetos empaquetados"
2264
2221 -#: commit-graph.c:1518
2222 -msgid "Counting distinct commits in commit graph"
2223 -msgstr "Contando commits distintos en commit graph"
2224 -
2225 -#: commit-graph.c:1550
2265 +#: commit-graph.c:1722
2266 msgid "Finding extra edges in commit graph"
2267 msgstr "Encontrando esquinas extra en commit graph"
2268
2229 -#: commit-graph.c:1599
2269 +#: commit-graph.c:1771
2270 msgid "failed to write correct number of base graph ids"
2271 msgstr "falló al escribir el número correcto de ids de base graph"
2272
2233 -#: commit-graph.c:1633 midx.c:812
2273 +#: commit-graph.c:1802 midx.c:794
2274 #, c-format
2275 msgid "unable to create leading directories of %s"
2276 msgstr "no se pudo crear directorios principales para %s"
2277
2238 -#: commit-graph.c:1646
2278 +#: commit-graph.c:1815
2279 msgid "unable to create temporary graph layer"
2280 msgstr "no es posible crear un una capa de gráfico temporal"
2281
2242 -#: commit-graph.c:1651
2282 +#: commit-graph.c:1820
2283 #, c-format
2284 msgid "unable to adjust shared permissions for '%s'"
2285 msgstr "no se pudo poner permisos a '%s'"
2286
2247 -#: commit-graph.c:1728
2287 +#: commit-graph.c:1879
2288 #, c-format
2289 msgid "Writing out commit graph in %d pass"
2290 msgid_plural "Writing out commit graph in %d passes"
2291 msgstr[0] "Escribiendo commit graph en %d paso"
2292 msgstr[1] "Escribiendo commit graph en %d pasos"
2293
2254 -#: commit-graph.c:1773
2294 +#: commit-graph.c:1915
2295 msgid "unable to open commit-graph chain file"
2296 msgstr "no se pudo abrir la cadena de archivos commit-graph"
2297
2258 -#: commit-graph.c:1789
2298 +#: commit-graph.c:1931
2299 msgid "failed to rename base commit-graph file"
2300 msgstr "no se pudo renombrar el archivo base commit-graph"
2301
2262 -#: commit-graph.c:1809
2302 +#: commit-graph.c:1951
2303 msgid "failed to rename temporary commit-graph file"
2304 msgstr "falló al renombrar el archivo temporal commit-graph"
2305
2266 -#: commit-graph.c:1935
2306 +#: commit-graph.c:2084
2307 msgid "Scanning merged commits"
2308 msgstr "Escaneando commits fusionados"
2309
2270 -#: commit-graph.c:1946
2271 -#, c-format
2272 -msgid "unexpected duplicate commit id %s"
2273 -msgstr "id de commit duplicado inesperado %s"
2274 -
2275 -#: commit-graph.c:1969
2310 +#: commit-graph.c:2128
2311 msgid "Merging commit-graph"
2312 msgstr "Fusionando commit-graph"
2313
2279 -#: commit-graph.c:2156
2280 -#, c-format
2281 -msgid "the commit graph format cannot write %d commits"
2282 -msgstr "el formato de gráficos de commit no pudede escribir %d commits"
2314 +#: commit-graph.c:2235
2315 +msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled"
2316 +msgstr ""
2317 +"intentando escribir un commit-graph, pero 'core.commitGraph' está "
2318 +"deshabilitado"
2319
2284 -#: commit-graph.c:2167
2320 +#: commit-graph.c:2342
2321 msgid "too many commits to write graph"
2322 msgstr "demasiados commits para escribir el gráfico"
2323
2288 -#: commit-graph.c:2260
2324 +#: commit-graph.c:2440
2325 msgid "the commit-graph file has incorrect checksum and is likely corrupt"
2326 msgstr ""
2327 "el archivo de commit-graph tiene checksums incorrectos y probablemente está "
2328 "corrupto"
2329
2294 -#: commit-graph.c:2270
2330 +#: commit-graph.c:2450
2331 #, c-format
2332 msgid "commit-graph has incorrect OID order: %s then %s"
2333 msgstr "commit-graph tiene un orden de OID incorrecto: %s luego %s"
2334
2299 -#: commit-graph.c:2280 commit-graph.c:2295
2335 +#: commit-graph.c:2460 commit-graph.c:2475
2336 #, c-format
2337 msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
2338 msgstr "commit-graph tiene un valor fanout incorrecto: fanout[%d] = %u != %u"
2339
2304 -#: commit-graph.c:2287
2340 +#: commit-graph.c:2467
2341 #, c-format
2342 msgid "failed to parse commit %s from commit-graph"
2343 msgstr "falló al analizar commit %s para commit-graph"
2344
2309 -#: commit-graph.c:2305
2345 +#: commit-graph.c:2485
2346 msgid "Verifying commits in commit graph"
2347 msgstr "Verificando commits en commit graph"
2348
2313 -#: commit-graph.c:2320
2349 +#: commit-graph.c:2500
2350 #, c-format
2351 msgid "failed to parse commit %s from object database for commit-graph"
2352 msgstr ""
2353 "falló al analizar el commit %s de la base de datos de objetos para commit-"
2354 "graph"
2355
2320 -#: commit-graph.c:2327
2356 +#: commit-graph.c:2507
2357 #, c-format
2358 msgid "root tree OID for commit %s in commit-graph is %s != %s"
2359 msgstr "árbol raíz OID para commit %s en commit-graph es %s != %s"
2360
2325 -#: commit-graph.c:2337
2361 +#: commit-graph.c:2517
2362 #, c-format
2363 msgid "commit-graph parent list for commit %s is too long"
2364 msgstr "lista padre de commit-graph para commit %s es muy larga"
2365
2330 -#: commit-graph.c:2346
2366 +#: commit-graph.c:2526
2367 #, c-format
2368 msgid "commit-graph parent for %s is %s != %s"
2369 msgstr "padre de commit-graph para %s es %s != %s"
2370
2335 -#: commit-graph.c:2360
2371 +#: commit-graph.c:2540
2372 #, c-format
2373 msgid "commit-graph parent list for commit %s terminates early"
2374 msgstr "lista padre de commit-graph para commit %s termina antes"
2375
2340 -#: commit-graph.c:2365
2376 +#: commit-graph.c:2545
2377 #, c-format
2378 msgid ""
2379 "commit-graph has generation number zero for commit %s, but non-zero elsewhere"
2380 msgstr ""
2381 "commit-graph ha generado número cero para %s, pero no-cero para los demás"
2382
2347 -#: commit-graph.c:2369
2383 +#: commit-graph.c:2549
2384 #, c-format
2385 msgid ""
2386 "commit-graph has non-zero generation number for commit %s, but zero elsewhere"
2387 msgstr ""
2388 "commit-graph tiene generación no-cero para %s, pero cero para los demás"
2389
2354 -#: commit-graph.c:2385
2390 +#: commit-graph.c:2566
2391 #, c-format
2356 -msgid "commit-graph generation for commit %s is %u != %u"
2357 -msgstr "generación commit-graph para commit %s es %u != %u"
2392 +msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>"
2393 +msgstr "generación commit-graph para commit %s es %<PRIuMAX> < %<PRIuMAX>"
2394
2359 -#: commit-graph.c:2391
2395 +#: commit-graph.c:2572
2396 #, c-format
2397 msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
2398 msgstr ""
2399 "fecha de commit para commit %s en commit-graph es %<PRIuMAX> != %<PRIuMAX>"
2400
2365 -#: commit.c:52 sequencer.c:2739 builtin/am.c:359 builtin/am.c:403
2366 -#: builtin/am.c:1371 builtin/am.c:2013 builtin/replace.c:457
2401 +#: commit.c:52 sequencer.c:2887 builtin/am.c:359 builtin/am.c:403
2402 +#: builtin/am.c:1371 builtin/am.c:2018 builtin/replace.c:457
2403 #, c-format
2404 msgid "could not parse %s"
2405 msgstr "no se puede analizar %s"
@@ -2393,27 +2429,27 @@ msgstr ""
2429 "Apapa este mensaje ejecutando\n"
2430 "\"git config advice.graftFileDeprecated false\""
2431
2396 -#: commit.c:1172
2432 +#: commit.c:1223
2433 #, c-format
2434 msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
2435 msgstr "Commit %s tiene una firma GPG no confiable, pretendidamente por %s."
2436
2401 -#: commit.c:1176
2437 +#: commit.c:1227
2438 #, c-format
2439 msgid "Commit %s has a bad GPG signature allegedly by %s."
2440 msgstr "Commit %s tiene una mala firma GPG pretendidamente por %s."
2441
2406 -#: commit.c:1179
2442 +#: commit.c:1230
2443 #, c-format
2444 msgid "Commit %s does not have a GPG signature."
2445 msgstr "Commit %s no tiene una firma GPG."
2446
2411 -#: commit.c:1182
2447 +#: commit.c:1233
2448 #, c-format
2449 msgid "Commit %s has a good GPG signature by %s\n"
2450 msgstr "El Commit %s tiene una buena firma GPG por %s\n"
2451
2416 -#: commit.c:1436
2452 +#: commit.c:1487
2453 msgid ""
2454 "Warning: commit message did not conform to UTF-8.\n"
2455 "You may want to amend it after fixing the message, or set the config\n"
@@ -2428,7 +2464,7 @@ msgstr ""
2464 msgid "memory exhausted"
2465 msgstr "memoria agotada"
2466
2431 -#: config.c:125
2467 +#: config.c:126
2468 #, c-format
2469 msgid ""
2470 "exceeded maximum include depth (%d) while including\n"
@@ -2443,293 +2479,337 @@ msgstr ""
2479 "\t%s\n"
2480 "Esto puede ser causado por inclusiones circulares."
2481
2446 -#: config.c:141
2482 +#: config.c:142
2483 #, c-format
2484 msgid "could not expand include path '%s'"
2485 msgstr "no se pudo expandir rutas de inclusión '%s'"
2486
2451 -#: config.c:152
2487 +#: config.c:153
2488 msgid "relative config includes must come from files"
2489 msgstr "inclusiones de configuración relativas tienen que venir de archivos"
2490
2455 -#: config.c:198
2491 +#: config.c:199
2492 msgid "relative config include conditionals must come from files"
2493 msgstr ""
2494 "la configuración relativa incluye condicionales que deben venir de archivos"
2495
2460 -#: config.c:378
2496 +#: config.c:396
2497 +#, c-format
2498 +msgid "invalid config format: %s"
2499 +msgstr "formato config inválido: %s"
2500 +
2501 +#: config.c:400
2502 +#, c-format
2503 +msgid "missing environment variable name for configuration '%.*s'"
2504 +msgstr "falta el nombre de la variable de entorno para la configuración '%.*s'"
2505 +
2506 +#: config.c:405
2507 +#, c-format
2508 +msgid "missing environment variable '%s' for configuration '%.*s'"
2509 +msgstr "Falta la variable de entorno '%s' para la configuración '%.*s'"
2510 +
2511 +#: config.c:442
2512 #, c-format
2513 msgid "key does not contain a section: %s"
2514 msgstr "llave no contiene una sección: %s"
2515
2465 -#: config.c:384
2516 +#: config.c:448
2517 #, c-format
2518 msgid "key does not contain variable name: %s"
2519 msgstr "llave no contiene el nombre de variable: %s"
2520
2470 -#: config.c:408 sequencer.c:2456
2521 +#: config.c:472 sequencer.c:2588
2522 #, c-format
2523 msgid "invalid key: %s"
2524 msgstr "llave inválida: %s"
2525
2475 -#: config.c:414
2526 +#: config.c:478
2527 #, c-format
2528 msgid "invalid key (newline): %s"
2529 msgstr "llave inválida (nueva línea): %s"
2530
2480 -#: config.c:450 config.c:462
2531 +#: config.c:511
2532 +msgid "empty config key"
2533 +msgstr "clave de config vacía"
2534 +
2535 +#: config.c:529 config.c:541
2536 #, c-format
2537 msgid "bogus config parameter: %s"
2538 msgstr "parámetro de configuración malogrado: %s"
2539
2485 -#: config.c:497
2540 +#: config.c:555 config.c:572 config.c:579 config.c:588
2541 #, c-format
2542 msgid "bogus format in %s"
2543 msgstr "formato malogrado en %s"
2544
2490 -#: config.c:836
2545 +#: config.c:622
2546 +#, c-format
2547 +msgid "bogus count in %s"
2548 +msgstr "conteo malogrado en %s"
2549 +
2550 +#: config.c:626
2551 +#, c-format
2552 +msgid "too many entries in %s"
2553 +msgstr "demasiadas entradas en %s"
2554 +
2555 +#: config.c:636
2556 +#, c-format
2557 +msgid "missing config key %s"
2558 +msgstr "llave de configuración faltante %s"
2559 +
2560 +#: config.c:644
2561 +#, c-format
2562 +msgid "missing config value %s"
2563 +msgstr "valor de config faltante para %s"
2564 +
2565 +#: config.c:995
2566 #, c-format
2567 msgid "bad config line %d in blob %s"
2568 msgstr "mala línea de config %d en el blob %s"
2569
2495 -#: config.c:840
2570 +#: config.c:999
2571 #, c-format
2572 msgid "bad config line %d in file %s"
2573 msgstr "mala línea de config %d en el archivo %s"
2574
2500 -#: config.c:844
2575 +#: config.c:1003
2576 #, c-format
2577 msgid "bad config line %d in standard input"
2578 msgstr "mala línea de config %d en la entrada standard"
2579
2505 -#: config.c:848
2580 +#: config.c:1007
2581 #, c-format
2582 msgid "bad config line %d in submodule-blob %s"
2583 msgstr "mala línea de config %d en el submódulo-blob %s"
2584
2510 -#: config.c:852
2585 +#: config.c:1011
2586 #, c-format
2587 msgid "bad config line %d in command line %s"
2588 msgstr "mala línea de config %d en la línea de comando %s"
2589
2515 -#: config.c:856
2590 +#: config.c:1015
2591 #, c-format
2592 msgid "bad config line %d in %s"
2593 msgstr "mala línea de config %d en %s"
2594
2520 -#: config.c:993
2595 +#: config.c:1152
2596 msgid "out of range"
2597 msgstr "fuera de rango"
2598
2524 -#: config.c:993
2599 +#: config.c:1152
2600 msgid "invalid unit"
2601 msgstr "unidad inválida"
2602
2528 -#: config.c:994
2603 +#: config.c:1153
2604 #, c-format
2605 msgid "bad numeric config value '%s' for '%s': %s"
2606 msgstr "mal valor de config numérica '%s' para '%s': %s"
2607
2533 -#: config.c:1013
2608 +#: config.c:1163
2609 #, c-format
2610 msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
2611 msgstr "mal valor de config numérica '%s' para '%s' en el blob %s: %s"
2612
2538 -#: config.c:1016
2613 +#: config.c:1166
2614 #, c-format
2615 msgid "bad numeric config value '%s' for '%s' in file %s: %s"
2616 msgstr "mal valor de config numérica '%s' para '%s' en el archivo %s: %s"
2617
2543 -#: config.c:1019
2618 +#: config.c:1169
2619 #, c-format
2620 msgid "bad numeric config value '%s' for '%s' in standard input: %s"
2621 msgstr "mal valor de config numérica '%s' para '%s' en la entrada standard: %s"
2622
2548 -#: config.c:1022
2623 +#: config.c:1172
2624 #, c-format
2625 msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
2626 msgstr ""
2627 "mal valor de config numérica '%s' para '%s' en el submódulo-blob %s: %s"
2628
2554 -#: config.c:1025
2629 +#: config.c:1175
2630 #, c-format
2631 msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
2632 msgstr ""
2633 "mal valor de config numérica '%s' para '%s' en la línea de comando %s: %s"
2634
2560 -#: config.c:1028
2635 +#: config.c:1178
2636 #, c-format
2637 msgid "bad numeric config value '%s' for '%s' in %s: %s"
2638 msgstr "mal valor de config numérica '%s' para '%s' en %s: %s"
2639
2565 -#: config.c:1123
2640 +#: config.c:1194
2641 +#, c-format
2642 +msgid "bad boolean config value '%s' for '%s'"
2643 +msgstr "mal valor de config booleana '%s' para '%s'"
2644 +
2645 +#: config.c:1289
2646 #, c-format
2647 msgid "failed to expand user dir in: '%s'"
2648 msgstr "falló al expandir el directorio de usuario en: '%s'"
2649
2570 -#: config.c:1132
2650 +#: config.c:1298
2651 #, c-format
2652 msgid "'%s' for '%s' is not a valid timestamp"
2653 msgstr "'%s' para '%s' no es una marca de tiempo válida"
2654
2575 -#: config.c:1223
2655 +#: config.c:1391
2656 #, c-format
2657 msgid "abbrev length out of range: %d"
2658 msgstr "largo de abreviatura fuera de rango: %d"
2659
2580 -#: config.c:1237 config.c:1248
2660 +#: config.c:1405 config.c:1416
2661 #, c-format
2662 msgid "bad zlib compression level %d"
2663 msgstr "nivel de compresión de zlib erróneo %d"
2664
2585 -#: config.c:1340
2665 +#: config.c:1508
2666 msgid "core.commentChar should only be one character"
2667 msgstr "core.commentChar debería tener solo un caracter"
2668
2589 -#: config.c:1373
2669 +#: config.c:1541
2670 #, c-format
2671 msgid "invalid mode for object creation: %s"
2672 msgstr "modo inválido de creación de objetos: %s"
2673
2594 -#: config.c:1445
2674 +#: config.c:1613
2675 #, c-format
2676 msgid "malformed value for %s"
2677 msgstr "valor malformado para %s"
2678
2599 -#: config.c:1471
2679 +#: config.c:1639
2680 #, c-format
2681 msgid "malformed value for %s: %s"
2682 msgstr "valor malformado para %s: %s"
2683
2604 -#: config.c:1472
2684 +#: config.c:1640
2685 msgid "must be one of nothing, matching, simple, upstream or current"
2686 msgstr "debe ser uno de nothing, matching, simple, upstream o current"
2687
2608 -#: config.c:1533 builtin/pack-objects.c:3617
2688 +#: config.c:1701 builtin/pack-objects.c:3666
2689 #, c-format
2690 msgid "bad pack compression level %d"
2691 msgstr "nivel de compresión de pack erróneo %d"
2692
2613 -#: config.c:1655
2693 +#: config.c:1823
2694 #, c-format
2695 msgid "unable to load config blob object '%s'"
2696 msgstr "incapaz de cargar configuración de objeto blob '%s'"
2697
2618 -#: config.c:1658
2698 +#: config.c:1826
2699 #, c-format
2700 msgid "reference '%s' does not point to a blob"
2701 msgstr "referencia '%s' no apunta a un blob"
2702
2623 -#: config.c:1675
2703 +#: config.c:1843
2704 #, c-format
2705 msgid "unable to resolve config blob '%s'"
2706 msgstr "no se posible resolver configuración de blob '%s'"
2707
2628 -#: config.c:1705
2708 +#: config.c:1873
2709 #, c-format
2710 msgid "failed to parse %s"
2711 msgstr "no se pudo analizar %s"
2712
2633 -#: config.c:1759
2713 +#: config.c:1927
2714 msgid "unable to parse command-line config"
2715 msgstr "no es posible analizar la configuración de la línea de comando"
2716
2637 -#: config.c:2113
2717 +#: config.c:2290
2718 msgid "unknown error occurred while reading the configuration files"
2719 msgstr ""
2720 "error desconocido ocurrió mientras se leían los archivos de configuración"
2721
2642 -#: config.c:2283
2722 +#: config.c:2464
2723 #, c-format
2724 msgid "Invalid %s: '%s'"
2725 msgstr "Inválido %s: '%s'"
2726
2647 -#: config.c:2328
2727 +#: config.c:2509
2728 #, c-format
2729 msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
2730 msgstr "valor splitIndex.maxPercentChange '%d' debe estar entre 0 y 100"
2731
2652 -#: config.c:2374
2732 +#: config.c:2555
2733 #, c-format
2734 msgid "unable to parse '%s' from command-line config"
2735 msgstr "no es posible analizar '%s' de la configuración de la línea de comando"
2736
2657 -#: config.c:2376
2737 +#: config.c:2557
2738 #, c-format
2739 msgid "bad config variable '%s' in file '%s' at line %d"
2740 msgstr "mala variable de config '%s' en el archivo '%s' en la línea %d"
2741
2662 -#: config.c:2457
2742 +#: config.c:2641
2743 #, c-format
2744 msgid "invalid section name '%s'"
2745 msgstr "nombre de sección inválido '%s'"
2746
2667 -#: config.c:2489
2747 +#: config.c:2673
2748 #, c-format
2749 msgid "%s has multiple values"
2750 msgstr "%s tiene múltiples valores"
2751
2672 -#: config.c:2518
2752 +#: config.c:2702
2753 #, c-format
2754 msgid "failed to write new configuration file %s"
2755 msgstr "falló al escribir nuevo archivo de configuración %s"
2756
2677 -#: config.c:2770 config.c:3094
2757 +#: config.c:2954 config.c:3280
2758 #, c-format
2759 msgid "could not lock config file %s"
2760 msgstr "no se pudo bloquear archivo de configuración %s"
2761
2682 -#: config.c:2781
2762 +#: config.c:2965
2763 #, c-format
2764 msgid "opening %s"
2765 msgstr "abriendo %s"
2766
2687 -#: config.c:2816 builtin/config.c:344
2767 +#: config.c:3002 builtin/config.c:361
2768 #, c-format
2769 msgid "invalid pattern: %s"
2770 msgstr "patrón inválido: %s"
2771
2692 -#: config.c:2841
2772 +#: config.c:3027
2773 #, c-format
2774 msgid "invalid config file %s"
2775 msgstr "archivo de configuración inválido: %s"
2776
2697 -#: config.c:2854 config.c:3107
2777 +#: config.c:3040 config.c:3293
2778 #, c-format
2779 msgid "fstat on %s failed"
2780 msgstr "fstat en %s falló"
2781
2702 -#: config.c:2865
2782 +#: config.c:3051
2783 #, c-format
2784 msgid "unable to mmap '%s'"
2785 msgstr "no es posible hacer mmap '%s'"
2786
2707 -#: config.c:2874 config.c:3112
2787 +#: config.c:3060 config.c:3298
2788 #, c-format
2789 msgid "chmod on %s failed"
2790 msgstr "chmod en %s falló"
2791
2712 -#: config.c:2959 config.c:3209
2792 +#: config.c:3145 config.c:3395
2793 #, c-format
2794 msgid "could not write config file %s"
2795 msgstr "no se pudo escribir el archivo de configuración %s"
2796
2717 -#: config.c:2993
2797 +#: config.c:3179
2798 #, c-format
2799 msgid "could not set '%s' to '%s'"
2800 msgstr "no se pudo configurar '%s' a '%s'"
2801
2722 -#: config.c:2995 builtin/remote.c:655 builtin/remote.c:849 builtin/remote.c:857
2802 +#: config.c:3181 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863
2803 #, c-format
2804 msgid "could not unset '%s'"
2805 msgstr "no se pudo desactivar '%s'"
2806
2727 -#: config.c:3085
2807 +#: config.c:3271
2808 #, c-format
2809 msgid "invalid section name: %s"
2810 msgstr "sección de nombre inválida: %s"
2811
2732 -#: config.c:3252
2812 +#: config.c:3438
2813 #, c-format
2814 msgid "missing value for '%s'"
2815 msgstr "valor faltante para '%s'"
@@ -2791,45 +2871,45 @@ msgstr "paquete inválido"
2871 msgid "protocol error: unexpected '%s'"
2872 msgstr "error de protocolo: '%s' inesperado"
2873
2794 -#: connect.c:473
2874 +#: connect.c:497
2875 #, c-format
2876 msgid "unknown object format '%s' specified by server"
2877 msgstr "formato de objeto desconocido '%s' ha sido provisto por el servidor"
2878
2799 -#: connect.c:500
2879 +#: connect.c:526
2880 #, c-format
2881 msgid "invalid ls-refs response: %s"
2882 msgstr "respuesta de referencias ls-refs inválida: %s"
2883
2804 -#: connect.c:504
2884 +#: connect.c:530
2885 msgid "expected flush after ref listing"
2886 msgstr "flush esperado tras listado de refs"
2887
2808 -#: connect.c:507
2888 +#: connect.c:533
2889 msgid "expected response end packet after ref listing"
2890 msgstr "se esperaba un paquete final luego del ref listing"
2891
2812 -#: connect.c:640
2892 +#: connect.c:666
2893 #, c-format
2894 msgid "protocol '%s' is not supported"
2895 msgstr "protocolo '%s' no es soportado"
2896
2817 -#: connect.c:691
2897 +#: connect.c:717
2898 msgid "unable to set SO_KEEPALIVE on socket"
2899 msgstr "no es posible configurar SO_KEEPALIVE en el socket"
2900
2821 -#: connect.c:731 connect.c:794
2901 +#: connect.c:757 connect.c:820
2902 #, c-format
2903 msgid "Looking up %s ... "
2904 msgstr "Revisando %s... "
2905
2826 -#: connect.c:735
2906 +#: connect.c:761
2907 #, c-format
2908 msgid "unable to look up %s (port %s) (%s)"
2909 msgstr "no se puede revisar %s (puerto %s) (%s)"
2910
2911 #. TRANSLATORS: this is the end of "Looking up %s ... "
2832 -#: connect.c:739 connect.c:810
2912 +#: connect.c:765 connect.c:836
2913 #, c-format
2914 msgid ""
2915 "done.\n"
@@ -2838,7 +2918,7 @@ msgstr ""
2918 "hecho.\n"
2919 "Conectando a %s (puerto %s) ... "
2920
2841 -#: connect.c:761 connect.c:838
2921 +#: connect.c:787 connect.c:864
2922 #, c-format
2923 msgid ""
2924 "unable to connect to %s:\n"
@@ -2848,74 +2928,78 @@ msgstr ""
2928 "%s"
2929
2930 #. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
2851 -#: connect.c:767 connect.c:844
2931 +#: connect.c:793 connect.c:870
2932 msgid "done."
2933 msgstr "hecho."
2934
2855 -#: connect.c:798
2935 +#: connect.c:824
2936 #, c-format
2937 msgid "unable to look up %s (%s)"
2938 msgstr "no es posible revisar %s (%s)"
2939
2860 -#: connect.c:804
2940 +#: connect.c:830
2941 #, c-format
2942 msgid "unknown port %s"
2943 msgstr "puerto desconocido %s"
2944
2865 -#: connect.c:941 connect.c:1271
2945 +#: connect.c:967 connect.c:1299
2946 #, c-format
2947 msgid "strange hostname '%s' blocked"
2948 msgstr "hostname extraño '%s' bloqueado"
2949
2870 -#: connect.c:943
2950 +#: connect.c:969
2951 #, c-format
2952 msgid "strange port '%s' blocked"
2953 msgstr "puerto extraño '%s' bloqueado"
2954
2875 -#: connect.c:953
2955 +#: connect.c:979
2956 #, c-format
2957 msgid "cannot start proxy %s"
2958 msgstr "no se puede comenzar proxy %s"
2959
2880 -#: connect.c:1024
2960 +#: connect.c:1050
2961 msgid "no path specified; see 'git help pull' for valid url syntax"
2962 msgstr ""
2963 "no hay ruta especificada; vea 'git help pull' para sintaxis de url válidas"
2964
2885 -#: connect.c:1219
2965 +#: connect.c:1190
2966 +msgid "newline is forbidden in git:// hosts and repo paths"
2967 +msgstr "la nueva línea está prohibida en git://hosts y rutas de repositorio"
2968 +
2969 +#: connect.c:1247
2970 msgid "ssh variant 'simple' does not support -4"
2971 msgstr "variante 'simple' de ssh no soporta -4"
2972
2889 -#: connect.c:1231
2973 +#: connect.c:1259
2974 msgid "ssh variant 'simple' does not support -6"
2975 msgstr "variante 'simple' de ssh no soporta -6"
2976
2893 -#: connect.c:1248
2977 +#: connect.c:1276
2978 msgid "ssh variant 'simple' does not support setting port"
2979 msgstr "variante ssh 'simple' no soporta configurar puerto"
2980
2897 -#: connect.c:1360
2981 +#: connect.c:1388
2982 #, c-format
2983 msgid "strange pathname '%s' blocked"
2984 msgstr "ruta extraña '%s' bloqueada"
2985
2902 -#: connect.c:1407
2986 +#: connect.c:1436
2987 msgid "unable to fork"
2988 msgstr "no es posible hacer fork"
2989
2906 -#: connected.c:109 builtin/fsck.c:209 builtin/prune.c:45
2990 +#: connected.c:108 builtin/fsck.c:191 builtin/prune.c:45
2991 msgid "Checking connectivity"
2992 msgstr "Verificando conectividad"
2993
2910 -#: connected.c:121
2994 +#: connected.c:120
2995 msgid "Could not run 'git rev-list'"
2996 msgstr "No se pudo correr 'git rev-list'"
2997
2914 -#: connected.c:141
2998 +#: connected.c:144
2999 msgid "failed write to rev-list"
3000 msgstr "falló escribir a rev-list"
3001
2918 -#: connected.c:148
3002 +#: connected.c:149
3003 msgid "failed to close rev-list's stdin"
3004 msgstr "falló al cerrar la entrada standard de rev-list"
3005
@@ -2990,40 +3074,40 @@ msgstr "falló al codificar '%s' de %s a %s"
3074 msgid "encoding '%s' from %s to %s and back is not the same"
3075 msgstr "codificación '%s' de %s a %s y de vuelta no son iguales"
3076
2993 -#: convert.c:668
3077 +#: convert.c:665
3078 #, c-format
3079 msgid "cannot fork to run external filter '%s'"
3080 msgstr "no se puede hacer fork para ejecutar filtros externos '%s'"
3081
2998 -#: convert.c:688
3082 +#: convert.c:685
3083 #, c-format
3084 msgid "cannot feed the input to external filter '%s'"
3085 msgstr "no se pueden alimentar de input a los filtros externos '%s'"
3086
3003 -#: convert.c:695
3087 +#: convert.c:692
3088 #, c-format
3089 msgid "external filter '%s' failed %d"
3090 msgstr "filtro externo '%s' falló %d"
3091
3008 -#: convert.c:730 convert.c:733
3092 +#: convert.c:727 convert.c:730
3093 #, c-format
3094 msgid "read from external filter '%s' failed"
3095 msgstr "lectura de filtro externo '%s' falló"
3096
3013 -#: convert.c:736 convert.c:791
3097 +#: convert.c:733 convert.c:788
3098 #, c-format
3099 msgid "external filter '%s' failed"
3100 msgstr "filtro externo '%s' falló"
3101
3018 -#: convert.c:840
3102 +#: convert.c:837
3103 msgid "unexpected filter type"
3104 msgstr "tipo de filtro inesperado"
3105
3022 -#: convert.c:851
3106 +#: convert.c:848
3107 msgid "path name too long for external filter"
3108 msgstr "nombre de ruta muy largo para filtro externo"
3109
3026 -#: convert.c:943
3110 +#: convert.c:940
3111 #, c-format
3112 msgid ""
3113 "external filter '%s' is not available anymore although not all paths have "
@@ -3032,16 +3116,16 @@ msgstr ""
3116 "filtro externo '%s' ya no está disponible aunque no todas las rutas han sido "
3117 "filtradas"
3118
3035 -#: convert.c:1243
3119 +#: convert.c:1240
3120 msgid "true/false are no valid working-tree-encodings"
3121 msgstr "true/false no son working-tree-encodings válidos"
3122
3039 -#: convert.c:1431 convert.c:1465
3123 +#: convert.c:1428 convert.c:1462
3124 #, c-format
3125 msgid "%s: clean filter '%s' failed"
3126 msgstr "%s: falló al limpiar filtro '%s'"
3127
3044 -#: convert.c:1511
3128 +#: convert.c:1508
3129 #, c-format
3130 msgid "%s: smudge filter %s failed"
3131 msgstr "%s: filtro smudge %s falló"
@@ -3059,17 +3143,17 @@ msgstr "rehusando trabajar con credenciales faltantes en el campo host"
3143 msgid "refusing to work with credential missing protocol field"
3144 msgstr "rehusando trabajar con credenciales faltantes en el campo protocolo"
3145
3062 -#: credential.c:396
3146 +#: credential.c:394
3147 #, c-format
3148 msgid "url contains a newline in its %s component: %s"
3149 msgstr "url contiene un espace de línea en su componente %s: %s"
3150
3067 -#: credential.c:440
3151 +#: credential.c:438
3152 #, c-format
3153 msgid "url has no scheme: %s"
3154 msgstr "url no tiene scheme: %s"
3155
3072 -#: credential.c:513
3156 +#: credential.c:511
3157 #, c-format
3158 msgid "credential url cannot be parsed: %s"
3159 msgstr "url credencial no puede ser analizada: %s"
@@ -3166,6 +3250,31 @@ msgstr "regex isla de config tiene muchos grupos de captura (max=%d)"
3250 msgid "Marked %d islands, done.\n"
3251 msgstr "%d islas marcadas, listo.\n"
3252
3253 +#: diff-merges.c:70
3254 +#, c-format
3255 +msgid "unknown value for --diff-merges: %s"
3256 +msgstr "valor desconocido para --diff-merges: %s"
3257 +
3258 +#: diff-lib.c:534
3259 +msgid "--merge-base does not work with ranges"
3260 +msgstr "--merge-base no funciona con rangos"
3261 +
3262 +#: diff-lib.c:536
3263 +msgid "--merge-base only works with commits"
3264 +msgstr "--merge-base solo funciona con confirmaciones"
3265 +
3266 +#: diff-lib.c:553
3267 +msgid "unable to get HEAD"
3268 +msgstr "no es posible obtener HEAD"
3269 +
3270 +#: diff-lib.c:560
3271 +msgid "no merge base found"
3272 +msgstr "no se encontró base de fusión"
3273 +
3274 +#: diff-lib.c:562
3275 +msgid "multiple merge bases found"
3276 +msgstr "múltiples bases de fusión encontradas"
3277 +
3278 #: diff-no-index.c:238
3279 msgid "git diff --no-index [<options>] <path> <path>"
3280 msgstr "git diff --no-index [<opciones>] <path> <path>"
@@ -3229,35 +3338,35 @@ msgstr ""
3338 "Errores en la variable de config 'diff.dirstat' encontrados:\n"
3339 "%s"
3340
3232 -#: diff.c:4243
3341 +#: diff.c:4276
3342 #, c-format
3343 msgid "external diff died, stopping at %s"
3344 msgstr "diff externo murió, deteniendo en %s"
3345
3237 -#: diff.c:4589
3346 +#: diff.c:4628
3347 msgid "--name-only, --name-status, --check and -s are mutually exclusive"
3348 msgstr "--name-only, --name-status, --check y -s son mutuamente exclusivas"
3349
3241 -#: diff.c:4592
3350 +#: diff.c:4631
3351 msgid "-G, -S and --find-object are mutually exclusive"
3352 msgstr "-G, -S y --find-object son mutuamente exclusivas"
3353
3245 -#: diff.c:4670
3354 +#: diff.c:4710
3355 msgid "--follow requires exactly one pathspec"
3356 msgstr "--follow requiere exactamente un pathspec"
3357
3249 -#: diff.c:4718
3358 +#: diff.c:4758
3359 #, c-format
3360 msgid "invalid --stat value: %s"
3361 msgstr "valor --stat inválido: %s"
3362
3254 -#: diff.c:4723 diff.c:4728 diff.c:4733 diff.c:4738 diff.c:5250
3255 -#: parse-options.c:197 parse-options.c:201
3363 +#: diff.c:4763 diff.c:4768 diff.c:4773 diff.c:4778 diff.c:5306
3364 +#: parse-options.c:197 parse-options.c:201 builtin/commit-graph.c:180
3365 #, c-format
3366 msgid "%s expects a numerical value"
3367 msgstr "%s espera un valor numérico"
3368
3260 -#: diff.c:4755
3369 +#: diff.c:4795
3370 #, c-format
3371 msgid ""
3372 "Failed to parse --dirstat/-X option parameter:\n"
@@ -3266,42 +3375,42 @@ msgstr ""
3375 "Falló al analizar parámetro de opción --dirstat/-X:\n"
3376 "%s"
3377
3269 -#: diff.c:4840
3378 +#: diff.c:4880
3379 #, c-format
3380 msgid "unknown change class '%c' in --diff-filter=%s"
3381 msgstr "cambio de clase desconocido '%c' en --diff-filter=%s"
3382
3274 -#: diff.c:4864
3383 +#: diff.c:4904
3384 #, c-format
3385 msgid "unknown value after ws-error-highlight=%.*s"
3386 msgstr "valor desconocido luego de ws-error-highlight=%.*s"
3387
3279 -#: diff.c:4878
3388 +#: diff.c:4918
3389 #, c-format
3390 msgid "unable to resolve '%s'"
3391 msgstr "no se puede resolver '%s'"
3392
3284 -#: diff.c:4928 diff.c:4934
3393 +#: diff.c:4968 diff.c:4974
3394 #, c-format
3395 msgid "%s expects <n>/<m> form"
3396 msgstr "%s espera forma <n>/<m>"
3397
3289 -#: diff.c:4946
3398 +#: diff.c:4986
3399 #, c-format
3400 msgid "%s expects a character, got '%s'"
3401 msgstr "%s esperaba un char, se obtuvo '%s'"
3402
3294 -#: diff.c:4967
3403 +#: diff.c:5007
3404 #, c-format
3405 msgid "bad --color-moved argument: %s"
3406 msgstr "mal argumento --color-moved: %s"
3407
3299 -#: diff.c:4986
3408 +#: diff.c:5026
3409 #, c-format
3410 msgid "invalid mode '%s' in --color-moved-ws"
3411 msgstr "modo inválido '%s' en --color-moved-ws"
3412
3304 -#: diff.c:5026
3413 +#: diff.c:5066
3414 msgid ""
3415 "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
3416 "\"histogram\""
@@ -3309,154 +3418,159 @@ msgstr ""
3418 "opción diff-algorithm acepta \"myers\", \"minimal\", \"patience\" e "
3419 "\"histogram\""
3420
3312 -#: diff.c:5062 diff.c:5082
3421 +#: diff.c:5102 diff.c:5122
3422 #, c-format
3423 msgid "invalid argument to %s"
3424 msgstr "argumento inválido para %s"
3425
3317 -#: diff.c:5219
3426 +#: diff.c:5226
3427 +#, c-format
3428 +msgid "invalid regex given to -I: '%s'"
3429 +msgstr "regex inválido para -I: '%s'"
3430 +
3431 +#: diff.c:5275
3432 #, c-format
3433 msgid "failed to parse --submodule option parameter: '%s'"
3434 msgstr "falló al analizar parámetro de opción --submodule: '%s'"
3435
3322 -#: diff.c:5275
3436 +#: diff.c:5331
3437 #, c-format
3438 msgid "bad --word-diff argument: %s"
3439 msgstr "mal argumento --word-diff: %s"
3440
3327 -#: diff.c:5298
3441 +#: diff.c:5367
3442 msgid "Diff output format options"
3443 msgstr "Opciones de formato de salida para diff"
3444
3331 -#: diff.c:5300 diff.c:5306
3445 +#: diff.c:5369 diff.c:5375
3446 msgid "generate patch"
3447 msgstr "generar parche"
3448
3335 -#: diff.c:5303 builtin/log.c:177
3449 +#: diff.c:5372 builtin/log.c:179
3450 msgid "suppress diff output"
3451 msgstr "suprimir salida de diff"
3452
3339 -#: diff.c:5308 diff.c:5422 diff.c:5429
3453 +#: diff.c:5377 diff.c:5491 diff.c:5498
3454 msgid "<n>"
3455 msgstr "<n>"
3456
3343 -#: diff.c:5309 diff.c:5312
3457 +#: diff.c:5378 diff.c:5381
3458 msgid "generate diffs with <n> lines context"
3459 msgstr "genera diffs con <n> líneas de contexto"
3460
3347 -#: diff.c:5314
3461 +#: diff.c:5383
3462 msgid "generate the diff in raw format"
3463 msgstr "genera el diff en formato raw"
3464
3351 -#: diff.c:5317
3465 +#: diff.c:5386
3466 msgid "synonym for '-p --raw'"
3467 msgstr "sinónimo para '-p --stat'"
3468
3355 -#: diff.c:5321
3469 +#: diff.c:5390
3470 msgid "synonym for '-p --stat'"
3471 msgstr "sinónimo para '-p --stat'"
3472
3359 -#: diff.c:5325
3473 +#: diff.c:5394
3474 msgid "machine friendly --stat"
3475 msgstr "--stat amigable para máquina"
3476
3363 -#: diff.c:5328
3477 +#: diff.c:5397
3478 msgid "output only the last line of --stat"
3479 msgstr "mostrar solo la última línea para --stat"
3480
3367 -#: diff.c:5330 diff.c:5338
3481 +#: diff.c:5399 diff.c:5407
3482 msgid "<param1,param2>..."
3483 msgstr "<param1,param2>..."
3484
3371 -#: diff.c:5331
3485 +#: diff.c:5400
3486 msgid ""
3487 "output the distribution of relative amount of changes for each sub-directory"
3488 msgstr ""
3489 "muestra la distribución de cantidades de cambios relativa para cada "
3490 "subdirectorio"
3491
3378 -#: diff.c:5335
3492 +#: diff.c:5404
3493 msgid "synonym for --dirstat=cumulative"
3494 msgstr "sinónimo para --dirstat=cumulative"
3495
3382 -#: diff.c:5339
3496 +#: diff.c:5408
3497 msgid "synonym for --dirstat=files,param1,param2..."
3498 msgstr "sinonimo para --dirstat=archivos,param1,param2..."
3499
3386 -#: diff.c:5343
3500 +#: diff.c:5412
3501 msgid "warn if changes introduce conflict markers or whitespace errors"
3502 msgstr ""
3503 "advierte si cambios introducen conflictos de markers o errores de espacios "
3504 "en blanco"
3505
3392 -#: diff.c:5346
3506 +#: diff.c:5415
3507 msgid "condensed summary such as creations, renames and mode changes"
3508 msgstr ""
3509 "resumen condensado de creaciones, cambios de nombres y cambios de modos"
3510
3397 -#: diff.c:5349
3511 +#: diff.c:5418
3512 msgid "show only names of changed files"
3513 msgstr "mostrar solo nombres de archivos cambiados"
3514
3401 -#: diff.c:5352
3515 +#: diff.c:5421
3516 msgid "show only names and status of changed files"
3517 msgstr "mostrar solo nombres y estados de archivos cambiados"
3518
3405 -#: diff.c:5354
3519 +#: diff.c:5423
3520 msgid "<width>[,<name-width>[,<count>]]"
3521 msgstr "<ancho>[,<nombre-ancho>[,<cantidad>]]"
3522
3409 -#: diff.c:5355
3523 +#: diff.c:5424
3524 msgid "generate diffstat"
3525 msgstr "generar diffstat"
3526
3413 -#: diff.c:5357 diff.c:5360 diff.c:5363
3527 +#: diff.c:5426 diff.c:5429 diff.c:5432
3528 msgid "<width>"
3529 msgstr "<ancho>"
3530
3417 -#: diff.c:5358
3531 +#: diff.c:5427
3532 msgid "generate diffstat with a given width"
3533 msgstr "genera diffstat con un ancho dado"
3534
3421 -#: diff.c:5361
3535 +#: diff.c:5430
3536 msgid "generate diffstat with a given name width"
3537 msgstr "genera diffstat con un nombre de ancho dado"
3538
3425 -#: diff.c:5364
3539 +#: diff.c:5433
3540 msgid "generate diffstat with a given graph width"
3541 msgstr "genera diffstat con un ancho de graph dado"
3542
3429 -#: diff.c:5366
3543 +#: diff.c:5435
3544 msgid "<count>"
3545 msgstr "<cantidad>"
3546
3433 -#: diff.c:5367
3547 +#: diff.c:5436
3548 msgid "generate diffstat with limited lines"
3549 msgstr "genera diffstat con líneas limitadas"
3550
3437 -#: diff.c:5370
3551 +#: diff.c:5439
3552 msgid "generate compact summary in diffstat"
3553 msgstr "genera un resumen compacto de diffstat"
3554
3441 -#: diff.c:5373
3555 +#: diff.c:5442
3556 msgid "output a binary diff that can be applied"
3557 msgstr "muestra un diff binario que puede ser aplicado"
3558
3445 -#: diff.c:5376
3559 +#: diff.c:5445
3560 msgid "show full pre- and post-image object names on the \"index\" lines"
3561 msgstr ""
3562 "mostrar todo un pre- y post-image de nombres de objetos en las líneas \"index"
3563 "\""
3564
3451 -#: diff.c:5378
3565 +#: diff.c:5447
3566 msgid "show colored diff"
3567 msgstr "mostrar diff colorido"
3568
3455 -#: diff.c:5379
3569 +#: diff.c:5448
3570 msgid "<kind>"
3571 msgstr "<tipo>"
3572
3459 -#: diff.c:5380
3573 +#: diff.c:5449
3574 msgid ""
3575 "highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
3576 "diff"
@@ -3464,7 +3578,7 @@ msgstr ""
3578 "resaltar errores de espacios en blanco en las líneas 'context', 'old' o "
3579 "'new' del diff"
3580
3467 -#: diff.c:5383
3581 +#: diff.c:5452
3582 msgid ""
3583 "do not munge pathnames and use NULs as output field terminators in --raw or "
3584 "--numstat"
@@ -3472,89 +3586,89 @@ msgstr ""
3586 "no consolidar los pathnames y usar NULs como terminadores de campos en --raw "
3587 "o --numstat"
3588
3475 -#: diff.c:5386 diff.c:5389 diff.c:5392 diff.c:5498
3589 +#: diff.c:5455 diff.c:5458 diff.c:5461 diff.c:5570
3590 msgid "<prefix>"
3591 msgstr "<prefijo>"
3592
3479 -#: diff.c:5387
3593 +#: diff.c:5456
3594 msgid "show the given source prefix instead of \"a/\""
3595 msgstr "mostrar el prefijo de fuente dado en lugar de \"a/\""
3596
3483 -#: diff.c:5390
3597 +#: diff.c:5459
3598 msgid "show the given destination prefix instead of \"b/\""
3599 msgstr "mostrar el prefijo de destino en lugar de \"b/\""
3600
3487 -#: diff.c:5393
3601 +#: diff.c:5462
3602 msgid "prepend an additional prefix to every line of output"
3603 msgstr "anteponer un prefijo adicional a cada línea mostrada"
3604
3491 -#: diff.c:5396
3605 +#: diff.c:5465
3606 msgid "do not show any source or destination prefix"
3607 msgstr "no mostrar ningún prefijo de fuente o destino"
3608
3495 -#: diff.c:5399
3609 +#: diff.c:5468
3610 msgid "show context between diff hunks up to the specified number of lines"
3611 msgstr ""
3612 "muestra el contexto entre hunks de diff hasta el número especificado de "
3613 "líneas"
3614
3501 -#: diff.c:5403 diff.c:5408 diff.c:5413
3615 +#: diff.c:5472 diff.c:5477 diff.c:5482
3616 msgid "<char>"
3617 msgstr "<char>"
3618
3505 -#: diff.c:5404
3619 +#: diff.c:5473
3620 msgid "specify the character to indicate a new line instead of '+'"
3621 msgstr "especifica el char para indicar una nueva línea en lugar de '+'"
3622
3509 -#: diff.c:5409
3623 +#: diff.c:5478
3624 msgid "specify the character to indicate an old line instead of '-'"
3625 msgstr "especifica el char para indicar una línea vieja en lugar de '-'"
3626
3513 -#: diff.c:5414
3627 +#: diff.c:5483
3628 msgid "specify the character to indicate a context instead of ' '"
3629 msgstr "especifica el char para indicar un contexto en lugar de ' '"
3630
3517 -#: diff.c:5417
3631 +#: diff.c:5486
3632 msgid "Diff rename options"
3633 msgstr "Opciones de diff rename"
3634
3521 -#: diff.c:5418
3635 +#: diff.c:5487
3636 msgid "<n>[/<m>]"
3637 msgstr "<n>[/<m>]"
3638
3525 -#: diff.c:5419
3639 +#: diff.c:5488
3640 msgid "break complete rewrite changes into pairs of delete and create"
3641 msgstr "descomponer los cambios de reescritura en pares de borrar y crear"
3642
3529 -#: diff.c:5423
3643 +#: diff.c:5492
3644 msgid "detect renames"
3645 msgstr "detectar renombrados"
3646
3533 -#: diff.c:5427
3647 +#: diff.c:5496
3648 msgid "omit the preimage for deletes"
3649 msgstr "omite la preimage para borrados"
3650
3537 -#: diff.c:5430
3651 +#: diff.c:5499
3652 msgid "detect copies"
3653 msgstr "detectar copias"
3654
3541 -#: diff.c:5434
3655 +#: diff.c:5503
3656 msgid "use unmodified files as source to find copies"
3657 msgstr "usa archivos no modificados como fuente para encontrar copias"
3658
3545 -#: diff.c:5436
3659 +#: diff.c:5505
3660 msgid "disable rename detection"
3661 msgstr "deshabilita detección de renombres"
3662
3549 -#: diff.c:5439
3663 +#: diff.c:5508
3664 msgid "use empty blobs as rename source"
3665 msgstr "usa blobs vacíos como fuente de renombre"
3666
3553 -#: diff.c:5441
3667 +#: diff.c:5510
3668 msgid "continue listing the history of a file beyond renames"
3669 msgstr "continua listando el historial de un archivo más allá de renombres"
3670
3557 -#: diff.c:5444
3671 +#: diff.c:5513
3672 msgid ""
3673 "prevent rename/copy detection if the number of rename/copy targets exceeds "
3674 "given limit"
@@ -3562,155 +3676,159 @@ msgstr ""
3676 "previene detección de renombre/copias si el número de objetivos para "
3677 "renombres/copias excede el límite dado"
3678
3565 -#: diff.c:5446
3679 +#: diff.c:5515
3680 msgid "Diff algorithm options"
3681 msgstr "Opciones de algoritmos de diff"
3682
3569 -#: diff.c:5448
3683 +#: diff.c:5517
3684 msgid "produce the smallest possible diff"
3685 msgstr "produce el diff más pequeño posible"
3686
3573 -#: diff.c:5451
3687 +#: diff.c:5520
3688 msgid "ignore whitespace when comparing lines"
3689 msgstr "ignorar espacios en blanco cuando comparando líneas"
3690
3577 -#: diff.c:5454
3691 +#: diff.c:5523
3692 msgid "ignore changes in amount of whitespace"
3693 msgstr "ignorar cambios en la cantidad de líneas en blanco"
3694
3581 -#: diff.c:5457
3695 +#: diff.c:5526
3696 msgid "ignore changes in whitespace at EOL"
3697 msgstr "ignorar cambios en espacios en blanco en EOL"
3698
3585 -#: diff.c:5460
3699 +#: diff.c:5529
3700 msgid "ignore carrier-return at the end of line"
3701 msgstr "ignora carrier-return al final de la línea"
3702
3589 -#: diff.c:5463
3703 +#: diff.c:5532
3704 msgid "ignore changes whose lines are all blank"
3705 msgstr "ignora cambios cuyas líneas son todas en blanco"
3706
3593 -#: diff.c:5466
3707 +#: diff.c:5534 diff.c:5556 diff.c:5559 diff.c:5604
3708 +msgid "<regex>"
3709 +msgstr "<regex>"
3710 +
3711 +#: diff.c:5535
3712 +msgid "ignore changes whose all lines match <regex>"
3713 +msgstr "ignora cambios cuyas líneas concuerdan con <regex>"
3714 +
3715 +#: diff.c:5538
3716 msgid "heuristic to shift diff hunk boundaries for easy reading"
3717 msgstr "heurística para cambiar los límites de hunk para una fácil lectura"
3718
3597 -#: diff.c:5469
3719 +#: diff.c:5541
3720 msgid "generate diff using the \"patience diff\" algorithm"
3721 msgstr "genera un diff usando algoritmo \"patience diff\""
3722
3601 -#: diff.c:5473
3723 +#: diff.c:5545
3724 msgid "generate diff using the \"histogram diff\" algorithm"
3725 msgstr "genera un diff usando algoritmo \"histogram diff\""
3726
3605 -#: diff.c:5475
3727 +#: diff.c:5547
3728 msgid "<algorithm>"
3729 msgstr "<algoritmo>"
3730
3609 -#: diff.c:5476
3731 +#: diff.c:5548
3732 msgid "choose a diff algorithm"
3733 msgstr "escoge un algoritmo para diff"
3734
3613 -#: diff.c:5478
3735 +#: diff.c:5550
3736 msgid "<text>"
3737 msgstr "<texto>"
3738
3617 -#: diff.c:5479
3739 +#: diff.c:5551
3740 msgid "generate diff using the \"anchored diff\" algorithm"
3741 msgstr "genera un diff usando algoritmo \"anchored diff\""
3742
3621 -#: diff.c:5481 diff.c:5490 diff.c:5493
3743 +#: diff.c:5553 diff.c:5562 diff.c:5565
3744 msgid "<mode>"
3745 msgstr "<modo>"
3746
3625 -#: diff.c:5482
3747 +#: diff.c:5554
3748 msgid "show word diff, using <mode> to delimit changed words"
3749 msgstr ""
3750 "muestra diff por palabras usando <modo> para delimitar las palabras cambiadas"
3751
3630 -#: diff.c:5484 diff.c:5487 diff.c:5532
3631 -msgid "<regex>"
3632 -msgstr "<regex>"
3633 -
3634 -#: diff.c:5485
3752 +#: diff.c:5557
3753 msgid "use <regex> to decide what a word is"
3754 msgstr "usa <regex> para decidir que palabra es"
3755
3638 -#: diff.c:5488
3756 +#: diff.c:5560
3757 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
3758 msgstr "equivalente a --word-diff=color --word-diff-regex=<regex>"
3759
3642 -#: diff.c:5491
3760 +#: diff.c:5563
3761 msgid "moved lines of code are colored differently"
3762 msgstr "líneas movidas de código están coloreadas diferente"
3763
3646 -#: diff.c:5494
3764 +#: diff.c:5566
3765 msgid "how white spaces are ignored in --color-moved"
3766 msgstr "como espacios en blanco son ignorados en --color-moved"
3767
3650 -#: diff.c:5497
3768 +#: diff.c:5569
3769 msgid "Other diff options"
3770 msgstr "Otras opciones de diff"
3771
3654 -#: diff.c:5499
3772 +#: diff.c:5571
3773 msgid "when run from subdir, exclude changes outside and show relative paths"
3774 msgstr ""
3775 "cuando ejecutado desde un subdir, excluye cambios del exterior y muestra "
3776 "paths relativos"
3777
3660 -#: diff.c:5503
3778 +#: diff.c:5575
3779 msgid "treat all files as text"
3780 msgstr "tratar todos los archivos como texto"
3781
3664 -#: diff.c:5505
3782 +#: diff.c:5577
3783 msgid "swap two inputs, reverse the diff"
3784 msgstr "cambia dos inputs, invierte el diff"
3785
3668 -#: diff.c:5507
3786 +#: diff.c:5579
3787 msgid "exit with 1 if there were differences, 0 otherwise"
3788 msgstr "termina con 1 si hubieron diferencias, de lo contrario con 0"
3789
3672 -#: diff.c:5509
3790 +#: diff.c:5581
3791 msgid "disable all output of the program"
3792 msgstr "deshabilita todo el output del programa"
3793
3676 -#: diff.c:5511
3794 +#: diff.c:5583
3795 msgid "allow an external diff helper to be executed"
3796 msgstr "permite la ejecución de un diff helper externo"
3797
3680 -#: diff.c:5513
3798 +#: diff.c:5585
3799 msgid "run external text conversion filters when comparing binary files"
3800 msgstr ""
3801 "ejecuta filtros de conversión de texto externos cuando comparando binarios"
3802
3685 -#: diff.c:5515
3803 +#: diff.c:5587
3804 msgid "<when>"
3805 msgstr "<cuando>"
3806
3689 -#: diff.c:5516
3807 +#: diff.c:5588
3808 msgid "ignore changes to submodules in the diff generation"
3809 msgstr "ignorar cambios a submódulos en la generación de diff"
3810
3693 -#: diff.c:5519
3811 +#: diff.c:5591
3812 msgid "<format>"
3813 msgstr "<formato>"
3814
3697 -#: diff.c:5520
3815 +#: diff.c:5592
3816 msgid "specify how differences in submodules are shown"
3817 msgstr "especifica como son mostradas las diferencias en submódulos"
3818
3701 -#: diff.c:5524
3819 +#: diff.c:5596
3820 msgid "hide 'git add -N' entries from the index"
3821 msgstr "ocultar entradas 'git add -N' del index"
3822
3705 -#: diff.c:5527
3823 +#: diff.c:5599
3824 msgid "treat 'git add -N' entries as real in the index"
3825 msgstr "trata entradas 'git add -N' como reales en el index"
3826
3709 -#: diff.c:5529
3827 +#: diff.c:5601
3828 msgid "<string>"
3829 msgstr "<string>"
3830
3713 -#: diff.c:5530
3831 +#: diff.c:5602
3832 msgid ""
3833 "look for differences that change the number of occurrences of the specified "
3834 "string"
@@ -3718,7 +3836,7 @@ msgstr ""
3836 "busca por diferencias que cambien el número de ocurrencias para el string "
3837 "especificado"
3838
3721 -#: diff.c:5533
3839 +#: diff.c:5605
3840 msgid ""
3841 "look for differences that change the number of occurrences of the specified "
3842 "regex"
@@ -3726,23 +3844,35 @@ msgstr ""
3844 "busca por diferencias que cambien el número de ocurrencias para el regex "
3845 "especificado"
3846
3729 -#: diff.c:5536
3847 +#: diff.c:5608
3848 msgid "show all changes in the changeset with -S or -G"
3849 msgstr "mostrar todos los cambios en el changeset con -S o -G"
3850
3733 -#: diff.c:5539
3851 +#: diff.c:5611
3852 msgid "treat <string> in -S as extended POSIX regular expression"
3853 msgstr "tratar <string> en -S como una expresión regular extendida de POSIX"
3854
3737 -#: diff.c:5542
3855 +#: diff.c:5614
3856 msgid "control the order in which files appear in the output"
3857 msgstr "controlar el orden en el que los archivos aparecen en la salida"
3858
3741 -#: diff.c:5543
3859 +#: diff.c:5615 diff.c:5618
3860 +msgid "<path>"
3861 +msgstr "<ruta>"
3862 +
3863 +#: diff.c:5616
3864 +msgid "show the change in the specified path first"
3865 +msgstr "mostrar el cambio en la ruta especificada primero"
3866 +
3867 +#: diff.c:5619
3868 +msgid "skip the output to the specified path"
3869 +msgstr "saltar el output de la ruta especificada"
3870 +
3871 +#: diff.c:5621
3872 msgid "<object-id>"
3873 msgstr "<id-objeto>"
3874
3745 -#: diff.c:5544
3875 +#: diff.c:5622
3876 msgid ""
3877 "look for differences that change the number of occurrences of the specified "
3878 "object"
@@ -3750,33 +3880,33 @@ msgstr ""
3880 "busca por diferencias que cambien el número de ocurrencias para el objeto "
3881 "especificado"
3882
3753 -#: diff.c:5546
3883 +#: diff.c:5624
3884 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
3885 msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"
3886
3757 -#: diff.c:5547
3887 +#: diff.c:5625
3888 msgid "select files by diff type"
3889 msgstr "selecciona archivos por tipo de diff"
3890
3761 -#: diff.c:5549
3891 +#: diff.c:5627
3892 msgid "<file>"
3893 msgstr "<archivo>"
3894
3765 -#: diff.c:5550
3895 +#: diff.c:5628
3896 msgid "Output to a specific file"
3897 msgstr "Output a un archivo específico"
3898
3769 -#: diff.c:6205
3899 +#: diff.c:6285
3900 msgid "inexact rename detection was skipped due to too many files."
3901 msgstr ""
3902 "detección de cambio de nombre inexacta fue saltada por haber muchos archivos."
3903
3774 -#: diff.c:6208
3904 +#: diff.c:6288
3905 msgid "only found copies from modified paths due to too many files."
3906 msgstr ""
3907 "solo se encontraron copias de rutas modificadas por haber muchos archivos."
3908
3779 -#: diff.c:6211
3909 +#: diff.c:6291
3910 #, c-format
3911 msgid ""
3912 "you may want to set your %s variable to at least %d and retry the command."
@@ -3789,65 +3919,70 @@ msgstr ""
3919 msgid "failed to read orderfile '%s'"
3920 msgstr "falló al leer orden de archivos '%s'"
3921
3792 -#: diffcore-rename.c:592
3922 +#: diffcore-rename.c:786
3923 msgid "Performing inexact rename detection"
3924 msgstr "Realizando una detección de cambios de nombre inexacta"
3925
3796 -#: dir.c:573
3926 +#: diffcore-rotate.c:29
3927 +#, c-format
3928 +msgid "No such path '%s' in the diff"
3929 +msgstr "No hay ruta '%s' en el diff"
3930 +
3931 +#: dir.c:578
3932 #, c-format
3933 msgid "pathspec '%s' did not match any file(s) known to git"
3934 msgstr ""
3935 "ruta especificada '%s' no concordó con ningún archivo(s) conocido por git"
3936
3802 -#: dir.c:713 dir.c:742 dir.c:755
3937 +#: dir.c:718 dir.c:747 dir.c:760
3938 #, c-format
3939 msgid "unrecognized pattern: '%s'"
3940 msgstr "patrón desconocido: '%s'"
3941
3807 -#: dir.c:772 dir.c:786
3942 +#: dir.c:777 dir.c:791
3943 #, c-format
3944 msgid "unrecognized negative pattern: '%s'"
3945 msgstr "patrón negativo no reconocido: '%s'"
3946
3812 -#: dir.c:804
3947 +#: dir.c:809
3948 #, c-format
3949 msgid "your sparse-checkout file may have issues: pattern '%s' is repeated"
3950 msgstr ""
3951 "tu archivo sparse-checkout tal vez tenga errores: patrón '%s' está repetido"
3952
3818 -#: dir.c:814
3953 +#: dir.c:819
3954 msgid "disabling cone pattern matching"
3955 msgstr "deshabilitar coincidencia de patrónes cono"
3956
3822 -#: dir.c:1191
3957 +#: dir.c:1198
3958 #, c-format
3959 msgid "cannot use %s as an exclude file"
3960 msgstr "no se puede usar %s como archivo de exclusión"
3961
3827 -#: dir.c:2296
3962 +#: dir.c:2305
3963 #, c-format
3964 msgid "could not open directory '%s'"
3965 msgstr "no se pudo abrir el directorio '%s'"
3966
3832 -#: dir.c:2596
3967 +#: dir.c:2605
3968 msgid "failed to get kernel name and information"
3969 msgstr "falló al conseguir la información y nombre del kernel"
3970
3836 -#: dir.c:2720
3971 +#: dir.c:2729
3972 msgid "untracked cache is disabled on this system or location"
3973 msgstr "untracked cache está desactivado en este sistema o ubicación"
3974
3840 -#: dir.c:3502
3975 +#: dir.c:3534
3976 #, c-format
3977 msgid "index file corrupt in repo %s"
3978 msgstr "archivo índice corrompido en repositorio %s"
3979
3845 -#: dir.c:3547 dir.c:3552
3980 +#: dir.c:3579 dir.c:3584
3981 #, c-format
3982 msgid "could not create directories for %s"
3983 msgstr "no se pudo crear directorios para %s"
3984
3850 -#: dir.c:3581
3985 +#: dir.c:3613
3986 #, c-format
3987 msgid "could not migrate git directory from '%s' to '%s'"
3988 msgstr "no se pudo migrar el directorio git de '%s' a '%s'"
@@ -3866,12 +4001,12 @@ msgstr "Filtrando contenido"
4001 msgid "could not stat file '%s'"
4002 msgstr "no se pudo establecer el archivo '%s'"
4003
3869 -#: environment.c:150
4004 +#: environment.c:152
4005 #, c-format
4006 msgid "bad git namespace path \"%s\""
4007 msgstr "ruta de namespace de git mala \"%s\""
4008
3874 -#: environment.c:337
4009 +#: environment.c:335
4010 #, c-format
4011 msgid "could not set GIT_DIR to '%s'"
4012 msgstr "no se pudo configurar GIT_DIR a '%s'"
@@ -3881,260 +4016,264 @@ msgstr "no se pudo configurar GIT_DIR a '%s'"
4016 msgid "too many args to run %s"
4017 msgstr "demasiados argumentos para correr %s"
4018
3884 -#: fetch-pack.c:152
4019 +#: fetch-pack.c:177
4020 msgid "git fetch-pack: expected shallow list"
4021 msgstr "git fetch-pack: lista poco profunda esperada"
4022
3888 -#: fetch-pack.c:155
4023 +#: fetch-pack.c:180
4024 msgid "git fetch-pack: expected a flush packet after shallow list"
4025 msgstr ""
4026 "git fetch-pack: se esperaba un flush packet luego de la lista superficial"
4027
3893 -#: fetch-pack.c:166
4028 +#: fetch-pack.c:191
4029 msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
4030 msgstr "git fetch-pack: se esperaba ACK/NAK, se obtuvo un flush packet"
4031
3897 -#: fetch-pack.c:186
4032 +#: fetch-pack.c:211
4033 #, c-format
4034 msgid "git fetch-pack: expected ACK/NAK, got '%s'"
4035 msgstr "git fetch-pack: se esperaba ACK/NAK, se obtuvo '%s'"
4036
3902 -#: fetch-pack.c:197
4037 +#: fetch-pack.c:222
4038 msgid "unable to write to remote"
4039 msgstr "no se puede escribir al remoto"
4040
3906 -#: fetch-pack.c:259
4041 +#: fetch-pack.c:283
4042 msgid "--stateless-rpc requires multi_ack_detailed"
4043 msgstr "--stateless-rpc requiere multi_ack_detailed"
4044
3910 -#: fetch-pack.c:358 fetch-pack.c:1408
4045 +#: fetch-pack.c:378 fetch-pack.c:1457
4046 #, c-format
4047 msgid "invalid shallow line: %s"
4048 msgstr "línea poco profunda inválida: %s"
4049
3915 -#: fetch-pack.c:364 fetch-pack.c:1414
4050 +#: fetch-pack.c:384 fetch-pack.c:1463
4051 #, c-format
4052 msgid "invalid unshallow line: %s"
4053 msgstr "línea superficial inválida: %s"
4054
3920 -#: fetch-pack.c:366 fetch-pack.c:1416
4055 +#: fetch-pack.c:386 fetch-pack.c:1465
4056 #, c-format
4057 msgid "object not found: %s"
4058 msgstr "objeto no encontrado: %s"
4059
3925 -#: fetch-pack.c:369 fetch-pack.c:1419
4060 +#: fetch-pack.c:389 fetch-pack.c:1468
4061 #, c-format
4062 msgid "error in object: %s"
4063 msgstr "error en objeto: %s"
4064
3930 -#: fetch-pack.c:371 fetch-pack.c:1421
4065 +#: fetch-pack.c:391 fetch-pack.c:1470
4066 #, c-format
4067 msgid "no shallow found: %s"
4068 msgstr "superficie no encontrada: %s"
4069
3935 -#: fetch-pack.c:374 fetch-pack.c:1425
4070 +#: fetch-pack.c:394 fetch-pack.c:1474
4071 #, c-format
4072 msgid "expected shallow/unshallow, got %s"
4073 msgstr "se esperaba shallow/unshallow, se obtuvo %s"
4074
3940 -#: fetch-pack.c:416
4075 +#: fetch-pack.c:434
4076 #, c-format
4077 msgid "got %s %d %s"
4078 msgstr "se obtuvo %s %d %s"
4079
3945 -#: fetch-pack.c:433
4080 +#: fetch-pack.c:451
4081 #, c-format
4082 msgid "invalid commit %s"
4083 msgstr "commit inválido %s"
4084
3950 -#: fetch-pack.c:464
4085 +#: fetch-pack.c:482
4086 msgid "giving up"
4087 msgstr "rindiéndose"
4088
3954 -#: fetch-pack.c:477 progress.c:336
4089 +#: fetch-pack.c:495 progress.c:339
4090 msgid "done"
4091 msgstr "listo"
4092
3958 -#: fetch-pack.c:489
4093 +#: fetch-pack.c:507
4094 #, c-format
4095 msgid "got %s (%d) %s"
4096 msgstr "se obtuvo %s (%d) %s"
4097
3963 -#: fetch-pack.c:535
4098 +#: fetch-pack.c:543
4099 #, c-format
4100 msgid "Marking %s as complete"
4101 msgstr "Marcando %s como completa"
4102
3968 -#: fetch-pack.c:756
4103 +#: fetch-pack.c:758
4104 #, c-format
4105 msgid "already have %s (%s)"
4106 msgstr "ya se tiene %s (%s)"
4107
3973 -#: fetch-pack.c:821
4108 +#: fetch-pack.c:844
4109 msgid "fetch-pack: unable to fork off sideband demultiplexer"
4110 msgstr "fetch-pack: no se puede extraer un demultiplexor de banda lateral"
4111
3977 -#: fetch-pack.c:829
4112 +#: fetch-pack.c:852
4113 msgid "protocol error: bad pack header"
4114 msgstr "error de protocolo: paquete de header erróneo"
4115
3981 -#: fetch-pack.c:910
4116 +#: fetch-pack.c:946
4117 #, c-format
4118 msgid "fetch-pack: unable to fork off %s"
4119 msgstr "fetch-pack: no se puede quitar %s"
4120
3986 -#: fetch-pack.c:927
4121 +#: fetch-pack.c:952
4122 +msgid "fetch-pack: invalid index-pack output"
4123 +msgstr "fetch-pack: salida de paquete de índice no válida"
4124 +
4125 +#: fetch-pack.c:969
4126 #, c-format
4127 msgid "%s failed"
4128 msgstr "%s falló"
4129
3991 -#: fetch-pack.c:929
4130 +#: fetch-pack.c:971
4131 msgid "error in sideband demultiplexer"
4132 msgstr "error en demultiplexor de banda lateral"
4133
3995 -#: fetch-pack.c:976
4134 +#: fetch-pack.c:1031
4135 #, c-format
4136 msgid "Server version is %.*s"
4137 msgstr "Versión de servidor es %.*s"
4138
4000 -#: fetch-pack.c:981 fetch-pack.c:987 fetch-pack.c:990 fetch-pack.c:996
4001 -#: fetch-pack.c:1000 fetch-pack.c:1004 fetch-pack.c:1008 fetch-pack.c:1012
4002 -#: fetch-pack.c:1016 fetch-pack.c:1020 fetch-pack.c:1024 fetch-pack.c:1028
4003 -#: fetch-pack.c:1034 fetch-pack.c:1040 fetch-pack.c:1045 fetch-pack.c:1050
4139 +#: fetch-pack.c:1039 fetch-pack.c:1045 fetch-pack.c:1048 fetch-pack.c:1054
4140 +#: fetch-pack.c:1058 fetch-pack.c:1062 fetch-pack.c:1066 fetch-pack.c:1070
4141 +#: fetch-pack.c:1074 fetch-pack.c:1078 fetch-pack.c:1082 fetch-pack.c:1086
4142 +#: fetch-pack.c:1092 fetch-pack.c:1098 fetch-pack.c:1103 fetch-pack.c:1108
4143 #, c-format
4144 msgid "Server supports %s"
4145 msgstr "El servidor soporta %s"
4146
4008 -#: fetch-pack.c:983
4147 +#: fetch-pack.c:1041
4148 msgid "Server does not support shallow clients"
4149 msgstr "El servidor no soporta clientes superficiales"
4150
4012 -#: fetch-pack.c:1043
4151 +#: fetch-pack.c:1101
4152 msgid "Server does not support --shallow-since"
4153 msgstr "El servidor no soporta --shalow-since"
4154
4016 -#: fetch-pack.c:1048
4155 +#: fetch-pack.c:1106
4156 msgid "Server does not support --shallow-exclude"
4157 msgstr "El servidor no soporta --shalow-exclude"
4158
4020 -#: fetch-pack.c:1052
4159 +#: fetch-pack.c:1110
4160 msgid "Server does not support --deepen"
4161 msgstr "El servidor no soporta --deepen"
4162
4024 -#: fetch-pack.c:1054
4163 +#: fetch-pack.c:1112
4164 msgid "Server does not support this repository's object format"
4165 msgstr "El servidor no soporta el formato de objetos de este repositorio"
4166
4028 -#: fetch-pack.c:1071
4167 +#: fetch-pack.c:1125
4168 msgid "no common commits"
4169 msgstr "no hay commits comunes"
4170
4032 -#: fetch-pack.c:1083 fetch-pack.c:1639
4171 +#: fetch-pack.c:1138 fetch-pack.c:1682
4172 msgid "git fetch-pack: fetch failed."
4173 msgstr "git fetch-pack: fetch falló."
4174
4036 -#: fetch-pack.c:1211
4175 +#: fetch-pack.c:1265
4176 #, c-format
4177 msgid "mismatched algorithms: client %s; server %s"
4178 msgstr "algoritmos no compatibles: cliente %s; servidor %s"
4179
4041 -#: fetch-pack.c:1215
4180 +#: fetch-pack.c:1269
4181 #, c-format
4182 msgid "the server does not support algorithm '%s'"
4183 msgstr "servidor no soporta el algoritmo '%s'"
4184
4046 -#: fetch-pack.c:1235
4185 +#: fetch-pack.c:1289
4186 msgid "Server does not support shallow requests"
4187 msgstr "El servidor no soporta peticiones superficiales"
4188
4050 -#: fetch-pack.c:1242
4189 +#: fetch-pack.c:1296
4190 msgid "Server supports filter"
4191 msgstr "El servidor soporta filtro"
4192
4054 -#: fetch-pack.c:1286
4193 +#: fetch-pack.c:1335
4194 msgid "unable to write request to remote"
4195 msgstr "no se puede escribir request al remoto"
4196
4058 -#: fetch-pack.c:1304
4197 +#: fetch-pack.c:1353
4198 #, c-format
4199 msgid "error reading section header '%s'"
4200 msgstr "error leyendo sección header '%s'"
4201
4063 -#: fetch-pack.c:1310
4202 +#: fetch-pack.c:1359
4203 #, c-format
4204 msgid "expected '%s', received '%s'"
4205 msgstr "se esperaba '%s', se recibió '%s'"
4206
4068 -#: fetch-pack.c:1371
4207 +#: fetch-pack.c:1420
4208 #, c-format
4209 msgid "unexpected acknowledgment line: '%s'"
4210 msgstr "línea de confirmación inesperada: '%s'"
4211
4073 -#: fetch-pack.c:1376
4212 +#: fetch-pack.c:1425
4213 #, c-format
4214 msgid "error processing acks: %d"
4215 msgstr "error procesando acks: %d"
4216
4078 -#: fetch-pack.c:1386
4217 +#: fetch-pack.c:1435
4218 msgid "expected packfile to be sent after 'ready'"
4219 msgstr "espere que el packfile sea mandado luego del 'listo'"
4220
4082 -#: fetch-pack.c:1388
4221 +#: fetch-pack.c:1437
4222 msgid "expected no other sections to be sent after no 'ready'"
4223 msgstr "espere que ninguna otra sección sea enviada luego del 'listo'"
4224
4086 -#: fetch-pack.c:1430
4225 +#: fetch-pack.c:1479
4226 #, c-format
4227 msgid "error processing shallow info: %d"
4228 msgstr "error procesando información superficial: %d"
4229
4091 -#: fetch-pack.c:1477
4230 +#: fetch-pack.c:1526
4231 #, c-format
4232 msgid "expected wanted-ref, got '%s'"
4233 msgstr "se esperaba wanted-ref, se obtuvo '%s'"
4234
4096 -#: fetch-pack.c:1482
4235 +#: fetch-pack.c:1531
4236 #, c-format
4237 msgid "unexpected wanted-ref: '%s'"
4238 msgstr "wanted-ref inesperado: '%s'"
4239
4101 -#: fetch-pack.c:1487
4240 +#: fetch-pack.c:1536
4241 #, c-format
4242 msgid "error processing wanted refs: %d"
4243 msgstr "error procesando refs deseadas: %d"
4244
4106 -#: fetch-pack.c:1517
4245 +#: fetch-pack.c:1566
4246 msgid "git fetch-pack: expected response end packet"
4247 msgstr "git fetch-pack: se espera un paquete final de respuesta"
4248
4110 -#: fetch-pack.c:1921
4249 +#: fetch-pack.c:1960
4250 msgid "no matching remote head"
4251 msgstr "no concuerda el head remoto"
4252
4114 -#: fetch-pack.c:1944 builtin/clone.c:692
4253 +#: fetch-pack.c:1983 builtin/clone.c:693
4254 msgid "remote did not send all necessary objects"
4255 msgstr "remoto no mando todos los objetos necesarios"
4256
4118 -#: fetch-pack.c:1971
4257 +#: fetch-pack.c:2010
4258 #, c-format
4259 msgid "no such remote ref %s"
4260 msgstr "no existe ref remota %s"
4261
4123 -#: fetch-pack.c:1974
4262 +#: fetch-pack.c:2013
4263 #, c-format
4264 msgid "Server does not allow request for unadvertised object %s"
4265 msgstr "El servidor no permite solicitudes de objetos inadvertidos %s"
4266
4128 -#: gpg-interface.c:272
4267 +#: gpg-interface.c:273
4268 msgid "could not create temporary file"
4269 msgstr "no se pudo crear archivo temporal"
4270
4132 -#: gpg-interface.c:275
4271 +#: gpg-interface.c:276
4272 #, c-format
4273 msgid "failed writing detached signature to '%s'"
4274 msgstr "falló al escribir la firma separada para '%s'"
4275
4137 -#: gpg-interface.c:457
4276 +#: gpg-interface.c:470
4277 msgid "gpg failed to sign the data"
4278 msgstr "gpg falló al firmar la data"
4279
@@ -4143,7 +4282,7 @@ msgstr "gpg falló al firmar la data"
4282 msgid "ignore invalid color '%.*s' in log.graphColors"
4283 msgstr "ignora color inválido '%.*s' en log.graphColors"
4284
4146 -#: grep.c:668
4285 +#: grep.c:543
4286 msgid ""
4287 "given pattern contains NULL byte (via -f <file>). This is only supported "
4288 "with -P under PCRE v2"
@@ -4151,18 +4290,18 @@ msgstr ""
4290 "el patrón provisto contiene bytes NULL (via -f <archivo>). Esto solo es "
4291 "soportado con -P bajo PCRE v2"
4292
4154 -#: grep.c:2128
4293 +#: grep.c:1906
4294 #, c-format
4295 msgid "'%s': unable to read %s"
4296 msgstr "'%s': no es posible leer %s"
4297
4159 -#: grep.c:2145 setup.c:176 builtin/clone.c:411 builtin/diff.c:89
4298 +#: grep.c:1923 setup.c:176 builtin/clone.c:412 builtin/diff.c:90
4299 #: builtin/rm.c:135
4300 #, c-format
4301 msgid "failed to stat '%s'"
4302 msgstr "falló al marcar '%s'"
4303
4165 -#: grep.c:2156
4304 +#: grep.c:1934
4305 #, c-format
4306 msgid "'%s': short read"
4307 msgstr "'%s': lectura corta"
@@ -4219,41 +4358,41 @@ msgstr "Comandos de bajo nivel / Sincronización de repositorios"
4358 msgid "Low-level Commands / Internal Helpers"
4359 msgstr "Comandos de bajo nivel / Auxiliares internos"
4360
4222 -#: help.c:298
4361 +#: help.c:300
4362 #, c-format
4363 msgid "available git commands in '%s'"
4364 msgstr "comandos disponibles de git en '%s'"
4365
4227 -#: help.c:305
4366 +#: help.c:307
4367 msgid "git commands available from elsewhere on your $PATH"
4368 msgstr "comandos disponibles de git desde otro lugar en tu $PATH"
4369
4231 -#: help.c:314
4370 +#: help.c:316
4371 msgid "These are common Git commands used in various situations:"
4372 msgstr "Estos son comandos comunes de Git usados en varias situaciones:"
4373
4235 -#: help.c:363 git.c:99
4374 +#: help.c:365 git.c:100
4375 #, c-format
4376 msgid "unsupported command listing type '%s'"
4377 msgstr "comando de listado de tipos no soportado '%s'"
4378
4240 -#: help.c:403
4241 -msgid "The common Git guides are:"
4242 -msgstr "Las guías comunes de Git son:"
4379 +#: help.c:405
4380 +msgid "The Git concept guides are:"
4381 +msgstr "Las guías de conceptos de Git son:"
4382
4244 -#: help.c:427
4383 +#: help.c:429
4384 msgid "See 'git help <command>' to read about a specific subcommand"
4385 msgstr "Vea 'git help <comando>' para leer sobre los subcomandos específicos"
4386
4248 -#: help.c:432
4387 +#: help.c:434
4388 msgid "External commands"
4389 msgstr "Comandos externos"
4390
4252 -#: help.c:447
4391 +#: help.c:449
4392 msgid "Command aliases"
4393 msgstr "Aliases de comando"
4394
4256 -#: help.c:511
4395 +#: help.c:527
4396 #, c-format
4397 msgid ""
4398 "'%s' appears to be a git command, but we were not\n"
@@ -4262,31 +4401,31 @@ msgstr ""
4401 "'%s' parece ser un comando de git, pero no hemos\n"
4402 "podido ejecutarlo. ¿Tal vez git-%s se ha roto?"
4403
4265 -#: help.c:570
4404 +#: help.c:543 help.c:631
4405 +#, c-format
4406 +msgid "git: '%s' is not a git command. See 'git --help'."
4407 +msgstr "git: '%s'no es un comando de git. Mira 'git --help'."
4408 +
4409 +#: help.c:591
4410 msgid "Uh oh. Your system reports no Git commands at all."
4411 msgstr "Oh oh. Tu sistema no reporta ningún comando de Git."
4412
4269 -#: help.c:592
4413 +#: help.c:613
4414 #, c-format
4415 msgid "WARNING: You called a Git command named '%s', which does not exist."
4416 msgstr "PELIGRO: Has llamado a un comando de Git '%s', el cual no existe."
4417
4274 -#: help.c:597
4418 +#: help.c:618
4419 #, c-format
4420 msgid "Continuing under the assumption that you meant '%s'."
4421 msgstr "Continuando asumiendo que quisiste decir '%s'."
4422
4279 -#: help.c:602
4423 +#: help.c:623
4424 #, c-format
4425 msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
4426 msgstr "Continuando en %0.1f segundos, asumiendo que tu dijiste '%s'."
4427
4284 -#: help.c:610
4285 -#, c-format
4286 -msgid "git: '%s' is not a git command. See 'git --help'."
4287 -msgstr "git: '%s'no es un comando de git. Mira 'git --help'."
4288 -
4289 -#: help.c:614
4428 +#: help.c:635
4429 msgid ""
4430 "\n"
4431 "The most similar command is"
@@ -4300,16 +4439,16 @@ msgstr[1] ""
4439 "\n"
4440 "Los comandos más similares son"
4441
4303 -#: help.c:654
4442 +#: help.c:675
4443 msgid "git version [<options>]"
4444 msgstr "git versión [<opciones>]"
4445
4307 -#: help.c:709
4446 +#: help.c:730
4447 #, c-format
4448 msgid "%s: %s - %s"
4449 msgstr "%s: %s - %s"
4450
4312 -#: help.c:713
4451 +#: help.c:734
4452 msgid ""
4453 "\n"
4454 "Did you mean this?"
@@ -4323,7 +4462,15 @@ msgstr[1] ""
4462 "\n"
4463 "¿Quisiste decir alguno de estos?"
4464
4326 -#: ident.c:349
4465 +#: ident.c:353
4466 +msgid "Author identity unknown\n"
4467 +msgstr "Identidad del autor desconocido\n"
4468 +
4469 +#: ident.c:356
4470 +msgid "Committer identity unknown\n"
4471 +msgstr "Se desconoce la identidad del autor\n"
4472 +
4473 +#: ident.c:362
4474 msgid ""
4475 "\n"
4476 "*** Please tell me who you are.\n"
@@ -4349,66 +4496,66 @@ msgstr ""
4496 "Omite --global para configurar tu identidad solo en este repositorio.\n"
4497 "\n"
4498
4352 -#: ident.c:379
4499 +#: ident.c:397
4500 msgid "no email was given and auto-detection is disabled"
4501 msgstr "no se entrego ningún email y la detección automática está desactivada"
4502
4356 -#: ident.c:384
4503 +#: ident.c:402
4504 #, c-format
4505 msgid "unable to auto-detect email address (got '%s')"
4506 msgstr "no es posible auto-detectar la dirección de correo (se obtuvo '%s')"
4507
4361 -#: ident.c:401
4508 +#: ident.c:419
4509 msgid "no name was given and auto-detection is disabled"
4510 msgstr "no se entrego ningún nombre y la detección automática está desactivada"
4511
4365 -#: ident.c:407
4512 +#: ident.c:425
4513 #, c-format
4514 msgid "unable to auto-detect name (got '%s')"
4515 msgstr "no es posible auto-detectar el nombre (se obtuvo '%s')"
4516
4370 -#: ident.c:415
4517 +#: ident.c:433
4518 #, c-format
4519 msgid "empty ident name (for <%s>) not allowed"
4520 msgstr "no se puede tener un nombre vacío (para <%s>)"
4521
4375 -#: ident.c:421
4522 +#: ident.c:439
4523 #, c-format
4524 msgid "name consists only of disallowed characters: %s"
4525 msgstr "el nombre consiste solo de caracteres no permitidos: %s"
4526
4380 -#: ident.c:436 builtin/commit.c:634
4527 +#: ident.c:454 builtin/commit.c:634
4528 #, c-format
4529 msgid "invalid date format: %s"
4530 msgstr "formato de fecha inválido: %s"
4531
4385 -#: list-objects-filter-options.c:58
4532 +#: list-objects-filter-options.c:81
4533 msgid "expected 'tree:<depth>'"
4534 msgstr "se esperaba 'tree:<depth>'"
4535
4389 -#: list-objects-filter-options.c:73
4536 +#: list-objects-filter-options.c:96
4537 msgid "sparse:path filters support has been dropped"
4538 msgstr "soporte para filtros sparse:path ha sido discontinuado"
4539
4393 -#: list-objects-filter-options.c:86
4540 +#: list-objects-filter-options.c:109
4541 #, c-format
4542 msgid "invalid filter-spec '%s'"
4543 msgstr "filtro -spec inválido '%s'"
4544
4398 -#: list-objects-filter-options.c:102
4545 +#: list-objects-filter-options.c:125
4546 #, c-format
4547 msgid "must escape char in sub-filter-spec: '%c'"
4548 msgstr "tienes que escapar el caracter en sub-filter-spec: '%c'"
4549
4403 -#: list-objects-filter-options.c:144
4550 +#: list-objects-filter-options.c:167
4551 msgid "expected something after combine:"
4552 msgstr "se espera algo luego de combine:"
4553
4407 -#: list-objects-filter-options.c:226
4554 +#: list-objects-filter-options.c:249
4555 msgid "multiple filter-specs cannot be combined"
4556 msgstr "no se pueden combinar múltiples tipos de especificaciones de filtro"
4557
4411 -#: list-objects-filter-options.c:330
4558 +#: list-objects-filter-options.c:361
4559 msgid "unable to upgrade repository format to support partial clone"
4560 msgstr ""
4561 "no es posible actualizar el formato del repositorio para soportar clonado "
@@ -4464,56 +4611,312 @@ msgstr ""
4611 msgid "Unable to create '%s.lock': %s"
4612 msgstr "No se pudo crear '%s.lock': %s"
4613
4467 -#: ls-refs.c:109
4614 +#: ls-refs.c:37
4615 +#, c-format
4616 +msgid "invalid value '%s' for lsrefs.unborn"
4617 +msgstr "valor inválido '%s' para lsrefs.unborn"
4618 +
4619 +#: ls-refs.c:167
4620 msgid "expected flush after ls-refs arguments"
4621 msgstr "se esperaba un flush luego de argumentos ls-refs"
4622
4471 -#: merge-recursive.c:356
4472 -msgid "(bad commit)\n"
4473 -msgstr "(commit erróneo)\n"
4474 -
4475 -#: merge-recursive.c:379
4623 +#: merge-ort.c:888 merge-recursive.c:1191
4624 #, c-format
4477 -msgid "add_cacheinfo failed for path '%s'; merge aborting."
4478 -msgstr "add_cacheinfo falló para la ruta '%s'; abortando fusión."
4625 +msgid "Failed to merge submodule %s (not checked out)"
4626 +msgstr "Falló al fusionar el submódulo %s (no revisado)"
4627
4480 -#: merge-recursive.c:388
4628 +#: merge-ort.c:897 merge-recursive.c:1198
4629 #, c-format
4482 -msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
4483 -msgstr "add_cacheinfo falló para refrescar la ruta '%s'; abortando fusión."
4630 +msgid "Failed to merge submodule %s (commits not present)"
4631 +msgstr "Falló al fusionar el submódulo %s (commits no presentes)"
4632
4485 -#: merge-recursive.c:874
4633 +#: merge-ort.c:906 merge-recursive.c:1205
4634 #, c-format
4487 -msgid "failed to create path '%s'%s"
4488 -msgstr "falló al crear la ruta '%s'%s"
4635 +msgid "Failed to merge submodule %s (commits don't follow merge-base)"
4636 +msgstr "Falló el fusionar submódulo %s (commits no siguen la fusión base)"
4637
4490 -#: merge-recursive.c:885
4638 +#: merge-ort.c:916 merge-ort.c:923
4639 #, c-format
4492 -msgid "Removing %s to make room for subdirectory\n"
4493 -msgstr "Removiendo %s para hacer espacio para un subdirectorio\n"
4494 -
4495 -#: merge-recursive.c:899 merge-recursive.c:918
4496 -msgid ": perhaps a D/F conflict?"
4497 -msgstr ": ¿tal vez un conflicto D/F?"
4640 +msgid "Note: Fast-forwarding submodule %s to %s"
4641 +msgstr "Nota: Fast-forward de submódulo %s a %s"
4642
4499 -#: merge-recursive.c:908
4643 +#: merge-ort.c:944
4644 #, c-format
4501 -msgid "refusing to lose untracked file at '%s'"
4502 -msgstr "rehusando perder el archivo rastreado en '%s'"
4645 +msgid "Failed to merge submodule %s"
4646 +msgstr "falló al fusionar el submódulo %s"
4647
4504 -#: merge-recursive.c:949 builtin/cat-file.c:41
4648 +#: merge-ort.c:951
4649 #, c-format
4506 -msgid "cannot read object %s '%s'"
4507 -msgstr "no se puede leer el objeto %s '%s'"
4650 +msgid ""
4651 +"Failed to merge submodule %s, but a possible merge resolution exists:\n"
4652 +"%s\n"
4653 +msgstr ""
4654 +"Falló al fusionar el submódulo %s, pero existen posibles soluciones de "
4655 +"fusión:\n"
4656 +"%s\n"
4657
4509 -#: merge-recursive.c:954
4658 +#: merge-ort.c:955 merge-recursive.c:1259
4659 #, c-format
4511 -msgid "blob expected for %s '%s'"
4512 -msgstr "se esperaba blob para %s '%s'"
4660 +msgid ""
4661 +"If this is correct simply add it to the index for example\n"
4662 +"by using:\n"
4663 +"\n"
4664 +" git update-index --cacheinfo 160000 %s \"%s\"\n"
4665 +"\n"
4666 +"which will accept this suggestion.\n"
4667 +msgstr ""
4668 +"Si esto es correcto simplemente agrégalo al índice por ejemplo\n"
4669 +"usando:\n"
4670 +"\n"
4671 +" git update-index --cacheinfo 160000 %s \"%s\"\n"
4672 +"\n"
4673 +"el cual aceptará esta sugerencia.\n"
4674
4514 -#: merge-recursive.c:979
4675 +#: merge-ort.c:968
4676 #, c-format
4516 -msgid "failed to open '%s': %s"
4677 +msgid ""
4678 +"Failed to merge submodule %s, but multiple possible merges exist:\n"
4679 +"%s"
4680 +msgstr ""
4681 +"Falló al fusionar el submódulo %s, pero existen múltipes fusiones posibles:\n"
4682 +"%s"
4683 +
4684 +#: merge-ort.c:1127 merge-recursive.c:1341
4685 +msgid "Failed to execute internal merge"
4686 +msgstr "Falló al ejecutar la fusión interna"
4687 +
4688 +#: merge-ort.c:1132 merge-recursive.c:1346
4689 +#, c-format
4690 +msgid "Unable to add %s to database"
4691 +msgstr "No es posible agregar %s a la base de datos"
4692 +
4693 +#: merge-ort.c:1139 merge-recursive.c:1378
4694 +#, c-format
4695 +msgid "Auto-merging %s"
4696 +msgstr "Auto-fusionando %s"
4697 +
4698 +#: merge-ort.c:1278 merge-recursive.c:2100
4699 +#, c-format
4700 +msgid ""
4701 +"CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "
4702 +"implicit directory rename(s) putting the following path(s) there: %s."
4703 +msgstr ""
4704 +"CONFLICTO (cambio de nombre de directorio implícito): Archivo/directorio "
4705 +"existente en %s se interpone con el cambio de nombres implícito, poniendo "
4706 +"la(s) siguiente(s) ruta(s) aquí: %s."
4707 +
4708 +#: merge-ort.c:1288 merge-recursive.c:2110
4709 +#, c-format
4710 +msgid ""
4711 +"CONFLICT (implicit dir rename): Cannot map more than one path to %s; "
4712 +"implicit directory renames tried to put these paths there: %s"
4713 +msgstr ""
4714 +"CONFLICTO (cambio de nombre implícito): No se puede mapear más de una ruta "
4715 +"para %s; cambio de nombre implícito intentó poner estas rutas: %s"
4716 +
4717 +#: merge-ort.c:1471
4718 +#, c-format
4719 +msgid ""
4720 +"CONFLICT (directory rename split): Unclear where to rename %s to; it was "
4721 +"renamed to multiple other directories, with no destination getting a "
4722 +"majority of the files."
4723 +msgstr ""
4724 +"CONFLICTO (división de cambio de nombre de directorio): No está claro dónde "
4725 +"cambiar el nombre de %s; se le cambió el nombre a varios otros directorios, "
4726 +"sin que ningún destino obtenga la mayoría de los archivos."
4727 +
4728 +#: merge-ort.c:1637 merge-recursive.c:2447
4729 +#, c-format
4730 +msgid ""
4731 +"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
4732 +"renamed."
4733 +msgstr ""
4734 +"PELIGRO: Evitando aplicar %s -> %s renombrado a %s, porque %s mismo fue "
4735 +"renombrado."
4736 +
4737 +#: merge-ort.c:1781 merge-recursive.c:3215
4738 +#, c-format
4739 +msgid ""
4740 +"Path updated: %s added in %s inside a directory that was renamed in %s; "
4741 +"moving it to %s."
4742 +msgstr ""
4743 +"Path actualizado: %s agregado en %s dentro de un directorio que fue "
4744 +"renombrado en %s; moviéndolo a %s."
4745 +
4746 +#: merge-ort.c:1788 merge-recursive.c:3222
4747 +#, c-format
4748 +msgid ""
4749 +"Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
4750 +"%s; moving it to %s."
4751 +msgstr ""
4752 +"Path actualizado: %s renombrado a %s en %s, dentro de un directorio que fue "
4753 +"renombrado en %s; moviéndolo a %s."
4754 +
4755 +#: merge-ort.c:1801 merge-recursive.c:3218
4756 +#, c-format
4757 +msgid ""
4758 +"CONFLICT (file location): %s added in %s inside a directory that was renamed "
4759 +"in %s, suggesting it should perhaps be moved to %s."
4760 +msgstr ""
4761 +"CONFLICTO (ubicación de archivo): %s agregado en %s dentro de un directorio "
4762 +"que fue renombrado en %s, sugerimos que debería ser movido a %s."
4763 +
4764 +#: merge-ort.c:1809 merge-recursive.c:3225
4765 +#, c-format
4766 +msgid ""
4767 +"CONFLICT (file location): %s renamed to %s in %s, inside a directory that "
4768 +"was renamed in %s, suggesting it should perhaps be moved to %s."
4769 +msgstr ""
4770 +"CONFLICTO (ubicación de archivo): %s renombrado a %s en %s, dentro de un "
4771 +"directorio que fue renombrado en %s, sugiriendo que tal vez debería ser "
4772 +"movido a %s."
4773 +
4774 +#: merge-ort.c:1952
4775 +#, c-format
4776 +msgid "CONFLICT (rename/rename): %s renamed to %s in %s and to %s in %s."
4777 +msgstr ""
4778 +"CONFLICTO (renombrar / renombrar): %s renombrado a %s en %s y %s en %s."
4779 +
4780 +#: merge-ort.c:2047
4781 +#, c-format
4782 +msgid ""
4783 +"CONFLICT (rename involved in collision): rename of %s -> %s has content "
4784 +"conflicts AND collides with another path; this may result in nested conflict "
4785 +"markers."
4786 +msgstr ""
4787 +"CONFLICTO (cambio de nombre involucrado en colisión): cambio de nombre de%s -"
4788 +">%s tiene conflictos de contenido Y colisiona con otra ruta; esto puede "
4789 +"resultar en marcadores de conflicto anidados."
4790 +
4791 +#: merge-ort.c:2066 merge-ort.c:2090
4792 +#, c-format
4793 +msgid "CONFLICT (rename/delete): %s renamed to %s in %s, but deleted in %s."
4794 +msgstr ""
4795 +"CONFLICTO (renombrar / eliminar): %s renombrado a %s en %s, pero eliminado "
4796 +"en %s."
4797 +
4798 +#: merge-ort.c:2735
4799 +#, c-format
4800 +msgid ""
4801 +"CONFLICT (file/directory): directory in the way of %s from %s; moving it to "
4802 +"%s instead."
4803 +msgstr ""
4804 +"CONFLICTO (archivo / directorio): directorio en el camino de%s de%s; "
4805 +"moviéndolo a%s en su lugar."
4806 +
4807 +#: merge-ort.c:2808
4808 +#, c-format
4809 +msgid ""
4810 +"CONFLICT (distinct types): %s had different types on each side; renamed %s "
4811 +"of them so each can be recorded somewhere."
4812 +msgstr ""
4813 +"CONFLICTO (tipos distintos):%s tenía tipos diferentes en cada lado; "
4814 +"renombrado%s de ellos para que cada uno pueda ser grabado en algún lugar."
4815 +
4816 +#: merge-ort.c:2812
4817 +msgid "both"
4818 +msgstr "ambos"
4819 +
4820 +#: merge-ort.c:2812
4821 +msgid "one"
4822 +msgstr "uno"
4823 +
4824 +#: merge-ort.c:2907 merge-recursive.c:3052
4825 +msgid "content"
4826 +msgstr "contenido"
4827 +
4828 +#: merge-ort.c:2909 merge-recursive.c:3056
4829 +msgid "add/add"
4830 +msgstr "agregar/agregar"
4831 +
4832 +#: merge-ort.c:2911 merge-recursive.c:3101
4833 +msgid "submodule"
4834 +msgstr "submódulo"
4835 +
4836 +#: merge-ort.c:2913 merge-recursive.c:3102
4837 +#, c-format
4838 +msgid "CONFLICT (%s): Merge conflict in %s"
4839 +msgstr "CONFLICTO (%s): Conflicto de fusión en %s"
4840 +
4841 +#: merge-ort.c:2938
4842 +#, c-format
4843 +msgid ""
4844 +"CONFLICT (modify/delete): %s deleted in %s and modified in %s. Version %s "
4845 +"of %s left in tree."
4846 +msgstr ""
4847 +"CONFLICTO (modificar / eliminar): %s eliminado en %s y modificado en %s. "
4848 +"Versión %s de %s restante en el árbol."
4849 +
4850 +#. TRANSLATORS: The %s arguments are: 1) tree hash of a merge
4851 +#. base, and 2-3) the trees for the two trees we're merging.
4852 +#.
4853 +#: merge-ort.c:3406
4854 +#, c-format
4855 +msgid "collecting merge info failed for trees %s, %s, %s"
4856 +msgstr ""
4857 +"La recopilación de información de fusión falló para los árboles %s, %s, %s"
4858 +
4859 +#: merge-ort-wrappers.c:13 merge-recursive.c:3661
4860 +#, c-format
4861 +msgid ""
4862 +"Your local changes to the following files would be overwritten by merge:\n"
4863 +" %s"
4864 +msgstr ""
4865 +"Los cambios locales de los siguientes archivos serán sobreescritos por "
4866 +"merge:\n"
4867 +" %s"
4868 +
4869 +#: merge-ort-wrappers.c:33 merge-recursive.c:3436
4870 +#, c-format
4871 +msgid "Already up to date!"
4872 +msgstr "¡Ya está actualizado!"
4873 +
4874 +#: merge-recursive.c:356
4875 +msgid "(bad commit)\n"
4876 +msgstr "(commit erróneo)\n"
4877 +
4878 +#: merge-recursive.c:379
4879 +#, c-format
4880 +msgid "add_cacheinfo failed for path '%s'; merge aborting."
4881 +msgstr "add_cacheinfo falló para la ruta '%s'; abortando fusión."
4882 +
4883 +#: merge-recursive.c:388
4884 +#, c-format
4885 +msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
4886 +msgstr "add_cacheinfo falló para refrescar la ruta '%s'; abortando fusión."
4887 +
4888 +#: merge-recursive.c:874
4889 +#, c-format
4890 +msgid "failed to create path '%s'%s"
4891 +msgstr "falló al crear la ruta '%s'%s"
4892 +
4893 +#: merge-recursive.c:885
4894 +#, c-format
4895 +msgid "Removing %s to make room for subdirectory\n"
4896 +msgstr "Removiendo %s para hacer espacio para un subdirectorio\n"
4897 +
4898 +#: merge-recursive.c:899 merge-recursive.c:918
4899 +msgid ": perhaps a D/F conflict?"
4900 +msgstr ": ¿tal vez un conflicto D/F?"
4901 +
4902 +#: merge-recursive.c:908
4903 +#, c-format
4904 +msgid "refusing to lose untracked file at '%s'"
4905 +msgstr "rehusando perder el archivo rastreado en '%s'"
4906 +
4907 +#: merge-recursive.c:949 builtin/cat-file.c:41
4908 +#, c-format
4909 +msgid "cannot read object %s '%s'"
4910 +msgstr "no se puede leer el objeto %s '%s'"
4911 +
4912 +#: merge-recursive.c:954
4913 +#, c-format
4914 +msgid "blob expected for %s '%s'"
4915 +msgstr "se esperaba blob para %s '%s'"
4916 +
4917 +#: merge-recursive.c:979
4918 +#, c-format
4919 +msgid "failed to open '%s': %s"
4920 msgstr "falló al abrir '%s': %s"
4921
4922 #: merge-recursive.c:990
@@ -4526,21 +4929,6 @@ msgstr "falló al crear el enlace simbólico '%s': %s"
4929 msgid "do not know what to do with %06o %s '%s'"
4930 msgstr "no se que hacer con %06o %s '%s'"
4931
4529 -#: merge-recursive.c:1191
4530 -#, c-format
4531 -msgid "Failed to merge submodule %s (not checked out)"
4532 -msgstr "Falló al fusionar el submódulo %s (no revisado)"
4533 -
4534 -#: merge-recursive.c:1198
4535 -#, c-format
4536 -msgid "Failed to merge submodule %s (commits not present)"
4537 -msgstr "Falló al fusionar el submódulo %s (commits no presentes)"
4538 -
4539 -#: merge-recursive.c:1205
4540 -#, c-format
4541 -msgid "Failed to merge submodule %s (commits don't follow merge-base)"
4542 -msgstr "Falló el fusionar submódulo %s (commits no siguen la fusión base)"
4543 -
4932 #: merge-recursive.c:1213 merge-recursive.c:1225
4933 #, c-format
4934 msgid "Fast-forwarding submodule %s to the following commit:"
@@ -4566,42 +4954,11 @@ msgstr "Falló al fusionar el submódulo %s (no es posible avance rápido)"
4954 msgid "Found a possible merge resolution for the submodule:\n"
4955 msgstr "Se encontró una posible solución de fusión para el submódulo:\n"
4956
4569 -#: merge-recursive.c:1259
4570 -#, c-format
4571 -msgid ""
4572 -"If this is correct simply add it to the index for example\n"
4573 -"by using:\n"
4574 -"\n"
4575 -" git update-index --cacheinfo 160000 %s \"%s\"\n"
4576 -"\n"
4577 -"which will accept this suggestion.\n"
4578 -msgstr ""
4579 -"Si esto es correcto simplemente agrégalo al índice por ejemplo\n"
4580 -"usando:\n"
4581 -"\n"
4582 -" git update-index --cacheinfo 160000 %s \"%s\"\n"
4583 -"\n"
4584 -"el cual aceptará esta sugerencia.\n"
4585 -
4957 #: merge-recursive.c:1268
4958 #, c-format
4959 msgid "Failed to merge submodule %s (multiple merges found)"
4960 msgstr "Falló al fusionar el submódulo %s (fusiones múltiples encontradas)"
4961
4591 -#: merge-recursive.c:1341
4592 -msgid "Failed to execute internal merge"
4593 -msgstr "Falló al ejecutar la fusión interna"
4594 -
4595 -#: merge-recursive.c:1346
4596 -#, c-format
4597 -msgid "Unable to add %s to database"
4598 -msgstr "No es posible agregar %s a la base de datos"
4599 -
4600 -#: merge-recursive.c:1378
4601 -#, c-format
4602 -msgid "Auto-merging %s"
4603 -msgstr "Auto-fusionando %s"
4604 -
4962 #: merge-recursive.c:1402
4963 #, c-format
4964 msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
@@ -4713,25 +5070,6 @@ msgstr ""
5070 "colocar %s porque el directorio %s fue renombrado a otros múltiples "
5071 "directorios, sin ningún que contenga la mayoría de archivos."
5072
4716 -#: merge-recursive.c:2100
4717 -#, c-format
4718 -msgid ""
4719 -"CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "
4720 -"implicit directory rename(s) putting the following path(s) there: %s."
4721 -msgstr ""
4722 -"CONFLICTO (cambio de nombre de directorio implícito): Archivo/directorio "
4723 -"existente en %s se interpone con el cambio de nombres implícito, poniendo "
4724 -"la(s) siguiente(s) ruta(s) aquí: %s."
4725 -
4726 -#: merge-recursive.c:2110
4727 -#, c-format
4728 -msgid ""
4729 -"CONFLICT (implicit dir rename): Cannot map more than one path to %s; "
4730 -"implicit directory renames tried to put these paths there: %s"
4731 -msgstr ""
4732 -"CONFLICTO (cambio de nombre implícito): No se puede mapear más de una ruta "
4733 -"para %s; cambio de nombre implícito intentó poner estas rutas: %s"
4734 -
5073 #: merge-recursive.c:2202
5074 #, c-format
5075 msgid ""
@@ -4741,15 +5079,6 @@ msgstr ""
5079 "CONFLICTO (renombrar/renombrar): Renombrar directorio %s->%s en %s. "
5080 "Renombrar directorio %s->%s en %s"
5081
4744 -#: merge-recursive.c:2447
4745 -#, c-format
4746 -msgid ""
4747 -"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
4748 -"renamed."
4749 -msgstr ""
4750 -"PELIGRO: Evitando aplicar %s -> %s renombrado a %s, porque %s mismo fue "
4751 -"renombrado."
4752 -
5082 #: merge-recursive.c:2973
5083 #, c-format
5084 msgid "cannot read object %s"
@@ -4768,71 +5097,17 @@ msgstr "modificar"
5097 msgid "modified"
5098 msgstr "modificado"
5099
4771 -#: merge-recursive.c:3052
4772 -msgid "content"
4773 -msgstr "contenido"
4774 -
4775 -#: merge-recursive.c:3056
4776 -msgid "add/add"
4777 -msgstr "agregar/agregar"
4778 -
5100 #: merge-recursive.c:3079
5101 #, c-format
5102 msgid "Skipped %s (merged same as existing)"
5103 msgstr "Saltado %s (fusionado como existente)"
5104
4784 -#: merge-recursive.c:3101 git-submodule.sh:959
4785 -msgid "submodule"
4786 -msgstr "submódulo"
4787 -
4788 -#: merge-recursive.c:3102
4789 -#, c-format
4790 -msgid "CONFLICT (%s): Merge conflict in %s"
4791 -msgstr "CONFLICTO (%s): Conflicto de fusión en %s"
4792 -
5105 #: merge-recursive.c:3132
5106 #, c-format
5107 msgid "Adding as %s instead"
5108 msgstr "Agregando más bien como %s"
5109
4798 -#: merge-recursive.c:3215
4799 -#, c-format
4800 -msgid ""
4801 -"Path updated: %s added in %s inside a directory that was renamed in %s; "
4802 -"moving it to %s."
4803 -msgstr ""
4804 -"Path actualizado: %s agregado en %s dentro de un directorio que fue "
4805 -"renombrado en %s; moviéndolo a %s."
4806 -
4807 -#: merge-recursive.c:3218
4808 -#, c-format
4809 -msgid ""
4810 -"CONFLICT (file location): %s added in %s inside a directory that was renamed "
4811 -"in %s, suggesting it should perhaps be moved to %s."
4812 -msgstr ""
4813 -"CONFLICTO (ubicación de archivo): %s agregado en %s dentro de un directorio "
4814 -"que fue renombrado en %s, sugerimos que debería ser movido a %s."
4815 -
4816 -#: merge-recursive.c:3222
4817 -#, c-format
4818 -msgid ""
4819 -"Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
4820 -"%s; moving it to %s."
4821 -msgstr ""
4822 -"Path actualizado: %s renombrado a %s en %s, dentro de un directorio que fue "
4823 -"renombrado en %s; moviéndolo a %s."
4824 -
4825 -#: merge-recursive.c:3225
4826 -#, c-format
4827 -msgid ""
4828 -"CONFLICT (file location): %s renamed to %s in %s, inside a directory that "
4829 -"was renamed in %s, suggesting it should perhaps be moved to %s."
4830 -msgstr ""
4831 -"CONFLICTO (ubicación de archivo): %s renombrado a %s en %s, dentro de un "
4832 -"directorio que fue renombrado en %s, sugiriendo que tal vez debería ser "
4833 -"movido a %s."
4834 -
4835 -#: merge-recursive.c:3339
5110 +#: merge-recursive.c:3339
5111 #, c-format
5112 msgid "Removing %s"
5113 msgstr "Eliminando %s"
@@ -4862,46 +5137,33 @@ msgstr "Agregando %s"
5137 msgid "CONFLICT (add/add): Merge conflict in %s"
5138 msgstr "CONFLICTO (add/add): Conflicto de merge en %s"
5139
4865 -#: merge-recursive.c:3436
4866 -msgid "Already up to date!"
4867 -msgstr "¡Ya está actualizado!"
4868 -
5140 #: merge-recursive.c:3445
5141 #, c-format
5142 msgid "merging of trees %s and %s failed"
5143 msgstr "falló la fusión de los árboles %s y %s"
5144
4874 -#: merge-recursive.c:3549
5145 +#: merge-recursive.c:3539
5146 msgid "Merging:"
5147 msgstr "Fusionando:"
5148
4878 -#: merge-recursive.c:3562
5149 +#: merge-recursive.c:3552
5150 #, c-format
5151 msgid "found %u common ancestor:"
5152 msgid_plural "found %u common ancestors:"
5153 msgstr[0] "se encontró %u ancestro común:"
5154 msgstr[1] "se encontraron %u ancestros comunes:"
5155
4885 -#: merge-recursive.c:3612
5156 +#: merge-recursive.c:3602
5157 msgid "merge returned no commit"
5158 msgstr "la fusión no devolvió ningún commit"
5159
4889 -#: merge-recursive.c:3671
4890 -#, c-format
4891 -msgid ""
4892 -"Your local changes to the following files would be overwritten by merge:\n"
4893 -" %s"
4894 -msgstr ""
4895 -"Los cambios locales de los siguientes archivos serán sobreescritos por "
4896 -"merge:\n"
4897 -" %s"
4898 -
4899 -#: merge-recursive.c:3768
5160 +#: merge-recursive.c:3758
5161 #, c-format
5162 msgid "Could not parse object '%s'"
5163 msgstr "No se pudo analizar el objeto '%s'"
5164
4904 -#: merge-recursive.c:3786 builtin/merge.c:705 builtin/merge.c:885
5165 +#: merge-recursive.c:3776 builtin/merge.c:712 builtin/merge.c:896
5166 +#: builtin/stash.c:471
5167 msgid "Unable to write index."
5168 msgstr "Incapaz de escribir el índice."
5169
@@ -4909,187 +5171,181 @@ msgstr "Incapaz de escribir el índice."
5171 msgid "failed to read the cache"
5172 msgstr "falló al leer la cache"
5173
4912 -#: merge.c:108 rerere.c:720 builtin/am.c:1878 builtin/am.c:1912
4913 -#: builtin/checkout.c:559 builtin/checkout.c:822 builtin/clone.c:816
5174 +#: merge.c:109 rerere.c:704 builtin/am.c:1883 builtin/am.c:1917
5175 +#: builtin/checkout.c:575 builtin/checkout.c:828 builtin/clone.c:817
5176 #: builtin/stash.c:265
5177 msgid "unable to write new index file"
5178 msgstr "no es posible escribir el archivo índice"
5179
4918 -#: midx.c:68
5180 +#: midx.c:62
5181 +msgid "multi-pack-index OID fanout is of the wrong size"
5182 +msgstr ""
5183 +"El abanico de OID de índice de paquetes múltiples es del tamaño incorrecto"
5184 +
5185 +#: midx.c:93
5186 #, c-format
5187 msgid "multi-pack-index file %s is too small"
5188 msgstr "archivo multi-pack-index %s es muy pequeño"
5189
4923 -#: midx.c:84
5190 +#: midx.c:109
5191 #, c-format
5192 msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
5193 msgstr "firma de multi-pack-index 0x%08x no concuerda con firma 0x%08x"
5194
4928 -#: midx.c:89
5195 +#: midx.c:114
5196 #, c-format
5197 msgid "multi-pack-index version %d not recognized"
5198 msgstr "versión %d de multi-pack-index no reconocida"
5199
4933 -#: midx.c:94
5200 +#: midx.c:119
5201 #, c-format
4935 -msgid "hash version %u does not match"
4936 -msgstr "versión de hash %u no concuerda"
4937 -
4938 -#: midx.c:108
4939 -msgid "invalid chunk offset (too large)"
4940 -msgstr "offset inválido del conjunto (muy grande)"
4941 -
4942 -#: midx.c:132
4943 -msgid "terminating multi-pack-index chunk id appears earlier than expected"
5202 +msgid "multi-pack-index hash version %u does not match version %u"
5203 msgstr ""
4945 -"terminando multi-pack-index porque el id del conjunto aparece antes de lo "
4946 -"esperado"
5204 +"La versión de hash de índice de paquetes múltiples %u no coincide con la "
5205 +"versión %u"
5206
4948 -#: midx.c:145
5207 +#: midx.c:136
5208 msgid "multi-pack-index missing required pack-name chunk"
5209 msgstr "multi-pack-index le falta el conjunto pack-name requerido"
5210
4952 -#: midx.c:147
5211 +#: midx.c:138
5212 msgid "multi-pack-index missing required OID fanout chunk"
5213 msgstr "multi-pack-index le falta el conjunto OID fanout requerido"
5214
4956 -#: midx.c:149
5215 +#: midx.c:140
5216 msgid "multi-pack-index missing required OID lookup chunk"
5217 msgstr "multi-pack-index le falta el conjunto OID fanout requerido"
5218
4960 -#: midx.c:151
5219 +#: midx.c:142
5220 msgid "multi-pack-index missing required object offsets chunk"
5221 msgstr "multi-pack-index le falta el conjunto de offset del objeto requerido"
5222
4964 -#: midx.c:165
5223 +#: midx.c:158
5224 #, c-format
5225 msgid "multi-pack-index pack names out of order: '%s' before '%s'"
5226 msgstr "multi-pack-index nombres de paquete fuera de orden:'%s' antes '%s'"
5227
4969 -#: midx.c:208
5228 +#: midx.c:202
5229 #, c-format
5230 msgid "bad pack-int-id: %u (%u total packs)"
5231 msgstr "mal pack-int-id: %u (%u paquetes totales)"
5232
4974 -#: midx.c:258
5233 +#: midx.c:252
5234 msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
5235 msgstr "multi-pack-index guarda un offset de 64-bit, pero off_t es muy pequeño"
5236
4978 -#: midx.c:286
4979 -msgid "error preparing packfile from multi-pack-index"
4980 -msgstr "error preparando packfile de multi-pack-index"
4981 -
4982 -#: midx.c:470
5237 +#: midx.c:467
5238 #, c-format
5239 msgid "failed to add packfile '%s'"
5240 msgstr "falló al agregar packfile '%s'"
5241
4987 -#: midx.c:476
5242 +#: midx.c:473
5243 #, c-format
5244 msgid "failed to open pack-index '%s'"
5245 msgstr "falló al abrir pack-index '%s'"
5246
4992 -#: midx.c:536
5247 +#: midx.c:533
5248 #, c-format
5249 msgid "failed to locate object %d in packfile"
5250 msgstr "falló al ubicar objeto %d en packfile"
5251
4997 -#: midx.c:840
5252 +#: midx.c:821
5253 msgid "Adding packfiles to multi-pack-index"
5254 msgstr "Agregando packfiles a multi-pack-index"
5255
5001 -#: midx.c:873
5256 +#: midx.c:855
5257 #, c-format
5258 msgid "did not see pack-file %s to drop"
5259 msgstr "no se vió pack-file %s caer"
5260
5006 -#: midx.c:925
5261 +#: midx.c:904
5262 msgid "no pack files to index."
5263 msgstr "no hay archivos pack para indexar."
5264
5010 -#: midx.c:977
5011 -msgid "Writing chunks to multi-pack-index"
5012 -msgstr "Escribiendo chunks a multi-pack-index"
5013 -
5014 -#: midx.c:1056
5265 +#: midx.c:965
5266 #, c-format
5267 msgid "failed to clear multi-pack-index at %s"
5268 msgstr "falló al limpiar multi-pack-index en %s"
5269
5019 -#: midx.c:1112
5270 +#: midx.c:1021
5271 +msgid "multi-pack-index file exists, but failed to parse"
5272 +msgstr ""
5273 +"El archivo de índice de paquetes múltiples existe, pero no se pudo analizar"
5274 +
5275 +#: midx.c:1029
5276 msgid "Looking for referenced packfiles"
5277 msgstr "Buscando por packfiles referidos"
5278
5023 -#: midx.c:1127
5279 +#: midx.c:1044
5280 #, c-format
5281 msgid ""
5282 "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
5283 msgstr ""
5284 "oid fanout fuera de orden: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
5285
5030 -#: midx.c:1132
5286 +#: midx.c:1049
5287 msgid "the midx contains no oid"
5288 msgstr "el midx no contiene oid"
5289
5034 -#: midx.c:1141
5290 +#: midx.c:1058
5291 msgid "Verifying OID order in multi-pack-index"
5292 msgstr "Verificando orden de OID en multi-pack-index"
5293
5038 -#: midx.c:1150
5294 +#: midx.c:1067
5295 #, c-format
5296 msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
5297 msgstr "oid lookup fuera de orden: oid[%d] = %s >= %s = oid[%d]"
5298
5043 -#: midx.c:1170
5299 +#: midx.c:1087
5300 msgid "Sorting objects by packfile"
5301 msgstr "Ordenando objetos por packfile"
5302
5047 -#: midx.c:1177
5303 +#: midx.c:1094
5304 msgid "Verifying object offsets"
5305 msgstr "Verificando offsets de objetos"
5306
5051 -#: midx.c:1193
5307 +#: midx.c:1110
5308 #, c-format
5309 msgid "failed to load pack entry for oid[%d] = %s"
5310 msgstr "fallo al cargar entrada pack para oid[%d] = %s"
5311
5056 -#: midx.c:1199
5312 +#: midx.c:1116
5313 #, c-format
5314 msgid "failed to load pack-index for packfile %s"
5315 msgstr "falló al cargar el pack-index para packfile %s"
5316
5061 -#: midx.c:1208
5317 +#: midx.c:1125
5318 #, c-format
5319 msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
5320 msgstr "offset para objeto incorrecto oid[%d] = %s: %<PRIx64> != %<PRIx64>"
5321
5066 -#: midx.c:1233
5322 +#: midx.c:1150
5323 msgid "Counting referenced objects"
5324 msgstr "Contando objetos no referenciados"
5325
5070 -#: midx.c:1243
5326 +#: midx.c:1160
5327 msgid "Finding and deleting unreferenced packfiles"
5328 msgstr "Encontrando y borrando packfiles sin referencias"
5329
5074 -#: midx.c:1433
5330 +#: midx.c:1351
5331 msgid "could not start pack-objects"
5332 msgstr "no se pudo empezar los pack-objetcts"
5333
5078 -#: midx.c:1452
5334 +#: midx.c:1371
5335 msgid "could not finish pack-objects"
5336 msgstr "no se pudo finalizar pack-objetcts"
5337
5082 -#: name-hash.c:537
5338 +#: name-hash.c:538
5339 #, c-format
5340 msgid "unable to create lazy_dir thread: %s"
5341 msgstr "no es posible crear hilo lazy_dir: %s"
5342
5087 -#: name-hash.c:559
5343 +#: name-hash.c:560
5344 #, c-format
5345 msgid "unable to create lazy_name thread: %s"
5346 msgstr "no es posible crear hilo lazy_name: %s"
5347
5092 -#: name-hash.c:565
5348 +#: name-hash.c:566
5349 #, c-format
5350 msgid "unable to join lazy_name thread: %s"
5351 msgstr "no es posible unir hilo lazy_name: %s"
@@ -5136,555 +5392,973 @@ msgstr "Rehusando reescribir notas en %s (fuera de refs/notes/)"
5392 msgid "Bad %s value: '%s'"
5393 msgstr "Valor erróneo para %s: '%s'"
5394
5139 -#: object.c:53
5395 +#: object-file.c:480
5396 #, c-format
5141 -msgid "invalid object type \"%s\""
5142 -msgstr "tipo de objeto \"%s\" inválido"
5397 +msgid "object directory %s does not exist; check .git/objects/info/alternates"
5398 +msgstr "objeto directorio %s no existe; revisa .git/objects/info/alternates"
5399
5144 -#: object.c:173
5400 +#: object-file.c:531

This file is too large to show in full.