]>
Commit | Line | Data |
---|---|---|
fb0e25bc | 1 | # Spanish translations for Git. |
f8038f5b | 2 | # Copyright (C) 2018 Christopher Diaz Riveros <christopher.diaz.riv@gmail.com> |
fb0e25bc CD |
3 | # This file is distributed under the same license as the Git package. |
4 | # Christopher Diaz Riveros <christopher.diaz.riv@gmail.com>, 2017. | |
5 | # | |
6 | msgid "" | |
7 | msgstr "" | |
8 | "Project-Id-Version: Git\n" | |
9 | "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" | |
33ac3e89 CDR |
10 | "POT-Creation-Date: 2018-03-16 07:29+0800\n" |
11 | "PO-Revision-Date: 2018-03-15 21:31-0500\n" | |
fb0e25bc CD |
12 | "Last-Translator: christopher.diaz.riv@gmail.com\n" |
13 | "Language-Team: CodeLabora <codelabora@gmail.com>\n" | |
14 | "Language: es\n" | |
15 | "MIME-Version: 1.0\n" | |
16 | "Content-Type: text/plain; charset=UTF-8\n" | |
17 | "Content-Transfer-Encoding: 8bit\n" | |
18 | "Plural-Forms: nplurals=2; plural=(n != 1);\n" | |
33ac3e89 | 19 | "X-Generator: Poedit 2.0.6\n" |
fb0e25bc | 20 | |
f8038f5b | 21 | #: advice.c:62 |
fb0e25bc CD |
22 | #, c-format |
23 | msgid "hint: %.*s\n" | |
24 | msgstr "ayuda: %.*s\n" | |
25 | ||
f8038f5b | 26 | #: advice.c:90 |
fb0e25bc | 27 | msgid "Cherry-picking is not possible because you have unmerged files." |
4b15eb22 CD |
28 | msgstr "" |
29 | "No es posible ejecutar cherry-picking porque tienes archivos sin fusionar." | |
fb0e25bc | 30 | |
f8038f5b | 31 | #: advice.c:92 |
fb0e25bc CD |
32 | msgid "Committing is not possible because you have unmerged files." |
33 | msgstr "No es posible realizar un commit porque tienes archivos sin fusionar." | |
34 | ||
f8038f5b | 35 | #: advice.c:94 |
fb0e25bc CD |
36 | msgid "Merging is not possible because you have unmerged files." |
37 | msgstr "No es posible hacer merge porque tienes archivos sin fusionar." | |
38 | ||
f8038f5b | 39 | #: advice.c:96 |
fb0e25bc CD |
40 | msgid "Pulling is not possible because you have unmerged files." |
41 | msgstr "No es posible hacer pull porque tienes archivos sin fusionar." | |
42 | ||
f8038f5b | 43 | #: advice.c:98 |
fb0e25bc CD |
44 | msgid "Reverting is not possible because you have unmerged files." |
45 | msgstr "No es posible revertir porque tienes archivos sin fusionar." | |
46 | ||
f8038f5b | 47 | #: advice.c:100 |
fb0e25bc CD |
48 | #, c-format |
49 | msgid "It is not possible to %s because you have unmerged files." | |
50 | msgstr "No es posible %s porque tienes archivos sin fusionar." | |
51 | ||
f8038f5b | 52 | #: advice.c:108 |
fb0e25bc CD |
53 | msgid "" |
54 | "Fix them up in the work tree, and then use 'git add/rm <file>'\n" | |
55 | "as appropriate to mark resolution and make a commit." | |
56 | msgstr "" | |
57 | "Corrígelos en el árbol de trabajo y entonces usa 'git add/rm <archivo>',\n" | |
58 | "como sea apropiado, para marcar la resolución y realizar un commit." | |
59 | ||
f8038f5b | 60 | #: advice.c:116 |
fb0e25bc CD |
61 | msgid "Exiting because of an unresolved conflict." |
62 | msgstr "Saliendo porque existe un conflicto sin resolver." | |
63 | ||
33ac3e89 | 64 | #: advice.c:121 builtin/merge.c:1251 |
fb0e25bc CD |
65 | msgid "You have not concluded your merge (MERGE_HEAD exists)." |
66 | msgstr "No has concluido tu fusión (MERGE_HEAD existe)." | |
67 | ||
f8038f5b | 68 | #: advice.c:123 |
fb0e25bc CD |
69 | msgid "Please, commit your changes before merging." |
70 | msgstr "Por favor, realiza un commit antes de fusionar." | |
71 | ||
f8038f5b | 72 | #: advice.c:124 |
fb0e25bc | 73 | msgid "Exiting because of unfinished merge." |
715fc761 | 74 | msgstr "Saliendo por una fusión inconclusa." |
fb0e25bc | 75 | |
f8038f5b | 76 | #: advice.c:130 |
fb0e25bc CD |
77 | #, c-format |
78 | msgid "" | |
79 | "Note: checking out '%s'.\n" | |
80 | "\n" | |
81 | "You are in 'detached HEAD' state. You can look around, make experimental\n" | |
82 | "changes and commit them, and you can discard any commits you make in this\n" | |
83 | "state without impacting any branches by performing another checkout.\n" | |
84 | "\n" | |
85 | "If you want to create a new branch to retain commits you create, you may\n" | |
86 | "do so (now or later) by using -b with the checkout command again. Example:\n" | |
87 | "\n" | |
88 | " git checkout -b <new-branch-name>\n" | |
89 | "\n" | |
90 | msgstr "" | |
91 | "Nota: actualizando el árbol de trabajo '%s'.\n" | |
92 | "\n" | |
93 | "Te encuentras en estado 'detached HEAD'. Puedes revisar por aquí, hacer\n" | |
94 | "cambios experimentales y confirmarlos, y puedes descartar cualquier\n" | |
95 | "commit que hayas hecho en este estado sin impactar a tu rama realizando\n" | |
96 | "otro checkout.\n" | |
97 | "\n" | |
98 | "Si quieres crear una nueva rama para mantener los commits que has creado,\n" | |
4b15eb22 CD |
99 | "puedes hacerlo (ahora o después) usando -b con el comando checkout. " |
100 | "Ejemplo:\n" | |
fb0e25bc CD |
101 | "\n" |
102 | " git checkout -b <nombre-de-nueva-rama>\n" | |
103 | "\n" | |
104 | ||
105 | #: apply.c:58 | |
106 | #, c-format | |
107 | msgid "unrecognized whitespace option '%s'" | |
715fc761 | 108 | msgstr "opción de espacios en blanco no reconocida '%s'" |
fb0e25bc CD |
109 | |
110 | #: apply.c:74 | |
111 | #, c-format | |
112 | msgid "unrecognized whitespace ignore option '%s'" | |
715fc761 | 113 | msgstr "opción de ignorar espacios en blanco no reconocida '%s'" |
fb0e25bc | 114 | |
f8038f5b | 115 | #: apply.c:122 |
fb0e25bc CD |
116 | msgid "--reject and --3way cannot be used together." |
117 | msgstr "--reject y --3way no se pueden utilizar juntas." | |
118 | ||
f8038f5b | 119 | #: apply.c:124 |
fb0e25bc CD |
120 | msgid "--cached and --3way cannot be used together." |
121 | msgstr "--cached y --3way no se pueden utilizar juntas." | |
122 | ||
f8038f5b | 123 | #: apply.c:127 |
fb0e25bc | 124 | msgid "--3way outside a repository" |
33ac3e89 | 125 | msgstr "--3way está fuera de un repositorio" |
fb0e25bc | 126 | |
f8038f5b | 127 | #: apply.c:138 |
fb0e25bc | 128 | msgid "--index outside a repository" |
33ac3e89 | 129 | msgstr "--index está fuera de un repositorio" |
fb0e25bc | 130 | |
f8038f5b | 131 | #: apply.c:141 |
fb0e25bc | 132 | msgid "--cached outside a repository" |
33ac3e89 | 133 | msgstr "--cached está fuera de un repositorio" |
fb0e25bc | 134 | |
f8038f5b | 135 | #: apply.c:821 |
fb0e25bc CD |
136 | #, c-format |
137 | msgid "Cannot prepare timestamp regexp %s" | |
715fc761 | 138 | msgstr "No se puede preparar una marca de tiempo para la expresión regular %s" |
fb0e25bc | 139 | |
f8038f5b | 140 | #: apply.c:830 |
fb0e25bc CD |
141 | #, c-format |
142 | msgid "regexec returned %d for input: %s" | |
9df63a4a | 143 | msgstr "regexec retornó %d para la entrada: %s" |
fb0e25bc | 144 | |
f8038f5b | 145 | #: apply.c:904 |
fb0e25bc CD |
146 | #, c-format |
147 | msgid "unable to find filename in patch at line %d" | |
4b15eb22 | 148 | msgstr "" |
715fc761 | 149 | "no se puede encontrar el nombre del archivo en el parche en la línea %d" |
fb0e25bc | 150 | |
f8038f5b | 151 | #: apply.c:942 |
fb0e25bc CD |
152 | #, c-format |
153 | msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" | |
4b15eb22 | 154 | msgstr "" |
715fc761 | 155 | "git apply: mal git-diff - se esperaba /dev/null, se encontró %s en la línea " |
4b15eb22 | 156 | "%d" |
fb0e25bc | 157 | |
f8038f5b | 158 | #: apply.c:948 |
fb0e25bc CD |
159 | #, c-format |
160 | msgid "git apply: bad git-diff - inconsistent new filename on line %d" | |
4b15eb22 | 161 | msgstr "" |
715fc761 | 162 | "git apply: mal git-diff - nuevo nombre de archivo inconsistente en la línea " |
4b15eb22 | 163 | "%d" |
fb0e25bc | 164 | |
f8038f5b | 165 | #: apply.c:949 |
fb0e25bc CD |
166 | #, c-format |
167 | msgid "git apply: bad git-diff - inconsistent old filename on line %d" | |
4b15eb22 | 168 | msgstr "" |
715fc761 | 169 | "git apply: mal git-diff - viejo nombre de archivo inconsistente en la línea " |
4b15eb22 | 170 | "%d" |
fb0e25bc | 171 | |
f8038f5b | 172 | #: apply.c:954 |
fb0e25bc CD |
173 | #, c-format |
174 | msgid "git apply: bad git-diff - expected /dev/null on line %d" | |
715fc761 | 175 | msgstr "git apply: mal git-diff - se esperaba /dev/null en la línea %d" |
fb0e25bc | 176 | |
f8038f5b | 177 | #: apply.c:983 |
fb0e25bc CD |
178 | #, c-format |
179 | msgid "invalid mode on line %d: %s" | |
715fc761 | 180 | msgstr "modo inválido en la línea %d: %s" |
fb0e25bc | 181 | |
f8038f5b | 182 | #: apply.c:1301 |
fb0e25bc CD |
183 | #, c-format |
184 | msgid "inconsistent header lines %d and %d" | |
715fc761 | 185 | msgstr "header inconsistente en las líneas %d y %d" |
fb0e25bc | 186 | |
f8038f5b | 187 | #: apply.c:1473 |
fb0e25bc CD |
188 | #, c-format |
189 | msgid "recount: unexpected line: %.*s" | |
715fc761 | 190 | msgstr "recount: línea inesperada: %.*s" |
fb0e25bc | 191 | |
f8038f5b | 192 | #: apply.c:1542 |
fb0e25bc CD |
193 | #, c-format |
194 | msgid "patch fragment without header at line %d: %.*s" | |
715fc761 | 195 | msgstr "fragmento de parche sin header en la línea %d: %.*s" |
fb0e25bc | 196 | |
f8038f5b | 197 | #: apply.c:1562 |
fb0e25bc | 198 | #, c-format |
4b15eb22 CD |
199 | msgid "" |
200 | "git diff header lacks filename information when removing %d leading pathname " | |
201 | "component (line %d)" | |
202 | msgid_plural "" | |
203 | "git diff header lacks filename information when removing %d leading pathname " | |
204 | "components (line %d)" | |
205 | msgstr[0] "" | |
715fc761 | 206 | "al header de git diff carece de información del nombre del archivo %d cuando " |
9df63a4a | 207 | "lo remueve de la ruta principal componente (línea %d)" |
4b15eb22 | 208 | msgstr[1] "" |
715fc761 | 209 | "los headers de git diff carecen de información de los nombres de los " |
9df63a4a | 210 | "archivos %d cuando los remueven de la ruta principal componentes (línea %d)" |
fb0e25bc | 211 | |
f8038f5b | 212 | #: apply.c:1575 |
fb0e25bc CD |
213 | #, c-format |
214 | msgid "git diff header lacks filename information (line %d)" | |
4b15eb22 | 215 | msgstr "" |
715fc761 | 216 | "el header de git diff carece de información del nombre del archivo (línea %d)" |
fb0e25bc | 217 | |
f8038f5b | 218 | #: apply.c:1763 |
fb0e25bc CD |
219 | msgid "new file depends on old contents" |
220 | msgstr "el nuevo archivo depende de contenidos viejos" | |
221 | ||
f8038f5b | 222 | #: apply.c:1765 |
fb0e25bc | 223 | msgid "deleted file still has contents" |
715fc761 | 224 | msgstr "el archivo eliminado todavía tiene contenido" |
fb0e25bc | 225 | |
f8038f5b | 226 | #: apply.c:1799 |
fb0e25bc CD |
227 | #, c-format |
228 | msgid "corrupt patch at line %d" | |
715fc761 | 229 | msgstr "parche corrupto en la línea %d" |
fb0e25bc | 230 | |
f8038f5b | 231 | #: apply.c:1836 |
fb0e25bc CD |
232 | #, c-format |
233 | msgid "new file %s depends on old contents" | |
234 | msgstr "nuevo archivo %s depende en contenidos viejos" | |
235 | ||
f8038f5b | 236 | #: apply.c:1838 |
fb0e25bc CD |
237 | #, c-format |
238 | msgid "deleted file %s still has contents" | |
715fc761 | 239 | msgstr "el archivo borrado %s todavía tiene contenido" |
fb0e25bc | 240 | |
f8038f5b | 241 | #: apply.c:1841 |
fb0e25bc CD |
242 | #, c-format |
243 | msgid "** warning: file %s becomes empty but is not deleted" | |
715fc761 | 244 | msgstr "** peligro: el archivo %s esta vacío pero no es borrado" |
fb0e25bc | 245 | |
f8038f5b | 246 | #: apply.c:1988 |
fb0e25bc CD |
247 | #, c-format |
248 | msgid "corrupt binary patch at line %d: %.*s" | |
715fc761 | 249 | msgstr "parche binario corrupto en la línea %d: %.*s" |
fb0e25bc | 250 | |
f8038f5b | 251 | #: apply.c:2025 |
fb0e25bc CD |
252 | #, c-format |
253 | msgid "unrecognized binary patch at line %d" | |
715fc761 | 254 | msgstr "parche binario no reconocido en la línea %d" |
fb0e25bc | 255 | |
f8038f5b | 256 | #: apply.c:2185 |
fb0e25bc CD |
257 | #, c-format |
258 | msgid "patch with only garbage at line %d" | |
715fc761 | 259 | msgstr "parche que solo contiene basura en la línea %d" |
fb0e25bc | 260 | |
f8038f5b | 261 | #: apply.c:2271 |
fb0e25bc CD |
262 | #, c-format |
263 | msgid "unable to read symlink %s" | |
715fc761 | 264 | msgstr "no es posible leer el enlace simbólico %s" |
fb0e25bc | 265 | |
f8038f5b | 266 | #: apply.c:2275 |
fb0e25bc CD |
267 | #, c-format |
268 | msgid "unable to open or read %s" | |
269 | msgstr "no es posible abrir o leer %s" | |
270 | ||
f8038f5b | 271 | #: apply.c:2934 |
fb0e25bc CD |
272 | #, c-format |
273 | msgid "invalid start of line: '%c'" | |
715fc761 | 274 | msgstr "comienzo invalido de línea: '%c'" |
fb0e25bc | 275 | |
f8038f5b | 276 | #: apply.c:3055 |
fb0e25bc CD |
277 | #, c-format |
278 | msgid "Hunk #%d succeeded at %d (offset %d line)." | |
279 | msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." | |
715fc761 | 280 | msgstr[0] "Hunk #%d tuvo éxito en %d (%d línea compensada)." |
9df63a4a | 281 | msgstr[1] "Hunk #%d tuvo éxito en %d (%d líneas compensadas)." |
fb0e25bc | 282 | |
f8038f5b | 283 | #: apply.c:3067 |
fb0e25bc CD |
284 | #, c-format |
285 | msgid "Context reduced to (%ld/%ld) to apply fragment at %d" | |
286 | msgstr "Contexto reducido a (%ld/%ld) para aplicar el fragmento en %d" | |
287 | ||
f8038f5b | 288 | #: apply.c:3073 |
fb0e25bc CD |
289 | #, c-format |
290 | msgid "" | |
291 | "while searching for:\n" | |
292 | "%.*s" | |
293 | msgstr "" | |
33ac3e89 | 294 | "mientras se busca:\n" |
fb0e25bc CD |
295 | "%.*s" |
296 | ||
f8038f5b | 297 | #: apply.c:3095 |
fb0e25bc CD |
298 | #, c-format |
299 | msgid "missing binary patch data for '%s'" | |
300 | msgstr "data perdida en parche binario para '%s'" | |
301 | ||
f8038f5b | 302 | #: apply.c:3103 |
fb0e25bc CD |
303 | #, c-format |
304 | msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'" | |
4b15eb22 CD |
305 | msgstr "" |
306 | "no se puede revertir-aplicar un parche binario sin el hunk revertido a '%s'" | |
fb0e25bc | 307 | |
f8038f5b | 308 | #: apply.c:3149 |
fb0e25bc CD |
309 | #, c-format |
310 | msgid "cannot apply binary patch to '%s' without full index line" | |
715fc761 | 311 | msgstr "no se puede aplicar el parche binario a '%s' sin un índice completo" |
fb0e25bc | 312 | |
f8038f5b | 313 | #: apply.c:3159 |
fb0e25bc | 314 | #, c-format |
4b15eb22 CD |
315 | msgid "" |
316 | "the patch applies to '%s' (%s), which does not match the current contents." | |
317 | msgstr "" | |
318 | "el parche aplica a '%s' (%s), lo cual no concuerda con los contenidos " | |
319 | "actuales." | |
fb0e25bc | 320 | |
f8038f5b | 321 | #: apply.c:3167 |
fb0e25bc CD |
322 | #, c-format |
323 | msgid "the patch applies to an empty '%s' but it is not empty" | |
715fc761 | 324 | msgstr "el parche aplica a un '%s' vacío, pero este no lo esta" |
fb0e25bc | 325 | |
f8038f5b | 326 | #: apply.c:3185 |
fb0e25bc CD |
327 | #, c-format |
328 | msgid "the necessary postimage %s for '%s' cannot be read" | |
329 | msgstr "la postimagen necesaria %s para '%s' no se puede leer" | |
330 | ||
f8038f5b | 331 | #: apply.c:3198 |
fb0e25bc CD |
332 | #, c-format |
333 | msgid "binary patch does not apply to '%s'" | |
334 | msgstr "el parche binario no aplica para '%s'" | |
335 | ||
f8038f5b | 336 | #: apply.c:3204 |
fb0e25bc CD |
337 | #, c-format |
338 | msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" | |
4b15eb22 CD |
339 | msgstr "" |
340 | "el parche binario para '%s' crea un resultado incorrecto (saliendo %s, se " | |
341 | "obtuvo %s)" | |
fb0e25bc | 342 | |
f8038f5b | 343 | #: apply.c:3225 |
fb0e25bc CD |
344 | #, c-format |
345 | msgid "patch failed: %s:%ld" | |
346 | msgstr "el parche fallo: %s:%ld" | |
347 | ||
f8038f5b | 348 | #: apply.c:3347 |
fb0e25bc CD |
349 | #, c-format |
350 | msgid "cannot checkout %s" | |
351 | msgstr "no se puede hacer checkout a %s" | |
352 | ||
f8038f5b | 353 | #: apply.c:3396 apply.c:3407 apply.c:3453 setup.c:277 |
fb0e25bc CD |
354 | #, c-format |
355 | msgid "failed to read %s" | |
356 | msgstr "no se pudo leer %s" | |
357 | ||
f8038f5b | 358 | #: apply.c:3404 |
fb0e25bc CD |
359 | #, c-format |
360 | msgid "reading from '%s' beyond a symbolic link" | |
715fc761 | 361 | msgstr "leyendo de '%s' tras un enlace simbólico" |
fb0e25bc | 362 | |
f8038f5b | 363 | #: apply.c:3433 apply.c:3673 |
fb0e25bc CD |
364 | #, c-format |
365 | msgid "path %s has been renamed/deleted" | |
366 | msgstr "la ruta %s ha sido renombrada/suprimida" | |
367 | ||
f8038f5b | 368 | #: apply.c:3516 apply.c:3687 |
fb0e25bc CD |
369 | #, c-format |
370 | msgid "%s: does not exist in index" | |
9df63a4a | 371 | msgstr "%s: no existe en el índice" |
fb0e25bc | 372 | |
f8038f5b | 373 | #: apply.c:3525 apply.c:3695 |
fb0e25bc CD |
374 | #, c-format |
375 | msgid "%s: does not match index" | |
9df63a4a | 376 | msgstr "%s: no concuerda con el índice" |
fb0e25bc | 377 | |
f8038f5b | 378 | #: apply.c:3560 |
fb0e25bc | 379 | msgid "repository lacks the necessary blob to fall back on 3-way merge." |
4b15eb22 CD |
380 | msgstr "" |
381 | "el repositorio carece del blob necesario para regresar en un merge de tres-" | |
33ac3e89 | 382 | "vías." |
fb0e25bc | 383 | |
f8038f5b | 384 | #: apply.c:3563 |
fb0e25bc CD |
385 | #, c-format |
386 | msgid "Falling back to three-way merge...\n" | |
9df63a4a | 387 | msgstr "Retrocediendo en un merge de tres-vías...\n" |
fb0e25bc | 388 | |
f8038f5b | 389 | #: apply.c:3579 apply.c:3583 |
fb0e25bc CD |
390 | #, c-format |
391 | msgid "cannot read the current contents of '%s'" | |
392 | msgstr "no se pueden leer los contenidos actuales de '%s'" | |
393 | ||
f8038f5b | 394 | #: apply.c:3595 |
fb0e25bc CD |
395 | #, c-format |
396 | msgid "Failed to fall back on three-way merge...\n" | |
9df63a4a | 397 | msgstr "Fallo el merge en retroceso de tres-vías...\n" |
fb0e25bc | 398 | |
f8038f5b | 399 | #: apply.c:3609 |
fb0e25bc CD |
400 | #, c-format |
401 | msgid "Applied patch to '%s' with conflicts.\n" | |
402 | msgstr "Parche aplicado a '%s' con conflictos.\n" | |
403 | ||
f8038f5b | 404 | #: apply.c:3614 |
fb0e25bc CD |
405 | #, c-format |
406 | msgid "Applied patch to '%s' cleanly.\n" | |
407 | msgstr "Parche aplicado a '%s' limpiamente\n" | |
408 | ||
f8038f5b | 409 | #: apply.c:3640 |
fb0e25bc | 410 | msgid "removal patch leaves file contents" |
715fc761 | 411 | msgstr "parche de remoción deja contenidos en el archivo" |
fb0e25bc | 412 | |
f8038f5b | 413 | #: apply.c:3712 |
fb0e25bc CD |
414 | #, c-format |
415 | msgid "%s: wrong type" | |
416 | msgstr "%s: tipo incorrecto" | |
417 | ||
f8038f5b | 418 | #: apply.c:3714 |
fb0e25bc CD |
419 | #, c-format |
420 | msgid "%s has type %o, expected %o" | |
421 | msgstr "%s tiene tipo %o, se esperaba %o" | |
422 | ||
f8038f5b | 423 | #: apply.c:3864 apply.c:3866 |
fb0e25bc CD |
424 | #, c-format |
425 | msgid "invalid path '%s'" | |
426 | msgstr "ruta invalida '%s'" | |
427 | ||
f8038f5b | 428 | #: apply.c:3922 |
fb0e25bc CD |
429 | #, c-format |
430 | msgid "%s: already exists in index" | |
9df63a4a | 431 | msgstr "%s: ya existe en el índice" |
fb0e25bc | 432 | |
f8038f5b | 433 | #: apply.c:3925 |
fb0e25bc CD |
434 | #, c-format |
435 | msgid "%s: already exists in working directory" | |
436 | msgstr "%s: ya existe en el directorio de trabajo" | |
437 | ||
f8038f5b | 438 | #: apply.c:3945 |
fb0e25bc CD |
439 | #, c-format |
440 | msgid "new mode (%o) of %s does not match old mode (%o)" | |
441 | msgstr "nuevo modo (%o) de %s no concuerda con el viejo modo (%o)" | |
442 | ||
f8038f5b | 443 | #: apply.c:3950 |
fb0e25bc CD |
444 | #, c-format |
445 | msgid "new mode (%o) of %s does not match old mode (%o) of %s" | |
446 | msgstr "nuevo modo (%o) de %s no concuerda con el viejo modo (%o) de %s" | |
447 | ||
f8038f5b | 448 | #: apply.c:3970 |
fb0e25bc CD |
449 | #, c-format |
450 | msgid "affected file '%s' is beyond a symbolic link" | |
715fc761 | 451 | msgstr "archivo afectado '%s' esta tras un enlace simbólico" |
fb0e25bc | 452 | |
f8038f5b | 453 | #: apply.c:3974 |
fb0e25bc CD |
454 | #, c-format |
455 | msgid "%s: patch does not apply" | |
456 | msgstr "%s: el parche no aplica" | |
457 | ||
f8038f5b | 458 | #: apply.c:3989 |
fb0e25bc CD |
459 | #, c-format |
460 | msgid "Checking patch %s..." | |
461 | msgstr "Revisando el parche %s..." | |
462 | ||
f8038f5b | 463 | #: apply.c:4080 |
fb0e25bc CD |
464 | #, c-format |
465 | msgid "sha1 information is lacking or useless for submodule %s" | |
9df63a4a | 466 | msgstr "falta información del sha1 o es inútil para el submódulo %s" |
fb0e25bc | 467 | |
f8038f5b | 468 | #: apply.c:4087 |
fb0e25bc CD |
469 | #, c-format |
470 | msgid "mode change for %s, which is not in current HEAD" | |
471 | msgstr "modo cambiado para %s, el cual no se encuentra en el HEAD actual" | |
472 | ||
f8038f5b | 473 | #: apply.c:4090 |
fb0e25bc CD |
474 | #, c-format |
475 | msgid "sha1 information is lacking or useless (%s)." | |
715fc761 | 476 | msgstr "falta información sha1 o es inútil (%s)." |
fb0e25bc | 477 | |
33ac3e89 | 478 | #: apply.c:4095 builtin/checkout.c:235 builtin/reset.c:140 |
fb0e25bc CD |
479 | #, c-format |
480 | msgid "make_cache_entry failed for path '%s'" | |
481 | msgstr "make_cache_entry fallo para la ruta '%s'" | |
482 | ||
f8038f5b | 483 | #: apply.c:4099 |
fb0e25bc CD |
484 | #, c-format |
485 | msgid "could not add %s to temporary index" | |
9df63a4a | 486 | msgstr "no se pudo añadir %s al índice temporal" |
fb0e25bc | 487 | |
f8038f5b | 488 | #: apply.c:4109 |
fb0e25bc CD |
489 | #, c-format |
490 | msgid "could not write temporary index to %s" | |
715fc761 | 491 | msgstr "no se pudo escribir un índice temporal para %s" |
fb0e25bc | 492 | |
f8038f5b | 493 | #: apply.c:4247 |
fb0e25bc CD |
494 | #, c-format |
495 | msgid "unable to remove %s from index" | |
9df63a4a | 496 | msgstr "no se puede remover %s del índice" |
fb0e25bc | 497 | |
f8038f5b | 498 | #: apply.c:4282 |
fb0e25bc CD |
499 | #, c-format |
500 | msgid "corrupt patch for submodule %s" | |
9df63a4a | 501 | msgstr "parche corrupto para el submódulo %s" |
fb0e25bc | 502 | |
f8038f5b | 503 | #: apply.c:4288 |
fb0e25bc CD |
504 | #, c-format |
505 | msgid "unable to stat newly created file '%s'" | |
715fc761 | 506 | msgstr "no es posible establecer el archivo recién creado '%s'" |
fb0e25bc | 507 | |
f8038f5b | 508 | #: apply.c:4296 |
fb0e25bc CD |
509 | #, c-format |
510 | msgid "unable to create backing store for newly created file %s" | |
4b15eb22 | 511 | msgstr "" |
715fc761 | 512 | "no es posible crear una copia de seguridad para el archivo recién creado %s" |
fb0e25bc | 513 | |
f8038f5b | 514 | #: apply.c:4302 apply.c:4446 |
fb0e25bc CD |
515 | #, c-format |
516 | msgid "unable to add cache entry for %s" | |
517 | msgstr "no es posible agregar una entrada en el cache para %s" | |
518 | ||
f8038f5b | 519 | #: apply.c:4343 |
fb0e25bc CD |
520 | #, c-format |
521 | msgid "failed to write to '%s'" | |
522 | msgstr "fallo escribir para '%s'" | |
523 | ||
f8038f5b | 524 | #: apply.c:4347 |
fb0e25bc CD |
525 | #, c-format |
526 | msgid "closing file '%s'" | |
527 | msgstr "cerrando archivo '%s'" | |
528 | ||
f8038f5b | 529 | #: apply.c:4417 |
fb0e25bc CD |
530 | #, c-format |
531 | msgid "unable to write file '%s' mode %o" | |
532 | msgstr "no es posible escribir el archivo '%s' modo %o" | |
533 | ||
f8038f5b | 534 | #: apply.c:4515 |
fb0e25bc CD |
535 | #, c-format |
536 | msgid "Applied patch %s cleanly." | |
33ac3e89 | 537 | msgstr "Parche %s aplicado limpiamente." |
fb0e25bc | 538 | |
f8038f5b | 539 | #: apply.c:4523 |
fb0e25bc | 540 | msgid "internal error" |
33ac3e89 | 541 | msgstr "error interno" |
fb0e25bc | 542 | |
f8038f5b | 543 | #: apply.c:4526 |
fb0e25bc CD |
544 | #, c-format |
545 | msgid "Applying patch %%s with %d reject..." | |
546 | msgid_plural "Applying patch %%s with %d rejects..." | |
547 | msgstr[0] "Aplicando parche %%s con %d rechazo..." | |
548 | msgstr[1] "Aplicando parche %%s con %d rechazos..." | |
549 | ||
f8038f5b | 550 | #: apply.c:4537 |
fb0e25bc CD |
551 | #, c-format |
552 | msgid "truncating .rej filename to %.*s.rej" | |
33ac3e89 | 553 | msgstr "truncando el nombre de archivo .rej a %.*s.rej" |
fb0e25bc | 554 | |
33ac3e89 | 555 | #: apply.c:4545 builtin/fetch.c:775 builtin/fetch.c:1025 |
fb0e25bc CD |
556 | #, c-format |
557 | msgid "cannot open %s" | |
558 | msgstr "no se puede abrir %s" | |
559 | ||
f8038f5b | 560 | #: apply.c:4559 |
fb0e25bc CD |
561 | #, c-format |
562 | msgid "Hunk #%d applied cleanly." | |
33ac3e89 | 563 | msgstr "Hunk #%d aplicado limpiamente." |
fb0e25bc | 564 | |
f8038f5b | 565 | #: apply.c:4563 |
fb0e25bc CD |
566 | #, c-format |
567 | msgid "Rejected hunk #%d." | |
33ac3e89 | 568 | msgstr "Hunk #%d rechazado." |
fb0e25bc | 569 | |
f8038f5b | 570 | #: apply.c:4673 |
fb0e25bc CD |
571 | #, c-format |
572 | msgid "Skipped patch '%s'." | |
573 | msgstr "Parche '%s' saltado." | |
574 | ||
f8038f5b | 575 | #: apply.c:4681 |
fb0e25bc CD |
576 | msgid "unrecognized input" |
577 | msgstr "input no reconocido" | |
578 | ||
f8038f5b | 579 | #: apply.c:4700 |
fb0e25bc | 580 | msgid "unable to read index file" |
9df63a4a | 581 | msgstr "no es posible leer el archivo índice" |
fb0e25bc | 582 | |
f8038f5b | 583 | #: apply.c:4837 |
fb0e25bc CD |
584 | #, c-format |
585 | msgid "can't open patch '%s': %s" | |
586 | msgstr "no se puede abrir el parche '%s': %s" | |
587 | ||
f8038f5b | 588 | #: apply.c:4864 |
fb0e25bc CD |
589 | #, c-format |
590 | msgid "squelched %d whitespace error" | |
591 | msgid_plural "squelched %d whitespace errors" | |
592 | msgstr[0] "%d error de espacios en blanco aplastado" | |
593 | msgstr[1] "%d errores de espacios en blanco aplastados" | |
594 | ||
f8038f5b | 595 | #: apply.c:4870 apply.c:4885 |
fb0e25bc CD |
596 | #, c-format |
597 | msgid "%d line adds whitespace errors." | |
598 | msgid_plural "%d lines add whitespace errors." | |
715fc761 | 599 | msgstr[0] "%d línea agrega errores de espacios en blanco." |
9df63a4a | 600 | msgstr[1] "%d líneas agregan errores de espacios en blanco." |
fb0e25bc | 601 | |
f8038f5b | 602 | #: apply.c:4878 |
fb0e25bc CD |
603 | #, c-format |
604 | msgid "%d line applied after fixing whitespace errors." | |
605 | msgid_plural "%d lines applied after fixing whitespace errors." | |
4b15eb22 | 606 | msgstr[0] "" |
715fc761 | 607 | "%d línea aplicada después de arreglar los errores de espacios en blanco." |
4b15eb22 | 608 | msgstr[1] "" |
9df63a4a | 609 | "%d líneas aplicadas después de arreglar los errores de espacios en blanco." |
fb0e25bc | 610 | |
f8038f5b | 611 | #: apply.c:4894 builtin/add.c:539 builtin/mv.c:298 builtin/rm.c:390 |
fb0e25bc | 612 | msgid "Unable to write new index file" |
9df63a4a | 613 | msgstr "No es posible escribir el archivo índice" |
fb0e25bc | 614 | |
33ac3e89 CDR |
615 | #: apply.c:4921 apply.c:4924 builtin/am.c:2254 builtin/am.c:2257 |
616 | #: builtin/clone.c:118 builtin/fetch.c:127 builtin/pull.c:193 | |
617 | #: builtin/submodule--helper.c:403 builtin/submodule--helper.c:1197 | |
618 | #: builtin/submodule--helper.c:1200 builtin/submodule--helper.c:1567 | |
619 | #: builtin/submodule--helper.c:1570 builtin/submodule--helper.c:1787 | |
fb0e25bc CD |
620 | #: git-add--interactive.perl:197 |
621 | msgid "path" | |
622 | msgstr "ruta" | |
623 | ||
f8038f5b | 624 | #: apply.c:4922 |
fb0e25bc CD |
625 | msgid "don't apply changes matching the given path" |
626 | msgstr "no aplicar cambios que concuerden con la ruta suministrada" | |
627 | ||
f8038f5b | 628 | #: apply.c:4925 |
fb0e25bc CD |
629 | msgid "apply changes matching the given path" |
630 | msgstr "aplicar cambios que concuerden con la ruta suministrada" | |
631 | ||
33ac3e89 | 632 | #: apply.c:4927 builtin/am.c:2263 |
fb0e25bc CD |
633 | msgid "num" |
634 | msgstr "num" | |
635 | ||
f8038f5b | 636 | #: apply.c:4928 |
fb0e25bc CD |
637 | msgid "remove <num> leading slashes from traditional diff paths" |
638 | msgstr "remover <num> slashes iniciales de las rutas diff tradicionales" | |
639 | ||
f8038f5b | 640 | #: apply.c:4931 |
fb0e25bc CD |
641 | msgid "ignore additions made by the patch" |
642 | msgstr "ignorar adiciones hechas por el parche" | |
643 | ||
f8038f5b | 644 | #: apply.c:4933 |
fb0e25bc | 645 | msgid "instead of applying the patch, output diffstat for the input" |
715fc761 | 646 | msgstr "en lugar de aplicar el parche, mostrar diffstat para la entrada" |
fb0e25bc | 647 | |
f8038f5b | 648 | #: apply.c:4937 |
fb0e25bc | 649 | msgid "show number of added and deleted lines in decimal notation" |
715fc761 | 650 | msgstr "mostrar el numero de líneas agregadas y eliminadas en notación decimal" |
fb0e25bc | 651 | |
f8038f5b | 652 | #: apply.c:4939 |
fb0e25bc CD |
653 | msgid "instead of applying the patch, output a summary for the input" |
654 | msgstr "en lugar de aplicar el parche, mostrar un resumen para la entrada" | |
655 | ||
f8038f5b | 656 | #: apply.c:4941 |
fb0e25bc CD |
657 | msgid "instead of applying the patch, see if the patch is applicable" |
658 | msgstr "en lugar de aplicar el parche, ver si el parche es aplicable" | |
659 | ||
f8038f5b | 660 | #: apply.c:4943 |
fb0e25bc | 661 | msgid "make sure the patch is applicable to the current index" |
715fc761 | 662 | msgstr "asegurar que el parche es aplicable al índice actual" |
fb0e25bc | 663 | |
f8038f5b | 664 | #: apply.c:4945 |
fb0e25bc | 665 | msgid "apply a patch without touching the working tree" |
715fc761 | 666 | msgstr "aplicar un parche sin tocar el árbol de trabajo" |
fb0e25bc | 667 | |
f8038f5b | 668 | #: apply.c:4947 |
fb0e25bc | 669 | msgid "accept a patch that touches outside the working area" |
715fc761 | 670 | msgstr "aceptar un parche que toca fuera del área de trabajo" |
fb0e25bc | 671 | |
33ac3e89 | 672 | #: apply.c:4950 |
fb0e25bc | 673 | msgid "also apply the patch (use with --stat/--summary/--check)" |
715fc761 | 674 | msgstr "también aplicar el parche ( usar con --stat/--summary/--check" |
fb0e25bc | 675 | |
33ac3e89 | 676 | #: apply.c:4952 |
fb0e25bc | 677 | msgid "attempt three-way merge if a patch does not apply" |
9df63a4a | 678 | msgstr "intentar merge de tres-vías si el parche no aplica" |
fb0e25bc | 679 | |
33ac3e89 | 680 | #: apply.c:4954 |
fb0e25bc | 681 | msgid "build a temporary index based on embedded index information" |
4b15eb22 | 682 | msgstr "" |
715fc761 | 683 | "construir un índice temporal basado en la información del índice incrustado" |
fb0e25bc | 684 | |
33ac3e89 | 685 | #: apply.c:4957 builtin/checkout-index.c:168 builtin/ls-files.c:515 |
fb0e25bc | 686 | msgid "paths are separated with NUL character" |
33ac3e89 | 687 | msgstr "rutas están separadas con un carácter NULL" |
fb0e25bc | 688 | |
33ac3e89 | 689 | #: apply.c:4959 |
fb0e25bc | 690 | msgid "ensure at least <n> lines of context match" |
715fc761 | 691 | msgstr "asegure que por lo menos <n> líneas del contexto concuerden" |
fb0e25bc | 692 | |
33ac3e89 | 693 | #: apply.c:4960 builtin/am.c:2242 builtin/interpret-trailers.c:95 |
4b15eb22 | 694 | #: builtin/interpret-trailers.c:97 builtin/interpret-trailers.c:99 |
33ac3e89 | 695 | #: builtin/pack-objects.c:3035 |
fb0e25bc | 696 | msgid "action" |
715fc761 | 697 | msgstr "acción" |
fb0e25bc | 698 | |
33ac3e89 | 699 | #: apply.c:4961 |
fb0e25bc | 700 | msgid "detect new or modified lines that have whitespace errors" |
4b15eb22 | 701 | msgstr "" |
715fc761 | 702 | "detectar líneas nuevas o modificadas que contienen errores de espacios en " |
4b15eb22 | 703 | "blanco" |
fb0e25bc | 704 | |
33ac3e89 | 705 | #: apply.c:4964 apply.c:4967 |
fb0e25bc | 706 | msgid "ignore changes in whitespace when finding context" |
4b15eb22 CD |
707 | msgstr "" |
708 | "ignorar cambios en los espacios en blanco cuando se encuentra el contexto" | |
fb0e25bc | 709 | |
33ac3e89 | 710 | #: apply.c:4970 |
fb0e25bc CD |
711 | msgid "apply the patch in reverse" |
712 | msgstr "aplicar el parche en reversa" | |
713 | ||
33ac3e89 | 714 | #: apply.c:4972 |
fb0e25bc | 715 | msgid "don't expect at least one line of context" |
715fc761 | 716 | msgstr "no espera al menos una línea del contexto" |
fb0e25bc | 717 | |
33ac3e89 | 718 | #: apply.c:4974 |
fb0e25bc CD |
719 | msgid "leave the rejected hunks in corresponding *.rej files" |
720 | msgstr "dejar los hunks rechazados en los archivos *.rej correspontientes" | |
721 | ||
33ac3e89 | 722 | #: apply.c:4976 |
fb0e25bc CD |
723 | msgid "allow overlapping hunks" |
724 | msgstr "permitir solapamiento de hunks" | |
725 | ||
33ac3e89 CDR |
726 | #: apply.c:4977 builtin/add.c:292 builtin/check-ignore.c:21 |
727 | #: builtin/commit.c:1276 builtin/count-objects.c:96 builtin/fsck.c:665 | |
728 | #: builtin/log.c:1901 builtin/mv.c:123 builtin/read-tree.c:125 | |
fb0e25bc CD |
729 | msgid "be verbose" |
730 | msgstr "ser verboso" | |
731 | ||
33ac3e89 | 732 | #: apply.c:4979 |
fb0e25bc | 733 | msgid "tolerate incorrectly detected missing new-line at the end of file" |
4b15eb22 | 734 | msgstr "" |
715fc761 | 735 | "tolerar nuevas líneas faltantes detectadas incorrectamente al final del " |
4b15eb22 | 736 | "archivo" |
fb0e25bc | 737 | |
33ac3e89 | 738 | #: apply.c:4982 |
fb0e25bc | 739 | msgid "do not trust the line counts in the hunk headers" |
715fc761 | 740 | msgstr "no confiar en el conteo de líneas en los headers del hunk" |
fb0e25bc | 741 | |
33ac3e89 | 742 | #: apply.c:4984 builtin/am.c:2251 |
fb0e25bc | 743 | msgid "root" |
9df63a4a | 744 | msgstr "raíz" |
fb0e25bc | 745 | |
33ac3e89 | 746 | #: apply.c:4985 |
fb0e25bc CD |
747 | msgid "prepend <root> to all filenames" |
748 | msgstr "anteponer <root> a todos los nombres de archivos" | |
749 | ||
750 | #: archive.c:13 | |
751 | msgid "git archive [<options>] <tree-ish> [<path>...]" | |
715fc761 | 752 | msgstr "git archive [<opciones>] <parte-del-árbol> [<ruta>...]" |
fb0e25bc CD |
753 | |
754 | #: archive.c:14 | |
755 | msgid "git archive --list" | |
756 | msgstr "git archive --list" | |
757 | ||
758 | #: archive.c:15 | |
4b15eb22 CD |
759 | msgid "" |
760 | "git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]" | |
761 | msgstr "" | |
762 | "git archive --remote <repo> [--exec <comando> ] [<opciones>] <parte-del-" | |
715fc761 | 763 | "árbol> [<ruta>...]" |
fb0e25bc CD |
764 | |
765 | #: archive.c:16 | |
766 | msgid "git archive --remote <repo> [--exec <cmd>] --list" | |
767 | msgstr "git archive --remote <repo> [--exec <comando>] --list" | |
768 | ||
f8038f5b | 769 | #: archive.c:351 builtin/add.c:176 builtin/add.c:515 builtin/rm.c:299 |
fb0e25bc CD |
770 | #, c-format |
771 | msgid "pathspec '%s' did not match any files" | |
715fc761 | 772 | msgstr "ruta especificada '%s' no concordó con ninguna carpeta" |
fb0e25bc | 773 | |
4b15eb22 | 774 | #: archive.c:436 |
fb0e25bc CD |
775 | msgid "fmt" |
776 | msgstr "fmt" | |
777 | ||
4b15eb22 | 778 | #: archive.c:436 |
fb0e25bc CD |
779 | msgid "archive format" |
780 | msgstr "formato del archivo" | |
781 | ||
33ac3e89 | 782 | #: archive.c:437 builtin/log.c:1462 |
fb0e25bc CD |
783 | msgid "prefix" |
784 | msgstr "prefijo" | |
785 | ||
4b15eb22 | 786 | #: archive.c:438 |
fb0e25bc CD |
787 | msgid "prepend prefix to each pathname in the archive" |
788 | msgstr "anteponer prefijo a cada ruta en el archivo" | |
789 | ||
33ac3e89 CDR |
790 | #: archive.c:439 builtin/blame.c:702 builtin/blame.c:703 builtin/config.c:62 |
791 | #: builtin/fast-export.c:1005 builtin/fast-export.c:1007 builtin/grep.c:869 | |
792 | #: builtin/hash-object.c:103 builtin/ls-files.c:551 builtin/ls-files.c:554 | |
4b15eb22 | 793 | #: builtin/notes.c:405 builtin/notes.c:568 builtin/read-tree.c:120 |
33ac3e89 | 794 | #: parse-options.h:165 |
fb0e25bc CD |
795 | msgid "file" |
796 | msgstr "carpeta" | |
797 | ||
4b15eb22 | 798 | #: archive.c:440 builtin/archive.c:89 |
fb0e25bc CD |
799 | msgid "write the archive to this file" |
800 | msgstr "escribe el archivo en esta carpeta" | |
801 | ||
4b15eb22 | 802 | #: archive.c:442 |
fb0e25bc | 803 | msgid "read .gitattributes in working directory" |
9df63a4a | 804 | msgstr "leer .gitattributes en el directorio de trabajo" |
fb0e25bc | 805 | |
4b15eb22 | 806 | #: archive.c:443 |
fb0e25bc CD |
807 | msgid "report archived files on stderr" |
808 | msgstr "reportar archivos archivados por stderr" | |
809 | ||
4b15eb22 | 810 | #: archive.c:444 |
fb0e25bc CD |
811 | msgid "store only" |
812 | msgstr "solo guardar" | |
813 | ||
4b15eb22 | 814 | #: archive.c:445 |
fb0e25bc | 815 | msgid "compress faster" |
9df63a4a | 816 | msgstr "comprimir mas rápido" |
fb0e25bc | 817 | |
4b15eb22 | 818 | #: archive.c:453 |
fb0e25bc CD |
819 | msgid "compress better" |
820 | msgstr "comprimir mejor" | |
821 | ||
4b15eb22 | 822 | #: archive.c:456 |
fb0e25bc CD |
823 | msgid "list supported archive formats" |
824 | msgstr "listar los formatos de carpeta soportados" | |
825 | ||
33ac3e89 CDR |
826 | #: archive.c:458 builtin/archive.c:90 builtin/clone.c:108 builtin/clone.c:111 |
827 | #: builtin/submodule--helper.c:1209 builtin/submodule--helper.c:1576 | |
fb0e25bc CD |
828 | msgid "repo" |
829 | msgstr "repo" | |
830 | ||
4b15eb22 | 831 | #: archive.c:459 builtin/archive.c:91 |
fb0e25bc CD |
832 | msgid "retrieve the archive from remote repository <repo>" |
833 | msgstr "obtener la carpeta del repositorio remoto <repo>" | |
834 | ||
4b15eb22 | 835 | #: archive.c:460 builtin/archive.c:92 builtin/notes.c:489 |
fb0e25bc CD |
836 | msgid "command" |
837 | msgstr "comando" | |
838 | ||
4b15eb22 | 839 | #: archive.c:461 builtin/archive.c:93 |
fb0e25bc | 840 | msgid "path to the remote git-upload-archive command" |
33ac3e89 | 841 | msgstr "ruta para el comando git-upload-archivo remoto" |
fb0e25bc | 842 | |
4b15eb22 | 843 | #: archive.c:468 |
fb0e25bc | 844 | msgid "Unexpected option --remote" |
33ac3e89 | 845 | msgstr "Opción inesperada --remote" |
fb0e25bc | 846 | |
4b15eb22 | 847 | #: archive.c:470 |
fb0e25bc | 848 | msgid "Option --exec can only be used together with --remote" |
715fc761 | 849 | msgstr "Opción --exec solo puede ser utilizada con --remote" |
fb0e25bc | 850 | |
4b15eb22 | 851 | #: archive.c:472 |
fb0e25bc | 852 | msgid "Unexpected option --output" |
715fc761 | 853 | msgstr "Opción inesperada --output" |
fb0e25bc | 854 | |
4b15eb22 | 855 | #: archive.c:494 |
fb0e25bc CD |
856 | #, c-format |
857 | msgid "Unknown archive format '%s'" | |
858 | msgstr "Formato de carpeta desconocido '%s'" | |
859 | ||
4b15eb22 | 860 | #: archive.c:501 |
fb0e25bc CD |
861 | #, c-format |
862 | msgid "Argument not supported for format '%s': -%d" | |
715fc761 | 863 | msgstr "Argumento no soportado para formato '%s': -%d" |
fb0e25bc | 864 | |
4b15eb22 | 865 | #: attr.c:218 |
fb0e25bc CD |
866 | #, c-format |
867 | msgid "%.*s is not a valid attribute name" | |
868 | msgstr "%.*s no es un nombre de atributo valido" | |
869 | ||
4b15eb22 | 870 | #: attr.c:415 |
fb0e25bc CD |
871 | msgid "" |
872 | "Negative patterns are ignored in git attributes\n" | |
873 | "Use '\\!' for literal leading exclamation." | |
874 | msgstr "" | |
875 | "Los patrones negativos son ignorados en los atributos de git\n" | |
715fc761 | 876 | "Usa '\\!' para comenzar literalmente con exclamación." |
fb0e25bc | 877 | |
33ac3e89 | 878 | #: bisect.c:460 |
fb0e25bc CD |
879 | #, c-format |
880 | msgid "Badly quoted content in file '%s': %s" | |
881 | msgstr "Revisa las comillas en el archivo '%s': %s" | |
882 | ||
33ac3e89 | 883 | #: bisect.c:668 |
fb0e25bc CD |
884 | #, c-format |
885 | msgid "We cannot bisect more!\n" | |
886 | msgstr "No podemos bisecar mas!\n" | |
887 | ||
33ac3e89 | 888 | #: bisect.c:722 |
fb0e25bc CD |
889 | #, c-format |
890 | msgid "Not a valid commit name %s" | |
891 | msgstr "No es un nombre de commit valido %s" | |
892 | ||
33ac3e89 | 893 | #: bisect.c:746 |
fb0e25bc CD |
894 | #, c-format |
895 | msgid "" | |
896 | "The merge base %s is bad.\n" | |
897 | "This means the bug has been fixed between %s and [%s].\n" | |
898 | msgstr "" | |
715fc761 | 899 | "La base de fisión %s esta mal.\n" |
9df63a4a | 900 | "Esto quiere decir que el bug ha sido arreglado entre %s y [%s].\n" |
fb0e25bc | 901 | |
33ac3e89 | 902 | #: bisect.c:751 |
fb0e25bc CD |
903 | #, c-format |
904 | msgid "" | |
905 | "The merge base %s is new.\n" | |
906 | "The property has changed between %s and [%s].\n" | |
907 | msgstr "" | |
715fc761 | 908 | "La base de fisión %s es nueva.\n" |
fb0e25bc CD |
909 | "Esta propiedad ha cambiado entre %s y [%s].\n" |
910 | ||
33ac3e89 | 911 | #: bisect.c:756 |
fb0e25bc CD |
912 | #, c-format |
913 | msgid "" | |
914 | "The merge base %s is %s.\n" | |
915 | "This means the first '%s' commit is between %s and [%s].\n" | |
916 | msgstr "" | |
715fc761 | 917 | "La base de fisión %s es %s.\n" |
fb0e25bc CD |
918 | "Esto quiere decir que el primer '%s' commit esta entre %s y [%s].\n" |
919 | ||
33ac3e89 | 920 | #: bisect.c:764 |
fb0e25bc CD |
921 | #, c-format |
922 | msgid "" | |
923 | "Some %s revs are not ancestors of the %s rev.\n" | |
924 | "git bisect cannot work properly in this case.\n" | |
925 | "Maybe you mistook %s and %s revs?\n" | |
926 | msgstr "" | |
715fc761 | 927 | "Algunas %s revisiones no son ancestros de la revisión %s.\n" |
fb0e25bc | 928 | "git bisect no puede trabajar bien en este caso.\n" |
715fc761 | 929 | "Tal vez confundió la revisión %s y %s?\n" |
fb0e25bc | 930 | |
33ac3e89 | 931 | #: bisect.c:777 |
fb0e25bc CD |
932 | #, c-format |
933 | msgid "" | |
934 | "the merge base between %s and [%s] must be skipped.\n" | |
935 | "So we cannot be sure the first %s commit is between %s and %s.\n" | |
936 | "We continue anyway." | |
937 | msgstr "" | |
9df63a4a CDR |
938 | "la base de fusión entre %s y [%s] tiene que ser saltada.\n" |
939 | "Así que no podemos estar seguros que el primer %s commit esta entre%s y %s.\n" | |
fb0e25bc CD |
940 | "Vamos a continuar de todas maneras." |
941 | ||
f8038f5b | 942 | #: bisect.c:810 |
fb0e25bc CD |
943 | #, c-format |
944 | msgid "Bisecting: a merge base must be tested\n" | |
715fc761 | 945 | msgstr "Bisectando: una base de fisión debe ser probada\n" |
fb0e25bc | 946 | |
33ac3e89 | 947 | #: bisect.c:850 |
fb0e25bc CD |
948 | #, c-format |
949 | msgid "a %s revision is needed" | |
715fc761 | 950 | msgstr "una %s revisión es necesaria" |
fb0e25bc | 951 | |
33ac3e89 | 952 | #: bisect.c:869 builtin/notes.c:175 builtin/tag.c:235 |
fb0e25bc CD |
953 | #, c-format |
954 | msgid "could not create file '%s'" | |
955 | msgstr "no se pudo crear el archivo '%s'" | |
956 | ||
33ac3e89 | 957 | #: bisect.c:920 |
fb0e25bc CD |
958 | #, c-format |
959 | msgid "could not read file '%s'" | |
960 | msgstr "no se pudo leer el archivo '%s'" | |
961 | ||
33ac3e89 | 962 | #: bisect.c:950 |
fb0e25bc CD |
963 | msgid "reading bisect refs failed" |
964 | msgstr "fallo leer las refs de bisect" | |
965 | ||
33ac3e89 | 966 | #: bisect.c:969 |
fb0e25bc CD |
967 | #, c-format |
968 | msgid "%s was both %s and %s\n" | |
969 | msgstr "%s fue tanto %s como %s\n" | |
970 | ||
33ac3e89 | 971 | #: bisect.c:977 |
fb0e25bc CD |
972 | #, c-format |
973 | msgid "" | |
974 | "No testable commit found.\n" | |
975 | "Maybe you started with bad path parameters?\n" | |
976 | msgstr "" | |
715fc761 | 977 | "No se encontró commit que se pueda probar.\n" |
fb0e25bc CD |
978 | "¿Quizás iniciaste con parámetros de rutas incorrectos?\n" |
979 | ||
33ac3e89 | 980 | #: bisect.c:996 |
fb0e25bc CD |
981 | #, c-format |
982 | msgid "(roughly %d step)" | |
983 | msgid_plural "(roughly %d steps)" | |
984 | msgstr[0] "(aproximadamente %d paso)" | |
985 | msgstr[1] "(aproximadamente %d pasos)" | |
986 | ||
987 | #. TRANSLATORS: the last %s will be replaced with "(roughly %d | |
988 | #. steps)" translation. | |
4b15eb22 | 989 | #. |
33ac3e89 | 990 | #: bisect.c:1002 |
fb0e25bc CD |
991 | #, c-format |
992 | msgid "Bisecting: %d revision left to test after this %s\n" | |
993 | msgid_plural "Bisecting: %d revisions left to test after this %s\n" | |
715fc761 | 994 | msgstr[0] "Bisectando: falta %d revisión por probar después de esto %s\n" |
9df63a4a | 995 | msgstr[1] "Bisectando: faltan %d revisiones por probar después de esto %s\n" |
fb0e25bc | 996 | |
33ac3e89 | 997 | #: blame.c:1758 |
fb0e25bc CD |
998 | msgid "--contents and --reverse do not blend well." |
999 | msgstr "--contents y --reverse no se mezclan bien." | |
1000 | ||
33ac3e89 | 1001 | #: blame.c:1769 |
fb0e25bc CD |
1002 | msgid "cannot use --contents with final commit object name" |
1003 | msgstr "no se puede usar --contents con el nombre de objeto commit final" | |
1004 | ||
33ac3e89 | 1005 | #: blame.c:1789 |
fb0e25bc | 1006 | msgid "--reverse and --first-parent together require specified latest commit" |
4b15eb22 | 1007 | msgstr "" |
9df63a4a | 1008 | "--reverse y --first-parent juntos requieren especificar el último commit" |
fb0e25bc | 1009 | |
33ac3e89 CDR |
1010 | #: blame.c:1798 bundle.c:160 ref-filter.c:1978 sequencer.c:1699 |
1011 | #: sequencer.c:2901 builtin/commit.c:976 builtin/log.c:366 builtin/log.c:920 | |
1012 | #: builtin/log.c:1371 builtin/log.c:1702 builtin/log.c:1950 builtin/merge.c:370 | |
4b15eb22 | 1013 | #: builtin/shortlog.c:191 |
fb0e25bc | 1014 | msgid "revision walk setup failed" |
715fc761 | 1015 | msgstr "fallo la configuración del camino de revisión" |
fb0e25bc | 1016 | |
33ac3e89 | 1017 | #: blame.c:1816 |
4b15eb22 CD |
1018 | msgid "" |
1019 | "--reverse --first-parent together require range along first-parent chain" | |
1020 | msgstr "" | |
9df63a4a | 1021 | "--reverse --first-parent juntos requieren un rango a lo largo de la cadena " |
4b15eb22 | 1022 | "del primer padre" |
fb0e25bc | 1023 | |
33ac3e89 | 1024 | #: blame.c:1827 |
fb0e25bc CD |
1025 | #, c-format |
1026 | msgid "no such path %s in %s" | |
1027 | msgstr "no hay una ruta %s en %s" | |
1028 | ||
33ac3e89 | 1029 | #: blame.c:1838 |
fb0e25bc CD |
1030 | #, c-format |
1031 | msgid "cannot read blob %s for path %s" | |
1032 | msgstr "no se puede leer el blob %s para la ruta %s" | |
1033 | ||
1034 | #: branch.c:53 | |
1035 | #, c-format | |
1036 | msgid "" | |
1037 | "\n" | |
1038 | "After fixing the error cause you may try to fix up\n" | |
1039 | "the remote tracking information by invoking\n" | |
1040 | "\"git branch --set-upstream-to=%s%s%s\"." | |
1041 | msgstr "" | |
1042 | "\n" | |
1043 | "Tras arreglar la causa del error puedes intentar arreglar\n" | |
715fc761 | 1044 | "la infamación del rastreo remoto invocando\n" |
fb0e25bc CD |
1045 | "\"git branch --set-upstream-to=%s%s%s\"." |
1046 | ||
1047 | #: branch.c:67 | |
1048 | #, c-format | |
1049 | msgid "Not setting branch %s as its own upstream." | |
1050 | msgstr "La rama %s no se configura como su propio upstream." | |
1051 | ||
1052 | #: branch.c:93 | |
1053 | #, c-format | |
4b15eb22 CD |
1054 | msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing." |
1055 | msgstr "" | |
1056 | "Rama '%s' configurada para hacer seguimiento a la rama remota '%s' de '%s' " | |
1057 | "por rebase." | |
fb0e25bc CD |
1058 | |
1059 | #: branch.c:94 | |
1060 | #, c-format | |
4b15eb22 CD |
1061 | msgid "Branch '%s' set up to track remote branch '%s' from '%s'." |
1062 | msgstr "" | |
1063 | "Rama '%s' configurada para hacer seguimiento a la rama remota '%s' de '%s'." | |
fb0e25bc CD |
1064 | |
1065 | #: branch.c:98 | |
1066 | #, c-format | |
4b15eb22 CD |
1067 | msgid "Branch '%s' set up to track local branch '%s' by rebasing." |
1068 | msgstr "" | |
1069 | "Rama '%s' configurada para hacer seguimiento a la rama local '%s' por rebase." | |
fb0e25bc CD |
1070 | |
1071 | #: branch.c:99 | |
1072 | #, c-format | |
4b15eb22 CD |
1073 | msgid "Branch '%s' set up to track local branch '%s'." |
1074 | msgstr "Rama '%s' configurada para hacer seguimiento a la rama local '%s'." | |
fb0e25bc CD |
1075 | |
1076 | #: branch.c:104 | |
1077 | #, c-format | |
4b15eb22 CD |
1078 | msgid "Branch '%s' set up to track remote ref '%s' by rebasing." |
1079 | msgstr "" | |
1080 | "Rama '%s' configurada para hacer seguimiento a la referencia remota '%s' por " | |
1081 | "rebase." | |
fb0e25bc CD |
1082 | |
1083 | #: branch.c:105 | |
1084 | #, c-format | |
4b15eb22 CD |
1085 | msgid "Branch '%s' set up to track remote ref '%s'." |
1086 | msgstr "" | |
1087 | "Rama '%s' configurada para hacer seguimiento a la referencia remota '%s'." | |
fb0e25bc CD |
1088 | |
1089 | #: branch.c:109 | |
1090 | #, c-format | |
4b15eb22 CD |
1091 | msgid "Branch '%s' set up to track local ref '%s' by rebasing." |
1092 | msgstr "" | |
1093 | "Rama '%s' configurada para hacer seguimiento a la referencia local '%s' por " | |
1094 | "rebase." | |
fb0e25bc CD |
1095 | |
1096 | #: branch.c:110 | |
1097 | #, c-format | |
4b15eb22 CD |
1098 | msgid "Branch '%s' set up to track local ref '%s'." |
1099 | msgstr "" | |
1100 | "Rama '%s' configurada para hacer seguimiento a la referencia local '%s'." | |
fb0e25bc CD |
1101 | |
1102 | #: branch.c:119 | |
1103 | msgid "Unable to write upstream branch configuration" | |
715fc761 | 1104 | msgstr "No es posible escribir la configuración de la rama upstream" |
fb0e25bc CD |
1105 | |
1106 | #: branch.c:156 | |
1107 | #, c-format | |
1108 | msgid "Not tracking: ambiguous information for ref %s" | |
715fc761 | 1109 | msgstr "No rastreando: información ambigua para la referencia %s" |
fb0e25bc | 1110 | |
f8038f5b | 1111 | #: branch.c:189 |
fb0e25bc CD |
1112 | #, c-format |
1113 | msgid "'%s' is not a valid branch name." | |
1114 | msgstr "'%s' no es un nombre valido de rama." | |
1115 | ||
f8038f5b | 1116 | #: branch.c:208 |
fb0e25bc CD |
1117 | #, c-format |
1118 | msgid "A branch named '%s' already exists." | |
1119 | msgstr "Una rama llamada '%s' ya existe." | |
1120 | ||
f8038f5b | 1121 | #: branch.c:213 |
fb0e25bc | 1122 | msgid "Cannot force update the current branch." |
715fc761 | 1123 | msgstr "No se puede forzar la actualización de la rama actual." |
fb0e25bc | 1124 | |
f8038f5b | 1125 | #: branch.c:233 |
fb0e25bc CD |
1126 | #, c-format |
1127 | msgid "Cannot setup tracking information; starting point '%s' is not a branch." | |
4b15eb22 | 1128 | msgstr "" |
715fc761 | 1129 | "No se puede configurar el rastreo de información; el punto de partida '%s' " |
33ac3e89 | 1130 | "no es una rama." |
fb0e25bc | 1131 | |
f8038f5b | 1132 | #: branch.c:235 |
fb0e25bc CD |
1133 | #, c-format |
1134 | msgid "the requested upstream branch '%s' does not exist" | |
1135 | msgstr "la rama de upstream solicitada '%s' no existe" | |
1136 | ||
f8038f5b | 1137 | #: branch.c:237 |
fb0e25bc CD |
1138 | msgid "" |
1139 | "\n" | |
1140 | "If you are planning on basing your work on an upstream\n" | |
1141 | "branch that already exists at the remote, you may need to\n" | |
1142 | "run \"git fetch\" to retrieve it.\n" | |
1143 | "\n" | |
1144 | "If you are planning to push out a new local branch that\n" | |
1145 | "will track its remote counterpart, you may want to use\n" | |
1146 | "\"git push -u\" to set the upstream config as you push." | |
1147 | msgstr "" | |
1148 | "\n" | |
1149 | "Si estas planeando basar tu trabajo en una rama upstream\n" | |
1150 | "que ya existe en el remoto, tal vez necesites ejecutar\n" | |
1151 | "\"git fetch\" para recibirla.\n" | |
1152 | "\n" | |
1153 | "Si estás planeando hacer push a una nueva rama local que\n" | |
1154 | "va a rastrear a su contraparte remota, tal vez quieras usar\n" | |
4b15eb22 CD |
1155 | "\"git push -u\" para configurar tu upstream predeterminado cuando realizas " |
1156 | "el push." | |
fb0e25bc | 1157 | |
f8038f5b | 1158 | #: branch.c:280 |
fb0e25bc CD |
1159 | #, c-format |
1160 | msgid "Not a valid object name: '%s'." | |
1161 | msgstr "Nombre de objeto no valido: '%s'." | |
1162 | ||
f8038f5b | 1163 | #: branch.c:300 |
fb0e25bc CD |
1164 | #, c-format |
1165 | msgid "Ambiguous object name: '%s'." | |
1166 | msgstr "Nombre de objeto ambiguo: '%s'." | |
1167 | ||
f8038f5b | 1168 | #: branch.c:305 |
fb0e25bc CD |
1169 | #, c-format |
1170 | msgid "Not a valid branch point: '%s'." | |
1171 | msgstr "Punto de rama no valido: '%s'." | |
1172 | ||
f8038f5b | 1173 | #: branch.c:359 |
fb0e25bc CD |
1174 | #, c-format |
1175 | msgid "'%s' is already checked out at '%s'" | |
1176 | msgstr "'%s' ya ha sido marcado en '%s'" | |
1177 | ||
f8038f5b | 1178 | #: branch.c:382 |
fb0e25bc CD |
1179 | #, c-format |
1180 | msgid "HEAD of working tree %s is not updated" | |
33ac3e89 | 1181 | msgstr "HEAD del árbol de trabajo %s no esta actualizada" |
fb0e25bc CD |
1182 | |
1183 | #: bundle.c:34 | |
1184 | #, c-format | |
1185 | msgid "'%s' does not look like a v2 bundle file" | |
1186 | msgstr "'%s' no se ve como un archivo bundle v2" | |
1187 | ||
1188 | #: bundle.c:62 | |
1189 | #, c-format | |
1190 | msgid "unrecognized header: %s%s (%d)" | |
1191 | msgstr "header no reconocido %s%s (%d)" | |
1192 | ||
33ac3e89 | 1193 | #: bundle.c:88 sequencer.c:1879 sequencer.c:2337 builtin/commit.c:750 |
fb0e25bc CD |
1194 | #, c-format |
1195 | msgid "could not open '%s'" | |
1196 | msgstr "no se pudo abrir '%s'" | |
1197 | ||
33ac3e89 | 1198 | #: bundle.c:139 |
fb0e25bc | 1199 | msgid "Repository lacks these prerequisite commits:" |
715fc761 | 1200 | msgstr "Al repositorio le falta estos commits prerrequisito:" |
fb0e25bc | 1201 | |
33ac3e89 | 1202 | #: bundle.c:190 |
fb0e25bc CD |
1203 | #, c-format |
1204 | msgid "The bundle contains this ref:" | |
1205 | msgid_plural "The bundle contains these %d refs:" | |
1206 | msgstr[0] "El bundle contiene esta referencia:" | |
1207 | msgstr[1] "El bundle contiene estas %d referencias:" | |
1208 | ||
33ac3e89 | 1209 | #: bundle.c:197 |
fb0e25bc CD |
1210 | msgid "The bundle records a complete history." |
1211 | msgstr "El bundle registra una historia completa." | |
1212 | ||
33ac3e89 | 1213 | #: bundle.c:199 |
fb0e25bc CD |
1214 | #, c-format |
1215 | msgid "The bundle requires this ref:" | |
1216 | msgid_plural "The bundle requires these %d refs:" | |
1217 | msgstr[0] "El bundle requiere esta referencia:" | |
1218 | msgstr[1] "El bundle requiere estas %d referencias:" | |
1219 | ||
33ac3e89 | 1220 | #: bundle.c:258 |
fb0e25bc | 1221 | msgid "Could not spawn pack-objects" |
33ac3e89 | 1222 | msgstr "No se pudo crear los pack-objetcts" |
fb0e25bc | 1223 | |
33ac3e89 | 1224 | #: bundle.c:269 |
fb0e25bc | 1225 | msgid "pack-objects died" |
9df63a4a | 1226 | msgstr "pack-objects murió" |
fb0e25bc | 1227 | |
33ac3e89 | 1228 | #: bundle.c:311 |
fb0e25bc | 1229 | msgid "rev-list died" |
9df63a4a | 1230 | msgstr "rev-list murió" |
fb0e25bc | 1231 | |
33ac3e89 | 1232 | #: bundle.c:360 |
fb0e25bc CD |
1233 | #, c-format |
1234 | msgid "ref '%s' is excluded by the rev-list options" | |
1235 | msgstr "referencia '%s' es excluida por las opciones de rev-list" | |
1236 | ||
33ac3e89 | 1237 | #: bundle.c:450 builtin/log.c:183 builtin/log.c:1607 builtin/shortlog.c:296 |
fb0e25bc CD |
1238 | #, c-format |
1239 | msgid "unrecognized argument: %s" | |
1240 | msgstr "argumento no reconocido: %s" | |
1241 | ||
33ac3e89 | 1242 | #: bundle.c:458 |
fb0e25bc | 1243 | msgid "Refusing to create empty bundle." |
9df63a4a | 1244 | msgstr "Rechazando crear un bundle vacío." |
fb0e25bc | 1245 | |
33ac3e89 | 1246 | #: bundle.c:470 |
fb0e25bc CD |
1247 | #, c-format |
1248 | msgid "cannot create '%s'" | |
1249 | msgstr "no se puede crear '%s'" | |
1250 | ||
33ac3e89 | 1251 | #: bundle.c:498 |
fb0e25bc | 1252 | msgid "index-pack died" |
9df63a4a | 1253 | msgstr "index-pack murió" |
fb0e25bc | 1254 | |
33ac3e89 | 1255 | #: color.c:296 |
fb0e25bc CD |
1256 | #, c-format |
1257 | msgid "invalid color value: %.*s" | |
1258 | msgstr "color inválido: %.*s" | |
1259 | ||
33ac3e89 CDR |
1260 | #: commit.c:41 sequencer.c:2141 builtin/am.c:421 builtin/am.c:465 |
1261 | #: builtin/am.c:1436 builtin/am.c:2072 | |
fb0e25bc CD |
1262 | #, c-format |
1263 | msgid "could not parse %s" | |
715fc761 | 1264 | msgstr "no se puede analizar %s" |
fb0e25bc CD |
1265 | |
1266 | #: commit.c:43 | |
1267 | #, c-format | |
1268 | msgid "%s %s is not a commit!" | |
1269 | msgstr "%s %s no es un commit!" | |
1270 | ||
33ac3e89 | 1271 | #: commit.c:1506 |
fb0e25bc CD |
1272 | msgid "" |
1273 | "Warning: commit message did not conform to UTF-8.\n" | |
1274 | "You may want to amend it after fixing the message, or set the config\n" | |
1275 | "variable i18n.commitencoding to the encoding your project uses.\n" | |
1276 | msgstr "" | |
1277 | "Peligro: el mensaje del commit no se ajusta a UTF-8.\n" | |
715fc761 CDR |
1278 | "Tal vez quiera enmendarlo después de arreglar el mensaje, o arreglar la\n" |
1279 | "variable de configuración i18n.commitencoding para la codificación que usa " | |
4b15eb22 | 1280 | "su proyecto.\n" |
fb0e25bc | 1281 | |
f8038f5b | 1282 | #: compat/obstack.c:405 compat/obstack.c:407 |
fb0e25bc CD |
1283 | msgid "memory exhausted" |
1284 | msgstr "memoria agotada" | |
1285 | ||
f8038f5b | 1286 | #: config.c:186 |
fb0e25bc | 1287 | msgid "relative config include conditionals must come from files" |
4b15eb22 | 1288 | msgstr "" |
715fc761 | 1289 | "la configuración relativa incluye condicionales que deben venir de archivos" |
fb0e25bc | 1290 | |
f8038f5b | 1291 | #: config.c:720 |
fb0e25bc CD |
1292 | #, c-format |
1293 | msgid "bad config line %d in blob %s" | |
715fc761 | 1294 | msgstr "mala línea de config %d en el blob %s" |
fb0e25bc | 1295 | |
f8038f5b | 1296 | #: config.c:724 |
fb0e25bc CD |
1297 | #, c-format |
1298 | msgid "bad config line %d in file %s" | |
715fc761 | 1299 | msgstr "mala línea de config %d en el archivo %s" |
fb0e25bc | 1300 | |
f8038f5b | 1301 | #: config.c:728 |
fb0e25bc CD |
1302 | #, c-format |
1303 | msgid "bad config line %d in standard input" | |
715fc761 | 1304 | msgstr "mala línea de config %d en la entrada standard" |
fb0e25bc | 1305 | |
f8038f5b | 1306 | #: config.c:732 |
fb0e25bc CD |
1307 | #, c-format |
1308 | msgid "bad config line %d in submodule-blob %s" | |
9df63a4a | 1309 | msgstr "mala línea de config %d en el submódulo-blob %s" |
fb0e25bc | 1310 | |
f8038f5b | 1311 | #: config.c:736 |
fb0e25bc CD |
1312 | #, c-format |
1313 | msgid "bad config line %d in command line %s" | |
715fc761 | 1314 | msgstr "mala línea de config %d en la línea de comando %s" |
fb0e25bc | 1315 | |
f8038f5b | 1316 | #: config.c:740 |
fb0e25bc CD |
1317 | #, c-format |
1318 | msgid "bad config line %d in %s" | |
715fc761 | 1319 | msgstr "mala línea de config %d en %s" |
fb0e25bc | 1320 | |
f8038f5b | 1321 | #: config.c:868 |
fb0e25bc CD |
1322 | msgid "out of range" |
1323 | msgstr "fuera de rango" | |
1324 | ||
f8038f5b | 1325 | #: config.c:868 |
fb0e25bc CD |
1326 | msgid "invalid unit" |
1327 | msgstr "unidad invalida" | |
1328 | ||
f8038f5b | 1329 | #: config.c:874 |
fb0e25bc CD |
1330 | #, c-format |
1331 | msgid "bad numeric config value '%s' for '%s': %s" | |
715fc761 | 1332 | msgstr "mal valor de config numérica '%s' para '%s': %s" |
fb0e25bc | 1333 | |
f8038f5b | 1334 | #: config.c:879 |
fb0e25bc CD |
1335 | #, c-format |
1336 | msgid "bad numeric config value '%s' for '%s' in blob %s: %s" | |
715fc761 | 1337 | msgstr "mal valor de config numérica '%s' para '%s' en el blob %s: %s" |
fb0e25bc | 1338 | |
f8038f5b | 1339 | #: config.c:882 |
fb0e25bc CD |
1340 | #, c-format |
1341 | msgid "bad numeric config value '%s' for '%s' in file %s: %s" | |
715fc761 | 1342 | msgstr "mal valor de config numérica '%s' para '%s' en el archivo %s: %s" |
fb0e25bc | 1343 | |
f8038f5b | 1344 | #: config.c:885 |
fb0e25bc CD |
1345 | #, c-format |
1346 | msgid "bad numeric config value '%s' for '%s' in standard input: %s" | |
715fc761 | 1347 | msgstr "mal valor de config numérica '%s' para '%s' en la entrada standard: %s" |
fb0e25bc | 1348 | |
f8038f5b | 1349 | #: config.c:888 |
fb0e25bc CD |
1350 | #, c-format |
1351 | msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s" | |
4b15eb22 | 1352 | msgstr "" |
9df63a4a | 1353 | "mal valor de config numérica '%s' para '%s' en el submódulo-blob %s: %s" |
fb0e25bc | 1354 | |
f8038f5b | 1355 | #: config.c:891 |
fb0e25bc CD |
1356 | #, c-format |
1357 | msgid "bad numeric config value '%s' for '%s' in command line %s: %s" | |
4b15eb22 | 1358 | msgstr "" |
715fc761 | 1359 | "mal valor de config numérica '%s' para '%s' en la línea de comando %s: %s" |
fb0e25bc | 1360 | |
f8038f5b | 1361 | #: config.c:894 |
fb0e25bc CD |
1362 | #, c-format |
1363 | msgid "bad numeric config value '%s' for '%s' in %s: %s" | |
715fc761 | 1364 | msgstr "mal valor de config numérica '%s' para '%s' en %s: %s" |
fb0e25bc | 1365 | |
f8038f5b | 1366 | #: config.c:989 |
fb0e25bc CD |
1367 | #, c-format |
1368 | msgid "failed to expand user dir in: '%s'" | |
1369 | msgstr "fallo al expandir el directorio de usuario en: '%s'" | |
1370 | ||
f8038f5b CDR |
1371 | #: config.c:998 |
1372 | #, c-format | |
1373 | msgid "'%s' for '%s' is not a valid timestamp" | |
1374 | msgstr "'%s' para '%s' no es una marca de tiempo válida" | |
1375 | ||
1376 | #: config.c:1094 config.c:1105 | |
fb0e25bc CD |
1377 | #, c-format |
1378 | msgid "bad zlib compression level %d" | |
715fc761 | 1379 | msgstr "mala compresión zlib en nivel %d" |
fb0e25bc | 1380 | |
33ac3e89 | 1381 | #: config.c:1225 |
fb0e25bc CD |
1382 | #, c-format |
1383 | msgid "invalid mode for object creation: %s" | |
715fc761 | 1384 | msgstr "modo invalido de creación de objetos: %s" |
fb0e25bc | 1385 | |
33ac3e89 | 1386 | #: config.c:1386 |
fb0e25bc CD |
1387 | #, c-format |
1388 | msgid "bad pack compression level %d" | |
715fc761 | 1389 | msgstr "mala compresión pack en el nivel %d" |
fb0e25bc | 1390 | |
33ac3e89 | 1391 | #: config.c:1582 |
fb0e25bc | 1392 | msgid "unable to parse command-line config" |
715fc761 | 1393 | msgstr "no es posible analizar la configuración de la línea de comando" |
fb0e25bc | 1394 | |
33ac3e89 | 1395 | #: config.c:1914 |
fb0e25bc | 1396 | msgid "unknown error occurred while reading the configuration files" |
4b15eb22 | 1397 | msgstr "" |
715fc761 | 1398 | "error desconocido ocurrió mientras se leían los archivos de configuración" |
fb0e25bc | 1399 | |
33ac3e89 | 1400 | #: config.c:2101 |
fb0e25bc CD |
1401 | #, c-format |
1402 | msgid "Invalid %s: '%s'" | |
1403 | msgstr "Invalido %s: '%s'" | |
1404 | ||
33ac3e89 | 1405 | #: config.c:2144 |
fb0e25bc CD |
1406 | #, c-format |
1407 | msgid "unknown core.untrackedCache value '%s'; using 'keep' default value" | |
4b15eb22 | 1408 | msgstr "" |
33ac3e89 CDR |
1409 | "valor core.untrackedCache '%s' desconocido; usando 'keep' como valor por " |
1410 | "defecto" | |
fb0e25bc | 1411 | |
33ac3e89 | 1412 | #: config.c:2170 |
fb0e25bc CD |
1413 | #, c-format |
1414 | msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100" | |
1415 | msgstr "valor splitIndex.maxPercentChange '%d' debe estar entre 0 y 100" | |
1416 | ||
33ac3e89 | 1417 | #: config.c:2195 |
fb0e25bc CD |
1418 | #, c-format |
1419 | msgid "unable to parse '%s' from command-line config" | |
715fc761 | 1420 | msgstr "no es posible analizar '%s' de la configuración de la línea de comando" |
fb0e25bc | 1421 | |
33ac3e89 | 1422 | #: config.c:2197 |
fb0e25bc CD |
1423 | #, c-format |
1424 | msgid "bad config variable '%s' in file '%s' at line %d" | |
715fc761 | 1425 | msgstr "mala variable de config '%s' en el archivo '%s' en la línea %d" |
fb0e25bc | 1426 | |
33ac3e89 | 1427 | #: config.c:2256 |
fb0e25bc CD |
1428 | #, c-format |
1429 | msgid "%s has multiple values" | |
715fc761 | 1430 | msgstr "%s tiene múltiples valores" |
fb0e25bc | 1431 | |
33ac3e89 | 1432 | #: config.c:2599 config.c:2816 |
fb0e25bc CD |
1433 | #, c-format |
1434 | msgid "fstat on %s failed" | |
1435 | msgstr "fstat en %s fallo" | |
1436 | ||
33ac3e89 | 1437 | #: config.c:2706 |
fb0e25bc CD |
1438 | #, c-format |
1439 | msgid "could not set '%s' to '%s'" | |
1440 | msgstr "no se pudo configurar '%s' a '%s'" | |
1441 | ||
33ac3e89 | 1442 | #: config.c:2708 builtin/remote.c:776 |
fb0e25bc CD |
1443 | #, c-format |
1444 | msgid "could not unset '%s'" | |
1445 | msgstr "no se pudo desactivar '%s'" | |
1446 | ||
f8038f5b | 1447 | #: connect.c:52 |
fb0e25bc | 1448 | msgid "The remote end hung up upon initial contact" |
715fc761 | 1449 | msgstr "El remoto se colgó en el contacto inicial" |
fb0e25bc | 1450 | |
f8038f5b | 1451 | #: connect.c:54 |
fb0e25bc CD |
1452 | msgid "" |
1453 | "Could not read from remote repository.\n" | |
1454 | "\n" | |
1455 | "Please make sure you have the correct access rights\n" | |
1456 | "and the repository exists." | |
1457 | msgstr "" | |
1458 | "No se pudo leer del repositorio remoto.\n" | |
1459 | "\n" | |
715fc761 | 1460 | "Por favor asegúrese que tiene los permisos de acceso correctos\n" |
fb0e25bc CD |
1461 | "y que el repositorio existe." |
1462 | ||
33ac3e89 | 1463 | #: connected.c:66 builtin/fsck.c:198 builtin/prune.c:144 |
fb0e25bc CD |
1464 | msgid "Checking connectivity" |
1465 | msgstr "Verificando conectividad" | |
1466 | ||
33ac3e89 | 1467 | #: connected.c:78 |
fb0e25bc CD |
1468 | msgid "Could not run 'git rev-list'" |
1469 | msgstr "No se pudo correr 'git rev-list'" | |
1470 | ||
33ac3e89 | 1471 | #: connected.c:98 |
fb0e25bc CD |
1472 | msgid "failed write to rev-list" |
1473 | msgstr "fallo escribir a rev-list" | |
1474 | ||
33ac3e89 | 1475 | #: connected.c:105 |
fb0e25bc CD |
1476 | msgid "failed to close rev-list's stdin" |
1477 | msgstr "fallo al cerrar la entrada standard de rev-list" | |
1478 | ||
1479 | #: convert.c:205 | |
1480 | #, c-format | |
33ac3e89 CDR |
1481 | msgid "CRLF would be replaced by LF in %s." |
1482 | msgstr "CRLF será reemplazado por LF en %s." | |
1483 | ||
1484 | #: convert.c:207 | |
1485 | #, c-format | |
fb0e25bc CD |
1486 | msgid "" |
1487 | "CRLF will be replaced by LF in %s.\n" | |
1488 | "The file will have its original line endings in your working directory." | |
1489 | msgstr "" | |
9df63a4a | 1490 | "CRLF será remplazado por LF en %s.\n" |
715fc761 CDR |
1491 | "El archivo tendrá sus finales de línea originales en tu directorio de " |
1492 | "trabajo." | |
fb0e25bc | 1493 | |
33ac3e89 | 1494 | #: convert.c:215 |
fb0e25bc | 1495 | #, c-format |
33ac3e89 CDR |
1496 | msgid "LF would be replaced by CRLF in %s" |
1497 | msgstr "LF será reemplazado por CRLF en %s" | |
fb0e25bc | 1498 | |
33ac3e89 | 1499 | #: convert.c:217 |
fb0e25bc CD |
1500 | #, c-format |
1501 | msgid "" | |
1502 | "LF will be replaced by CRLF in %s.\n" | |
1503 | "The file will have its original line endings in your working directory." | |
1504 | msgstr "" | |
9df63a4a | 1505 | "LF será reemplazado por CRLF en %s.\n" |
715fc761 | 1506 | "El archivo tendrá sus finales de línea originales en tu directorio de " |
4b15eb22 | 1507 | "trabajo." |
fb0e25bc | 1508 | |
fb0e25bc CD |
1509 | #: date.c:116 |
1510 | msgid "in the future" | |
1511 | msgstr "en el futuro" | |
1512 | ||
1513 | #: date.c:122 | |
1514 | #, c-format | |
1515 | msgid "%<PRIuMAX> second ago" | |
1516 | msgid_plural "%<PRIuMAX> seconds ago" | |
1517 | msgstr[0] "hace %<PRIuMAX> segundo" | |
1518 | msgstr[1] "hace %<PRIuMAX> segundos" | |
1519 | ||
1520 | #: date.c:129 | |
1521 | #, c-format | |
1522 | msgid "%<PRIuMAX> minute ago" | |
1523 | msgid_plural "%<PRIuMAX> minutes ago" | |
1524 | msgstr[0] "hace %<PRIuMAX> minuto" | |
1525 | msgstr[1] "hace %<PRIuMAX> minutos" | |
1526 | ||
1527 | #: date.c:136 | |
1528 | #, c-format | |
1529 | msgid "%<PRIuMAX> hour ago" | |
1530 | msgid_plural "%<PRIuMAX> hours ago" | |
1531 | msgstr[0] "hace %<PRIuMAX> hora" | |
1532 | msgstr[1] "hace %<PRIuMAX> horas" | |
1533 | ||
1534 | #: date.c:143 | |
1535 | #, c-format | |
1536 | msgid "%<PRIuMAX> day ago" | |
1537 | msgid_plural "%<PRIuMAX> days ago" | |
1538 | msgstr[0] "hace %<PRIuMAX> día" | |
1539 | msgstr[1] "hace %<PRIuMAX> días" | |
1540 | ||
1541 | #: date.c:149 | |
1542 | #, c-format | |
1543 | msgid "%<PRIuMAX> week ago" | |
1544 | msgid_plural "%<PRIuMAX> weeks ago" | |
1545 | msgstr[0] "hace %<PRIuMAX> semana" | |
1546 | msgstr[1] "hace %<PRIuMAX> semanas" | |
1547 | ||
1548 | #: date.c:156 | |
1549 | #, c-format | |
1550 | msgid "%<PRIuMAX> month ago" | |
1551 | msgid_plural "%<PRIuMAX> months ago" | |
1552 | msgstr[0] "hace %<PRIuMAX> mes" | |
1553 | msgstr[1] "hace %<PRIuMAX> meses" | |
1554 | ||
1555 | #: date.c:167 | |
1556 | #, c-format | |
1557 | msgid "%<PRIuMAX> year" | |
4b15eb22 CD |
1558 | msgid_plural "%<PRIuMAX> years" |
1559 | msgstr[0] "%<PRIuMAX> año" | |
fb0e25bc CD |
1560 | msgstr[1] "%<PRIuMAX> años" |
1561 | ||
1562 | #. TRANSLATORS: "%s" is "<n> years" | |
1563 | #: date.c:170 | |
1564 | #, c-format | |
1565 | msgid "%s, %<PRIuMAX> month ago" | |
1566 | msgid_plural "%s, %<PRIuMAX> months ago" | |
1567 | msgstr[0] "%s, y %<PRIuMAX> mes atrás" | |
1568 | msgstr[1] "%s, y %<PRIuMAX> meses atrás" | |
1569 | ||
1570 | #: date.c:175 date.c:180 | |
1571 | #, c-format | |
1572 | msgid "%<PRIuMAX> year ago" | |
1573 | msgid_plural "%<PRIuMAX> years ago" | |
1574 | msgstr[0] "hace %<PRIuMAX> año" | |
1575 | msgstr[1] "hace %<PRIuMAX> años" | |
1576 | ||
1577 | #: diffcore-order.c:24 | |
1578 | #, c-format | |
1579 | msgid "failed to read orderfile '%s'" | |
1580 | msgstr "fallo al leer orden de archivos '%s'" | |
1581 | ||
f8038f5b | 1582 | #: diffcore-rename.c:535 |
fb0e25bc | 1583 | msgid "Performing inexact rename detection" |
715fc761 | 1584 | msgstr "Realizando una detección de cambios de nombre inexacta" |
fb0e25bc | 1585 | |
4b15eb22 | 1586 | #: diff.c:74 |
fb0e25bc CD |
1587 | #, c-format |
1588 | msgid "option '%s' requires a value" | |
715fc761 | 1589 | msgstr "opción '%s' requiere un valor" |
fb0e25bc | 1590 | |
4b15eb22 | 1591 | #: diff.c:152 |
fb0e25bc CD |
1592 | #, c-format |
1593 | msgid " Failed to parse dirstat cut-off percentage '%s'\n" | |
1594 | msgstr " Fallo al analizar dirstat porcentaje de corte '%s'\n" | |
1595 | ||
4b15eb22 | 1596 | #: diff.c:157 |
fb0e25bc CD |
1597 | #, c-format |
1598 | msgid " Unknown dirstat parameter '%s'\n" | |
715fc761 | 1599 | msgstr " parámetro '%s' de dirstat desconocido\n" |
fb0e25bc | 1600 | |
4b15eb22 CD |
1601 | #: diff.c:281 |
1602 | msgid "" | |
1603 | "color moved setting must be one of 'no', 'default', 'zebra', 'dimmed_zebra', " | |
1604 | "'plain'" | |
1605 | msgstr "" | |
1606 | "opción de color debe ser una entre 'no', 'default', 'zebra', 'dimmed_zebra, " | |
1607 | "'plain'" | |
1608 | ||
1609 | #: diff.c:341 | |
fb0e25bc CD |
1610 | #, c-format |
1611 | msgid "Unknown value for 'diff.submodule' config variable: '%s'" | |
33ac3e89 CDR |
1612 | msgstr "" |
1613 | "Valor para la variable de configuración 'diff.submodule' desconocido: '%s'" | |
fb0e25bc | 1614 | |
f8038f5b | 1615 | #: diff.c:401 |
fb0e25bc CD |
1616 | #, c-format |
1617 | msgid "" | |
1618 | "Found errors in 'diff.dirstat' config variable:\n" | |
1619 | "%s" | |
1620 | msgstr "" | |
1621 | "Errores en la variable de config 'diff.dirstat' encontrados:\n" | |
1622 | "%s" | |
1623 | ||
33ac3e89 | 1624 | #: diff.c:3822 |
fb0e25bc CD |
1625 | #, c-format |
1626 | msgid "external diff died, stopping at %s" | |
9df63a4a | 1627 | msgstr "diff externo murió, deteniendo en %s" |
fb0e25bc | 1628 | |
33ac3e89 | 1629 | #: diff.c:4146 |
fb0e25bc CD |
1630 | msgid "--name-only, --name-status, --check and -s are mutually exclusive" |
1631 | msgstr "--name-only, --name-status, --check y -s son mutuamente exclusivas" | |
1632 | ||
33ac3e89 CDR |
1633 | #: diff.c:4149 |
1634 | msgid "-G, -S and --find-object are mutually exclusive" | |
1635 | msgstr "-G, -S y --find-object son mutuamente exclusivas" | |
1636 | ||
1637 | #: diff.c:4237 | |
fb0e25bc CD |
1638 | msgid "--follow requires exactly one pathspec" |
1639 | msgstr "--follow requiere exactamente un pathspec" | |
1640 | ||
33ac3e89 | 1641 | #: diff.c:4403 |
fb0e25bc CD |
1642 | #, c-format |
1643 | msgid "" | |
1644 | "Failed to parse --dirstat/-X option parameter:\n" | |
1645 | "%s" | |
1646 | msgstr "" | |
715fc761 | 1647 | "Fallo al analizar parámetro de opción --dirstat/-X:\n" |
fb0e25bc CD |
1648 | "%s" |
1649 | ||
33ac3e89 | 1650 | #: diff.c:4417 |
fb0e25bc CD |
1651 | #, c-format |
1652 | msgid "Failed to parse --submodule option parameter: '%s'" | |
715fc761 | 1653 | msgstr "Fallo al analizar parámetro de opción --submodule: '%s'" |
fb0e25bc | 1654 | |
33ac3e89 | 1655 | #: diff.c:5493 |
fb0e25bc | 1656 | msgid "inexact rename detection was skipped due to too many files." |
4b15eb22 | 1657 | msgstr "" |
33ac3e89 | 1658 | "detección de cambio de nombre inexacta fue saltada por haber muchos archivos." |
fb0e25bc | 1659 | |
33ac3e89 | 1660 | #: diff.c:5496 |
fb0e25bc | 1661 | msgid "only found copies from modified paths due to too many files." |
4b15eb22 | 1662 | msgstr "" |
33ac3e89 | 1663 | "solo se encontraron copias de rutas modificadas por haber muchos archivos." |
fb0e25bc | 1664 | |
33ac3e89 | 1665 | #: diff.c:5499 |
fb0e25bc | 1666 | #, c-format |
4b15eb22 CD |
1667 | msgid "" |
1668 | "you may want to set your %s variable to at least %d and retry the command." | |
1669 | msgstr "" | |
1670 | "tal vez quiera configurar la variable %s para por lo menos %d y volver a " | |
1671 | "intentar el comando." | |
fb0e25bc | 1672 | |
33ac3e89 CDR |
1673 | #: dir.c:1866 |
1674 | #, c-format | |
1675 | msgid "could not open directory '%s'" | |
1676 | msgstr "no se pudo abrir el directorio '%s'" | |
1677 | ||
1678 | #: dir.c:2108 | |
fb0e25bc | 1679 | msgid "failed to get kernel name and information" |
715fc761 | 1680 | msgstr "fallo al conseguir la información y nombre del kernel" |
fb0e25bc | 1681 | |
33ac3e89 | 1682 | #: dir.c:2232 |
fb0e25bc | 1683 | msgid "Untracked cache is disabled on this system or location." |
33ac3e89 | 1684 | msgstr "Untracked cache esta desactivado en este sistema o ubicación." |
fb0e25bc | 1685 | |
33ac3e89 | 1686 | #: dir.c:3024 dir.c:3029 |
fb0e25bc CD |
1687 | #, c-format |
1688 | msgid "could not create directories for %s" | |
1689 | msgstr "no se pudo crear directorios para %s" | |
1690 | ||
33ac3e89 | 1691 | #: dir.c:3054 |
fb0e25bc CD |
1692 | #, c-format |
1693 | msgid "could not migrate git directory from '%s' to '%s'" | |
1694 | msgstr "no se pudo migrar el directorio git de '%s' a '%s'" | |
1695 | ||
f8038f5b CDR |
1696 | #: editor.c:61 |
1697 | #, c-format | |
1698 | msgid "hint: Waiting for your editor to close the file...%c" | |
1699 | msgstr "ayuda: Esperando que tu editor cierre el archivo ...%c" | |
1700 | ||
1701 | #: entry.c:177 | |
4b15eb22 CD |
1702 | msgid "Filtering content" |
1703 | msgstr "Filtrando contenido" | |
1704 | ||
f8038f5b | 1705 | #: entry.c:435 |
fb0e25bc CD |
1706 | #, c-format |
1707 | msgid "could not stat file '%s'" | |
1708 | msgstr "no se pudo establecer el archivo '%s'" | |
1709 | ||
33ac3e89 CDR |
1710 | #: fetch-object.c:17 |
1711 | msgid "Remote with no URL" | |
1712 | msgstr "Remoto sin URL" | |
1713 | ||
1714 | #: fetch-pack.c:253 | |
fb0e25bc CD |
1715 | msgid "git fetch-pack: expected shallow list" |
1716 | msgstr "git fetch-pack: lista poco profunda esperada" | |
1717 | ||
33ac3e89 CDR |
1718 | #: fetch-pack.c:265 |
1719 | msgid "git fetch-pack: expected ACK/NAK, got a flush packet" | |
1720 | msgstr "git fetch-pack: se esperaba ACK/NAK, se obtuvo un flush packet" | |
fb0e25bc | 1721 | |
33ac3e89 | 1722 | #: fetch-pack.c:284 builtin/archive.c:63 |
fb0e25bc CD |
1723 | #, c-format |
1724 | msgid "remote error: %s" | |
1725 | msgstr "error remoto: %s" | |
1726 | ||
33ac3e89 | 1727 | #: fetch-pack.c:285 |
fb0e25bc CD |
1728 | #, c-format |
1729 | msgid "git fetch-pack: expected ACK/NAK, got '%s'" | |
1730 | msgstr "git fetch-pack: se esperaba ACK/NAK, se obtuvo '%s'" | |
1731 | ||
33ac3e89 | 1732 | #: fetch-pack.c:337 |
fb0e25bc CD |
1733 | msgid "--stateless-rpc requires multi_ack_detailed" |
1734 | msgstr "--stateless-rpc requiere multi_ack_detailed" | |
1735 | ||
33ac3e89 | 1736 | #: fetch-pack.c:428 |
fb0e25bc CD |
1737 | #, c-format |
1738 | msgid "invalid shallow line: %s" | |
715fc761 | 1739 | msgstr "línea poco profunda invalida: %s" |
fb0e25bc | 1740 | |
33ac3e89 | 1741 | #: fetch-pack.c:434 |
fb0e25bc CD |
1742 | #, c-format |
1743 | msgid "invalid unshallow line: %s" | |
1744 | msgstr "línea superficial inválida: %s" | |
1745 | ||
33ac3e89 | 1746 | #: fetch-pack.c:436 |
fb0e25bc CD |
1747 | #, c-format |
1748 | msgid "object not found: %s" | |
1749 | msgstr "objeto no encontrado: %s" | |
1750 | ||
33ac3e89 | 1751 | #: fetch-pack.c:439 |
fb0e25bc CD |
1752 | #, c-format |
1753 | msgid "error in object: %s" | |
1754 | msgstr "error en objeto: %s" | |
1755 | ||
33ac3e89 | 1756 | #: fetch-pack.c:441 |
fb0e25bc CD |
1757 | #, c-format |
1758 | msgid "no shallow found: %s" | |
1759 | msgstr "superficie no encontrada: %s" | |
1760 | ||
33ac3e89 | 1761 | #: fetch-pack.c:444 |
fb0e25bc CD |
1762 | #, c-format |
1763 | msgid "expected shallow/unshallow, got %s" | |
1764 | msgstr "se esperaba shallow/unshallow, se obtuvo %s" | |
1765 | ||
33ac3e89 | 1766 | #: fetch-pack.c:485 |
fb0e25bc CD |
1767 | #, c-format |
1768 | msgid "got %s %d %s" | |
1769 | msgstr "se obtuvo %s %d %s" | |
1770 | ||
33ac3e89 | 1771 | #: fetch-pack.c:499 |
fb0e25bc CD |
1772 | #, c-format |
1773 | msgid "invalid commit %s" | |
1774 | msgstr "commit inválido %s" | |
1775 | ||
33ac3e89 | 1776 | #: fetch-pack.c:532 |
fb0e25bc | 1777 | msgid "giving up" |
9df63a4a | 1778 | msgstr "rindiéndose" |
fb0e25bc | 1779 | |
33ac3e89 | 1780 | #: fetch-pack.c:542 progress.c:229 |
fb0e25bc CD |
1781 | msgid "done" |
1782 | msgstr "listo" | |
1783 | ||
33ac3e89 | 1784 | #: fetch-pack.c:554 |
fb0e25bc CD |
1785 | #, c-format |
1786 | msgid "got %s (%d) %s" | |
1787 | msgstr "se obtuvo %s (%d) %s" | |
1788 | ||
33ac3e89 | 1789 | #: fetch-pack.c:600 |
fb0e25bc CD |
1790 | #, c-format |
1791 | msgid "Marking %s as complete" | |
1792 | msgstr "Marcando %s como completa" | |
1793 | ||
33ac3e89 | 1794 | #: fetch-pack.c:788 |
fb0e25bc CD |
1795 | #, c-format |
1796 | msgid "already have %s (%s)" | |
1797 | msgstr "ya se tiene %s (%s)" | |
1798 | ||
33ac3e89 | 1799 | #: fetch-pack.c:829 |
fb0e25bc CD |
1800 | msgid "fetch-pack: unable to fork off sideband demultiplexer" |
1801 | msgstr "fetch-pack: no se puede extraer un demultiplexor de banda lateral" | |
1802 | ||
33ac3e89 | 1803 | #: fetch-pack.c:837 |
fb0e25bc CD |
1804 | msgid "protocol error: bad pack header" |
1805 | msgstr "error de protocolo: mal paquete de header" | |
1806 | ||
33ac3e89 | 1807 | #: fetch-pack.c:895 |
fb0e25bc CD |
1808 | #, c-format |
1809 | msgid "fetch-pack: unable to fork off %s" | |
1810 | msgstr "fetch-pack: no se puede quitar %s" | |
1811 | ||
33ac3e89 | 1812 | #: fetch-pack.c:911 |
fb0e25bc CD |
1813 | #, c-format |
1814 | msgid "%s failed" | |
1815 | msgstr "%s fallo" | |
1816 | ||
33ac3e89 | 1817 | #: fetch-pack.c:913 |
fb0e25bc CD |
1818 | msgid "error in sideband demultiplexer" |
1819 | msgstr "error en demultiplexor de banda lateral" | |
1820 | ||
33ac3e89 | 1821 | #: fetch-pack.c:940 |
fb0e25bc CD |
1822 | msgid "Server does not support shallow clients" |
1823 | msgstr "Servidor no soporta clientes superficiales" | |
1824 | ||
33ac3e89 | 1825 | #: fetch-pack.c:944 |
fb0e25bc CD |
1826 | msgid "Server supports multi_ack_detailed" |
1827 | msgstr "Servidor soporta ulti_ack_detailed" | |
1828 | ||
33ac3e89 | 1829 | #: fetch-pack.c:947 |
fb0e25bc CD |
1830 | msgid "Server supports no-done" |
1831 | msgstr "Servidor soporta no-done" | |
1832 | ||
33ac3e89 | 1833 | #: fetch-pack.c:953 |
fb0e25bc CD |
1834 | msgid "Server supports multi_ack" |
1835 | msgstr "Servidor soporta multi_ack" | |
1836 | ||
33ac3e89 | 1837 | #: fetch-pack.c:957 |
fb0e25bc CD |
1838 | msgid "Server supports side-band-64k" |
1839 | msgstr "Servidor soporta side-band-64k" | |
1840 | ||
33ac3e89 | 1841 | #: fetch-pack.c:961 |
fb0e25bc CD |
1842 | msgid "Server supports side-band" |
1843 | msgstr "Servidor soporta side-band" | |
1844 | ||
33ac3e89 | 1845 | #: fetch-pack.c:965 |
fb0e25bc CD |
1846 | msgid "Server supports allow-tip-sha1-in-want" |
1847 | msgstr "Servidor soporta allow-tip-sha1-in-want" | |
1848 | ||
33ac3e89 | 1849 | #: fetch-pack.c:969 |
fb0e25bc CD |
1850 | msgid "Server supports allow-reachable-sha1-in-want" |
1851 | msgstr "Servidor soporta allow-reachable-sha1-in-want" | |
1852 | ||
33ac3e89 | 1853 | #: fetch-pack.c:979 |
fb0e25bc CD |
1854 | msgid "Server supports ofs-delta" |
1855 | msgstr "Servidor soporta ofs-delta" | |
1856 | ||
33ac3e89 CDR |
1857 | #: fetch-pack.c:985 |
1858 | msgid "Server supports filter" | |
1859 | msgstr "Servidor soporta filtro" | |
1860 | ||
1861 | #: fetch-pack.c:993 | |
fb0e25bc CD |
1862 | #, c-format |
1863 | msgid "Server version is %.*s" | |
715fc761 | 1864 | msgstr "Versión de servidor es %.*s" |
fb0e25bc | 1865 | |
33ac3e89 | 1866 | #: fetch-pack.c:999 |
fb0e25bc CD |
1867 | msgid "Server does not support --shallow-since" |
1868 | msgstr "Servidor no soporta --shalow-since" | |
1869 | ||
33ac3e89 | 1870 | #: fetch-pack.c:1003 |
fb0e25bc CD |
1871 | msgid "Server does not support --shallow-exclude" |
1872 | msgstr "Servidor no soporta --shalow-exclude" | |
1873 | ||
33ac3e89 | 1874 | #: fetch-pack.c:1005 |
fb0e25bc CD |
1875 | msgid "Server does not support --deepen" |
1876 | msgstr "Servidor no soporta --deepen" | |
1877 | ||
33ac3e89 | 1878 | #: fetch-pack.c:1016 |
fb0e25bc CD |
1879 | msgid "no common commits" |
1880 | msgstr "no hay commits comunes" | |
1881 | ||
33ac3e89 | 1882 | #: fetch-pack.c:1028 |
fb0e25bc | 1883 | msgid "git fetch-pack: fetch failed." |
33ac3e89 | 1884 | msgstr "git fetch-pack: fetch fallo." |
fb0e25bc | 1885 | |
33ac3e89 | 1886 | #: fetch-pack.c:1190 |
fb0e25bc CD |
1887 | msgid "no matching remote head" |
1888 | msgstr "no concuerda el head remoto" | |
1889 | ||
33ac3e89 | 1890 | #: fetch-pack.c:1212 |
fb0e25bc CD |
1891 | #, c-format |
1892 | msgid "no such remote ref %s" | |
1893 | msgstr "no existe ref remota %s" | |
1894 | ||
33ac3e89 | 1895 | #: fetch-pack.c:1215 |
fb0e25bc CD |
1896 | #, c-format |
1897 | msgid "Server does not allow request for unadvertised object %s" | |
1898 | msgstr "Servidor no permite solicitudes de objetos inadvertidos %s" | |
1899 | ||
1900 | #: gpg-interface.c:181 | |
1901 | msgid "gpg failed to sign the data" | |
1902 | msgstr "gpg fallo al firmar la data" | |
1903 | ||
1904 | #: gpg-interface.c:211 | |
1905 | msgid "could not create temporary file" | |
1906 | msgstr "no se pudo crear archivo temporal" | |
1907 | ||
4b15eb22 | 1908 | #: gpg-interface.c:214 |
fb0e25bc CD |
1909 | #, c-format |
1910 | msgid "failed writing detached signature to '%s'" | |
1911 | msgstr "fallo al escribir la firma separada para '%s'" | |
1912 | ||
1913 | #: graph.c:97 | |
1914 | #, c-format | |
1915 | msgid "ignore invalid color '%.*s' in log.graphColors" | |
1916 | msgstr "ignora color invalido '%.*s' en log.graphColors" | |
1917 | ||
33ac3e89 | 1918 | #: grep.c:2022 |
fb0e25bc CD |
1919 | #, c-format |
1920 | msgid "'%s': unable to read %s" | |
1921 | msgstr "'%s': no es posible leer %s" | |
1922 | ||
33ac3e89 CDR |
1923 | #: grep.c:2039 setup.c:163 builtin/clone.c:407 builtin/diff.c:81 |
1924 | #: builtin/rm.c:134 | |
fb0e25bc CD |
1925 | #, c-format |
1926 | msgid "failed to stat '%s'" | |
1927 | msgstr "fallo al marcar '%s'" | |
1928 | ||
33ac3e89 | 1929 | #: grep.c:2050 |
fb0e25bc CD |
1930 | #, c-format |
1931 | msgid "'%s': short read" | |
1932 | msgstr "'%s': lectura corta" | |
1933 | ||
1934 | #: help.c:179 | |
1935 | #, c-format | |
1936 | msgid "available git commands in '%s'" | |
1937 | msgstr "comandos disponibles de git en '%s'" | |
1938 | ||
1939 | #: help.c:186 | |
1940 | msgid "git commands available from elsewhere on your $PATH" | |
1941 | msgstr "comandos disponibles de git desde otro lugar en tu $PATH" | |
1942 | ||
1943 | #: help.c:217 | |
1944 | msgid "These are common Git commands used in various situations:" | |
1945 | msgstr "Estos son comandos comunes de Git usados en varias situaciones:" | |
1946 | ||
1947 | #: help.c:281 | |
1948 | #, c-format | |
1949 | msgid "" | |
1950 | "'%s' appears to be a git command, but we were not\n" | |
1951 | "able to execute it. Maybe git-%s is broken?" | |
1952 | msgstr "" | |
715fc761 | 1953 | "'%s' parece ser un comando de git, pero no hemos\n" |
fb0e25bc CD |
1954 | "podido ejecutarlo. Tal vez git-%s se ha roto?" |
1955 | ||
1956 | #: help.c:336 | |
1957 | msgid "Uh oh. Your system reports no Git commands at all." | |
33ac3e89 | 1958 | msgstr "Oh oh. Tu sistema no reporta ningún comando de Git." |
fb0e25bc CD |
1959 | |
1960 | #: help.c:358 | |
1961 | #, c-format | |
1962 | msgid "WARNING: You called a Git command named '%s', which does not exist." | |
1963 | msgstr "PELIGRO: Has llamado a un comando de Git '%s', el cual no existe." | |
1964 | ||
1965 | #: help.c:363 | |
1966 | #, c-format | |
1967 | msgid "Continuing under the assumption that you meant '%s'." | |
1968 | msgstr "Continuando asumiendo que quisiste decir '%s'." | |
1969 | ||
1970 | #: help.c:368 | |
1971 | #, c-format | |
1972 | msgid "Continuing in %0.1f seconds, assuming that you meant '%s'." | |
1973 | msgstr "Continuando en %0.1f segundos, asumiendo que tu dijiste '%s'." | |
1974 | ||
1975 | #: help.c:376 | |
1976 | #, c-format | |
1977 | msgid "git: '%s' is not a git command. See 'git --help'." | |
715fc761 | 1978 | msgstr "git: '%s'no es un comando de git. Mira 'git --help'." |
fb0e25bc CD |
1979 | |
1980 | #: help.c:380 | |
1981 | msgid "" | |
1982 | "\n" | |
1983 | "The most similar command is" | |
1984 | msgid_plural "" | |
1985 | "\n" | |
1986 | "The most similar commands are" | |
1987 | msgstr[0] "" | |
1988 | "\n" | |
1989 | "El comando mas similar es" | |
1990 | msgstr[1] "" | |
1991 | "\n" | |
1992 | "Los comandos mas similares son" | |
1993 | ||
1994 | #: help.c:395 | |
1995 | msgid "git version [<options>]" | |
715fc761 | 1996 | msgstr "git versión [<opciones>]" |
fb0e25bc | 1997 | |
f8038f5b | 1998 | #: help.c:462 |
fb0e25bc CD |
1999 | #, c-format |
2000 | msgid "%s: %s - %s" | |
2001 | msgstr "%s: %s - %s" | |
2002 | ||
f8038f5b | 2003 | #: help.c:466 |
fb0e25bc CD |
2004 | msgid "" |
2005 | "\n" | |
2006 | "Did you mean this?" | |
2007 | msgid_plural "" | |
2008 | "\n" | |
2009 | "Did you mean one of these?" | |
2010 | msgstr[0] "" | |
2011 | "\n" | |
2012 | "Quisiste decir esto?" | |
2013 | msgstr[1] "" | |
2014 | "\n" | |
2015 | "Quisiste decir alguno de estos?" | |
2016 | ||
2017 | #: ident.c:342 | |
2018 | msgid "" | |
2019 | "\n" | |
2020 | "*** Please tell me who you are.\n" | |
2021 | "\n" | |
2022 | "Run\n" | |
2023 | "\n" | |
2024 | " git config --global user.email \"you@example.com\"\n" | |
2025 | " git config --global user.name \"Your Name\"\n" | |
2026 | "\n" | |
2027 | "to set your account's default identity.\n" | |
2028 | "Omit --global to set the identity only in this repository.\n" | |
2029 | "\n" | |
2030 | msgstr "" | |
2031 | "\n" | |
715fc761 | 2032 | "*** Por favor cuéntame quien eres.\n" |
fb0e25bc CD |
2033 | "\n" |
2034 | "Corre\n" | |
2035 | "\n" | |
2036 | " git config --global user.email \"you@example.com\"\n" | |
2037 | " git config --global user.name \"Tu Nombre\"\n" | |
2038 | "\n" | |
2039 | "para configurar la identidad por defecto de tu cuenta.\n" | |
2040 | "Omite --global para configurar tu identidad solo en este repositorio.\n" | |
2041 | "\n" | |
2042 | ||
2043 | #: ident.c:366 | |
2044 | msgid "no email was given and auto-detection is disabled" | |
715fc761 | 2045 | msgstr "no se entrego ningún email y la detección automática esta desactivada" |
fb0e25bc CD |
2046 | |
2047 | #: ident.c:371 | |
2048 | #, c-format | |
2049 | msgid "unable to auto-detect email address (got '%s')" | |
715fc761 | 2050 | msgstr "no es posible auto-detectar la dirección de correo (se obtuvo '%s')" |
fb0e25bc CD |
2051 | |
2052 | #: ident.c:381 | |
2053 | msgid "no name was given and auto-detection is disabled" | |
715fc761 | 2054 | msgstr "no se entrego ningún nombre y la detección automática esta desactivada" |
fb0e25bc CD |
2055 | |
2056 | #: ident.c:387 | |
2057 | #, c-format | |
2058 | msgid "unable to auto-detect name (got '%s')" | |
2059 | msgstr "no es posible auto-detectar el nombre (se obtuvo '%s')" | |
2060 | ||
2061 | #: ident.c:395 | |
2062 | #, c-format | |
2063 | msgid "empty ident name (for <%s>) not allowed" | |
715fc761 | 2064 | msgstr "no se puede tener un nombre vacío (para <%s>)" |
fb0e25bc CD |
2065 | |
2066 | #: ident.c:401 | |
2067 | #, c-format | |
2068 | msgid "name consists only of disallowed characters: %s" | |
2069 | msgstr "el nombre consiste solo de caracteres no permitidos: %s" | |
2070 | ||
33ac3e89 | 2071 | #: ident.c:416 builtin/commit.c:582 |
fb0e25bc CD |
2072 | #, c-format |
2073 | msgid "invalid date format: %s" | |
2074 | msgstr "formato de fecha invalido: %s" | |
2075 | ||
33ac3e89 CDR |
2076 | #: list-objects-filter-options.c:36 |
2077 | msgid "multiple filter-specs cannot be combined" | |
2078 | msgstr "no se pueden combinar múltiples tipos de especificaciones de filtro" | |
f8038f5b | 2079 | |
33ac3e89 CDR |
2080 | #: list-objects-filter-options.c:126 |
2081 | msgid "cannot change partial clone promisor remote" | |
2082 | msgstr "no se puede cambiar un clon parcial remoto promisor" | |
f8038f5b | 2083 | |
4b15eb22 | 2084 | #: lockfile.c:151 |
fb0e25bc CD |
2085 | #, c-format |
2086 | msgid "" | |
2087 | "Unable to create '%s.lock': %s.\n" | |
2088 | "\n" | |
2089 | "Another git process seems to be running in this repository, e.g.\n" | |
2090 | "an editor opened by 'git commit'. Please make sure all processes\n" | |
2091 | "are terminated then try again. If it still fails, a git process\n" | |
2092 | "may have crashed in this repository earlier:\n" | |
2093 | "remove the file manually to continue." | |
2094 | msgstr "" | |
2095 | "No se puede crear '%s.lock': %s.\n" | |
2096 | "\n" | |
2097 | "Otro proceso git parece estar corriendo en el repositorio, es decir\n" | |
715fc761 | 2098 | "un editor abierto con 'git commit'. Por favor asegúrese de que todos los " |
4b15eb22 | 2099 | "procesos\n" |
715fc761 | 2100 | "están terminados y vuelve a intentar. Si el fallo permanece, un proceso git\n" |
fb0e25bc CD |
2101 | "puede haber roto el repositorio antes:\n" |
2102 | "borra el archivo manualmente para continuar." | |
2103 | ||
4b15eb22 | 2104 | #: lockfile.c:159 |
fb0e25bc CD |
2105 | #, c-format |
2106 | msgid "Unable to create '%s.lock': %s" | |
2107 | msgstr "No se pudo crear '%s.lock': %s" | |
2108 | ||
521437fe | 2109 | #: merge.c:74 |
fb0e25bc CD |
2110 | msgid "failed to read the cache" |
2111 | msgstr "fallo al leer la cache" | |
2112 | ||
33ac3e89 CDR |
2113 | #: merge.c:134 builtin/am.c:1946 builtin/am.c:1980 builtin/checkout.c:378 |
2114 | #: builtin/checkout.c:599 builtin/clone.c:759 | |
fb0e25bc | 2115 | msgid "unable to write new index file" |
9df63a4a | 2116 | msgstr "no es posible escribir el archivo índice" |
fb0e25bc | 2117 | |
4b15eb22 | 2118 | #: merge-recursive.c:235 |
fb0e25bc CD |
2119 | msgid "(bad commit)\n" |
2120 | msgstr "(mal commit)\n" | |
2121 | ||
4b15eb22 | 2122 | #: merge-recursive.c:257 merge-recursive.c:265 |
fb0e25bc CD |
2123 | #, c-format |
2124 | msgid "addinfo_cache failed for path '%s'" | |
2125 | msgstr "addinfo_cache fallo para la ruta '%s'" | |
2126 | ||
4b15eb22 | 2127 | #: merge-recursive.c:329 |
fb0e25bc | 2128 | msgid "error building trees" |
715fc761 | 2129 | msgstr "error construyendo árboles" |
fb0e25bc | 2130 | |
33ac3e89 | 2131 | #: merge-recursive.c:771 |
fb0e25bc CD |
2132 | #, c-format |
2133 | msgid "failed to create path '%s'%s" | |
2134 | msgstr "fallo al crear la ruta '%s'%s" | |
2135 | ||
33ac3e89 | 2136 | #: merge-recursive.c:782 |
fb0e25bc CD |
2137 | #, c-format |
2138 | msgid "Removing %s to make room for subdirectory\n" | |
2139 | msgstr "Removiendo %s para hacer espacio para un subdirectorio\n" | |
2140 | ||
33ac3e89 | 2141 | #: merge-recursive.c:796 merge-recursive.c:815 |
fb0e25bc CD |
2142 | msgid ": perhaps a D/F conflict?" |
2143 | msgstr ": tal vez un conflicto D/F?" | |
2144 | ||
33ac3e89 | 2145 | #: merge-recursive.c:805 |
fb0e25bc CD |
2146 | #, c-format |
2147 | msgid "refusing to lose untracked file at '%s'" | |
2148 | msgstr "rehusando perder el archivo rastreado en '%s'" | |
2149 | ||
33ac3e89 | 2150 | #: merge-recursive.c:847 builtin/cat-file.c:37 |
fb0e25bc CD |
2151 | #, c-format |
2152 | msgid "cannot read object %s '%s'" | |
2153 | msgstr "no se puede leer el objeto %s '%s'" | |
2154 | ||
33ac3e89 | 2155 | #: merge-recursive.c:849 |
fb0e25bc CD |
2156 | #, c-format |
2157 | msgid "blob expected for %s '%s'" | |
2158 | msgstr "se esperaba blob para %s '%s'" | |
2159 | ||
33ac3e89 | 2160 | #: merge-recursive.c:873 |
fb0e25bc CD |
2161 | #, c-format |
2162 | msgid "failed to open '%s': %s" | |
2163 | msgstr "fallo al abrir '%s': %s" | |
2164 | ||
33ac3e89 | 2165 | #: merge-recursive.c:884 |
fb0e25bc CD |
2166 | #, c-format |
2167 | msgid "failed to symlink '%s': %s" | |
715fc761 | 2168 | msgstr "fallo al crear el enlace simbólico '%s': %s" |
fb0e25bc | 2169 | |
33ac3e89 | 2170 | #: merge-recursive.c:889 |
fb0e25bc CD |
2171 | #, c-format |
2172 | msgid "do not know what to do with %06o %s '%s'" | |
2173 | msgstr "no se que hacer con %06o %s '%s'" | |
2174 | ||
33ac3e89 | 2175 | #: merge-recursive.c:1029 |
fb0e25bc | 2176 | msgid "Failed to execute internal merge" |
715fc761 | 2177 | msgstr "Fallo al ejecutar la fusión interna" |
fb0e25bc | 2178 | |
33ac3e89 | 2179 | #: merge-recursive.c:1034 |
fb0e25bc CD |
2180 | #, c-format |
2181 | msgid "Unable to add %s to database" | |
2182 | msgstr "No es posible agregar %s a la base de datos" | |
2183 | ||
33ac3e89 | 2184 | #: merge-recursive.c:1146 |
fb0e25bc | 2185 | #, c-format |
4b15eb22 CD |
2186 | msgid "" |
2187 | "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " | |
2188 | "in tree." | |
2189 | msgstr "" | |
715fc761 | 2190 | "CONFLICTO (%s/borrar): %s borrado en %s y %s en %s. Falta versión %s de %s " |
33ac3e89 | 2191 | "en el árbol." |
fb0e25bc | 2192 | |
33ac3e89 | 2193 | #: merge-recursive.c:1151 |
fb0e25bc | 2194 | #, c-format |
4b15eb22 CD |
2195 | msgid "" |
2196 | "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " | |
2197 | "left in tree." | |
2198 | msgstr "" | |
715fc761 | 2199 | "CONFLICTO (%s/borrar): %s borrado en %s y %s para %s en %s. Versión %s de %s " |
33ac3e89 | 2200 | "permanece en el árbol." |
fb0e25bc | 2201 | |
33ac3e89 | 2202 | #: merge-recursive.c:1158 |
fb0e25bc | 2203 | #, c-format |
4b15eb22 CD |
2204 | msgid "" |
2205 | "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " | |
2206 | "in tree at %s." | |
2207 | msgstr "" | |
2208 | "CONFLICTO (%s/eliminar): %s eliminado en %s y %s en %s. Versión %s de %s " | |
2209 | "dejada en el árbol, en %s." | |
fb0e25bc | 2210 | |
33ac3e89 | 2211 | #: merge-recursive.c:1163 |
fb0e25bc | 2212 | #, c-format |
4b15eb22 CD |
2213 | msgid "" |
2214 | "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " | |
2215 | "left in tree at %s." | |
2216 | msgstr "" | |
715fc761 CDR |
2217 | "CONFLICTO (%s/borrar): %s borrado en %s y %s para %s en %s. Versión %s de %s " |
2218 | "permanece en el árbol en %s." | |
fb0e25bc | 2219 | |
33ac3e89 | 2220 | #: merge-recursive.c:1197 |
fb0e25bc CD |
2221 | msgid "rename" |
2222 | msgstr "renombrar" | |
2223 | ||
33ac3e89 | 2224 | #: merge-recursive.c:1197 |
fb0e25bc CD |
2225 | msgid "renamed" |
2226 | msgstr "renombrado" | |
2227 | ||
33ac3e89 | 2228 | #: merge-recursive.c:1254 |
fb0e25bc CD |
2229 | #, c-format |
2230 | msgid "%s is a directory in %s adding as %s instead" | |
2231 | msgstr "%s es un directorio en %s agregando como %s más bien" | |
2232 | ||
33ac3e89 | 2233 | #: merge-recursive.c:1279 |
fb0e25bc | 2234 | #, c-format |
4b15eb22 CD |
2235 | msgid "" |
2236 | "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" | |
2237 | "\"->\"%s\" in \"%s\"%s" | |
2238 | msgstr "" | |
2239 | "CONFLICTO (renombrar/renombrar): Renombrar \"%s\"->\"%s\" en la rama \"%s\" " | |
2240 | "renombrar \"%s\"->\"%s\" en \"%s\"%s" | |
fb0e25bc | 2241 | |
33ac3e89 | 2242 | #: merge-recursive.c:1284 |
fb0e25bc CD |
2243 | msgid " (left unresolved)" |
2244 | msgstr " (dejado sin resolver)" | |
2245 | ||
33ac3e89 | 2246 | #: merge-recursive.c:1346 |
fb0e25bc CD |
2247 | #, c-format |
2248 | msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" | |
4b15eb22 CD |
2249 | msgstr "" |
2250 | "CONFLICTO (renombrar/renombrar): Renombrar %s->%s en %s. Renombrar %s->%s en " | |
2251 | "%s" | |
fb0e25bc | 2252 | |
33ac3e89 | 2253 | #: merge-recursive.c:1379 |
fb0e25bc CD |
2254 | #, c-format |
2255 | msgid "Renaming %s to %s and %s to %s instead" | |
2256 | msgstr "Renombrando %s a %s y %s a %s más bien" | |
2257 | ||
33ac3e89 | 2258 | #: merge-recursive.c:1582 |
fb0e25bc CD |
2259 | #, c-format |
2260 | msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s" | |
4b15eb22 CD |
2261 | msgstr "" |
2262 | "CONFLICTO (renombrar/agregar): Renombrar %s->%s en %s. %s agregado en %s" | |
fb0e25bc | 2263 | |
33ac3e89 | 2264 | #: merge-recursive.c:1597 |
fb0e25bc CD |
2265 | #, c-format |
2266 | msgid "Adding merged %s" | |
2267 | msgstr "Agregar %s fusionado" | |
2268 | ||
33ac3e89 | 2269 | #: merge-recursive.c:1604 merge-recursive.c:1834 |
fb0e25bc CD |
2270 | #, c-format |
2271 | msgid "Adding as %s instead" | |
2272 | msgstr "Agregando más bien como %s" | |
2273 | ||
33ac3e89 | 2274 | #: merge-recursive.c:1661 |
fb0e25bc CD |
2275 | #, c-format |
2276 | msgid "cannot read object %s" | |
2277 | msgstr "no se pudo leer el objeto %s" | |
2278 | ||
33ac3e89 | 2279 | #: merge-recursive.c:1664 |
fb0e25bc CD |
2280 | #, c-format |
2281 | msgid "object %s is not a blob" | |
2282 | msgstr "objeto %s no es un blob" | |
2283 | ||
33ac3e89 | 2284 | #: merge-recursive.c:1733 |
fb0e25bc CD |
2285 | msgid "modify" |
2286 | msgstr "modificar" | |
2287 | ||
33ac3e89 | 2288 | #: merge-recursive.c:1733 |
fb0e25bc CD |
2289 | msgid "modified" |
2290 | msgstr "modificado" | |
2291 | ||
33ac3e89 | 2292 | #: merge-recursive.c:1743 |
fb0e25bc CD |
2293 | msgid "content" |
2294 | msgstr "contenido" | |
2295 | ||
33ac3e89 | 2296 | #: merge-recursive.c:1750 |
fb0e25bc CD |
2297 | msgid "add/add" |
2298 | msgstr "agregar/agregar" | |
2299 | ||
33ac3e89 | 2300 | #: merge-recursive.c:1786 |
fb0e25bc CD |
2301 | #, c-format |
2302 | msgid "Skipped %s (merged same as existing)" | |
2303 | msgstr "Saltado %s (fusionado como existente)" | |
2304 | ||
33ac3e89 | 2305 | #: merge-recursive.c:1800 |
fb0e25bc CD |
2306 | #, c-format |
2307 | msgid "Auto-merging %s" | |
2308 | msgstr "Auto-fusionando %s" | |
2309 | ||
33ac3e89 | 2310 | #: merge-recursive.c:1804 git-submodule.sh:879 |
fb0e25bc CD |
2311 | msgid "submodule" |
2312 | msgstr "submódulo" | |
2313 | ||
33ac3e89 | 2314 | #: merge-recursive.c:1805 |
fb0e25bc CD |
2315 | #, c-format |
2316 | msgid "CONFLICT (%s): Merge conflict in %s" | |
2317 | msgstr "CONFLICTO (%s): Conflicto de fusión en %s" | |
2318 | ||
33ac3e89 | 2319 | #: merge-recursive.c:1899 |
fb0e25bc CD |
2320 | #, c-format |
2321 | msgid "Removing %s" | |
2322 | msgstr "Eliminando %s" | |
2323 | ||
33ac3e89 | 2324 | #: merge-recursive.c:1925 |
fb0e25bc CD |
2325 | msgid "file/directory" |
2326 | msgstr "archivo/directorio" | |
2327 | ||
33ac3e89 | 2328 | #: merge-recursive.c:1931 |
fb0e25bc CD |
2329 | msgid "directory/file" |
2330 | msgstr "directorio/archivo" | |
2331 | ||
33ac3e89 | 2332 | #: merge-recursive.c:1938 |
fb0e25bc CD |
2333 | #, c-format |
2334 | msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" | |
4b15eb22 CD |
2335 | msgstr "" |
2336 | "CONFLICTO (%s): Hay un directorio con el nombre %s en %s. Agregando %s como " | |
2337 | "%s" | |
fb0e25bc | 2338 | |
33ac3e89 | 2339 | #: merge-recursive.c:1947 |
fb0e25bc CD |
2340 | #, c-format |
2341 | msgid "Adding %s" | |
2342 | msgstr "Agregando %s" | |
2343 | ||
33ac3e89 | 2344 | #: merge-recursive.c:1987 |
521437fe CDR |
2345 | #, c-format |
2346 | msgid "Dirty index: cannot merge (dirty: %s)" | |
2347 | msgstr "Índice sucio: no se puede fusionar (sucio: %s)" | |
2348 | ||
33ac3e89 | 2349 | #: merge-recursive.c:1991 |
4b15eb22 | 2350 | msgid "Already up to date!" |
fb0e25bc CD |
2351 | msgstr "¡Ya está actualizado!" |
2352 | ||
33ac3e89 | 2353 | #: merge-recursive.c:2000 |
fb0e25bc CD |
2354 | #, c-format |
2355 | msgid "merging of trees %s and %s failed" | |
2356 | msgstr "falló la fusión de los árboles %s y %s" | |
2357 | ||
33ac3e89 | 2358 | #: merge-recursive.c:2097 |
fb0e25bc CD |
2359 | msgid "Merging:" |
2360 | msgstr "Fusionando:" | |
2361 | ||
33ac3e89 | 2362 | #: merge-recursive.c:2110 |
fb0e25bc CD |
2363 | #, c-format |
2364 | msgid "found %u common ancestor:" | |
2365 | msgid_plural "found %u common ancestors:" | |
2366 | msgstr[0] "se encontró %u ancestro común:" | |
2367 | msgstr[1] "se encontraron %u ancestros comunes:" | |
2368 | ||
33ac3e89 | 2369 | #: merge-recursive.c:2149 |
fb0e25bc | 2370 | msgid "merge returned no commit" |
9df63a4a | 2371 | msgstr "la fusión no devolvió ningún commit" |
fb0e25bc | 2372 | |
33ac3e89 | 2373 | #: merge-recursive.c:2212 |
fb0e25bc CD |
2374 | #, c-format |
2375 | msgid "Could not parse object '%s'" | |
2376 | msgstr "No se pudo analizar el objeto '%s'" | |
2377 | ||
33ac3e89 | 2378 | #: merge-recursive.c:2228 builtin/merge.c:657 builtin/merge.c:816 |
fb0e25bc CD |
2379 | msgid "Unable to write index." |
2380 | msgstr "Incapaz de escribir el índice." | |
2381 | ||
4b15eb22 | 2382 | #: notes-merge.c:272 |
fb0e25bc CD |
2383 | #, c-format |
2384 | msgid "" | |
2385 | "You have not concluded your previous notes merge (%s exists).\n" | |
4b15eb22 CD |
2386 | "Please, use 'git notes merge --commit' or 'git notes merge --abort' to " |
2387 | "commit/abort the previous merge before you start a new notes merge." | |
fb0e25bc | 2388 | msgstr "" |
715fc761 | 2389 | "No has concluido tus notas previas de fusión (%s existe).\n" |
4b15eb22 | 2390 | "Por favor, usa 'git notes merge --commit' o 'git notes merge --abort' para " |
715fc761 CDR |
2391 | "confirmar/abortar la fusión previa antes de que puedas comenzar una nueva " |
2392 | "nota de fusión." | |
fb0e25bc | 2393 | |
4b15eb22 | 2394 | #: notes-merge.c:279 |
fb0e25bc CD |
2395 | #, c-format |
2396 | msgid "You have not concluded your notes merge (%s exists)." | |
715fc761 | 2397 | msgstr "No has terminado tus notas de fusión (%s existe)." |
fb0e25bc | 2398 | |
33ac3e89 | 2399 | #: notes-utils.c:43 |
fb0e25bc | 2400 | msgid "Cannot commit uninitialized/unreferenced notes tree" |
4b15eb22 | 2401 | msgstr "" |
715fc761 | 2402 | "No se puede realizar commit, notas del árbol no inicializadas o no " |
33ac3e89 | 2403 | "referenciadas" |
fb0e25bc | 2404 | |
33ac3e89 | 2405 | #: notes-utils.c:102 |
fb0e25bc CD |
2406 | #, c-format |
2407 | msgid "Bad notes.rewriteMode value: '%s'" | |
2408 | msgstr "Mal valor para notes.rewriteMode: '%s'" | |
2409 | ||
33ac3e89 | 2410 | #: notes-utils.c:112 |
fb0e25bc CD |
2411 | #, c-format |
2412 | msgid "Refusing to rewrite notes in %s (outside of refs/notes/)" | |
2413 | msgstr "Rehusando reescribir notas en %s (fuera de refs/notes/)" | |
2414 | ||
2415 | #. TRANSLATORS: The first %s is the name of | |
2416 | #. the environment variable, the second %s is | |
2417 | #. its value. | |
4b15eb22 | 2418 | #. |
33ac3e89 | 2419 | #: notes-utils.c:142 |
fb0e25bc CD |
2420 | #, c-format |
2421 | msgid "Bad %s value: '%s'" | |
2422 | msgstr "Mal valor para %s: '%s'" | |
2423 | ||
4b15eb22 | 2424 | #: object.c:239 |
fb0e25bc CD |
2425 | #, c-format |
2426 | msgid "unable to parse object: %s" | |
2427 | msgstr "incapaz de analizar objeto: %s" | |
2428 | ||
33ac3e89 | 2429 | #: packfile.c:561 |
4b15eb22 CD |
2430 | msgid "offset before end of packfile (broken .idx?)" |
2431 | msgstr "offset antes del final del paquete (broken .idx?)" | |
2432 | ||
33ac3e89 | 2433 | #: packfile.c:1694 |
4b15eb22 CD |
2434 | #, c-format |
2435 | msgid "offset before start of pack index for %s (corrupt index?)" | |
2436 | msgstr "" | |
2437 | "offset antes del comienzo del índice del paquete para %s (índice corrupto?)" | |
2438 | ||
33ac3e89 | 2439 | #: packfile.c:1698 |
4b15eb22 CD |
2440 | #, c-format |
2441 | msgid "offset beyond end of pack index for %s (truncated index?)" | |
2442 | msgstr "" | |
2443 | "offset más allá del índice de fin de paquete para %s (índice truncado?)" | |
2444 | ||
33ac3e89 | 2445 | #: parse-options.c:619 |
fb0e25bc CD |
2446 | msgid "..." |
2447 | msgstr "..." | |
2448 | ||
33ac3e89 | 2449 | #: parse-options.c:638 |
fb0e25bc CD |
2450 | #, c-format |
2451 | msgid "usage: %s" | |
2452 | msgstr "uso: %s" | |
2453 | ||
2454 | #. TRANSLATORS: the colon here should align with the | |
2455 | #. one in "usage: %s" translation. | |
4b15eb22 | 2456 | #. |
33ac3e89 | 2457 | #: parse-options.c:644 |
fb0e25bc CD |
2458 | #, c-format |
2459 | msgid " or: %s" | |
2460 | msgstr " o: %s" | |
2461 | ||
33ac3e89 | 2462 | #: parse-options.c:647 |
fb0e25bc CD |
2463 | #, c-format |
2464 | msgid " %s" | |
2465 | msgstr " %s" | |
2466 | ||
33ac3e89 | 2467 | #: parse-options.c:686 |
fb0e25bc CD |
2468 | msgid "-NUM" |
2469 | msgstr "-NUM" | |
2470 | ||
2471 | #: parse-options-cb.c:108 | |
2472 | #, c-format | |
2473 | msgid "malformed object name '%s'" | |
9df63a4a | 2474 | msgstr "nombre de objeto mal formado '%s'" |
fb0e25bc | 2475 | |
4b15eb22 | 2476 | #: path.c:891 |
fb0e25bc CD |
2477 | #, c-format |
2478 | msgid "Could not make %s writable by group" | |
2479 | msgstr "No se pudo hacer que %s fuera escribible por el grupo" | |
2480 | ||
2481 | #: pathspec.c:129 | |
2482 | msgid "Escape character '\\' not allowed as last character in attr value" | |
4b15eb22 | 2483 | msgstr "" |
9df63a4a | 2484 | "Carácter de escape '\\' no permitido como último carácter en el valor attr" |
fb0e25bc CD |
2485 | |
2486 | #: pathspec.c:147 | |
2487 | msgid "Only one 'attr:' specification is allowed." | |
715fc761 | 2488 | msgstr "Solo una especificación 'attr' es permitida." |
fb0e25bc CD |
2489 | |
2490 | #: pathspec.c:150 | |
2491 | msgid "attr spec must not be empty" | |
9df63a4a | 2492 | msgstr "especificación attr no puede estar vacía" |
fb0e25bc CD |
2493 | |
2494 | #: pathspec.c:193 | |
2495 | #, c-format | |
2496 | msgid "invalid attribute name %s" | |
2497 | msgstr "nombre de atributo %s invalido" | |
2498 | ||
2499 | #: pathspec.c:258 | |
2500 | msgid "global 'glob' and 'noglob' pathspec settings are incompatible" | |
4b15eb22 | 2501 | msgstr "" |
33ac3e89 | 2502 | "configuraciones globales de pathspec 'glob' y 'noglob' son incompatibles" |
fb0e25bc CD |
2503 | |
2504 | #: pathspec.c:265 | |
4b15eb22 CD |
2505 | msgid "" |
2506 | "global 'literal' pathspec setting is incompatible with all other global " | |
2507 | "pathspec settings" | |
2508 | msgstr "" | |
2509 | "la configuración global de 'literal' para patrones de ruta es incompatible " | |
2510 | "con las demás configuraciones globales de patrones de ruta" | |
fb0e25bc CD |
2511 | |
2512 | #: pathspec.c:305 | |
2513 | msgid "invalid parameter for pathspec magic 'prefix'" | |
2514 | msgstr "parámetro no válido para el prefijo 'magic pathspec'" | |
2515 | ||
2516 | #: pathspec.c:326 | |
2517 | #, c-format | |
2518 | msgid "Invalid pathspec magic '%.*s' in '%s'" | |
33ac3e89 | 2519 | msgstr "Magic pathspec inválido '%.*s' en '%s'" |
fb0e25bc CD |
2520 | |
2521 | #: pathspec.c:331 | |
2522 | #, c-format | |
2523 | msgid "Missing ')' at the end of pathspec magic in '%s'" | |
2524 | msgstr "Falta ')' al final del magic pathspec en '%s'" | |
2525 | ||
2526 | #: pathspec.c:369 | |
2527 | #, c-format | |
2528 | msgid "Unimplemented pathspec magic '%c' in '%s'" | |
33ac3e89 | 2529 | msgstr "Magic pathspec '%c' no implementado en '%s'" |
fb0e25bc CD |
2530 | |
2531 | #: pathspec.c:428 | |
2532 | #, c-format | |
2533 | msgid "%s: 'literal' and 'glob' are incompatible" | |
2534 | msgstr "%s: 'literal' y 'glob' son incompatibles" | |
2535 | ||
2536 | #: pathspec.c:441 | |
2537 | #, c-format | |
2538 | msgid "%s: '%s' is outside repository" | |
2539 | msgstr "%s: '%s' está fuera del repositorio" | |
2540 | ||
2541 | #: pathspec.c:515 | |
2542 | #, c-format | |
2543 | msgid "'%s' (mnemonic: '%c')" | |
9df63a4a | 2544 | msgstr "'%s' (nemotécnico: '%c')" |
fb0e25bc CD |
2545 | |
2546 | #: pathspec.c:525 | |
2547 | #, c-format | |
2548 | msgid "%s: pathspec magic not supported by this command: %s" | |
2549 | msgstr "%s: magic pathspec no soportado por este comando: %s" | |
2550 | ||
f8038f5b | 2551 | #: pathspec.c:592 |
fb0e25bc CD |
2552 | #, c-format |
2553 | msgid "pathspec '%s' is beyond a symbolic link" | |
2554 | msgstr "el patrón de ruta '%s' está detrás de un enlace simbólico" | |
2555 | ||
4b15eb22 | 2556 | #: pretty.c:962 |
fb0e25bc CD |
2557 | msgid "unable to parse --pretty format" |
2558 | msgstr "incapaz de analizar el formato --pretty" | |
2559 | ||
33ac3e89 | 2560 | #: read-cache.c:1473 |
fb0e25bc CD |
2561 | #, c-format |
2562 | msgid "" | |
2563 | "index.version set, but the value is invalid.\n" | |
2564 | "Using version %i" | |
2565 | msgstr "" | |
2566 | "index.version configurado, pero el valor no es válido.\n" | |
2567 | "Usando versión %i" | |
2568 | ||
33ac3e89 | 2569 | #: read-cache.c:1483 |
fb0e25bc CD |
2570 | #, c-format |
2571 | msgid "" | |
2572 | "GIT_INDEX_VERSION set, but the value is invalid.\n" | |
2573 | "Using version %i" | |
2574 | msgstr "" | |
2575 | "GIT_INDEX_VERSION configurado, pero el valor no es válido.\n" | |
2576 | "Usando versión %i" | |
2577 | ||
33ac3e89 | 2578 | #: read-cache.c:2375 sequencer.c:3248 wrapper.c:658 builtin/merge.c:1049 |
fb0e25bc CD |
2579 | #, c-format |
2580 | msgid "could not close '%s'" | |
2581 | msgstr "no se pudo cerrar '%s'" | |
2582 | ||
33ac3e89 | 2583 | #: read-cache.c:2448 sequencer.c:1900 sequencer.c:2627 |
fb0e25bc CD |
2584 | #, c-format |
2585 | msgid "could not stat '%s'" | |
2586 | msgstr "no se pudo definir '%s'" | |
2587 | ||
33ac3e89 | 2588 | #: read-cache.c:2461 |
fb0e25bc CD |
2589 | #, c-format |
2590 | msgid "unable to open git dir: %s" | |
2591 | msgstr "no es posible abrir el directorio de git: %s" | |
2592 | ||
33ac3e89 | 2593 | #: read-cache.c:2473 |
fb0e25bc CD |
2594 | #, c-format |
2595 | msgid "unable to unlink: %s" | |
2596 | msgstr "no es posible remover el vinculo: %s" | |
2597 | ||
f8038f5b | 2598 | #: refs.c:706 |
fb0e25bc CD |
2599 | #, c-format |
2600 | msgid "Could not open '%s' for writing" | |
9df63a4a | 2601 | msgstr "No se pudo abrir '%s' para escritura" |
fb0e25bc | 2602 | |
f8038f5b | 2603 | #: refs.c:1850 |
fb0e25bc CD |
2604 | msgid "ref updates forbidden inside quarantine environment" |
2605 | msgstr "actualizaciones de ref prohibidas dentro de ambiente de cuarentena" | |
2606 | ||
f8038f5b | 2607 | #: refs/files-backend.c:1189 |
4b15eb22 CD |
2608 | #, c-format |
2609 | msgid "could not remove reference %s" | |
2610 | msgstr "no se pudo remover la referencia %s" | |
2611 | ||
33ac3e89 CDR |
2612 | #: refs/files-backend.c:1203 refs/packed-backend.c:1528 |
2613 | #: refs/packed-backend.c:1538 | |
fb0e25bc CD |
2614 | #, c-format |
2615 | msgid "could not delete reference %s: %s" | |
2616 | msgstr "no se pudo eliminar la referencia %s: %s" | |
2617 | ||
33ac3e89 | 2618 | #: refs/files-backend.c:1206 refs/packed-backend.c:1541 |
fb0e25bc CD |
2619 | #, c-format |
2620 | msgid "could not delete references: %s" | |
2621 | msgstr "no se pudo eliminar la referencia: %s" | |
2622 | ||
33ac3e89 | 2623 | #: ref-filter.c:35 wt-status.c:1842 |
fb0e25bc CD |
2624 | msgid "gone" |
2625 | msgstr "desaparecido" | |
2626 | ||
2627 | #: ref-filter.c:36 | |
2628 | #, c-format | |
2629 | msgid "ahead %d" | |
2630 | msgstr "adelante %d" | |
2631 | ||
2632 | #: ref-filter.c:37 | |
2633 | #, c-format | |
2634 | msgid "behind %d" | |
715fc761 | 2635 | msgstr "detrás %d" |
fb0e25bc CD |
2636 | |
2637 | #: ref-filter.c:38 | |
2638 | #, c-format | |
2639 | msgid "ahead %d, behind %d" | |
715fc761 | 2640 | msgstr "delante %d, detrás %d" |
fb0e25bc | 2641 | |
f8038f5b | 2642 | #: ref-filter.c:107 |
fb0e25bc CD |
2643 | #, c-format |
2644 | msgid "expected format: %%(color:<color>)" | |
2645 | msgstr "formato esperado: %%(color:<color>)" | |
2646 | ||
f8038f5b | 2647 | #: ref-filter.c:109 |
fb0e25bc CD |
2648 | #, c-format |
2649 | msgid "unrecognized color: %%(color:%s)" | |
2650 | msgstr "color no reconocido: %%(color:%s)" | |
2651 | ||
f8038f5b | 2652 | #: ref-filter.c:129 |
fb0e25bc CD |
2653 | #, c-format |
2654 | msgid "Integer value expected refname:lstrip=%s" | |
33ac3e89 | 2655 | msgstr "Valor entero esperado refname:lstrip=%s" |
fb0e25bc | 2656 | |
f8038f5b | 2657 | #: ref-filter.c:133 |
fb0e25bc CD |
2658 | #, c-format |
2659 | msgid "Integer value expected refname:rstrip=%s" | |
33ac3e89 | 2660 | msgstr "Valor entero esperado refname:rstrip=%s" |
fb0e25bc | 2661 | |
f8038f5b | 2662 | #: ref-filter.c:135 |
fb0e25bc CD |
2663 | #, c-format |
2664 | msgid "unrecognized %%(%s) argument: %s" | |
2665 | msgstr "argumento: %s no reconocido %%(%s)" | |
2666 | ||
f8038f5b | 2667 | #: ref-filter.c:184 |
fb0e25bc CD |
2668 | #, c-format |
2669 | msgid "%%(body) does not take arguments" | |
2670 | msgstr "%%(body) no toma ningún argumento" | |
2671 | ||
f8038f5b | 2672 | #: ref-filter.c:191 |
fb0e25bc CD |
2673 | #, c-format |
2674 | msgid "%%(subject) does not take arguments" | |
2675 | msgstr "%%(subject) no toma ningún argumento" | |
2676 | ||
f8038f5b | 2677 | #: ref-filter.c:209 |
fb0e25bc | 2678 | #, c-format |
6628a6e6 CDR |
2679 | msgid "unknown %%(trailers) argument: %s" |
2680 | msgstr "%%(trailers) desconocidos, argumento: %s" | |
fb0e25bc | 2681 | |
f8038f5b | 2682 | #: ref-filter.c:232 |
fb0e25bc CD |
2683 | #, c-format |
2684 | msgid "positive value expected contents:lines=%s" | |
2685 | msgstr "valor positivo esperado contents:lines=%s" | |
2686 | ||
f8038f5b | 2687 | #: ref-filter.c:234 |
fb0e25bc CD |
2688 | #, c-format |
2689 | msgid "unrecognized %%(contents) argument: %s" | |
2690 | msgstr "argumento %s no reconocido %%(contents)" | |
2691 | ||
f8038f5b | 2692 | #: ref-filter.c:247 |
fb0e25bc CD |
2693 | #, c-format |
2694 | msgid "positive value expected objectname:short=%s" | |
2695 | msgstr "valor positivo esperado objectname:short=%s" | |
2696 | ||
f8038f5b | 2697 | #: ref-filter.c:251 |
fb0e25bc CD |
2698 | #, c-format |
2699 | msgid "unrecognized %%(objectname) argument: %s" | |
2700 | msgstr "argumento: %s no reconocido %%(objectname)" | |
2701 | ||
f8038f5b | 2702 | #: ref-filter.c:278 |
fb0e25bc CD |
2703 | #, c-format |
2704 | msgid "expected format: %%(align:<width>,<position>)" | |
2705 | msgstr "formato esperado: %%(align:<ancho>,<posición>)" | |
2706 | ||
f8038f5b | 2707 | #: ref-filter.c:290 |
fb0e25bc CD |
2708 | #, c-format |
2709 | msgid "unrecognized position:%s" | |
2710 | msgstr "posición desconocida: %s" | |
2711 | ||
f8038f5b | 2712 | #: ref-filter.c:294 |
fb0e25bc CD |
2713 | #, c-format |
2714 | msgid "unrecognized width:%s" | |
2715 | msgstr "ancho desconocido: %s" | |
2716 | ||
f8038f5b | 2717 | #: ref-filter.c:300 |
fb0e25bc CD |
2718 | #, c-format |
2719 | msgid "unrecognized %%(align) argument: %s" | |
2720 | msgstr "argumento no reconocido para %%(align): %s" | |
2721 | ||
f8038f5b | 2722 | #: ref-filter.c:304 |
fb0e25bc CD |
2723 | #, c-format |
2724 | msgid "positive width expected with the %%(align) atom" | |
2725 | msgstr "se esperaba un ancho positivo con el átomo %%(align)" | |
2726 | ||
f8038f5b | 2727 | #: ref-filter.c:319 |
fb0e25bc CD |
2728 | #, c-format |
2729 | msgid "unrecognized %%(if) argument: %s" | |
2730 | msgstr "argumento: %s no reconocido %%(if)" | |
2731 | ||
f8038f5b | 2732 | #: ref-filter.c:409 |
fb0e25bc CD |
2733 | #, c-format |
2734 | msgid "malformed field name: %.*s" | |
9df63a4a | 2735 | msgstr "nombre mal formado de campo: %.*s" |
fb0e25bc | 2736 | |
f8038f5b | 2737 | #: ref-filter.c:435 |
fb0e25bc CD |
2738 | #, c-format |
2739 | msgid "unknown field name: %.*s" | |
2740 | msgstr "nombre de campo desconocido: %.*s" | |
2741 | ||
f8038f5b | 2742 | #: ref-filter.c:547 |
fb0e25bc CD |
2743 | #, c-format |
2744 | msgid "format: %%(if) atom used without a %%(then) atom" | |
715fc761 | 2745 | msgstr "formato: átomo %%(if) usado sin un átomo %%(then)" |
fb0e25bc | 2746 | |
f8038f5b | 2747 | #: ref-filter.c:607 |
fb0e25bc CD |
2748 | #, c-format |
2749 | msgid "format: %%(then) atom used without an %%(if) atom" | |
715fc761 | 2750 | msgstr "formato: átomo %%(then) usado sin átomo %%(if)" |
fb0e25bc | 2751 | |
f8038f5b | 2752 | #: ref-filter.c:609 |
fb0e25bc CD |
2753 | #, c-format |
2754 | msgid "format: %%(then) atom used more than once" | |
715fc761 | 2755 | msgstr "formato: átomo %%(then) usado mas de una vez" |
fb0e25bc | 2756 | |
f8038f5b | 2757 | #: ref-filter.c:611 |
fb0e25bc CD |
2758 | #, c-format |
2759 | msgid "format: %%(then) atom used after %%(else)" | |
715fc761 | 2760 | msgstr "formato: átomo %%(then) usado después de %%(else)" |
fb0e25bc | 2761 | |
f8038f5b | 2762 | #: ref-filter.c:637 |
fb0e25bc CD |
2763 | #, c-format |
2764 | msgid "format: %%(else) atom used without an %%(if) atom" | |
715fc761 | 2765 | msgstr "formato: átomo %%(else) usado sin un átomo %%(if)" |
fb0e25bc | 2766 | |
f8038f5b | 2767 | #: ref-filter.c:639 |
fb0e25bc CD |
2768 | #, c-format |
2769 | msgid "format: %%(else) atom used without a %%(then) atom" | |
33ac3e89 | 2770 | msgstr "formato: átomo %%(else) usado sin un átomo %%(then)" |
fb0e25bc | 2771 | |
f8038f5b | 2772 | #: ref-filter.c:641 |
fb0e25bc CD |
2773 | #, c-format |
2774 | msgid "format: %%(else) atom used more than once" | |
715fc761 | 2775 | msgstr "formato: átomo %%(else) usado mas de una vez" |
fb0e25bc | 2776 | |
f8038f5b | 2777 | #: ref-filter.c:654 |
fb0e25bc CD |
2778 | #, c-format |
2779 | msgid "format: %%(end) atom used without corresponding atom" | |
715fc761 | 2780 | msgstr "formato: átomo %%(end) usado sin átomo correspondiente" |
fb0e25bc | 2781 | |
f8038f5b | 2782 | #: ref-filter.c:709 |
fb0e25bc CD |
2783 | #, c-format |
2784 | msgid "malformed format string %s" | |
9df63a4a | 2785 | msgstr "formato de cadena mal formado %s" |
fb0e25bc | 2786 | |
f8038f5b | 2787 | #: ref-filter.c:1313 |
fb0e25bc CD |
2788 | #, c-format |
2789 | msgid "(no branch, rebasing %s)" | |
2790 | msgstr "(no hay rama, rebasando %s)" | |
2791 | ||
f8038f5b | 2792 | #: ref-filter.c:1316 |
fb0e25bc CD |
2793 | #, c-format |
2794 | msgid "(no branch, bisect started on %s)" | |
9df63a4a | 2795 | msgstr "(no hay rama, comenzando bisecado en %s)" |
fb0e25bc CD |
2796 | |
2797 | #. TRANSLATORS: make sure this matches "HEAD | |
2798 | #. detached at " in wt-status.c | |
4b15eb22 | 2799 | #. |
f8038f5b | 2800 | #: ref-filter.c:1324 |
fb0e25bc CD |
2801 | #, c-format |
2802 | msgid "(HEAD detached at %s)" | |
715fc761 | 2803 | msgstr "(HEAD desacoplado en %s)" |
fb0e25bc CD |
2804 | |
2805 | #. TRANSLATORS: make sure this matches "HEAD | |
2806 | #. detached from " in wt-status.c | |
4b15eb22 | 2807 | #. |
f8038f5b | 2808 | #: ref-filter.c:1331 |
fb0e25bc CD |
2809 | #, c-format |
2810 | msgid "(HEAD detached from %s)" | |
2811 | msgstr "(HEAD desacoplado de %s)" | |
2812 | ||
f8038f5b | 2813 | #: ref-filter.c:1335 |
fb0e25bc CD |
2814 | msgid "(no branch)" |
2815 | msgstr "(sin rama)" | |
2816 | ||
33ac3e89 | 2817 | #: ref-filter.c:1364 |
fb0e25bc CD |
2818 | #, c-format |
2819 | msgid "missing object %s for %s" | |
9df63a4a | 2820 | msgstr "falta objeto %s para %s" |
fb0e25bc | 2821 | |
33ac3e89 | 2822 | #: ref-filter.c:1367 |
fb0e25bc CD |
2823 | #, c-format |
2824 | msgid "parse_object_buffer failed on %s for %s" | |
2825 | msgstr "parse_object_buffer falló en %s para %s" | |
2826 | ||
33ac3e89 | 2827 | #: ref-filter.c:1819 |
fb0e25bc CD |
2828 | #, c-format |
2829 | msgid "malformed object at '%s'" | |
9df63a4a | 2830 | msgstr "objeto mal formado en '%s'" |
fb0e25bc | 2831 | |
33ac3e89 | 2832 | #: ref-filter.c:1886 |
fb0e25bc CD |
2833 | #, c-format |
2834 | msgid "ignoring ref with broken name %s" | |
2835 | msgstr "ignorando referencia con nombre roto %s" | |
2836 | ||
33ac3e89 | 2837 | #: ref-filter.c:1891 |
fb0e25bc CD |
2838 | #, c-format |
2839 | msgid "ignoring broken ref %s" | |
2840 | msgstr "ignorando referencia rota %s" | |
2841 | ||
33ac3e89 | 2842 | #: ref-filter.c:2152 |
fb0e25bc CD |
2843 | #, c-format |
2844 | msgid "format: %%(end) atom missing" | |
715fc761 | 2845 | msgstr "formato: falta átomo %%(end)" |
fb0e25bc | 2846 | |
33ac3e89 | 2847 | #: ref-filter.c:2246 |
fb0e25bc CD |
2848 | #, c-format |
2849 | msgid "malformed object name %s" | |
9df63a4a | 2850 | msgstr "nombre de objeto mal formado %s" |
fb0e25bc | 2851 | |
33ac3e89 | 2852 | #: remote.c:795 |
fb0e25bc CD |
2853 | #, c-format |
2854 | msgid "Cannot fetch both %s and %s to %s" | |
2855 | msgstr "No se pueden traer ambos %s y %s a %s" | |
2856 | ||
33ac3e89 | 2857 | #: remote.c:799 |
fb0e25bc CD |
2858 | #, c-format |
2859 | msgid "%s usually tracks %s, not %s" | |
2860 | msgstr "%s por lo general hace seguimiento a %s, no a %s" | |
2861 | ||
33ac3e89 | 2862 | #: remote.c:803 |
fb0e25bc CD |
2863 | #, c-format |
2864 | msgid "%s tracks both %s and %s" | |
2865 | msgstr "%s hace seguimiento tanto a %s como a %s" | |
2866 | ||
33ac3e89 | 2867 | #: remote.c:811 |
fb0e25bc CD |
2868 | msgid "Internal error" |
2869 | msgstr "Error interno" | |
2870 | ||
33ac3e89 | 2871 | #: remote.c:1726 remote.c:1828 |
fb0e25bc CD |
2872 | msgid "HEAD does not point to a branch" |
2873 | msgstr "HEAD no apunta a ninguna rama" | |
2874 | ||
33ac3e89 | 2875 | #: remote.c:1735 |
fb0e25bc CD |
2876 | #, c-format |
2877 | msgid "no such branch: '%s'" | |
2878 | msgstr "no existe tal rama: '%s'" | |
2879 | ||
33ac3e89 | 2880 | #: remote.c:1738 |
fb0e25bc CD |
2881 | #, c-format |
2882 | msgid "no upstream configured for branch '%s'" | |
2883 | msgstr "no se ha configurado upstream para la rama '%s'" | |
2884 | ||
33ac3e89 | 2885 | #: remote.c:1744 |
fb0e25bc CD |
2886 | #, c-format |
2887 | msgid "upstream branch '%s' not stored as a remote-tracking branch" | |
2888 | msgstr "la rama '%s' de upstream no es guardad como rama de rastreo remoto" | |
2889 | ||
33ac3e89 | 2890 | #: remote.c:1759 |
fb0e25bc CD |
2891 | #, c-format |
2892 | msgid "push destination '%s' on remote '%s' has no local tracking branch" | |
4b15eb22 CD |
2893 | msgstr "" |
2894 | "destino de push '%s' en el remoto '%s' no tiene una rama de rastreo local" | |
fb0e25bc | 2895 | |
33ac3e89 | 2896 | #: remote.c:1771 |
fb0e25bc CD |
2897 | #, c-format |
2898 | msgid "branch '%s' has no remote for pushing" | |
2899 | msgstr "la rama '%s' no tiene remoto para enviar" | |
2900 | ||
33ac3e89 | 2901 | #: remote.c:1782 |
fb0e25bc CD |
2902 | #, c-format |
2903 | msgid "push refspecs for '%s' do not include '%s'" | |
2904 | msgstr "refspecs del push para '%s' no incluyen '%s'" | |
2905 | ||
33ac3e89 | 2906 | #: remote.c:1795 |
fb0e25bc CD |
2907 | msgid "push has no destination (push.default is 'nothing')" |
2908 | msgstr "push no tiene destino (push.default es 'nada')" | |
2909 | ||
33ac3e89 | 2910 | #: remote.c:1817 |
fb0e25bc | 2911 | msgid "cannot resolve 'simple' push to a single destination" |
9df63a4a | 2912 | msgstr "no se puede resolver push 'simple' para un destino único" |
fb0e25bc | 2913 | |
33ac3e89 | 2914 | #: remote.c:2132 |
fb0e25bc CD |
2915 | #, c-format |
2916 | msgid "Your branch is based on '%s', but the upstream is gone.\n" | |
33ac3e89 | 2917 | msgstr "Tu rama esta basada en '%s', pero upstream ha desaparecido.\n" |
fb0e25bc | 2918 | |
33ac3e89 | 2919 | #: remote.c:2136 |
fb0e25bc CD |
2920 | msgid " (use \"git branch --unset-upstream\" to fixup)\n" |
2921 | msgstr " (usa \"git branch --unset-upstream\" para arreglar)\n" | |
2922 | ||
33ac3e89 | 2923 | #: remote.c:2139 |
fb0e25bc | 2924 | #, c-format |
4b15eb22 | 2925 | msgid "Your branch is up to date with '%s'.\n" |
fb0e25bc CD |
2926 | msgstr "Tu rama está actualizada con '%s'.\n" |
2927 | ||
33ac3e89 CDR |
2928 | #: remote.c:2143 |
2929 | #, c-format | |
2930 | msgid "Your branch and '%s' refer to different commits.\n" | |
2931 | msgstr "Tu rama y '%s' refieren a commits diferentes.\n" | |
2932 | ||
2933 | #: remote.c:2146 | |
2934 | #, c-format | |
2935 | msgid " (use \"%s\" for details)\n" | |
2936 | msgstr " (usa \"%s\" para detalles)\n" | |
2937 | ||
2938 | #: remote.c:2150 | |
fb0e25bc CD |
2939 | #, c-format |
2940 | msgid "Your branch is ahead of '%s' by %d commit.\n" | |
2941 | msgid_plural "Your branch is ahead of '%s' by %d commits.\n" | |
715fc761 CDR |
2942 | msgstr[0] "Tu rama está adelantada a '%s' por %d commit.\n" |
2943 | msgstr[1] "Tu rama está adelantada a '%s' por %d commits.\n" | |
fb0e25bc | 2944 | |
33ac3e89 | 2945 | #: remote.c:2156 |
fb0e25bc | 2946 | msgid " (use \"git push\" to publish your local commits)\n" |
715fc761 | 2947 | msgstr " (usa \"git push\" para publicar tus commits locales)\n" |
fb0e25bc | 2948 | |
33ac3e89 | 2949 | #: remote.c:2159 |
fb0e25bc CD |
2950 | #, c-format |
2951 | msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" | |
4b15eb22 CD |
2952 | msgid_plural "" |
2953 | "Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n" | |
2954 | msgstr[0] "" | |
f8038f5b | 2955 | "Tu rama está detrás de '%s' por %d commit, y puede ser avanzada rápido.\n" |
4b15eb22 | 2956 | msgstr[1] "" |
f8038f5b | 2957 | "Tu rama está detrás de '%s' por %d commits, y puede ser avanzada rápido.\n" |
fb0e25bc | 2958 | |
33ac3e89 | 2959 | #: remote.c:2167 |
fb0e25bc CD |
2960 | msgid " (use \"git pull\" to update your local branch)\n" |
2961 | msgstr " (usa \"git pull\" para actualizar tu rama local)\n" | |
2962 | ||
33ac3e89 | 2963 | #: remote.c:2170 |
fb0e25bc CD |
2964 | #, c-format |
2965 | msgid "" | |
2966 | "Your branch and '%s' have diverged,\n" | |
2967 | "and have %d and %d different commit each, respectively.\n" | |
2968 | msgid_plural "" | |
2969 | "Your branch and '%s' have diverged,\n" | |
2970 | "and have %d and %d different commits each, respectively.\n" | |
2971 | msgstr[0] "" | |
2972 | "Tu rama y '%s' han divergido,\n" | |
2973 | "y se tiene %d y %d commit diferentes en cada una respectivamente.\n" | |
2974 | msgstr[1] "" | |
2975 | "Tu rama y '%s' han divergido,\n" | |
2976 | "y tienen %d y %d commits diferentes cada una respectivamente.\n" | |
2977 | ||
33ac3e89 | 2978 | #: remote.c:2180 |
fb0e25bc CD |
2979 | msgid " (use \"git pull\" to merge the remote branch into yours)\n" |
2980 | msgstr " (usa \"git pull\" para fusionar la rama remota en la tuya)\n" | |
2981 | ||
33ac3e89 | 2982 | #: revision.c:2277 |
fb0e25bc CD |
2983 | msgid "your current branch appears to be broken" |
2984 | msgstr "tu rama actual parece estar rota" | |
2985 | ||
33ac3e89 | 2986 | #: revision.c:2280 |
fb0e25bc CD |
2987 | #, c-format |
2988 | msgid "your current branch '%s' does not have any commits yet" | |
2989 | msgstr "tu rama actual '%s' no tiene ningún commit todavía" | |
2990 | ||
33ac3e89 | 2991 | #: revision.c:2477 |
fb0e25bc CD |
2992 | msgid "--first-parent is incompatible with --bisect" |
2993 | msgstr "--first-parent es incompatible con --bisect" | |
2994 | ||
33ac3e89 | 2995 | #: run-command.c:731 |
fb0e25bc CD |
2996 | msgid "open /dev/null failed" |
2997 | msgstr "falló al abrir /dev/null" | |
2998 | ||
33ac3e89 | 2999 | #: run-command.c:1274 |
f8038f5b CDR |
3000 | #, c-format |
3001 | msgid "" | |
3002 | "The '%s' hook was ignored because it's not set as executable.\n" | |
3003 | "You can disable this warning with `git config advice.ignoredHook false`." | |
3004 | msgstr "" | |
9df63a4a | 3005 | "El hook '%s' fue ignorado porque no ha sido configurado como ejecutable.\n" |
f8038f5b CDR |
3006 | "Puedes desactivar esta advertencias con `git config advice.ignoredHook " |
3007 | "false`." | |
3008 | ||
521437fe | 3009 | #: send-pack.c:141 |
33ac3e89 CDR |
3010 | msgid "unexpected flush packet while reading remote unpack status" |
3011 | msgstr "" | |
3012 | "flush packet inesperado mientras se leía estatus de desempaquetado remoto" | |
3013 | ||
3014 | #: send-pack.c:143 | |
fb0e25bc CD |
3015 | #, c-format |
3016 | msgid "unable to parse remote unpack status: %s" | |
3017 | msgstr "no es posible analizar el estado de desempaquetado remoto: %s" | |
3018 | ||
33ac3e89 | 3019 | #: send-pack.c:145 |
fb0e25bc CD |
3020 | #, c-format |
3021 | msgid "remote unpack failed: %s" | |
3022 | msgstr "desempaquetado remoto falló: %s" | |
3023 | ||
33ac3e89 | 3024 | #: send-pack.c:308 |
fb0e25bc CD |
3025 | msgid "failed to sign the push certificate" |
3026 | msgstr "falló al firmar el certificado de push" | |
3027 | ||
33ac3e89 | 3028 | #: send-pack.c:421 |
fb0e25bc CD |
3029 | msgid "the receiving end does not support --signed push" |
3030 | msgstr "el final receptor no soporta --signed push" | |
3031 | ||
33ac3e89 | 3032 | #: send-pack.c:423 |
4b15eb22 CD |
3033 | msgid "" |
3034 | "not sending a push certificate since the receiving end does not support --" | |
3035 | "signed push" | |
3036 | msgstr "" | |
3037 | "no se manda un certificado de push ya que el destino no soporta push firmado " | |
3038 | "(--signed )" | |
fb0e25bc | 3039 | |
33ac3e89 | 3040 | #: send-pack.c:435 |
fb0e25bc CD |
3041 | msgid "the receiving end does not support --atomic push" |
3042 | msgstr "el destino no soporta push atómicos (--atomic)" | |
3043 | ||
33ac3e89 | 3044 | #: send-pack.c:440 |
fb0e25bc CD |
3045 | msgid "the receiving end does not support push options" |
3046 | msgstr "el destino no soporta opciones de push" | |
3047 | ||
33ac3e89 CDR |
3048 | #: sequencer.c:158 |
3049 | #, c-format | |
3050 | msgid "invalid commit message cleanup mode '%s'" | |
3051 | msgstr "mensaje de commit inválido, modo cleanup '%s'" | |
3052 | ||
3053 | #: sequencer.c:267 | |
fb0e25bc CD |
3054 | msgid "revert" |
3055 | msgstr "revertir" | |
3056 | ||
33ac3e89 | 3057 | #: sequencer.c:269 |
fb0e25bc CD |
3058 | msgid "cherry-pick" |
3059 | msgstr "cherry-pick" | |
3060 | ||
33ac3e89 | 3061 | #: sequencer.c:271 |
fb0e25bc CD |
3062 | msgid "rebase -i" |
3063 | msgstr "rebase -i" | |
3064 | ||
33ac3e89 | 3065 | #: sequencer.c:273 |
fb0e25bc CD |
3066 | #, c-format |
3067 | msgid "Unknown action: %d" | |
715fc761 | 3068 | msgstr "Acción desconocida: %d" |
fb0e25bc | 3069 | |
33ac3e89 | 3070 | #: sequencer.c:330 |
fb0e25bc CD |
3071 | msgid "" |
3072 | "after resolving the conflicts, mark the corrected paths\n" | |
3073 | "with 'git add <paths>' or 'git rm <paths>'" | |
3074 | msgstr "" | |
9df63a4a | 3075 | "después de resolver los conflictos, marca las rutas corregidas\n" |
fb0e25bc CD |
3076 | "con 'git add <rutas>' o 'git rm <rutas>'" |
3077 | ||
33ac3e89 | 3078 | #: sequencer.c:333 |
fb0e25bc CD |
3079 | msgid "" |
3080 | "after resolving the conflicts, mark the corrected paths\n" | |
3081 | "with 'git add <paths>' or 'git rm <paths>'\n" | |
3082 | "and commit the result with 'git commit'" | |
3083 | msgstr "" | |
3084 | "tras resolver los conflictos, marca las rutas corregidas\n" | |
3085 | "con 'git add <rutas>' o 'git rm <rutas>'\n" | |
3086 | "y haz un commit del resultado con 'git commit'" | |
3087 | ||
33ac3e89 | 3088 | #: sequencer.c:346 sequencer.c:2245 |
fb0e25bc CD |
3089 | #, c-format |
3090 | msgid "could not lock '%s'" | |
33ac3e89 | 3091 | msgstr "no se pudo bloquear '%s'" |
fb0e25bc | 3092 | |
33ac3e89 CDR |
3093 | #: sequencer.c:349 sequencer.c:2124 sequencer.c:2250 sequencer.c:2264 |
3094 | #: sequencer.c:3246 sequencer.c:3310 wrapper.c:656 | |
fb0e25bc CD |
3095 | #, c-format |
3096 | msgid "could not write to '%s'" | |
33ac3e89 | 3097 | msgstr "no se pudo escribir en '%s'" |
fb0e25bc | 3098 | |
33ac3e89 | 3099 | #: sequencer.c:353 |
fb0e25bc CD |
3100 | #, c-format |
3101 | msgid "could not write eol to '%s'" | |
33ac3e89 | 3102 | msgstr "no se pudo escribir EOL en '%s'" |
fb0e25bc | 3103 | |
33ac3e89 | 3104 | #: sequencer.c:356 sequencer.c:2128 sequencer.c:2252 |
fb0e25bc | 3105 | #, c-format |
33ac3e89 CDR |
3106 | msgid "failed to finalize '%s'" |
3107 | msgstr "falló al finalizar '%s'" | |
fb0e25bc | 3108 | |
33ac3e89 CDR |
3109 | #: sequencer.c:379 sequencer.c:1340 sequencer.c:2148 builtin/am.c:259 |
3110 | #: builtin/commit.c:722 builtin/merge.c:1047 | |
fb0e25bc CD |
3111 | #, c-format |
3112 | msgid "could not read '%s'" | |
33ac3e89 | 3113 | msgstr "no se pudo leer '%s'" |
fb0e25bc | 3114 | |
33ac3e89 | 3115 | #: sequencer.c:405 |
fb0e25bc CD |
3116 | #, c-format |
3117 | msgid "your local changes would be overwritten by %s." | |
33ac3e89 | 3118 | msgstr "tus cambios locales serán sobreescritos por %s." |
fb0e25bc | 3119 | |
33ac3e89 | 3120 | #: sequencer.c:409 |
fb0e25bc | 3121 | msgid "commit your changes or stash them to proceed." |
33ac3e89 | 3122 | msgstr "realiza un commit con tus cambios o aplica un stash para proceder." |
fb0e25bc | 3123 | |
33ac3e89 | 3124 | #: sequencer.c:438 |
fb0e25bc CD |
3125 | #, c-format |
3126 | msgid "%s: fast-forward" | |
3127 | msgstr "%s: avance rápido" | |
3128 | ||
3129 | #. TRANSLATORS: %s will be "revert", "cherry-pick" or | |
3130 | #. "rebase -i". | |
4b15eb22 | 3131 | #. |
33ac3e89 | 3132 | #: sequencer.c:526 |
fb0e25bc CD |
3133 | #, c-format |
3134 | msgid "%s: Unable to write new index file" | |
3135 | msgstr "%s: Incapaz de escribir el nuevo archivo índice" | |
3136 | ||
33ac3e89 | 3137 | #: sequencer.c:542 |
521437fe | 3138 | msgid "could not resolve HEAD commit" |
33ac3e89 | 3139 | msgstr "no se pudo resolver el commit de HEAD" |
fb0e25bc | 3140 | |
33ac3e89 | 3141 | #: sequencer.c:562 |
521437fe CDR |
3142 | msgid "unable to update cache tree" |
3143 | msgstr "no es posible actualizar el árbol de la caché" | |
fb0e25bc | 3144 | |
33ac3e89 | 3145 | #: sequencer.c:658 |
fb0e25bc CD |
3146 | #, c-format |
3147 | msgid "" | |
3148 | "you have staged changes in your working tree\n" | |
3149 | "If these changes are meant to be squashed into the previous commit, run:\n" | |
3150 | "\n" | |
3151 | " git commit --amend %s\n" | |
3152 | "\n" | |
3153 | "If they are meant to go into a new commit, run:\n" | |
3154 | "\n" | |
3155 | " git commit %s\n" | |
3156 | "\n" | |
3157 | "In both cases, once you're done, continue with:\n" | |
3158 | "\n" | |
3159 | " git rebase --continue\n" | |
3160 | msgstr "" | |
715fc761 CDR |
3161 | "se ha aplicado un stage a los cambios en el árbol de trabajo\n" |
3162 | "si estos cambios están destinados a ser aplastados en el commit previo, " | |
4b15eb22 | 3163 | "ejecuta:\n" |
fb0e25bc CD |
3164 | "\n" |
3165 | " git commit --amend %s\n" | |
3166 | "\n" | |
715fc761 | 3167 | "Si estos cambios están destinados a un nuevo commit, ejecuta:\n" |
fb0e25bc CD |
3168 | "\n" |
3169 | " git commit %s\n" | |
3170 | "\n" | |
3171 | "en cambos casos, cuando acabes, continua con:\n" | |
3172 | "\n" | |
3173 | " git rebase --continue\n" | |
3174 | ||
33ac3e89 CDR |
3175 | #: sequencer.c:915 |
3176 | msgid "'prepare-commit-msg' hook failed" | |
3177 | msgstr "hook 'prepare-commit-msg' falló" | |
3178 | ||
3179 | #: sequencer.c:922 | |
3180 | msgid "" | |
3181 | "Your name and email address were configured automatically based\n" | |
3182 | "on your username and hostname. Please check that they are accurate.\n" | |
3183 | "You can suppress this message by setting them explicitly. Run the\n" | |
3184 | "following command and follow the instructions in your editor to edit\n" | |
3185 | "your configuration file:\n" | |
3186 | "\n" | |
3187 | " git config --global --edit\n" | |
3188 | "\n" | |
3189 | "After doing this, you may fix the identity used for this commit with:\n" | |
3190 | "\n" | |
3191 | " git commit --amend --reset-author\n" | |
3192 | msgstr "" | |
3193 | "Tu nombre y correo fueron configurados automáticamente basados\n" | |
3194 | "en tu usuario y nombre de host. Por favor verifica que son correctos.\n" | |
3195 | "Tu puedes suprimir este mensaje configurándolos de forma explicita. Ejecuta " | |
3196 | "el \n" | |
3197 | "siguiente comando y sigue las instrucciones de tu editor\n" | |
3198 | " para modificar tu archivo de configuración:\n" | |
3199 | "\n" | |
3200 | " git config --global --edit\n" | |
3201 | "\n" | |
3202 | "Tras hacer esto, puedes arreglar la identidad usada para este commit con:\n" | |
3203 | "\n" | |
3204 | " git commit --amend --reset-author\n" | |
3205 | ||
3206 | #: sequencer.c:935 | |
3207 | msgid "" | |
3208 | "Your name and email address were configured automatically based\n" | |
3209 | "on your username and hostname. Please check that they are accurate.\n" | |
3210 | "You can suppress this message by setting them explicitly:\n" | |
3211 | "\n" | |
3212 | " git config --global user.name \"Your Name\"\n" | |
3213 | " git config --global user.email you@example.com\n" | |
3214 | "\n" | |
3215 | "After doing this, you may fix the identity used for this commit with:\n" | |
3216 | "\n" | |
3217 | " git commit --amend --reset-author\n" | |
3218 | msgstr "" | |
3219 | "Tu nombre y correo fueron configurados automáticamente basados\n" | |
3220 | "en tu usuario y nombre de host. Por favor verifica que son correctos.\n" | |
3221 | "Tu puedes suprimir este mensaje configurándolos de forma explicita: \n" | |
3222 | "\n" | |
3223 | " git config --global user.name \"Tu nombre\"\n" | |
3224 | " git config --global user.email you@example.com\n" | |
3225 | "\n" | |
3226 | "Tras hacer esto, puedes arreglar tu identidad para este commit con:\n" | |
3227 | "\n" | |
3228 | " git commit --amend --reset-author\n" | |
3229 | ||
3230 | #: sequencer.c:975 | |
3231 | msgid "couldn't look up newly created commit" | |
3232 | msgstr "no se pudo revisar el commit recién creado" | |
3233 | ||
3234 | #: sequencer.c:977 | |
3235 | msgid "could not parse newly created commit" | |
3236 | msgstr "no se pudo analizar el commit recién creado" | |
3237 | ||
3238 | #: sequencer.c:1023 | |
3239 | msgid "unable to resolve HEAD after creating commit" | |
3240 | msgstr "no se pudo resolver HEAD tras crear el commit" | |
3241 | ||
3242 | #: sequencer.c:1025 | |
3243 | msgid "detached HEAD" | |
3244 | msgstr "HEAD desacoplado" | |
3245 | ||
3246 | #: sequencer.c:1029 | |
3247 | msgid " (root-commit)" | |
3248 | msgstr " (commit-raíz)" | |
3249 | ||
3250 | #: sequencer.c:1050 | |
3251 | msgid "could not parse HEAD" | |
3252 | msgstr "no se pudo analizar HEAD" | |
3253 | ||
3254 | #: sequencer.c:1052 | |
3255 | #, c-format | |
3256 | msgid "HEAD %s is not a commit!" | |
3257 | msgstr "HEAD %s no es un commit!" | |
3258 | ||
3259 | #: sequencer.c:1056 builtin/commit.c:1491 | |
3260 | msgid "could not parse HEAD commit" | |
3261 | msgstr "no se pudo analizar el commit de HEAD" | |
3262 | ||
3263 | #: sequencer.c:1107 sequencer.c:1673 | |
3264 | msgid "unable to parse commit author" | |
3265 | msgstr "no es posible analizar el autor del commit" | |
3266 | ||
3267 | #: sequencer.c:1117 builtin/am.c:1630 builtin/merge.c:643 | |
3268 | msgid "git write-tree failed to write a tree" | |
3269 | msgstr "git write-tree falló al escribir el árbol" | |
3270 | ||
3271 | #: sequencer.c:1134 sequencer.c:1186 | |
3272 | #, c-format | |
3273 | msgid "unable to read commit message from '%s'" | |
3274 | msgstr "no se puede leer el mensaje del commit de '%s'" | |
3275 | ||
3276 | #: sequencer.c:1154 builtin/am.c:1650 builtin/commit.c:1594 builtin/merge.c:826 | |
3277 | #: builtin/merge.c:851 | |
3278 | msgid "failed to write commit object" | |
3279 | msgstr "fallo al escribir el objeto commit" | |
3280 | ||
3281 | #: sequencer.c:1213 | |
fb0e25bc | 3282 | #, c-format |
521437fe | 3283 | msgid "could not parse commit %s" |
33ac3e89 | 3284 | msgstr "no se pudo analizar commit %s" |
fb0e25bc | 3285 | |
33ac3e89 | 3286 | #: sequencer.c:1218 |
fb0e25bc | 3287 | #, c-format |
521437fe | 3288 | msgid "could not parse parent commit %s" |
33ac3e89 | 3289 | msgstr "no se pudo analizar el commit padre %s" |
fb0e25bc | 3290 | |
33ac3e89 | 3291 | #: sequencer.c:1347 |
fb0e25bc CD |
3292 | #, c-format |
3293 | msgid "" | |
3294 | "unexpected 1st line of squash message:\n" | |
3295 | "\n" | |
3296 | "\t%.*s" | |
3297 | msgstr "" | |
3298 | "1ra línea del mensaje squash no esperada:\n" | |
3299 | "\n" | |
3300 | "\t%.*s" | |
3301 | ||
33ac3e89 | 3302 | #: sequencer.c:1353 |
fb0e25bc CD |
3303 | #, c-format |
3304 | msgid "" | |
3305 | "invalid 1st line of squash message:\n" | |
3306 | "\n" | |
3307 | "\t%.*s" | |
3308 | msgstr "" | |
3309 | "1ra línea del mensaje squash inválida:\n" | |
3310 | "\n" | |
3311 | "\t%.*s" | |
3312 | ||
33ac3e89 | 3313 | #: sequencer.c:1359 sequencer.c:1384 |
fb0e25bc CD |
3314 | #, c-format |
3315 | msgid "This is a combination of %d commits." | |
715fc761 | 3316 | msgstr "Esta es una combinación de %d commits." |
fb0e25bc | 3317 | |
33ac3e89 | 3318 | #: sequencer.c:1368 sequencer.c:3265 |
fb0e25bc CD |
3319 | msgid "need a HEAD to fixup" |
3320 | msgstr "se necesita un HEAD para arreglar" | |
3321 | ||
33ac3e89 | 3322 | #: sequencer.c:1370 |
fb0e25bc CD |
3323 | msgid "could not read HEAD" |
3324 | msgstr "no se pudo leer HEAD" | |
3325 | ||
33ac3e89 | 3326 | #: sequencer.c:1372 |
fb0e25bc CD |
3327 | msgid "could not read HEAD's commit message" |
3328 | msgstr "no se pudo leer el mensaje de commit de HEAD" | |
3329 | ||
33ac3e89 | 3330 | #: sequencer.c:1378 |
fb0e25bc CD |
3331 | #, c-format |
3332 | msgid "cannot write '%s'" | |
3333 | msgstr "no se puede escribir '%s'" | |
3334 | ||
33ac3e89 | 3335 | #: sequencer.c:1387 git-rebase--interactive.sh:452 |
fb0e25bc | 3336 | msgid "This is the 1st commit message:" |
715fc761 | 3337 | msgstr "Este es el mensaje del 1er commit:" |
fb0e25bc | 3338 | |
33ac3e89 | 3339 | #: sequencer.c:1395 |
fb0e25bc CD |
3340 | #, c-format |
3341 | msgid "could not read commit message of %s" | |
3342 | msgstr "no se puede leer el mensaje del commit de %s" | |
3343 | ||
33ac3e89 | 3344 | #: sequencer.c:1402 |
fb0e25bc CD |
3345 | #, c-format |
3346 | msgid "This is the commit message #%d:" | |
33ac3e89 | 3347 | msgstr "Este es el mensaje del commit #%d:" |
fb0e25bc | 3348 | |
33ac3e89 | 3349 | #: sequencer.c:1407 |
fb0e25bc CD |
3350 | #, c-format |
3351 | msgid "The commit message #%d will be skipped:" | |
33ac3e89 | 3352 | msgstr "El mensaje del commit #%d será saltado:" |
fb0e25bc | 3353 | |
33ac3e89 | 3354 | #: sequencer.c:1412 |
fb0e25bc CD |
3355 | #, c-format |
3356 | msgid "unknown command: %d" | |
3357 | msgstr "comando desconocido: %d" | |
3358 | ||
33ac3e89 | 3359 | #: sequencer.c:1479 |
fb0e25bc | 3360 | msgid "your index file is unmerged." |
715fc761 | 3361 | msgstr "tu archivo índice no esta fusionado." |
fb0e25bc | 3362 | |
33ac3e89 | 3363 | #: sequencer.c:1498 |
fb0e25bc CD |
3364 | #, c-format |
3365 | msgid "commit %s is a merge but no -m option was given." | |
715fc761 | 3366 | msgstr "el commit %s es una fusión pero no se entrego la opción -m." |
fb0e25bc | 3367 | |
33ac3e89 | 3368 | #: sequencer.c:1506 |
fb0e25bc CD |
3369 | #, c-format |
3370 | msgid "commit %s does not have parent %d" | |
3371 | msgstr "el commit %s no tiene un padre %d" | |
3372 | ||
33ac3e89 | 3373 | #: sequencer.c:1510 |
fb0e25bc CD |
3374 | #, c-format |
3375 | msgid "mainline was specified but commit %s is not a merge." | |
715fc761 | 3376 | msgstr "línea principal especificada pero el commit %s no es una fusión." |
fb0e25bc | 3377 | |
33ac3e89 | 3378 | #: sequencer.c:1516 |
fb0e25bc CD |
3379 | #, c-format |
3380 | msgid "cannot get commit message for %s" | |
3381 | msgstr "no se puede obtener el mensaje de commit para %s" | |
3382 | ||
3383 | #. TRANSLATORS: The first %s will be a "todo" command like | |
3384 | #. "revert" or "pick", the second %s a SHA1. | |
33ac3e89 | 3385 | #: sequencer.c:1535 |
fb0e25bc CD |
3386 | #, c-format |
3387 | msgid "%s: cannot parse parent commit %s" | |
715fc761 | 3388 | msgstr "%s: no se puede analizar el commit padre %s" |
fb0e25bc | 3389 | |
33ac3e89 | 3390 | #: sequencer.c:1600 sequencer.c:2397 |
fb0e25bc CD |
3391 | #, c-format |
3392 | msgid "could not rename '%s' to '%s'" | |
33ac3e89 | 3393 | msgstr "no se puede renombrar '%s' a '%s'" |
fb0e25bc | 3394 | |
33ac3e89 | 3395 | #: sequencer.c:1654 |
fb0e25bc CD |
3396 | #, c-format |
3397 | msgid "could not revert %s... %s" | |
3398 | msgstr "no se pudo revertir %s... %s" | |
3399 | ||
33ac3e89 | 3400 | #: sequencer.c:1655 |
fb0e25bc CD |
3401 | #, c-format |
3402 | msgid "could not apply %s... %s" | |
3403 | msgstr "no se pudo aplicar %s... %s" | |
3404 | ||
33ac3e89 | 3405 | #: sequencer.c:1702 |
fb0e25bc | 3406 | msgid "empty commit set passed" |
715fc761 | 3407 | msgstr "conjunto de commits vacío entregado" |
fb0e25bc | 3408 | |
33ac3e89 | 3409 | #: sequencer.c:1712 |
fb0e25bc CD |
3410 | #, c-format |
3411 | msgid "git %s: failed to read the index" | |
3412 | msgstr "git %s: fallo al leer el índice" | |
3413 | ||
33ac3e89 | 3414 | #: sequencer.c:1718 |
fb0e25bc CD |
3415 | #, c-format |
3416 | msgid "git %s: failed to refresh the index" | |
3417 | msgstr "git %s: fallo al refrescar el índice" | |
3418 | ||
33ac3e89 | 3419 | #: sequencer.c:1792 |
521437fe CDR |
3420 | #, c-format |
3421 | msgid "%s does not accept arguments: '%s'" | |
3422 | msgstr "%s no acepta los argumentos: '%s'" | |
3423 | ||
33ac3e89 | 3424 | #: sequencer.c:1801 |
521437fe CDR |
3425 | #, c-format |
3426 | msgid "missing arguments for %s" | |
3427 | msgstr "faltan argumentos para para %s" | |
3428 | ||
33ac3e89 | 3429 | #: sequencer.c:1844 |
fb0e25bc CD |
3430 | #, c-format |
3431 | msgid "invalid line %d: %.*s" | |
3432 | msgstr "línea inválida %d: %.*s" | |
3433 | ||
33ac3e89 | 3434 | #: sequencer.c:1852 |
fb0e25bc CD |
3435 | #, c-format |
3436 | msgid "cannot '%s' without a previous commit" | |
3437 | msgstr "no se puede '%s' sin un commit previo" | |
3438 | ||
33ac3e89 | 3439 | #: sequencer.c:1883 sequencer.c:3056 sequencer.c:3091 |
fb0e25bc CD |
3440 | #, c-format |
3441 | msgid "could not read '%s'." | |
3442 | msgstr "no se puede leer '%s'." | |
3443 | ||
33ac3e89 | 3444 | #: sequencer.c:1906 |
fb0e25bc CD |
3445 | msgid "please fix this using 'git rebase --edit-todo'." |
3446 | msgstr "por favor arregle esto usando 'git rebase --edit-todo'." | |
3447 | ||
33ac3e89 | 3448 | #: sequencer.c:1908 |
fb0e25bc CD |
3449 | #, c-format |
3450 | msgid "unusable instruction sheet: '%s'" | |
9df63a4a | 3451 | msgstr "hoja de instrucciones inutilizable: '%s'" |
fb0e25bc | 3452 | |
33ac3e89 | 3453 | #: sequencer.c:1913 |
fb0e25bc | 3454 | msgid "no commits parsed." |
715fc761 | 3455 | msgstr "ningún commit analizado." |
fb0e25bc | 3456 | |
33ac3e89 | 3457 | #: sequencer.c:1924 |
fb0e25bc CD |
3458 | msgid "cannot cherry-pick during a revert." |
3459 | msgstr "no se puede realizar cherry-pick durante un revert." | |
3460 | ||
33ac3e89 | 3461 | #: sequencer.c:1926 |
fb0e25bc | 3462 | msgid "cannot revert during a cherry-pick." |
33ac3e89 | 3463 | msgstr "no se puede realizar un revert durante un cherry-pick." |
fb0e25bc | 3464 | |
33ac3e89 | 3465 | #: sequencer.c:1993 |
fb0e25bc CD |
3466 | #, c-format |
3467 | msgid "invalid key: %s" | |
3468 | msgstr "llave invalida: %s" | |
3469 | ||
33ac3e89 | 3470 | #: sequencer.c:1996 |
fb0e25bc CD |
3471 | #, c-format |
3472 | msgid "invalid value for %s: %s" | |
3473 | msgstr "valor invalido para %s: %s" | |
3474 | ||
33ac3e89 | 3475 | #: sequencer.c:2062 |
fb0e25bc CD |
3476 | #, c-format |
3477 | msgid "malformed options sheet: '%s'" | |
3478 | msgstr "hoja de opciones mal formada: '%s'" | |
3479 | ||
33ac3e89 | 3480 | #: sequencer.c:2100 |
fb0e25bc | 3481 | msgid "a cherry-pick or revert is already in progress" |
9df63a4a | 3482 | msgstr "un cherry-pick o revert ya esta en progreso" |
fb0e25bc | 3483 | |
33ac3e89 | 3484 | #: sequencer.c:2101 |
fb0e25bc CD |
3485 | msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" |
3486 | msgstr "intenta \"git cherry-pick (--continue | --quit | --abort)\"" | |
3487 | ||
33ac3e89 | 3488 | #: sequencer.c:2104 |
fb0e25bc CD |
3489 | #, c-format |
3490 | msgid "could not create sequencer directory '%s'" | |
33ac3e89 | 3491 | msgstr "no se pudo crear un directorio secuenciador '%s'" |
fb0e25bc | 3492 | |
33ac3e89 | 3493 | #: sequencer.c:2118 |
fb0e25bc CD |
3494 | msgid "could not lock HEAD" |
3495 | msgstr "no se pudo bloquear HEAD" | |
3496 | ||
33ac3e89 | 3497 | #: sequencer.c:2173 sequencer.c:2761 |
fb0e25bc | 3498 | msgid "no cherry-pick or revert in progress" |
715fc761 | 3499 | msgstr "ningún cherry-pick o revert en progreso" |
fb0e25bc | 3500 | |
33ac3e89 | 3501 | #: sequencer.c:2175 |
fb0e25bc CD |
3502 | msgid "cannot resolve HEAD" |
3503 | msgstr "no se puede resolver HEAD" | |
3504 | ||
33ac3e89 | 3505 | #: sequencer.c:2177 sequencer.c:2212 |
fb0e25bc CD |
3506 | msgid "cannot abort from a branch yet to be born" |
3507 | msgstr "no se puede abortar de una rama por nacer" | |
3508 | ||
33ac3e89 | 3509 | #: sequencer.c:2198 builtin/grep.c:720 |
fb0e25bc CD |
3510 | #, c-format |
3511 | msgid "cannot open '%s'" | |
3512 | msgstr "no se puede abrir '%s'" | |
3513 | ||
33ac3e89 | 3514 | #: sequencer.c:2200 |
fb0e25bc CD |
3515 | #, c-format |
3516 | msgid "cannot read '%s': %s" | |
3517 | msgstr "no se puede leer '%s': %s" | |
3518 | ||
33ac3e89 | 3519 | #: sequencer.c:2201 |
fb0e25bc CD |
3520 | msgid "unexpected end of file" |
3521 | msgstr "final de archivo inesperado" | |
3522 | ||
33ac3e89 | 3523 | #: sequencer.c:2207 |
fb0e25bc CD |
3524 | #, c-format |
3525 | msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" | |
715fc761 | 3526 | msgstr "archivo HEAD de pre-cherry-pick guardado '%s' esta corrupto" |
fb0e25bc | 3527 | |
33ac3e89 | 3528 | #: sequencer.c:2218 |
fb0e25bc CD |
3529 | msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!" |
3530 | msgstr "Parece que se ha movido HEAD. No se hace rebobinado, revise su HEAD!" | |
3531 | ||
33ac3e89 CDR |
3532 | #: sequencer.c:2324 sequencer.c:2679 |
3533 | #, c-format | |
3534 | msgid "could not update %s" | |
3535 | msgstr "no se puede actualizar %s" | |
3536 | ||
3537 | #: sequencer.c:2362 sequencer.c:2659 | |
fb0e25bc CD |
3538 | msgid "cannot read HEAD" |
3539 | msgstr "no se puede leer HEAD" | |
3540 | ||
33ac3e89 | 3541 | #: sequencer.c:2402 builtin/difftool.c:639 |
fb0e25bc CD |
3542 | #, c-format |
3543 | msgid "could not copy '%s' to '%s'" | |
3544 | msgstr "no se pudo copiar '%s' a '%s'" | |
3545 | ||
33ac3e89 | 3546 | #: sequencer.c:2421 |
fb0e25bc | 3547 | msgid "could not read index" |
9df63a4a | 3548 | msgstr "no se pudo leer índice" |
fb0e25bc | 3549 | |
33ac3e89 | 3550 | #: sequencer.c:2426 |
fb0e25bc CD |
3551 | #, c-format |
3552 | msgid "" | |
3553 | "execution failed: %s\n" | |
3554 | "%sYou can fix the problem, and then run\n" | |
3555 | "\n" | |
3556 | " git rebase --continue\n" | |
3557 | "\n" | |
3558 | msgstr "" | |
715fc761 | 3559 | "ejecución fallida: %s\n" |
9df63a4a | 3560 | "%sPuedes arreglar el problema, y luego ejecutar\n" |
fb0e25bc CD |
3561 | "\n" |
3562 | " git rebase --continue\n" | |
3563 | "\n" | |
3564 | ||
33ac3e89 | 3565 | #: sequencer.c:2432 |
fb0e25bc | 3566 | msgid "and made changes to the index and/or the working tree\n" |
715fc761 | 3567 | msgstr "y se hicieron cambios al índice y/o árbol de trabajo\n" |
fb0e25bc | 3568 | |
33ac3e89 | 3569 | #: sequencer.c:2438 |
fb0e25bc CD |
3570 | #, c-format |
3571 | msgid "" | |
3572 | "execution succeeded: %s\n" | |
3573 | "but left changes to the index and/or the working tree\n" | |
3574 | "Commit or stash your changes, and then run\n" | |
3575 | "\n" | |
3576 | " git rebase --continue\n" | |
3577 | "\n" | |
3578 | msgstr "" | |
715fc761 CDR |
3579 | "ejecución exitosa: %s\n" |
3580 | "pero todavía quedan cambios para el índice o árbol de trabajo.\n" | |
fb0e25bc CD |
3581 | "Realiza un commit o stash con tus cambios, y luego ejecuta\n" |
3582 | "\n" | |
3583 | " git rebase --continue\n" | |
3584 | "\n" | |
3585 | ||
33ac3e89 | 3586 | #: sequencer.c:2497 |
fb0e25bc CD |
3587 | #, c-format |
3588 | msgid "Applied autostash.\n" | |
3589 | msgstr "Autostash aplicado.\n" | |
3590 | ||
33ac3e89 | 3591 | #: sequencer.c:2509 |
fb0e25bc CD |
3592 | #, c-format |
3593 | msgid "cannot store %s" | |
3594 | msgstr "no se puede guardar %s" | |
3595 | ||
33ac3e89 | 3596 | #: sequencer.c:2512 git-rebase.sh:178 |
fb0e25bc CD |
3597 | #, c-format |
3598 | msgid "" | |
3599 | "Applying autostash resulted in conflicts.\n" | |
3600 | "Your changes are safe in the stash.\n" | |
3601 | "You can run \"git stash pop\" or \"git stash drop\" at any time.\n" | |
3602 | msgstr "" | |
3603 | "Aplicando autostash resultó en conflictos.\n" | |
9df63a4a | 3604 | "Tus cambios están seguros en el stash.\n" |
4b15eb22 CD |
3605 | "Puedes ejecutar \"git stash pop\" o \"git stash drop\" en cualquier " |
3606 | "momento.\n" | |
fb0e25bc | 3607 | |
33ac3e89 | 3608 | #: sequencer.c:2595 |
fb0e25bc CD |
3609 | #, c-format |
3610 | msgid "Stopped at %s... %.*s\n" | |
3611 | msgstr "Detenido en %s... %.*s\n" | |
3612 | ||
33ac3e89 | 3613 | #: sequencer.c:2637 |
fb0e25bc CD |
3614 | #, c-format |
3615 | msgid "unknown command %d" | |
3616 | msgstr "comando desconocido %d" | |
3617 | ||
33ac3e89 | 3618 | #: sequencer.c:2667 |
fb0e25bc CD |
3619 | msgid "could not read orig-head" |
3620 | msgstr "no se puede leer orig-head" | |
3621 | ||
33ac3e89 | 3622 | #: sequencer.c:2672 sequencer.c:3262 |
fb0e25bc CD |
3623 | msgid "could not read 'onto'" |
3624 | msgstr "no se puede leer 'onto'" | |
3625 | ||
33ac3e89 | 3626 | #: sequencer.c:2686 |
fb0e25bc CD |
3627 | #, c-format |
3628 | msgid "could not update HEAD to %s" | |
3629 | msgstr "no se puede actualizar HEAD a %s" | |
3630 | ||
33ac3e89 | 3631 | #: sequencer.c:2770 |
fb0e25bc | 3632 | msgid "cannot rebase: You have unstaged changes." |
715fc761 | 3633 | msgstr "no se puede realizar rebase: Tienes cambios fuera del área de stage." |
fb0e25bc | 3634 | |
33ac3e89 | 3635 | #: sequencer.c:2775 |
fb0e25bc CD |
3636 | msgid "could not remove CHERRY_PICK_HEAD" |
3637 | msgstr "no se puede remover CHERRY_PICK_HEAD" | |
3638 | ||
33ac3e89 | 3639 | #: sequencer.c:2784 |
fb0e25bc CD |
3640 | msgid "cannot amend non-existing commit" |
3641 | msgstr "no se puede arreglar un commit no existente" | |
3642 | ||
33ac3e89 | 3643 | #: sequencer.c:2786 |
fb0e25bc CD |
3644 | #, c-format |
3645 | msgid "invalid file: '%s'" | |
3646 | msgstr "archivo invalido: '%s'" | |
3647 | ||
33ac3e89 | 3648 | #: sequencer.c:2788 |
fb0e25bc CD |
3649 | #, c-format |
3650 | msgid "invalid contents: '%s'" | |
3651 | msgstr "contenido inválido: '%s'" | |
3652 | ||
33ac3e89 | 3653 | #: sequencer.c:2791 |
fb0e25bc CD |
3654 | msgid "" |
3655 | "\n" | |
3656 | "You have uncommitted changes in your working tree. Please, commit them\n" | |
3657 | "first and then run 'git rebase --continue' again." | |
3658 | msgstr "" | |
3659 | "\n" | |
715fc761 | 3660 | "Tienes cambios fuera de un commit en tu árbol de trabajo. Por favor, realiza " |
4b15eb22 | 3661 | "un commit con estos\n" |
fb0e25bc CD |
3662 | "primero y luego ejecuta 'git rebase --continue' de nuevo." |
3663 | ||
33ac3e89 | 3664 | #: sequencer.c:2801 |
fb0e25bc | 3665 | msgid "could not commit staged changes." |
715fc761 | 3666 | msgstr "no se pudo realizar el commit con los cambios en el área de stage." |
fb0e25bc | 3667 | |
33ac3e89 | 3668 | #: sequencer.c:2881 |
fb0e25bc CD |
3669 | #, c-format |
3670 | msgid "%s: can't cherry-pick a %s" | |
3671 | msgstr "%s: no se puede aplicar cherry-pick a un %s" | |
3672 | ||
33ac3e89 | 3673 | #: sequencer.c:2885 |
fb0e25bc CD |
3674 | #, c-format |
3675 | msgid "%s: bad revision" | |
3676 | msgstr "%s: mala revision" | |
3677 | ||
33ac3e89 | 3678 | #: sequencer.c:2918 |
fb0e25bc CD |
3679 | msgid "can't revert as initial commit" |
3680 | msgstr "no se puede revertir como commit inicial" | |
3681 | ||
33ac3e89 | 3682 | #: sequencer.c:3023 |
4b15eb22 CD |
3683 | msgid "make_script: unhandled options" |
3684 | msgstr "make_script: opciones desconocidas" | |
3685 | ||
33ac3e89 | 3686 | #: sequencer.c:3026 |
4b15eb22 CD |
3687 | msgid "make_script: error preparing revisions" |
3688 | msgstr "make_script: error preparando revisiones" | |
3689 | ||
33ac3e89 | 3690 | #: sequencer.c:3060 sequencer.c:3095 |
4b15eb22 CD |
3691 | #, c-format |
3692 | msgid "unusable todo list: '%s'" | |
9df63a4a | 3693 | msgstr "lista de pendientes inutilizable: '%s'" |
4b15eb22 | 3694 | |
33ac3e89 | 3695 | #: sequencer.c:3146 |
4b15eb22 | 3696 | #, c-format |
6628a6e6 CDR |
3697 | msgid "" |
3698 | "unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring." | |
4b15eb22 | 3699 | msgstr "" |
33ac3e89 | 3700 | "opción %s no reconocida para la opción rebase.missingCommitsCheck. Ignorando." |
4b15eb22 | 3701 | |
33ac3e89 | 3702 | #: sequencer.c:3212 |
4b15eb22 CD |
3703 | #, c-format |
3704 | msgid "" | |
3705 | "Warning: some commits may have been dropped accidentally.\n" | |
3706 | "Dropped commits (newer to older):\n" | |
3707 | msgstr "" | |
3708 | "Peligro: algunos commits pueden haber sido botados de forma accidental.\n" | |
3709 | "Commits botados (empezando con el mas nuevo):\n" | |
3710 | ||
33ac3e89 | 3711 | #: sequencer.c:3219 |
4b15eb22 CD |
3712 | #, c-format |
3713 | msgid "" | |
3714 | "To avoid this message, use \"drop\" to explicitly remove a commit.\n" | |
3715 | "\n" | |
3716 | "Use 'git config rebase.missingCommitsCheck' to change the level of " | |
3717 | "warnings.\n" | |
3718 | "The possible behaviours are: ignore, warn, error.\n" | |
3719 | "\n" | |
3720 | msgstr "" | |
3721 | "Para evitar este mensaje, use \"drop\" para remover de forma explícita un " | |
3722 | "commit.\n" | |
3723 | "\n" | |
3724 | "Use 'git config rebase.missingCommitsCheck' para cambiar el nivel de " | |
3725 | "advertencias.\n" | |
3726 | "Los posibles comportamientos son: ignore,warn,error.\n" | |
3727 | "\n" | |
3728 | ||
33ac3e89 | 3729 | #: sequencer.c:3231 |
4b15eb22 CD |
3730 | #, c-format |
3731 | msgid "" | |
3732 | "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --" | |
3733 | "continue'.\n" | |
3734 | "Or you can abort the rebase with 'git rebase --abort'.\n" | |
3735 | msgstr "" | |
3736 | "Se puede arreglar esto con 'git rebase --edit-todo' y después ejecutar 'git " | |
3737 | "rebase --continue'.\n" | |
3738 | "O se puede abortar el rebase con 'git rebase --abort'.\n" | |
3739 | ||
33ac3e89 | 3740 | #: sequencer.c:3244 sequencer.c:3304 wrapper.c:225 wrapper.c:395 |
f8038f5b | 3741 | #: builtin/am.c:779 |
4b15eb22 CD |
3742 | #, c-format |
3743 | msgid "could not open '%s' for writing" | |
3744 | msgstr "no se pudo abrir '%s' para escritura" | |
3745 | ||
33ac3e89 | 3746 | #: sequencer.c:3285 |
4b15eb22 | 3747 | #, c-format |
f8038f5b | 3748 | msgid "could not parse commit '%s'" |
33ac3e89 | 3749 | msgstr "no se pudo analizar commit '%s'" |
4b15eb22 | 3750 | |
33ac3e89 | 3751 | #: sequencer.c:3401 |
4b15eb22 CD |
3752 | msgid "the script was already rearranged." |
3753 | msgstr "este script ya fue reorganizado." | |
3754 | ||
33ac3e89 CDR |
3755 | #: setup.c:122 |
3756 | #, c-format | |
3757 | msgid "'%s' is outside repository" | |
3758 | msgstr "'%s' está fuera del repositorio" | |
3759 | ||
fb0e25bc CD |
3760 | #: setup.c:171 |
3761 | #, c-format | |
3762 | msgid "" | |
3763 | "%s: no such path in the working tree.\n" | |
3764 | "Use 'git <command> -- <path>...' to specify paths that do not exist locally." | |
3765 | msgstr "" | |
715fc761 | 3766 | "%s: no existe la ruta en el árbol de trabajo.\n" |
4b15eb22 CD |
3767 | "Use 'git <comando> -- <ruta>...' para especificar rutas que no existen " |
3768 | "localmente." | |
fb0e25bc CD |
3769 | |
3770 | #: setup.c:184 | |
3771 | #, c-format | |
3772 | msgid "" | |
3773 | "ambiguous argument '%s': unknown revision or path not in the working tree.\n" | |
3774 | "Use '--' to separate paths from revisions, like this:\n" | |
3775 | "'git <command> [<revision>...] -- [<file>...]'" | |
3776 | msgstr "" | |
4b15eb22 CD |
3777 | "argumento ambiguo '%s': revisión desconocida o ruta fuera del árbol de " |
3778 | "trabajo.\n" | |
fb0e25bc CD |
3779 | "Use '--' para separar las rutas de las revisiones, de esta manera:\n" |
3780 | "'git <comando> [<revisión>...] -- [<archivo>...]'" | |
3781 | ||
33ac3e89 CDR |
3782 | #: setup.c:233 |
3783 | #, c-format | |
3784 | msgid "option '%s' must come before non-option arguments" | |
3785 | msgstr "opción '%s' debe venir antes de argumentos no opcionales" | |
3786 | ||
fb0e25bc CD |
3787 | #: setup.c:252 |
3788 | #, c-format | |
3789 | msgid "" | |
3790 | "ambiguous argument '%s': both revision and filename\n" | |
3791 | "Use '--' to separate paths from revisions, like this:\n" | |
3792 | "'git <command> [<revision>...] -- [<file>...]'" | |
3793 | msgstr "" | |
3794 | "argumento ambiguo '%s': ambos revisión y nombre de archivo\n" | |
3795 | "Use '--' para separar rutas de revisiones, de esta manera:\n" | |
3796 | "'git <comando> [<revisión>...] -- [<archivo>...]'" | |
3797 | ||
33ac3e89 CDR |
3798 | #: setup.c:388 |
3799 | msgid "unable to set up work tree using invalid config" | |
3800 | msgstr "" | |
3801 | "no es posible configurar el directorio de trabajo usando una configuración " | |
3802 | "inválida" | |
3803 | ||
3804 | #: setup.c:395 | |
3805 | msgid "this operation must be run in a work tree" | |
3806 | msgstr "esta operación debe ser realizada en un árbol de trabajo" | |
3807 | ||
3808 | #: setup.c:506 | |
fb0e25bc CD |
3809 | #, c-format |
3810 | msgid "Expected git repo version <= %d, found %d" | |
715fc761 | 3811 | msgstr "Se esperaba versión de git repo <= %d, encontrada %d" |
fb0e25bc | 3812 | |
33ac3e89 | 3813 | #: setup.c:514 |
fb0e25bc | 3814 | msgid "unknown repository extensions found:" |
715fc761 | 3815 | msgstr "se encontró extensión de repositorio desconocida:" |
fb0e25bc | 3816 | |
33ac3e89 CDR |
3817 | #: setup.c:533 |
3818 | #, c-format | |
3819 | msgid "error opening '%s'" | |
3820 | msgstr "error abriendo '%s'" | |
3821 | ||
3822 | #: setup.c:535 | |
3823 | #, c-format | |
3824 | msgid "too large to be a .git file: '%s'" | |
3825 | msgstr "muy grande para ser un archivo .git: '%s'" | |
3826 | ||
3827 | #: setup.c:537 | |
3828 | #, c-format | |
3829 | msgid "error reading %s" | |
3830 | msgstr "error leyendo %s" | |
3831 | ||
3832 | #: setup.c:539 | |
3833 | #, c-format | |
3834 | msgid "invalid gitfile format: %s" | |
3835 | msgstr "formato gitfile inválido: %s" | |
3836 | ||
3837 | #: setup.c:541 | |
3838 | #, c-format | |
3839 | msgid "no path in gitfile: %s" | |
3840 | msgstr "no hay ruta en gitfile: %s" | |
3841 | ||
3842 | #: setup.c:543 | |
3843 | #, c-format | |
3844 | msgid "not a git repository: %s" | |
3845 | msgstr "no es un repositorio git: %s" | |
3846 | ||
3847 | #: setup.c:642 | |
3848 | #, c-format | |
3849 | msgid "'$%s' too big" | |
3850 | msgstr "'$%s' muy grande" | |
3851 | ||
3852 | #: setup.c:656 | |
3853 | #, c-format | |
3854 | msgid "not a git repository: '%s'" | |
3855 | msgstr "no es un repositorio git: '%s'" | |
3856 | ||
3857 | #: setup.c:685 setup.c:687 setup.c:718 | |
3858 | #, c-format | |
3859 | msgid "cannot chdir to '%s'" | |
3860 | msgstr "no se puede aplicar chdir a '%s'" | |
3861 | ||
3862 | #: setup.c:690 setup.c:746 setup.c:756 setup.c:795 setup.c:803 setup.c:818 | |
3863 | msgid "cannot come back to cwd" | |
3864 | msgstr "no se puede volver a cwd" | |
3865 | ||
3866 | #: setup.c:816 | |
fb0e25bc | 3867 | #, c-format |
33ac3e89 | 3868 | msgid "not a git repository (or any of the parent directories): %s" |
4b15eb22 | 3869 | msgstr "" |
33ac3e89 | 3870 | "no es un repositorio git (ni ninguno de los directorios superiores): %s" |
fb0e25bc | 3871 | |
33ac3e89 CDR |
3872 | #: setup.c:827 |
3873 | #, c-format | |
3874 | msgid "failed to stat '%*s%s%s'" | |
3875 | msgstr "fallo al determinar '%*s%s%s'" | |
fb0e25bc | 3876 | |
33ac3e89 | 3877 | #: setup.c:1057 |
fb0e25bc CD |
3878 | msgid "Unable to read current working directory" |
3879 | msgstr "Incapaz de leer el directorio de trabajo actual" | |
3880 | ||
33ac3e89 | 3881 | #: setup.c:1069 setup.c:1075 |
fb0e25bc | 3882 | #, c-format |
33ac3e89 CDR |
3883 | msgid "cannot change to '%s'" |
3884 | msgstr "no se puede cambiar a '%s'" | |
fb0e25bc | 3885 | |
33ac3e89 | 3886 | #: setup.c:1088 |
fb0e25bc CD |
3887 | #, c-format |
3888 | msgid "" | |
33ac3e89 | 3889 | "not a git repository (or any parent up to mount point %s)\n" |
fb0e25bc CD |
3890 | "Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)." |
3891 | msgstr "" | |
33ac3e89 | 3892 | "no es un repositorio git ( o ningún padre en el punto de montado %s)\n" |
4b15eb22 CD |
3893 | "Parando en el límite del sistema de archivos " |
3894 | "(GIT_DISCOVERY_ACROSS_FILESYSTEM no establecido)." | |
fb0e25bc | 3895 | |
33ac3e89 | 3896 | #: setup.c:1172 |
fb0e25bc CD |
3897 | #, c-format |
3898 | msgid "" | |
33ac3e89 | 3899 | "problem with core.sharedRepository filemode value (0%.3o).\n" |
fb0e25bc CD |
3900 | "The owner of files must always have read and write permissions." |
3901 | msgstr "" | |
33ac3e89 | 3902 | "problema con el valor del modo de archivo core.sharedRepository (0%.3o).\n" |
fb0e25bc CD |
3903 | "El dueño de los archivos tiene que tener permisos de lectura y escritura." |
3904 | ||
33ac3e89 CDR |
3905 | #: setup.c:1215 |
3906 | msgid "open /dev/null or dup failed" | |
3907 | msgstr "falló al abrir /dev/null o dup" | |
3908 | ||
3909 | #: setup.c:1230 | |
3910 | msgid "fork failed" | |
3911 | msgstr "falló fork" | |
3912 | ||
3913 | #: setup.c:1235 | |
3914 | msgid "setsid failed" | |
3915 | msgstr "falló setsid" | |
3916 | ||
3917 | #: sha1_file.c:592 | |
fb0e25bc CD |
3918 | #, c-format |
3919 | msgid "path '%s' does not exist" | |
3920 | msgstr "ruta '%s' no existe" | |
3921 | ||
33ac3e89 | 3922 | #: sha1_file.c:618 |
fb0e25bc CD |
3923 | #, c-format |
3924 | msgid "reference repository '%s' as a linked checkout is not supported yet." | |
4b15eb22 CD |
3925 | msgstr "" |
3926 | "repositorio de referencia '%s' como un checkout vinculado no es soportado " | |
3927 | "todavía." | |
fb0e25bc | 3928 | |
33ac3e89 | 3929 | #: sha1_file.c:624 |
fb0e25bc CD |
3930 | #, c-format |
3931 | msgid "reference repository '%s' is not a local repository." | |
3932 | msgstr "repositorio de referencia '%s' no es un repositorio local." | |
3933 | ||
33ac3e89 | 3934 | #: sha1_file.c:630 |
fb0e25bc CD |
3935 | #, c-format |
3936 | msgid "reference repository '%s' is shallow" | |
3937 | msgstr "repositorio de referencia '%s' es superficial (shallow)" | |
3938 | ||
33ac3e89 | 3939 | #: sha1_file.c:638 |
fb0e25bc CD |
3940 | #, c-format |
3941 | msgid "reference repository '%s' is grafted" | |
3942 | msgstr "repositorio de referencia '% s' está injertado" | |
3943 | ||
f8038f5b | 3944 | #: sha1_name.c:422 |
fb0e25bc CD |
3945 | #, c-format |
3946 | msgid "short SHA1 %s is ambiguous" | |
33ac3e89 | 3947 | msgstr "SHA1 %s corto es ambiguao" |
fb0e25bc | 3948 | |
f8038f5b | 3949 | #: sha1_name.c:433 |
fb0e25bc CD |
3950 | msgid "The candidates are:" |
3951 | msgstr "Los candidatos son:" | |
3952 | ||
f8038f5b | 3953 | #: sha1_name.c:693 |
fb0e25bc CD |
3954 | msgid "" |
3955 | "Git normally never creates a ref that ends with 40 hex characters\n" | |
3956 | "because it will be ignored when you just specify 40-hex. These refs\n" | |
3957 | "may be created by mistake. For example,\n" | |
3958 | "\n" | |
3959 | " git checkout -b $br $(git rev-parse ...)\n" | |
3960 | "\n" | |
3961 | "where \"$br\" is somehow empty and a 40-hex ref is created. Please\n" | |
3962 | "examine these refs and maybe delete them. Turn this message off by\n" | |
3963 | "running \"git config advice.objectNameWarning false\"" | |
3964 | msgstr "" | |
3965 | "Git normalmente nunca crea una ref que termine con 40 caracteres hex\n" | |
3966 | "porque esto sería ignorado cuando solo se especifiquen 40-hex. Estas refs\n" | |
3967 | "tal vez sean creadas por error. Por ejemplo,\n" | |
3968 | "\n" | |
3969 | " git checkout -b $br $(git rev-parse ...)\n" | |
3970 | "\n" | |
715fc761 CDR |
3971 | "donde \"$br\" está de alguna manera vacía y una ref de 40-hex es creada. Por " |
3972 | "favor\n" | |
fb0e25bc CD |
3973 | "examine estas refs y tal vez bórrelas. Silencie este mensaje \n" |
3974 | "ejecutando \"git config advice.objectNameWarning false\"" | |
3975 | ||
f8038f5b | 3976 | #: submodule.c:96 submodule.c:130 |
fb0e25bc | 3977 | msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" |
4b15eb22 CD |
3978 | msgstr "" |
3979 | "No se puede cambiar .gitmodules no fusionados, resuelva este problema primero" | |
fb0e25bc | 3980 | |
f8038f5b | 3981 | #: submodule.c:100 submodule.c:134 |
fb0e25bc CD |
3982 | #, c-format |
3983 | msgid "Could not find section in .gitmodules where path=%s" | |
3984 | msgstr "No se pudo encontrar la sección en .gitmodules donde path=%s" | |
3985 | ||
f8038f5b | 3986 | #: submodule.c:108 |
fb0e25bc CD |
3987 | #, c-format |
3988 | msgid "Could not update .gitmodules entry %s" | |
3989 | msgstr "No se pudo actualizar la entrada %s de .gitmodules" | |
3990 | ||
f8038f5b | 3991 | #: submodule.c:141 |
fb0e25bc CD |
3992 | #, c-format |
3993 | msgid "Could not remove .gitmodules entry for %s" | |
3994 | msgstr "No se pudo remover la entrada %s de .gitmodules" | |
3995 | ||
f8038f5b | 3996 | #: submodule.c:152 |
fb0e25bc CD |
3997 | msgid "staging updated .gitmodules failed" |
3998 | msgstr "falló realizar stage a los .gitmodules actualizados" | |
3999 | ||
f8038f5b | 4000 | #: submodule.c:312 |
fb0e25bc CD |
4001 | #, c-format |
4002 | msgid "in unpopulated submodule '%s'" | |
4003 | msgstr "en el submódulo no poblado '%s'" | |
4004 | ||
f8038f5b | 4005 | #: submodule.c:343 |
fb0e25bc CD |
4006 | #, c-format |
4007 | msgid "Pathspec '%s' is in submodule '%.*s'" | |
4008 | msgstr "El patrón de ruta '%s' está en el submódulo '%.*s'" | |
4009 | ||
f8038f5b | 4010 | #: submodule.c:833 |
4b15eb22 CD |
4011 | #, c-format |
4012 | msgid "submodule entry '%s' (%s) is a %s, not a commit" | |
4013 | msgstr "entrada de submódulo '%s' (%s) es un %s, no un commit" | |
4014 | ||
33ac3e89 | 4015 | #: submodule.c:1065 builtin/branch.c:648 builtin/submodule--helper.c:1724 |
4b15eb22 CD |
4016 | msgid "Failed to resolve HEAD as a valid ref." |
4017 | msgstr "Fallo al resolver HEAD como un ref valido." | |
4018 | ||
f8038f5b | 4019 | #: submodule.c:1370 |
fb0e25bc CD |
4020 | #, c-format |
4021 | msgid "'%s' not recognized as a git repository" | |
4022 | msgstr "'%s' no reconocido como un repositorio git" | |
4023 | ||
f8038f5b | 4024 | #: submodule.c:1508 |
fb0e25bc CD |
4025 | #, c-format |
4026 | msgid "could not start 'git status' in submodule '%s'" | |
4027 | msgstr "no se pudo comenzar 'git status' en el submódulo '%s'" | |
4028 | ||
f8038f5b | 4029 | #: submodule.c:1521 |
fb0e25bc CD |
4030 | #, c-format |
4031 | msgid "could not run 'git status' in submodule '%s'" | |
4032 | msgstr "no se pudo ejecutar 'git status' en el submódulo '%s'" | |
4033 | ||
f8038f5b | 4034 | #: submodule.c:1614 |
fb0e25bc CD |
4035 | #, c-format |
4036 | msgid "submodule '%s' has dirty index" | |
4037 | msgstr "submódulo '%s' tiene un índice corrupto" | |
4038 | ||
33ac3e89 | 4039 | #: submodule.c:1878 |
fb0e25bc | 4040 | #, c-format |
4b15eb22 CD |
4041 | msgid "" |
4042 | "relocate_gitdir for submodule '%s' with more than one worktree not supported" | |
4043 | msgstr "" | |
4044 | "relocate_gitdir para el submódulo '%s' con más de un árbol de trabajo no " | |
4045 | "soportado" | |
fb0e25bc | 4046 | |
33ac3e89 | 4047 | #: submodule.c:1890 submodule.c:1946 |
fb0e25bc CD |
4048 | #, c-format |
4049 | msgid "could not lookup name for submodule '%s'" | |
4050 | msgstr "no se pudo resolver el nombre para el submódulo '%s'" | |
4051 | ||
33ac3e89 CDR |
4052 | #: submodule.c:1894 builtin/submodule--helper.c:1246 |
4053 | #: builtin/submodule--helper.c:1256 | |
fb0e25bc CD |
4054 | #, c-format |
4055 | msgid "could not create directory '%s'" | |
4056 | msgstr "no se pudo crear el directorio '%s'" | |
4057 | ||
33ac3e89 | 4058 | #: submodule.c:1897 |
fb0e25bc CD |
4059 | #, c-format |
4060 | msgid "" | |
4061 | "Migrating git directory of '%s%s' from\n" | |
4062 | "'%s' to\n" | |
4063 | "'%s'\n" | |
4064 | msgstr "" | |
4065 | "Migrando directorio git de '%s%s' desde\n" | |
4066 | "'%s' hacia\n" | |
4067 | "'%s'\n" | |
4068 | ||
33ac3e89 | 4069 | #: submodule.c:1981 |
fb0e25bc CD |
4070 | #, c-format |
4071 | msgid "could not recurse into submodule '%s'" | |
33ac3e89 | 4072 | msgstr "no pudo recursar en el submódulo '%s'" |
fb0e25bc | 4073 | |
33ac3e89 | 4074 | #: submodule.c:2025 |
fb0e25bc CD |
4075 | msgid "could not start ls-files in .." |
4076 | msgstr "no se pudo comenzar ls-files en .." | |
4077 | ||
33ac3e89 | 4078 | #: submodule.c:2045 |
fb0e25bc CD |
4079 | msgid "BUG: returned path string doesn't match cwd?" |
4080 | msgstr "BUG: string de ruta recibido no concuerda con cwd?" | |
4081 | ||
33ac3e89 | 4082 | #: submodule.c:2064 |
fb0e25bc CD |
4083 | #, c-format |
4084 | msgid "ls-tree returned unexpected return code %d" | |
4085 | msgstr "ls-tree retornó un código %d inesperado" | |
4086 | ||
4b15eb22 CD |
4087 | #: submodule-config.c:263 |
4088 | msgid "negative values not allowed for submodule.fetchjobs" | |
4089 | msgstr "no se permiten valores negativos para submodule.fetchjobs" | |
4090 | ||
4091 | #: submodule-config.c:436 | |
fb0e25bc CD |
4092 | #, c-format |
4093 | msgid "invalid value for %s" | |
4094 | msgstr "valor inválido para %s" | |
4095 | ||
4b15eb22 | 4096 | #: trailer.c:238 |
fb0e25bc CD |
4097 | #, c-format |
4098 | msgid "running trailer command '%s' failed" | |
33ac3e89 | 4099 | msgstr "ejecución del comando de remolque '%s' falló" |
fb0e25bc | 4100 | |
4b15eb22 CD |
4101 | #: trailer.c:485 trailer.c:490 trailer.c:495 trailer.c:549 trailer.c:553 |
4102 | #: trailer.c:557 | |
fb0e25bc CD |
4103 | #, c-format |
4104 | msgid "unknown value '%s' for key '%s'" | |
4105 | msgstr "valor '%s' desconocido para la clave '%s'" | |
4106 | ||
4b15eb22 | 4107 | #: trailer.c:539 trailer.c:544 builtin/remote.c:290 |
fb0e25bc CD |
4108 | #, c-format |
4109 | msgid "more than one %s" | |
4110 | msgstr "más de un %s" | |
4111 | ||
4b15eb22 | 4112 | #: trailer.c:730 |
fb0e25bc CD |
4113 | #, c-format |
4114 | msgid "empty trailer token in trailer '%.*s'" | |
4115 | msgstr "token de remolque vacío en el trailer '%.*s'" | |
4116 | ||
4b15eb22 | 4117 | #: trailer.c:750 |
fb0e25bc CD |
4118 | #, c-format |
4119 | msgid "could not read input file '%s'" | |
4120 | msgstr "no se pudo leer el archivo de entrada '%s'" | |
4121 | ||
4b15eb22 | 4122 | #: trailer.c:753 |
fb0e25bc CD |
4123 | msgid "could not read from stdin" |
4124 | msgstr "no se pudo leer desde stdin" | |
4125 | ||
4b15eb22 | 4126 | #: trailer.c:1008 builtin/am.c:46 |
fb0e25bc CD |
4127 | #, c-format |
4128 | msgid "could not stat %s" | |
4129 | msgstr "no se pudo definir %s" | |
4130 | ||
4b15eb22 | 4131 | #: trailer.c:1010 |
fb0e25bc CD |
4132 | #, c-format |
4133 | msgid "file %s is not a regular file" | |
4134 | msgstr "el archivo %s no es un archivo regular" | |
4135 | ||
4b15eb22 | 4136 | #: trailer.c:1012 |
fb0e25bc CD |
4137 | #, c-format |
4138 | msgid "file %s is not writable by user" | |
33ac3e89 | 4139 | msgstr "el archivo %s no puede ser escrito por el usuario" |
fb0e25bc | 4140 | |
4b15eb22 | 4141 | #: trailer.c:1024 |
fb0e25bc CD |
4142 | msgid "could not open temporary file" |
4143 | msgstr "no se pudo abrir el archivo temporal" | |
4144 | ||
4b15eb22 | 4145 | #: trailer.c:1064 |
fb0e25bc CD |
4146 | #, c-format |
4147 | msgid "could not rename temporary file to %s" | |
4148 | msgstr "no se pudo renombrar el archivo temporal a %s" | |
4149 | ||
f8038f5b | 4150 | #: transport.c:63 |
fb0e25bc CD |
4151 | #, c-format |
4152 | msgid "Would set upstream of '%s' to '%s' of '%s'\n" | |
4153 | msgstr "Configurará upstream de '%s' a '%s' de '%s'\n" | |
4154 | ||
f8038f5b | 4155 | #: transport.c:152 |
fb0e25bc CD |
4156 | #, c-format |
4157 | msgid "transport: invalid depth option '%s'" | |
4158 | msgstr "transport: opción inválida '%s'" | |
4159 | ||
33ac3e89 | 4160 | #: transport.c:916 |
fb0e25bc CD |
4161 | #, c-format |
4162 | msgid "" | |
4163 | "The following submodule paths contain changes that can\n" | |
4164 | "not be found on any remote:\n" | |
4165 | msgstr "" | |
4166 | "La siguiente ruta de submódulo contiene cambios que no\n" | |
4167 | "pueden ser encontrados en ningún remoto:\n" | |
4168 | ||
33ac3e89 | 4169 | #: transport.c:920 |
fb0e25bc CD |
4170 | #, c-format |
4171 | msgid "" | |
4172 | "\n" | |
4173 | "Please try\n" | |
4174 | "\n" | |
4175 | "\tgit push --recurse-submodules=on-demand\n" | |
4176 | "\n" | |
4177 | "or cd to the path and use\n" | |
4178 | "\n" | |
4179 | "\tgit push\n" | |
4180 | "\n" | |
4181 | "to push them to a remote.\n" | |
4182 | "\n" | |
4183 | msgstr "" | |
4184 | "\n" | |
4185 | "Por favor intenta\n" | |
4186 | "\n" | |
4187 | "\tgit push --recurse-submodules=on-demand\n" | |
4188 | "\n" | |
4189 | "o cd a la ruta y usa\n" | |
4190 | "\n" | |
4191 | "\tgit push\n" | |
4192 | "\n" | |
4193 | "para hacer un push al remoto.\n" | |
4194 | "\n" | |
4195 | ||
33ac3e89 | 4196 | #: transport.c:928 |
fb0e25bc CD |
4197 | msgid "Aborting." |
4198 | msgstr "Abortando." | |
4199 | ||
33ac3e89 | 4200 | #: transport-helper.c:1079 |
fb0e25bc CD |
4201 | #, c-format |
4202 | msgid "Could not read ref %s" | |
4203 | msgstr "No se pudo leer la referencia %s" | |
4204 | ||
4205 | #: tree-walk.c:31 | |
4206 | msgid "too-short tree object" | |
715fc761 | 4207 | msgstr "objeto de árbol muy corto" |
fb0e25bc CD |
4208 | |
4209 | #: tree-walk.c:37 | |
4210 | msgid "malformed mode in tree entry" | |
4211 | msgstr "modo mal formado en la entrada de árbol" | |
4212 | ||
4213 | #: tree-walk.c:41 | |
4214 | msgid "empty filename in tree entry" | |
4215 | msgstr "nombre de archivo vacío en la entrada de árbol" | |
4216 | ||
4b15eb22 | 4217 | #: tree-walk.c:114 |
fb0e25bc CD |
4218 | msgid "too-short tree file" |
4219 | msgstr "archivo de árbol muy corto" | |
4220 | ||
33ac3e89 | 4221 | #: unpack-trees.c:108 |
fb0e25bc CD |
4222 | #, c-format |
4223 | msgid "" | |
4224 | "Your local changes to the following files would be overwritten by checkout:\n" | |
4225 | "%%sPlease commit your changes or stash them before you switch branches." | |
4226 | msgstr "" | |
33ac3e89 CDR |
4227 | "Los cambios locales de los siguientes archivos serán sobrescritos por " |
4228 | "checkuot:\n" | |
4229 | "%%sPor favor realiza un commit con los cambios o un stash antes de cambiar " | |
4b15eb22 | 4230 | "ramas." |
fb0e25bc | 4231 | |
33ac3e89 | 4232 | #: unpack-trees.c:110 |
fb0e25bc CD |
4233 | #, c-format |
4234 | msgid "" | |
4235 | "Your local changes to the following files would be overwritten by checkout:\n" | |
4236 | "%%s" | |
4237 | msgstr "" | |
715fc761 | 4238 | "Los cambios locales de los siguientes archivos serán sobreescritos por " |
4b15eb22 | 4239 | "checkout:\n" |
fb0e25bc CD |
4240 | "%%s" |
4241 | ||
33ac3e89 | 4242 | #: unpack-trees.c:113 |
fb0e25bc CD |
4243 | #, c-format |
4244 | msgid "" | |
4245 | "Your local changes to the following files would be overwritten by merge:\n" | |
4246 | "%%sPlease commit your changes or stash them before you merge." | |
4247 | msgstr "" | |
4b15eb22 CD |
4248 | "Los cambios locales de los siguientes archivos serán sobrescritos al " |
4249 | "fusionar:\n" | |
9df63a4a | 4250 | "%%sPor favor, confirma tus cambios o aguárdalos antes de fusionar." |
fb0e25bc | 4251 | |
33ac3e89 | 4252 | #: unpack-trees.c:115 |
fb0e25bc CD |
4253 | #, c-format |
4254 | msgid "" | |
4255 | "Your local changes to the following files would be overwritten by merge:\n" | |
4256 | "%%s" | |
4257 | msgstr "" | |
715fc761 | 4258 | "Los cambios locales de los siguientes archivos serán sobreescritos por " |
4b15eb22 | 4259 | "merge:\n" |
fb0e25bc CD |
4260 | "%%s" |
4261 | ||
33ac3e89 | 4262 | #: unpack-trees.c:118 |
fb0e25bc CD |
4263 | #, c-format |
4264 | msgid "" | |
4265 | "Your local changes to the following files would be overwritten by %s:\n" | |
4266 | "%%sPlease commit your changes or stash them before you %s." | |
4267 | msgstr "" | |
4268 | "Los cambios locales de los siguientes archivos serán sobrescritos al %s:\n" | |
9df63a4a | 4269 | "%%sPor favor, confirma tus cambios o guárdalos antes de %s." |
fb0e25bc | 4270 | |
33ac3e89 | 4271 | #: unpack-trees.c:120 |
fb0e25bc CD |
4272 | #, c-format |
4273 | msgid "" | |
4274 | "Your local changes to the following files would be overwritten by %s:\n" | |
4275 | "%%s" | |
4276 | msgstr "" | |
715fc761 | 4277 | "Los cambios locales de los siguientes archivos serán sobreescritos por %s:\n" |
fb0e25bc CD |
4278 | "%%s" |
4279 | ||
33ac3e89 | 4280 | #: unpack-trees.c:125 |
fb0e25bc CD |
4281 | #, c-format |
4282 | msgid "" | |
4283 | "Updating the following directories would lose untracked files in them:\n" | |
4284 | "%s" | |
4285 | msgstr "" | |
4b15eb22 CD |
4286 | "Al actualizar los siguientes directorios se perderán los archivos sin " |
4287 | "seguimiento en ellos:\n" | |
fb0e25bc CD |
4288 | "%s" |
4289 | ||
33ac3e89 | 4290 | #: unpack-trees.c:129 |
fb0e25bc CD |
4291 | #, c-format |
4292 | msgid "" | |
4293 | "The following untracked working tree files would be removed by checkout:\n" | |
4294 | "%%sPlease move or remove them before you switch branches." | |
4295 | msgstr "" | |
4b15eb22 CD |
4296 | "Los siguientes archivos sin seguimiento en el árbol de trabajo serán " |
4297 | "removidos al actualizar el árbol de trabajo:\n" | |
fb0e25bc CD |
4298 | "%%sPor favor, muévelos o elimínalos antes de intercambiar ramas." |
4299 | ||
33ac3e89 | 4300 | #: unpack-trees.c:131 |
fb0e25bc CD |
4301 | #, c-format |
4302 | msgid "" | |
4303 | "The following untracked working tree files would be removed by checkout:\n" | |
4304 | "%%s" | |
4305 | msgstr "" | |
4b15eb22 CD |
4306 | "Los siguientes archivos sin seguimiento del árbol de trabajo serán removidos " |
4307 | "al actualizar el árbol de trabajo:\n" | |
fb0e25bc CD |
4308 | "%%s" |
4309 | ||
33ac3e89 | 4310 | #: unpack-trees.c:134 |
fb0e25bc CD |
4311 | #, c-format |
4312 | msgid "" | |
4313 | "The following untracked working tree files would be removed by merge:\n" | |
4314 | "%%sPlease move or remove them before you merge." | |
4315 | msgstr "" | |
4b15eb22 CD |
4316 | "Los siguientes archivos sin seguimiento en el árbol de trabajo serán " |
4317 | "removidos al fusionar:\n" | |
fb0e25bc CD |
4318 | "%%sPor favor, muévelos o elimínalos antes de fusionar." |
4319 | ||
33ac3e89 | 4320 | #: unpack-trees.c:136 |
fb0e25bc CD |
4321 | #, c-format |
4322 | msgid "" | |
4323 | "The following untracked working tree files would be removed by merge:\n" | |
4324 | "%%s" | |
4325 | msgstr "" | |
4b15eb22 CD |
4326 | "Los siguientes archivos sin seguimiento de árbol de trabajo serán removidos " |
4327 | "al fusionar:\n" | |
fb0e25bc CD |
4328 | "%%s" |
4329 | ||
33ac3e89 | 4330 | #: unpack-trees.c:139 |
fb0e25bc CD |
4331 | #, c-format |
4332 | msgid "" | |
4333 | "The following untracked working tree files would be removed by %s:\n" | |
4334 | "%%sPlease move or remove them before you %s." | |
4335 | msgstr "" | |
4b15eb22 CD |
4336 | "Los siguientes archivos sin seguimiento en el árbol de trabajo serán " |
4337 | "removidos al %s:\n" | |
fb0e25bc CD |
4338 | "%%sPor favor, muévelos o elimínalos antes de %s." |
4339 | ||
33ac3e89 | 4340 | #: unpack-trees.c:141 |
fb0e25bc CD |
4341 | #, c-format |
4342 | msgid "" | |
4343 | "The following untracked working tree files would be removed by %s:\n" | |
4344 | "%%s" | |
4345 | msgstr "" | |
4b15eb22 CD |
4346 | "Los siguientes archivos sin seguimiento en el árbol de trabajo serán " |
4347 | "removidos al ejecutar %s:\n" | |
fb0e25bc CD |
4348 | "%%s" |
4349 | ||
33ac3e89 | 4350 | #: unpack-trees.c:146 |
fb0e25bc CD |
4351 | #, c-format |
4352 | msgid "" | |
4b15eb22 CD |
4353 | "The following untracked working tree files would be overwritten by " |
4354 | "checkout:\n" | |
fb0e25bc CD |
4355 | "%%sPlease move or remove them before you switch branches." |
4356 | msgstr "" | |
4b15eb22 CD |
4357 | "Los siguientes archivos sin seguimiento en el árbol de trabajo serán " |
4358 | "sobrescritos al actualizar el árbol de trabajo:\n" | |
fb0e25bc CD |
4359 | "%%sPor favor, muévelos o elimínalos antes de intercambiar ramas." |
4360 | ||
33ac3e89 | 4361 | #: unpack-trees.c:148 |
fb0e25bc CD |
4362 | #, c-format |
4363 | msgid "" | |
4b15eb22 CD |
4364 | "The following untracked working tree files would be overwritten by " |
4365 | "checkout:\n" | |
fb0e25bc CD |
4366 | "%%s" |
4367 | msgstr "" | |
4b15eb22 CD |
4368 | "Los siguientes archivos sin seguimiento de árbol de trabajo serán " |
4369 | "sobrescritos al actualizar el árbol de trabajo:\n" | |
fb0e25bc CD |
4370 | "%%s" |
4371 | ||
33ac3e89 | 4372 | #: unpack-trees.c:151 |
fb0e25bc CD |
4373 | #, c-format |
4374 | msgid "" | |
4375 | "The following untracked working tree files would be overwritten by merge:\n" | |
4376 | "%%sPlease move or remove them before you merge." | |
4377 | msgstr "" | |
4b15eb22 CD |
4378 | "Los siguientes archivos sin seguimiento en el árbol de trabajo serán " |
4379 | "sobrescritos al fusionar:\n" | |
fb0e25bc CD |
4380 | "%%sPor favor, muévelos o elimínalos antes de fusionar." |
4381 | ||
33ac3e89 | 4382 | #: unpack-trees.c:153 |
fb0e25bc CD |
4383 | #, c-format |
4384 | msgid "" | |
4385 | "The following untracked working tree files would be overwritten by merge:\n" | |
4386 | "%%s" | |
4387 | msgstr "" | |
4b15eb22 CD |
4388 | "Los siguientes archivos sin seguimiento de árbol de trabajo serán " |
4389 | "sobrescritos al fusionar:\n" | |
fb0e25bc CD |
4390 | "%%s" |
4391 | ||
33ac3e89 | 4392 | #: unpack-trees.c:156 |
fb0e25bc CD |
4393 | #, c-format |
4394 | msgid "" | |
4395 | "The following untracked working tree files would be overwritten by %s:\n" | |
4396 | "%%sPlease move or remove them before you %s." | |
4397 | msgstr "" | |
4b15eb22 CD |
4398 | "Los siguientes archivos sin seguimiento en el árbol de trabajo serán " |
4399 | "sobrescritos al %s:\n" | |
fb0e25bc CD |
4400 | "%%sPor favor, muévelos o elimínalos antes de %s." |
4401 | ||
33ac3e89 | 4402 | #: unpack-trees.c:158 |
fb0e25bc CD |
4403 | #, c-format |
4404 | msgid "" | |
4405 | "The following untracked working tree files would be overwritten by %s:\n" | |
4406 | "%%s" | |
4407 | msgstr "" | |
715fc761 | 4408 | "Los siguientes archivos no rastreados en el árbol de trabajo serán removidos " |
4b15eb22 | 4409 | "por %s:\n" |
fb0e25bc CD |
4410 | "%%s" |
4411 | ||
33ac3e89 | 4412 | #: unpack-trees.c:165 |
fb0e25bc CD |
4413 | #, c-format |
4414 | msgid "Entry '%s' overlaps with '%s'. Cannot bind." | |
33ac3e89 | 4415 | msgstr "Entrada '%s' se superpone con '%s'. No se pueden unir." |
fb0e25bc | 4416 | |
33ac3e89 | 4417 | #: unpack-trees.c:168 |
fb0e25bc CD |
4418 | #, c-format |
4419 | msgid "" | |
4b15eb22 | 4420 | "Cannot update sparse checkout: the following entries are not up to date:\n" |
fb0e25bc CD |
4421 | "%s" |
4422 | msgstr "" | |
4b15eb22 CD |
4423 | "No se puede actualizar el sparse checkout: las siguientes entradas no están " |
4424 | "actualizadas:\n" | |
fb0e25bc CD |
4425 | "%s" |
4426 | ||
33ac3e89 | 4427 | #: unpack-trees.c:170 |
fb0e25bc CD |
4428 | #, c-format |
4429 | msgid "" | |
4b15eb22 CD |
4430 | "The following working tree files would be overwritten by sparse checkout " |
4431 | "update:\n" | |
fb0e25bc CD |
4432 | "%s" |
4433 | msgstr "" | |
4b15eb22 CD |
4434 | "Los siguientes archivos del árbol de trabajo serán sobrescritos por la " |
4435 | "actualización sparse checkout:\n" | |
fb0e25bc CD |
4436 | "%s" |
4437 | ||
33ac3e89 | 4438 | #: unpack-trees.c:172 |
fb0e25bc CD |
4439 | #, c-format |
4440 | msgid "" | |
4b15eb22 CD |
4441 | "The following working tree files would be removed by sparse checkout " |
4442 | "update:\n" | |
fb0e25bc CD |
4443 | "%s" |
4444 | msgstr "" | |
4b15eb22 CD |
4445 | "Los siguientes archivos del árbol de trabajo serán removidos por la " |
4446 | "actualización sparse checkout:\n" | |
fb0e25bc CD |
4447 | "%s" |
4448 | ||
33ac3e89 | 4449 | #: unpack-trees.c:174 |
fb0e25bc CD |
4450 | #, c-format |
4451 | msgid "" | |
4452 | "Cannot update submodule:\n" | |
4453 | "%s" | |
4454 | msgstr "" | |
9df63a4a | 4455 | "No se puede actualizar le submódulo:\n" |
fb0e25bc CD |
4456 | "%s" |
4457 | ||
33ac3e89 | 4458 | #: unpack-trees.c:251 |
fb0e25bc CD |
4459 | #, c-format |
4460 | msgid "Aborting\n" | |
4461 | msgstr "Abortando\n" | |
4462 | ||
33ac3e89 | 4463 | #: unpack-trees.c:333 |
fb0e25bc CD |
4464 | msgid "Checking out files" |
4465 | msgstr "Revisando archivos" | |
4466 | ||
4467 | #: urlmatch.c:163 | |
4468 | msgid "invalid URL scheme name or missing '://' suffix" | |
33ac3e89 | 4469 | msgstr "nombre de URL invalido o sufijo '://' faltante" |
fb0e25bc CD |
4470 | |
4471 | #: urlmatch.c:187 urlmatch.c:346 urlmatch.c:405 | |
4472 | #, c-format | |
4473 | msgid "invalid %XX escape sequence" | |
33ac3e89 | 4474 | msgstr "secuencia de escape %XX invalida" |
fb0e25bc CD |
4475 | |
4476 | #: urlmatch.c:215 | |
4477 | msgid "missing host and scheme is not 'file:'" | |
33ac3e89 | 4478 | msgstr "falta host y el esquema no es 'file:'" |
fb0e25bc CD |
4479 | |
4480 | #: urlmatch.c:232 | |
4481 | msgid "a 'file:' URL may not have a port number" | |
4482 | msgstr "un 'archivo:' URL puede no tener un número de puerto" | |
4483 | ||
4484 | #: urlmatch.c:247 | |
4485 | msgid "invalid characters in host name" | |
4486 | msgstr "carácter inválido en el nombre del host" | |
4487 | ||
4488 | #: urlmatch.c:292 urlmatch.c:303 | |
4489 | msgid "invalid port number" | |
4490 | msgstr "numero de puerto invalido" | |
4491 | ||
4492 | #: urlmatch.c:371 | |
4493 | msgid "invalid '..' path segment" | |
4494 | msgstr "segmento de ruta '..' invalido" | |
4495 | ||
33ac3e89 | 4496 | #: worktree.c:245 builtin/am.c:2147 |
fb0e25bc CD |
4497 | #, c-format |
4498 | msgid "failed to read '%s'" | |
4499 | msgstr "fallo al leer '%s'" | |
4500 | ||
33ac3e89 CDR |
4501 | #: worktree.c:291 |
4502 | #, c-format | |
4503 | msgid "'%s' at main working tree is not the repository directory" | |
4504 | msgstr "" | |
4505 | "'%s' en el árbol de trabajo principal no es el directorio del repositorio" | |
4506 | ||
4507 | #: worktree.c:302 | |
4508 | #, c-format | |
4509 | msgid "'%s' file does not contain absolute path to the working tree location" | |
4510 | msgstr "" | |
4511 | "archivo '%s' no contiene una ruta absoluta a la ubicación del árbol de " | |
4512 | "trabajo" | |
4513 | ||
4514 | #: worktree.c:314 | |
4515 | #, c-format | |
4516 | msgid "'%s' does not exist" | |
4517 | msgstr "'%s' no existe" | |
4518 | ||
4519 | #: worktree.c:320 | |
4520 | #, c-format | |
4521 | msgid "'%s' is not a .git file, error code %d" | |
4522 | msgstr "'%s' no es un archivo .git, código de error %d" | |
4523 | ||
4524 | #: worktree.c:328 | |
4525 | #, c-format | |
4526 | msgid "'%s' does not point back to '%s'" | |
4527 | msgstr "'%s' no apunta de vuelta a '%s'" | |
4528 | ||
fb0e25bc CD |
4529 | #: wrapper.c:223 wrapper.c:393 |
4530 | #, c-format | |
4531 | msgid "could not open '%s' for reading and writing" | |
4532 | msgstr "no se pudo abrir '%s' para lectura y escritura" | |
4533 | ||
f8038f5b | 4534 | #: wrapper.c:227 wrapper.c:397 builtin/am.c:320 builtin/am.c:770 |
33ac3e89 | 4535 | #: builtin/am.c:862 builtin/merge.c:1044 |
fb0e25bc CD |
4536 | #, c-format |
4537 | msgid "could not open '%s' for reading" | |
4538 | msgstr "no se pudo abrir '%s' para lectura" | |
4539 | ||
4540 | #: wrapper.c:424 wrapper.c:624 | |
4541 | #, c-format | |
4542 | msgid "unable to access '%s'" | |
4543 | msgstr "no es posible acceder '%s'" | |
4544 | ||
4545 | #: wrapper.c:632 | |
4546 | msgid "unable to get current working directory" | |
4547 | msgstr "no es posible obtener el directorio de trabajo actual" | |
4548 | ||
33ac3e89 | 4549 | #: wt-status.c:151 |
fb0e25bc | 4550 | msgid "Unmerged paths:" |
33ac3e89 | 4551 | msgstr "Rutas no fusionadas:" |
fb0e25bc | 4552 | |
33ac3e89 | 4553 | #: wt-status.c:178 wt-status.c:205 |
fb0e25bc CD |
4554 | #, c-format |
4555 | msgid " (use \"git reset %s <file>...\" to unstage)" | |
715fc761 | 4556 | msgstr " (usa \"git reset %s <archivo>...\" para sacar del área de stage)" |
fb0e25bc | 4557 | |
33ac3e89 | 4558 | #: wt-status.c:180 wt-status.c:207 |
fb0e25bc | 4559 | msgid " (use \"git rm --cached <file>...\" to unstage)" |
715fc761 | 4560 | msgstr " (usa \"git rm --cached <archivo>...\" para sacar del área de stage)" |
fb0e25bc | 4561 | |
33ac3e89 | 4562 | #: wt-status.c:184 |
fb0e25bc | 4563 | msgid " (use \"git add <file>...\" to mark resolution)" |
715fc761 | 4564 | msgstr " (usa \"git add <archivo>...\" para marcar una resolución)" |
fb0e25bc | 4565 | |
33ac3e89 | 4566 | #: wt-status.c:186 wt-status.c:190 |
fb0e25bc | 4567 | msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)" |
4b15eb22 CD |
4568 | msgstr "" |
4569 | " (usa \"git add/rm <archivo>...\" como una forma apropiada de marcar la " | |
715fc761 | 4570 | "resolución)" |
fb0e25bc | 4571 | |
33ac3e89 | 4572 | #: wt-status.c:188 |
fb0e25bc | 4573 | msgid " (use \"git rm <file>...\" to mark resolution)" |
715fc761 | 4574 | msgstr " (usa \"git rm <file>...\" para marcar la resolución)" |
fb0e25bc | 4575 | |
33ac3e89 | 4576 | #: wt-status.c:199 wt-status.c:1007 |
fb0e25bc CD |
4577 | msgid "Changes to be committed:" |
4578 | msgstr "Cambios a ser confirmados:" | |
4579 | ||
33ac3e89 | 4580 | #: wt-status.c:217 wt-status.c:1016 |
fb0e25bc CD |
4581 | msgid "Changes not staged for commit:" |
4582 | msgstr "Cambios no rastreados para el commit:" | |
4583 | ||
33ac3e89 | 4584 | #: wt-status.c:221 |
fb0e25bc | 4585 | msgid " (use \"git add <file>...\" to update what will be committed)" |
4b15eb22 CD |
4586 | msgstr "" |
4587 | " (usa \"git add <archivo>...\" para actualizar lo que será confirmado)" | |
fb0e25bc | 4588 | |
33ac3e89 | 4589 | #: wt-status.c:223 |
fb0e25bc | 4590 | msgid " (use \"git add/rm <file>...\" to update what will be committed)" |
4b15eb22 | 4591 | msgstr "" |
715fc761 | 4592 | " (usa \"git add/rm <archivo>...\" para actualizar a lo que se le va a hacer " |
4b15eb22 | 4593 | "commit)" |
fb0e25bc | 4594 | |
33ac3e89 | 4595 | #: wt-status.c:224 |
4b15eb22 CD |
4596 | msgid "" |
4597 | " (use \"git checkout -- <file>...\" to discard changes in working directory)" | |
4598 | msgstr "" | |
4599 | " (usa \"git checkout -- <archivo>...\" para descartar los cambios en el " | |
4600 | "directorio de trabajo)" | |
fb0e25bc | 4601 | |
33ac3e89 | 4602 | #: wt-status.c:226 |
fb0e25bc | 4603 | msgid " (commit or discard the untracked or modified content in submodules)" |
4b15eb22 CD |
4604 | msgstr "" |
4605 | " (confirmar o descartar el contenido sin seguimiento o modificado en los " | |
4606 | "sub-módulos)" | |
fb0e25bc | 4607 | |
33ac3e89 | 4608 | #: wt-status.c:238 |
fb0e25bc CD |
4609 | #, c-format |
4610 | msgid " (use \"git %s <file>...\" to include in what will be committed)" | |
4b15eb22 CD |
4611 | msgstr "" |
4612 | " (usa \"git %s <archivo>...\" para incluirlo a lo que se será confirmado)" | |
fb0e25bc | 4613 | |
33ac3e89 | 4614 | #: wt-status.c:253 |
fb0e25bc CD |
4615 | msgid "both deleted:" |
4616 | msgstr "ambos borrados:" | |
4617 | ||
33ac3e89 | 4618 | #: wt-status.c:255 |
fb0e25bc CD |
4619 | msgid "added by us:" |
4620 | msgstr "agregado por nosotros:" | |
4621 | ||
33ac3e89 | 4622 | #: wt-status.c:257 |
fb0e25bc | 4623 | msgid "deleted by them:" |
9df63a4a | 4624 | msgstr "borrados por ellos:" |
fb0e25bc | 4625 | |
33ac3e89 | 4626 | #: wt-status.c:259 |
fb0e25bc CD |
4627 | msgid "added by them:" |
4628 | msgstr "agregado por ellos:" | |
4629 | ||
33ac3e89 | 4630 | #: wt-status.c:261 |
fb0e25bc CD |
4631 | msgid "deleted by us:" |
4632 | msgstr "borrado por nosotros:" | |
4633 | ||
33ac3e89 | 4634 | #: wt-status.c:263 |
fb0e25bc CD |
4635 | msgid "both added:" |
4636 | msgstr "ambos agregados:" | |
4637 | ||
33ac3e89 | 4638 | #: wt-status.c:265 |
fb0e25bc CD |
4639 | msgid "both modified:" |
4640 | msgstr "ambos modificados:" | |
4641 | ||
33ac3e89 | 4642 | #: wt-status.c:275 |
fb0e25bc CD |
4643 | msgid "new file:" |
4644 | msgstr "nuevo archivo:" | |
4645 | ||
33ac3e89 | 4646 | #: wt-status.c:277 |
fb0e25bc CD |
4647 | msgid "copied:" |
4648 | msgstr "copiado:" | |
4649 | ||
33ac3e89 | 4650 | #: wt-status.c:279 |
fb0e25bc CD |
4651 | msgid "deleted:" |
4652 | msgstr "borrado:" | |
4653 | ||
33ac3e89 | 4654 | #: wt-status.c:281 |
fb0e25bc CD |
4655 | msgid "modified:" |
4656 | msgstr "modificado:" | |
4657 | ||
33ac3e89 | 4658 | #: wt-status.c:283 |
fb0e25bc CD |
4659 | msgid "renamed:" |
4660 | msgstr "renombrado:" | |
4661 | ||
33ac3e89 | 4662 | #: wt-status.c:285 |
fb0e25bc CD |
4663 | msgid "typechange:" |
4664 | msgstr "cambio de tipo:" | |
4665 | ||
33ac3e89 | 4666 | #: wt-status.c:287 |
fb0e25bc CD |
4667 | msgid "unknown:" |
4668 | msgstr "desconocido:" | |
4669 | ||
33ac3e89 | 4670 | #: wt-status.c:289 |
fb0e25bc | 4671 | msgid "unmerged:" |
715fc761 | 4672 | msgstr "des-fusionado:" |
fb0e25bc | 4673 | |
33ac3e89 | 4674 | #: wt-status.c:369 |
fb0e25bc CD |
4675 | msgid "new commits, " |
4676 | msgstr "nuevos commits, " | |
4677 | ||
33ac3e89 | 4678 | #: wt-status.c:371 |
fb0e25bc CD |
4679 | msgid "modified content, " |
4680 | msgstr "contenido modificado, " | |
4681 | ||
33ac3e89 | 4682 | #: wt-status.c:373 |
fb0e25bc CD |
4683 | msgid "untracked content, " |
4684 | msgstr "contenido no rastreado, " | |
4685 | ||
33ac3e89 | 4686 | #: wt-status.c:847 |
fb0e25bc CD |
4687 | #, c-format |
4688 | msgid "Your stash currently has %d entry" | |
4689 | msgid_plural "Your stash currently has %d entries" | |
9df63a4a | 4690 | msgstr[0] "Tu stash actualmente tiene %d entrada" |
fb0e25bc CD |
4691 | msgstr[1] "Tu stash actualmente tiene %d entradas" |
4692 | ||
33ac3e89 | 4693 | #: wt-status.c:879 |
fb0e25bc CD |
4694 | msgid "Submodules changed but not updated:" |
4695 | msgstr "Submodulos cambiados pero no actualizados:" | |
4696 | ||
33ac3e89 | 4697 | #: wt-status.c:881 |
fb0e25bc CD |
4698 | msgid "Submodule changes to be committed:" |
4699 | msgstr "Submodulos cambiados listos para realizar commit:" | |
4700 | ||
33ac3e89 | 4701 | #: wt-status.c:963 |
fb0e25bc | 4702 | msgid "" |
4b15eb22 CD |
4703 | "Do not modify or remove the line above.\n" |
4704 | "Everything below it will be ignored." | |
fb0e25bc | 4705 | msgstr "" |
715fc761 | 4706 | "No modifique o borre la línea de encima.\n" |
4b15eb22 | 4707 | "Todo lo que este por abajo será removido." |
fb0e25bc | 4708 | |
33ac3e89 | 4709 | #: wt-status.c:1076 |
fb0e25bc | 4710 | msgid "You have unmerged paths." |
33ac3e89 | 4711 | msgstr "Tienes rutas no fusionadas." |
fb0e25bc | 4712 | |
33ac3e89 | 4713 | #: wt-status.c:1079 |
fb0e25bc CD |
4714 | msgid " (fix conflicts and run \"git commit\")" |
4715 | msgstr " (arregla los conflictos y corre \"git commit\"" | |
4716 | ||
33ac3e89 | 4717 | #: wt-status.c:1081 |
fb0e25bc CD |
4718 | msgid " (use \"git merge --abort\" to abort the merge)" |
4719 | msgstr " (usa \"git merge --abort\" para abortar la fusion)" | |
4720 | ||
33ac3e89 | 4721 | #: wt-status.c:1086 |
fb0e25bc CD |
4722 | msgid "All conflicts fixed but you are still merging." |
4723 | msgstr "Todos los conflictos resueltos pero sigues fusionando." | |
4724 | ||
33ac3e89 | 4725 | #: wt-status.c:1089 |
fb0e25bc | 4726 | msgid " (use \"git commit\" to conclude merge)" |
715fc761 | 4727 | msgstr " (usa \"git commit\" para concluir la fusión)" |
fb0e25bc | 4728 | |
33ac3e89 | 4729 | #: wt-status.c:1099 |
fb0e25bc | 4730 | msgid "You are in the middle of an am session." |
9df63a4a | 4731 | msgstr "Estás en medio de una sesión am." |
fb0e25bc | 4732 | |
33ac3e89 | 4733 | #: wt-status.c:1102 |
fb0e25bc | 4734 | msgid "The current patch is empty." |
715fc761 | 4735 | msgstr "El parche actual esta vacío." |
fb0e25bc | 4736 | |
33ac3e89 | 4737 | #: wt-status.c:1106 |
fb0e25bc CD |
4738 | msgid " (fix conflicts and then run \"git am --continue\")" |
4739 | msgstr " (arregla los conflictos y luego corre \"git am --continue\"" | |
4740 | ||
33ac3e89 | 4741 | #: wt-status.c:1108 |
fb0e25bc CD |
4742 | msgid " (use \"git am --skip\" to skip this patch)" |
4743 | msgstr " (usa \"git am --skip\" para saltar este parche)" | |
4744 | ||
33ac3e89 | 4745 | #: wt-status.c:1110 |
fb0e25bc CD |
4746 | msgid " (use \"git am --abort\" to restore the original branch)" |
4747 | msgstr " (usa \"git am --abort\" para restaurar la rama original)" | |
4748 | ||
33ac3e89 | 4749 | #: wt-status.c:1242 |
fb0e25bc CD |
4750 | msgid "git-rebase-todo is missing." |
4751 | msgstr "git-rebase-todo no esta presente." | |
4752 | ||
33ac3e89 | 4753 | #: wt-status.c:1244 |
fb0e25bc CD |
4754 | msgid "No commands done." |
4755 | msgstr "No se realizaron los comandos." | |
4756 | ||
33ac3e89 | 4757 | #: wt-status.c:1247 |
fb0e25bc CD |
4758 | #, c-format |
4759 | msgid "Last command done (%d command done):" | |
4760 | msgid_plural "Last commands done (%d commands done):" | |
9df63a4a CDR |
4761 | msgstr[0] "El último comando realizado (%d comando realizado):" |
4762 | msgstr[1] "Los últimos comandos realizados (%d comandos realizados):" | |
fb0e25bc | 4763 | |
33ac3e89 | 4764 | #: wt-status.c:1258 |
fb0e25bc CD |
4765 | #, c-format |
4766 | msgid " (see more in file %s)" | |
4767 | msgstr " (ver mas en el archivo %s)" | |
4768 | ||
33ac3e89 | 4769 | #: wt-status.c:1263 |
fb0e25bc CD |
4770 | msgid "No commands remaining." |
4771 | msgstr "No quedan mas comandos." | |
4772 | ||
33ac3e89 | 4773 | #: wt-status.c:1266 |
fb0e25bc CD |
4774 | #, c-format |
4775 | msgid "Next command to do (%d remaining command):" | |
4776 | msgid_plural "Next commands to do (%d remaining commands):" | |
33ac3e89 CDR |
4777 | msgstr[0] "Siguiente comando a realizar (%d comando restante):" |
4778 | msgstr[1] "Siguiente comandos a realizar (%d comandos faltantes):" | |
fb0e25bc | 4779 | |
33ac3e89 | 4780 | #: wt-status.c:1274 |
fb0e25bc CD |
4781 | msgid " (use \"git rebase --edit-todo\" to view and edit)" |
4782 | msgstr " (usa \"git rebase --edit-todo\" para ver y editar)" | |
4783 | ||
33ac3e89 | 4784 | #: wt-status.c:1287 |
fb0e25bc CD |
4785 | #, c-format |
4786 | msgid "You are currently rebasing branch '%s' on '%s'." | |
9df63a4a | 4787 | msgstr "Estás aplicando un rebase de la rama '%s' en '%s." |
fb0e25bc | 4788 | |
33ac3e89 | 4789 | #: wt-status.c:1292 |
fb0e25bc | 4790 | msgid "You are currently rebasing." |
9df63a4a | 4791 | msgstr "Estás aplicando un rebase." |
fb0e25bc | 4792 | |
33ac3e89 | 4793 | #: wt-status.c:1306 |
fb0e25bc CD |
4794 | msgid " (fix conflicts and then run \"git rebase --continue\")" |
4795 | msgstr " (corrige los conflictos y ejecuta \"git rebase --continue\")" | |
4796 | ||
33ac3e89 | 4797 | #: wt-status.c:1308 |
fb0e25bc CD |
4798 | msgid " (use \"git rebase --skip\" to skip this patch)" |
4799 | msgstr " (usa \"git rebase --skip\" para omitir este parche)" | |
4800 | ||
33ac3e89 | 4801 | #: wt-status.c:1310 |
fb0e25bc CD |
4802 | msgid " (use \"git rebase --abort\" to check out the original branch)" |
4803 | msgstr " (usa \"git rebase --abort\" para volver a tu rama original)" | |
4804 | ||
33ac3e89 | 4805 | #: wt-status.c:1316 |
fb0e25bc CD |
4806 | msgid " (all conflicts fixed: run \"git rebase --continue\")" |
4807 | msgstr " (todos los conflictos corregidos: ejecuta \"git rebase --continue\")" | |
4808 | ||
33ac3e89 | 4809 | #: wt-status.c:1320 |
fb0e25bc | 4810 | #, c-format |
4b15eb22 CD |
4811 | msgid "" |
4812 | "You are currently splitting a commit while rebasing branch '%s' on '%s'." | |
4813 | msgstr "" | |
9df63a4a | 4814 | "Estás dividiendo un commit mientras aplicas un rebase de la rama '%s' en " |
4b15eb22 | 4815 | "'%s'." |
fb0e25bc | 4816 | |
33ac3e89 | 4817 | #: wt-status.c:1325 |
fb0e25bc | 4818 | msgid "You are currently splitting a commit during a rebase." |
9df63a4a | 4819 | msgstr "Estás dividiendo un commit durante un rebase." |
fb0e25bc | 4820 | |
33ac3e89 | 4821 | #: wt-status.c:1328 |
fb0e25bc | 4822 | msgid " (Once your working directory is clean, run \"git rebase --continue\")" |
4b15eb22 CD |
4823 | msgstr "" |
4824 | " (Una vez que tu directorio de trabajo esté limpio, ejecuta \"git rebase --" | |
4825 | "continue\")" | |
fb0e25bc | 4826 | |
33ac3e89 | 4827 | #: wt-status.c:1332 |
fb0e25bc CD |
4828 | #, c-format |
4829 | msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." | |
4b15eb22 | 4830 | msgstr "" |
9df63a4a | 4831 | "Estás editando un commit mientras se aplica un rebase de la rama '%s' en " |
4b15eb22 | 4832 | "'%s'." |
fb0e25bc | 4833 | |
33ac3e89 | 4834 | #: wt-status.c:1337 |
fb0e25bc | 4835 | msgid "You are currently editing a commit during a rebase." |
9df63a4a | 4836 | msgstr "Estás editando un commit durante un rebase." |
fb0e25bc | 4837 | |
33ac3e89 | 4838 | #: wt-status.c:1340 |
fb0e25bc | 4839 | msgid " (use \"git commit --amend\" to amend the current commit)" |
715fc761 | 4840 | msgstr " (usa \"git commit --amend\" para enmendar el commit actual)" |
fb0e25bc | 4841 | |
33ac3e89 | 4842 | #: wt-status.c:1342 |
4b15eb22 CD |
4843 | msgid "" |
4844 | " (use \"git rebase --continue\" once you are satisfied with your changes)" | |
4845 | msgstr "" | |
4846 | " (usa \"git rebase --continue\" una vez que estés satisfecho con tus " | |
4847 | "cambios)" | |
fb0e25bc | 4848 | |
33ac3e89 | 4849 | #: wt-status.c:1352 |
fb0e25bc CD |
4850 | #, c-format |
4851 | msgid "You are currently cherry-picking commit %s." | |
9df63a4a | 4852 | msgstr "Estás realizando un cherry-picking en el commit %s." |
fb0e25bc | 4853 | |
33ac3e89 | 4854 | #: wt-status.c:1357 |
fb0e25bc CD |
4855 | msgid " (fix conflicts and run \"git cherry-pick --continue\")" |
4856 | msgstr " (corrige los conflictos y ejecuta \"git cherry-pick --continue\")" | |
4857 | ||
33ac3e89 | 4858 | #: wt-status.c:1360 |
fb0e25bc | 4859 | msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" |
4b15eb22 CD |
4860 | msgstr "" |
4861 | " (todos los conflictos corregidos: ejecuta \"git cherry-pick --continue\")" | |
fb0e25bc | 4862 | |
33ac3e89 | 4863 | #: wt-status.c:1362 |
fb0e25bc | 4864 | msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" |
4b15eb22 | 4865 | msgstr "" |
715fc761 | 4866 | " (use \"git cherry-pick --abort\" para cancelar la operación cherry-pick)" |
fb0e25bc | 4867 | |
33ac3e89 | 4868 | #: wt-status.c:1371 |
fb0e25bc CD |
4869 | #, c-format |
4870 | msgid "You are currently reverting commit %s." | |
9df63a4a | 4871 | msgstr "Estás revirtiendo el commit %s." |
fb0e25bc | 4872 | |
33ac3e89 | 4873 | #: wt-status.c:1376 |
fb0e25bc CD |
4874 | msgid " (fix conflicts and run \"git revert --continue\")" |
4875 | msgstr " (corrige los conflictos y ejecuta \"git revert --continue\")" | |
4876 | ||
33ac3e89 | 4877 | #: wt-status.c:1379 |
fb0e25bc CD |
4878 | msgid " (all conflicts fixed: run \"git revert --continue\")" |
4879 | msgstr " (todos los conflictos corregidos: ejecuta \"git revert --continue\")" | |
4880 | ||
33ac3e89 | 4881 | #: wt-status.c:1381 |
fb0e25bc CD |
4882 | msgid " (use \"git revert --abort\" to cancel the revert operation)" |
4883 | msgstr " (usa \"git revert --abort\" para cancelar la operación de revertir)" | |
4884 | ||
33ac3e89 | 4885 | #: wt-status.c:1392 |
fb0e25bc CD |
4886 | #, c-format |
4887 | msgid "You are currently bisecting, started from branch '%s'." | |
9df63a4a | 4888 | msgstr "Estás aplicando un bisect, comenzando en la rama '%s'." |
fb0e25bc | 4889 | |
33ac3e89 | 4890 | #: wt-status.c:1396 |
fb0e25bc | 4891 | msgid "You are currently bisecting." |
9df63a4a | 4892 | msgstr "Estás aplicando un bisect." |
fb0e25bc | 4893 | |
33ac3e89 | 4894 | #: wt-status.c:1399 |
fb0e25bc CD |
4895 | msgid " (use \"git bisect reset\" to get back to the original branch)" |
4896 | msgstr " (usa \"git bisect reset\" para volver a la rama original)" | |
4897 | ||
33ac3e89 | 4898 | #: wt-status.c:1596 |
fb0e25bc CD |
4899 | msgid "On branch " |
4900 | msgstr "En la rama " | |
4901 | ||
33ac3e89 | 4902 | #: wt-status.c:1602 |
fb0e25bc | 4903 | msgid "interactive rebase in progress; onto " |
33ac3e89 | 4904 | msgstr "rebase interactivo en progreso; en " |
fb0e25bc | 4905 | |
33ac3e89 | 4906 | #: wt-status.c:1604 |
fb0e25bc | 4907 | msgid "rebase in progress; onto " |
33ac3e89 | 4908 | msgstr "rebase en progreso; en " |
fb0e25bc | 4909 | |
33ac3e89 | 4910 | #: wt-status.c:1609 |
fb0e25bc | 4911 | msgid "HEAD detached at " |
33ac3e89 | 4912 | msgstr "HEAD desacoplada en " |
fb0e25bc | 4913 | |
33ac3e89 | 4914 | #: wt-status.c:1611 |
fb0e25bc | 4915 | msgid "HEAD detached from " |
33ac3e89 | 4916 | msgstr "HEAD desacoplada de " |
fb0e25bc | 4917 | |
33ac3e89 | 4918 | #: wt-status.c:1614 |
fb0e25bc CD |
4919 | msgid "Not currently on any branch." |
4920 | msgstr "Actualmente no estás en ninguna rama." | |
4921 | ||
33ac3e89 | 4922 | #: wt-status.c:1634 |
fb0e25bc CD |
4923 | msgid "Initial commit" |
4924 | msgstr "Confirmación inicial" | |
4925 | ||
33ac3e89 | 4926 | #: wt-status.c:1635 |
fb0e25bc | 4927 | msgid "No commits yet" |
9df63a4a | 4928 | msgstr "No hay commits todavía" |
fb0e25bc | 4929 | |
33ac3e89 | 4930 | #: wt-status.c:1649 |
fb0e25bc CD |
4931 | msgid "Untracked files" |
4932 | msgstr "Archivos sin seguimiento" | |
4933 | ||
33ac3e89 | 4934 | #: wt-status.c:1651 |
fb0e25bc CD |
4935 | msgid "Ignored files" |
4936 | msgstr "Archivos ignorados" | |
4937 | ||
33ac3e89 | 4938 | #: wt-status.c:1655 |
fb0e25bc CD |
4939 | #, c-format |
4940 | msgid "" | |
4941 | "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" | |
4942 | "may speed it up, but you have to be careful not to forget to add\n" | |
4943 | "new files yourself (see 'git help status')." | |
4944 | msgstr "" | |
4945 | "Tomó %.2f segundos enumerar los archivos no rastreados. 'status -uno'\n" | |
4946 | "puede acelerarlo, pero tiene que ser cuidadoso de no olvidar agregar\n" | |
4947 | "nuevos archivos usted mismo (vea 'git help status')." | |
4948 | ||
33ac3e89 | 4949 | #: wt-status.c:1661 |
fb0e25bc CD |
4950 | #, c-format |
4951 | msgid "Untracked files not listed%s" | |
4952 | msgstr "Archivos no rastreados no son mostrados %s" | |
4953 | ||
33ac3e89 | 4954 | #: wt-status.c:1663 |
fb0e25bc CD |
4955 | msgid " (use -u option to show untracked files)" |
4956 | msgstr " (usa la opción -u para mostrar los archivos sin seguimiento)" | |
4957 | ||
33ac3e89 | 4958 | #: wt-status.c:1669 |
fb0e25bc CD |
4959 | msgid "No changes" |
4960 | msgstr "Sin cambios" | |
4961 | ||
33ac3e89 | 4962 | #: wt-status.c:1674 |
fb0e25bc CD |
4963 | #, c-format |
4964 | msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" | |
4b15eb22 | 4965 | msgstr "" |
f8038f5b | 4966 | "sin cambios agregados al commit (usa \"git add\" y/o \"git commit -a\")\n" |
fb0e25bc | 4967 | |
33ac3e89 | 4968 | #: wt-status.c:1677 |
fb0e25bc CD |
4969 | #, c-format |
4970 | msgid "no changes added to commit\n" | |
4971 | msgstr "no se agregaron cambios al commit\n" | |
4972 | ||
33ac3e89 | 4973 | #: wt-status.c:1680 |
fb0e25bc | 4974 | #, c-format |
4b15eb22 CD |
4975 | msgid "" |
4976 | "nothing added to commit but untracked files present (use \"git add\" to " | |
4977 | "track)\n" | |
4978 | msgstr "" | |
f8038f5b CDR |
4979 | "no hay nada agregado al commit pero hay archivos sin seguimiento presentes " |
4980 | "(usa \"git add\" para hacerles seguimiento)\n" | |
fb0e25bc | 4981 | |
33ac3e89 | 4982 | #: wt-status.c:1683 |
fb0e25bc CD |
4983 | #, c-format |
4984 | msgid "nothing added to commit but untracked files present\n" | |
4b15eb22 CD |
4985 | msgstr "" |
4986 | "no hay nada agregado para confirmar, pero hay archivos sin seguimiento " | |
4987 | "presentes\n" | |
fb0e25bc | 4988 | |
33ac3e89 | 4989 | #: wt-status.c:1686 |
fb0e25bc CD |
4990 | #, c-format |
4991 | msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" | |
4b15eb22 CD |
4992 | msgstr "" |
4993 | "no hay nada para confirmar (crea/copia archivos y usa \"git add\" para " | |
4994 | "hacerles seguimiento)\n" | |
fb0e25bc | 4995 | |
33ac3e89 | 4996 | #: wt-status.c:1689 wt-status.c:1694 |
fb0e25bc CD |
4997 | #, c-format |
4998 | msgid "nothing to commit\n" | |
4999 | msgstr "nada para hacer commit\n" | |
5000 | ||
33ac3e89 | 5001 | #: wt-status.c:1692 |
fb0e25bc CD |
5002 | #, c-format |
5003 | msgid "nothing to commit (use -u to show untracked files)\n" | |
4b15eb22 CD |
5004 | msgstr "" |
5005 | "nada para hacer commit (usa -u para mostrar los archivos no rastreados)\n" | |
fb0e25bc | 5006 | |
33ac3e89 | 5007 | #: wt-status.c:1696 |
fb0e25bc CD |
5008 | #, c-format |
5009 | msgid "nothing to commit, working tree clean\n" | |
715fc761 | 5010 | msgstr "nada para hacer commit, el árbol de trabajo esta limpio\n" |
fb0e25bc | 5011 | |
33ac3e89 | 5012 | #: wt-status.c:1809 |
fb0e25bc | 5013 | msgid "No commits yet on " |
715fc761 | 5014 | msgstr "No hay commits todavía en " |
fb0e25bc | 5015 | |
33ac3e89 | 5016 | #: wt-status.c:1813 |
fb0e25bc CD |
5017 | msgid "HEAD (no branch)" |
5018 | msgstr "HEAD (sin rama)" | |
5019 | ||
33ac3e89 CDR |
5020 | #: wt-status.c:1844 |
5021 | msgid "different" | |
5022 | msgstr "diferente" | |
5023 | ||
5024 | #: wt-status.c:1846 wt-status.c:1854 | |
fb0e25bc | 5025 | msgid "behind " |
33ac3e89 | 5026 | msgstr "detrás " |
fb0e25bc | 5027 | |
33ac3e89 | 5028 | #: wt-status.c:1849 wt-status.c:1852 |
fb0e25bc | 5029 | msgid "ahead " |
33ac3e89 | 5030 | msgstr "adelante " |
fb0e25bc CD |
5031 | |
5032 | #. TRANSLATORS: the action is e.g. "pull with rebase" | |
33ac3e89 | 5033 | #: wt-status.c:2358 |
fb0e25bc CD |
5034 | #, c-format |
5035 | msgid "cannot %s: You have unstaged changes." | |
5036 | msgstr "no se puede %s: Tienes cambios sin marcar." | |
5037 | ||
33ac3e89 | 5038 | #: wt-status.c:2364 |
fb0e25bc | 5039 | msgid "additionally, your index contains uncommitted changes." |
715fc761 | 5040 | msgstr "adicionalmente, tu índice contiene cambios que no están en un commit." |
fb0e25bc | 5041 | |
33ac3e89 | 5042 | #: wt-status.c:2366 |
fb0e25bc CD |
5043 | #, c-format |
5044 | msgid "cannot %s: Your index contains uncommitted changes." | |
715fc761 | 5045 | msgstr "no se puede %s: Tu índice contiene cambios que no están en un commit." |
fb0e25bc | 5046 | |
33ac3e89 | 5047 | #: compat/precompose_utf8.c:58 builtin/clone.c:440 |
fb0e25bc CD |
5048 | #, c-format |
5049 | msgid "failed to unlink '%s'" | |
5050 | msgstr "fallo al desvincular '%s'" | |
5051 | ||
5052 | #: builtin/add.c:24 | |
5053 | msgid "git add [<options>] [--] <pathspec>..." | |
715fc761 | 5054 | msgstr "git add [<opción>] [--] <especificación-de-ruta>..." |
fb0e25bc | 5055 | |
f8038f5b | 5056 | #: builtin/add.c:83 |
fb0e25bc CD |
5057 | #, c-format |
5058 | msgid "unexpected diff status %c" | |
5059 | msgstr "diff status inesperado %c" | |
5060 | ||
33ac3e89 | 5061 | #: builtin/add.c:88 builtin/commit.c:257 |
fb0e25bc | 5062 | msgid "updating files failed" |
715fc761 | 5063 | msgstr "fallo la actualización de carpetas" |
fb0e25bc | 5064 | |
f8038f5b | 5065 | #: builtin/add.c:98 |
fb0e25bc CD |
5066 | #, c-format |
5067 | msgid "remove '%s'\n" | |
5068 | msgstr "remover '%s'\n" | |
5069 | ||
f8038f5b | 5070 | #: builtin/add.c:173 |
fb0e25bc CD |
5071 | msgid "Unstaged changes after refreshing the index:" |
5072 | msgstr "Cambios fuera del área de stage tras refrescar el índice:" | |
5073 | ||
f8038f5b | 5074 | #: builtin/add.c:233 builtin/rev-parse.c:888 |
fb0e25bc | 5075 | msgid "Could not read the index" |
9df63a4a | 5076 | msgstr "No se pudo leer el índice" |
fb0e25bc | 5077 | |
f8038f5b | 5078 | #: builtin/add.c:244 |
fb0e25bc CD |
5079 | #, c-format |
5080 | msgid "Could not open '%s' for writing." | |
5081 | msgstr "No se pudo abrir '%s' para escritura." | |
5082 | ||
f8038f5b | 5083 | #: builtin/add.c:248 |
fb0e25bc CD |
5084 | msgid "Could not write patch" |
5085 | msgstr "No se puede escribir el parche" | |
5086 | ||
f8038f5b | 5087 | #: builtin/add.c:251 |
fb0e25bc | 5088 | msgid "editing patch failed" |
715fc761 | 5089 | msgstr "fallo la edición del parche" |
fb0e25bc | 5090 | |
f8038f5b | 5091 | #: builtin/add.c:254 |
fb0e25bc CD |
5092 | #, c-format |
5093 | msgid "Could not stat '%s'" | |
5094 | msgstr "No se pudo definir '%s'" | |
5095 | ||
f8038f5b | 5096 | #: builtin/add.c:256 |
fb0e25bc | 5097 | msgid "Empty patch. Aborted." |
715fc761 | 5098 | msgstr "Parche vacío. Abortado." |
fb0e25bc | 5099 | |
f8038f5b | 5100 | #: builtin/add.c:261 |
fb0e25bc CD |
5101 | #, c-format |
5102 | msgid "Could not apply '%s'" | |
5103 | msgstr "No se pudo aplicar '%s'" | |
5104 | ||
f8038f5b | 5105 | #: builtin/add.c:271 |
fb0e25bc | 5106 | msgid "The following paths are ignored by one of your .gitignore files:\n" |
4b15eb22 CD |
5107 | msgstr "" |
5108 | "Las siguientes rutas son ignoradas por uno de tus archivos .gitignore:\n" | |
fb0e25bc | 5109 | |
33ac3e89 | 5110 | #: builtin/add.c:291 builtin/clean.c:911 builtin/fetch.c:146 builtin/mv.c:124 |
f8038f5b | 5111 | #: builtin/prune-packed.c:55 builtin/pull.c:207 builtin/push.c:541 |
4b15eb22 | 5112 | #: builtin/remote.c:1333 builtin/rm.c:242 builtin/send-pack.c:164 |
fb0e25bc | 5113 | msgid "dry run" |
715fc761 | 5114 | msgstr "dry run ( ejecución en seco)" |
fb0e25bc | 5115 | |
f8038f5b | 5116 | #: builtin/add.c:294 |
fb0e25bc | 5117 | msgid "interactive picking" |
715fc761 | 5118 | msgstr "selección interactiva" |
fb0e25bc | 5119 | |
33ac3e89 | 5120 | #: builtin/add.c:295 builtin/checkout.c:1128 builtin/reset.c:302 |
fb0e25bc CD |
5121 | msgid "select hunks interactively" |
5122 | msgstr "elegir hunks de forma interactiva" | |
5123 | ||
f8038f5b | 5124 | #: builtin/add.c:296 |
fb0e25bc CD |
5125 | msgid "edit current diff and apply" |
5126 | msgstr "editar diff actual y aplicar" | |
5127 | ||
f8038f5b | 5128 | #: builtin/add.c:297 |
fb0e25bc CD |
5129 | msgid "allow adding otherwise ignored files" |
5130 | msgstr "permitir agregar caso contrario ignorar archivos" | |
5131 | ||
f8038f5b | 5132 | #: builtin/add.c:298 |
fb0e25bc CD |
5133 | msgid "update tracked files" |
5134 | msgstr "actualizado las carpetas rastreadas" | |
5135 | ||
f8038f5b CDR |
5136 | #: builtin/add.c:299 |
5137 | msgid "renormalize EOL of tracked files (implies -u)" | |
5138 | msgstr "renormalizar EOL de los archivos rastreados (implica -u)" | |
5139 | ||
5140 | #: builtin/add.c:300 | |
fb0e25bc CD |
5141 | msgid "record only the fact that the path will be added later" |
5142 | msgstr "grabar solo el hecho de que la ruta será agregada después" | |
5143 | ||
f8038f5b | 5144 | #: builtin/add.c:301 |
fb0e25bc CD |
5145 | msgid "add changes from all tracked and untracked files" |
5146 | msgstr "agregar los cambios de todas las carpetas con y sin seguimiento" | |
5147 | ||
f8038f5b | 5148 | #: builtin/add.c:304 |
fb0e25bc | 5149 | msgid "ignore paths removed in the working tree (same as --no-all)" |
715fc761 | 5150 | msgstr "ignorar rutas removidas en el árbol de trabajo (lo mismo que --no-all)" |
fb0e25bc | 5151 | |
f8038f5b | 5152 | #: builtin/add.c:306 |
fb0e25bc | 5153 | msgid "don't add, only refresh the index" |
9df63a4a | 5154 | msgstr "no agregar, solo actualizar el índice" |
fb0e25bc | 5155 | |
f8038f5b | 5156 | #: builtin/add.c:307 |
fb0e25bc CD |
5157 | msgid "just skip files which cannot be added because of errors" |
5158 | msgstr "saltar las carpetas que no pueden ser agregadas a causa de errores" | |
5159 | ||
f8038f5b | 5160 | #: builtin/add.c:308 |
fb0e25bc CD |
5161 | msgid "check if - even missing - files are ignored in dry run" |
5162 | msgstr "comprobar si - incluso los archivos que faltan - se ignoran en dry run" | |
5163 | ||
f8038f5b | 5164 | #: builtin/add.c:309 builtin/update-index.c:964 |
fb0e25bc CD |
5165 | msgid "(+/-)x" |
5166 | msgstr "(+/-)x" | |
5167 | ||
f8038f5b | 5168 | #: builtin/add.c:309 builtin/update-index.c:965 |
fb0e25bc CD |
5169 | msgid "override the executable bit of the listed files" |
5170 | msgstr "sobrescribir el bit ejecutable de los archivos listados" | |
5171 | ||
f8038f5b | 5172 | #: builtin/add.c:311 |
fb0e25bc CD |
5173 | msgid "warn when adding an embedded repository" |
5174 | msgstr "avisar cuando se agrega un repositorio incrustado" | |
5175 | ||
f8038f5b | 5176 | #: builtin/add.c:326 |
fb0e25bc CD |
5177 | #, c-format |
5178 | msgid "" | |
5179 | "You've added another git repository inside your current repository.\n" | |
5180 | "Clones of the outer repository will not contain the contents of\n" | |
5181 | "the embedded repository and will not know how to obtain it.\n" | |
5182 | "If you meant to add a submodule, use:\n" | |
5183 | "\n" | |
5184 | "\tgit submodule add <url> %s\n" | |
5185 | "\n" | |
5186 | "If you added this path by mistake, you can remove it from the\n" | |
5187 | "index with:\n" | |
5188 | "\n" | |
5189 | "\tgit rm --cached %s\n" | |
5190 | "\n" | |
5191 | "See \"git help submodule\" for more information." | |
5192 | msgstr "" | |
5193 | "Se ha agregado otro repositorio de git dentro del repositorio actual.\n" | |
715fc761 CDR |
5194 | "Clones del repositorio exterior no tendrán el contenido del \n" |
5195 | "repositorio embebido y no sabrán como obtenerla.\n" | |
9df63a4a | 5196 | "Si quería agregar un submódulo, use:\n" |
fb0e25bc CD |
5197 | "\n" |
5198 | "\tgit submodule add <url> %s\n" | |
5199 | "\n" | |
715fc761 | 5200 | "Si se agrego esta ruta por error, puede removerla desde el índice \n" |
fb0e25bc CD |
5201 | "usando:\n" |
5202 | "\n" | |
5203 | "\tgit rm --cached %s\n" | |
5204 | "\n" | |
715fc761 | 5205 | "Vea \"git help submodule\" para mas información." |
fb0e25bc | 5206 | |
f8038f5b | 5207 | #: builtin/add.c:354 |
fb0e25bc CD |
5208 | #, c-format |
5209 | msgid "adding embedded git repository: %s" | |
5210 | msgstr "agregando repositorio embebido: %s" | |
5211 | ||
f8038f5b | 5212 | #: builtin/add.c:372 |
fb0e25bc CD |
5213 | #, c-format |
5214 | msgid "Use -f if you really want to add them.\n" | |
5215 | msgstr "Use -f si realmente quiere agregarlos.\n" | |
5216 | ||
f8038f5b | 5217 | #: builtin/add.c:380 |
fb0e25bc CD |
5218 | msgid "adding files failed" |
5219 | msgstr "fallo al agregar archivos" | |
5220 | ||
f8038f5b | 5221 | #: builtin/add.c:417 |
fb0e25bc CD |
5222 | msgid "-A and -u are mutually incompatible" |
5223 | msgstr "-A y -u son mutuamente incompatibles" | |
5224 | ||
f8038f5b | 5225 | #: builtin/add.c:424 |
fb0e25bc CD |
5226 | msgid "Option --ignore-missing can only be used together with --dry-run" |
5227 | msgstr "Opción --ignore-missing solo puede ser usada junto a --dry-run" | |
5228 | ||
f8038f5b | 5229 | #: builtin/add.c:428 |
fb0e25bc CD |
5230 | #, c-format |
5231 | msgid "--chmod param '%s' must be either -x or +x" | |
5232 | msgstr "El parámetro '%s' para --chmod debe ser -x ó +x" | |
5233 | ||
f8038f5b | 5234 | #: builtin/add.c:443 |
fb0e25bc CD |
5235 | #, c-format |
5236 | msgid "Nothing specified, nothing added.\n" | |
5237 | msgstr "Nada especificado, nada agregado.\n" | |
5238 | ||
f8038f5b | 5239 | #: builtin/add.c:444 |
fb0e25bc CD |
5240 | #, c-format |
5241 | msgid "Maybe you wanted to say 'git add .'?\n" | |
5242 | msgstr "Tal vez quiso decir 'git add .'?\n" | |
5243 | ||
33ac3e89 CDR |
5244 | #: builtin/add.c:449 builtin/check-ignore.c:177 builtin/checkout.c:280 |
5245 | #: builtin/checkout.c:483 builtin/clean.c:958 builtin/commit.c:316 | |
5246 | #: builtin/diff-tree.c:114 builtin/mv.c:144 builtin/reset.c:241 | |
5247 | #: builtin/rm.c:271 builtin/submodule--helper.c:326 | |
fb0e25bc | 5248 | msgid "index file corrupt" |
715fc761 | 5249 | msgstr "archivo índice corrompido" |
fb0e25bc | 5250 | |
4b15eb22 | 5251 | #: builtin/am.c:414 |
fb0e25bc CD |
5252 | msgid "could not parse author script" |
5253 | msgstr "no se pudo analizar el script del autor" | |
5254 | ||
4b15eb22 | 5255 | #: builtin/am.c:498 |
fb0e25bc CD |
5256 | #, c-format |
5257 | msgid "'%s' was deleted by the applypatch-msg hook" | |
5258 | msgstr "'%s' fue borrado por el hook de applypatch-msg" | |
5259 | ||
4b15eb22 | 5260 | #: builtin/am.c:539 |
fb0e25bc CD |
5261 | #, c-format |
5262 | msgid "Malformed input line: '%s'." | |
33ac3e89 | 5263 | msgstr "Línea mal formada: '%s'." |
fb0e25bc | 5264 | |
4b15eb22 | 5265 | #: builtin/am.c:576 |
fb0e25bc CD |
5266 | #, c-format |
5267 | msgid "Failed to copy notes from '%s' to '%s'" | |
5268 | msgstr "Fallo al copiar notas de '%s' a '%s'" | |
5269 | ||
4b15eb22 | 5270 | #: builtin/am.c:602 |
fb0e25bc CD |
5271 | msgid "fseek failed" |
5272 | msgstr "fall de fseek" | |
5273 | ||
f8038f5b | 5274 | #: builtin/am.c:790 |
fb0e25bc CD |
5275 | #, c-format |
5276 | msgid "could not parse patch '%s'" | |
5277 | msgstr "no se pudo analizar el parche '%s'" | |
5278 | ||
f8038f5b | 5279 | #: builtin/am.c:855 |
fb0e25bc | 5280 | msgid "Only one StGIT patch series can be applied at once" |
33ac3e89 | 5281 | msgstr "Solo un parche StGIT puede ser aplicado de una vez" |
fb0e25bc | 5282 | |
f8038f5b | 5283 | #: builtin/am.c:903 |
fb0e25bc CD |
5284 | msgid "invalid timestamp" |
5285 | msgstr "timestamp invalido" | |
5286 | ||
f8038f5b | 5287 | #: builtin/am.c:908 builtin/am.c:920 |
fb0e25bc | 5288 | msgid "invalid Date line" |
715fc761 | 5289 | msgstr "línea Date invalida" |
fb0e25bc | 5290 | |
f8038f5b | 5291 | #: builtin/am.c:915 |
fb0e25bc CD |
5292 | msgid "invalid timezone offset" |
5293 | msgstr "offset de zona horaria inválido" | |
5294 | ||
f8038f5b | 5295 | #: builtin/am.c:1008 |
fb0e25bc CD |
5296 | msgid "Patch format detection failed." |
5297 | msgstr "Falló al detectar el formato del parche." | |
5298 | ||
33ac3e89 | 5299 | #: builtin/am.c:1013 builtin/clone.c:405 |
fb0e25bc CD |
5300 | #, c-format |
5301 | msgid "failed to create directory '%s'" | |
5302 | msgstr "fallo al crear el directorio '%s'" | |
5303 | ||
33ac3e89 | 5304 | #: builtin/am.c:1018 |
fb0e25bc | 5305 | msgid "Failed to split patches." |
33ac3e89 | 5306 | msgstr "Fallo al dividir parches." |
fb0e25bc | 5307 | |
33ac3e89 | 5308 | #: builtin/am.c:1148 builtin/commit.c:342 |
fb0e25bc | 5309 | msgid "unable to write index file" |
9df63a4a | 5310 | msgstr "no es posible escribir en el archivo índice" |
fb0e25bc | 5311 | |
33ac3e89 | 5312 | #: builtin/am.c:1162 |
fb0e25bc CD |
5313 | #, c-format |
5314 | msgid "When you have resolved this problem, run \"%s --continue\"." | |
5315 | msgstr "Cuando haya resuelto este problema, ejecute \"%s --continue\"." | |
5316 | ||
33ac3e89 | 5317 | #: builtin/am.c:1163 |
fb0e25bc CD |
5318 | #, c-format |
5319 | msgid "If you prefer to skip this patch, run \"%s --skip\" instead." | |
5320 | msgstr "Si prefieres saltar este parche, ejecuta \"%s --skip\"." | |
5321 | ||
33ac3e89 | 5322 | #: builtin/am.c:1164 |
fb0e25bc CD |
5323 | #, c-format |
5324 | msgid "To restore the original branch and stop patching, run \"%s --abort\"." | |
4b15eb22 CD |
5325 | msgstr "" |
5326 | "Para restaurar la rama original y detener el parchado, ejecutar \"%s --abort" | |
5327 | "\"." | |
fb0e25bc | 5328 | |
33ac3e89 | 5329 | #: builtin/am.c:1271 |
fb0e25bc | 5330 | msgid "Patch is empty." |
715fc761 | 5331 | msgstr "El parche esta vacío." |
fb0e25bc | 5332 | |
33ac3e89 | 5333 | #: builtin/am.c:1337 |
fb0e25bc CD |
5334 | #, c-format |
5335 | msgid "invalid ident line: %.*s" | |
5336 | msgstr "sangría no válida: %.*s" | |
5337 | ||
33ac3e89 | 5338 | #: builtin/am.c:1359 |
fb0e25bc CD |
5339 | #, c-format |
5340 | msgid "unable to parse commit %s" | |
5341 | msgstr "no es posible analizar el commit %s" | |
5342 | ||
33ac3e89 | 5343 | #: builtin/am.c:1554 |
fb0e25bc | 5344 | msgid "Repository lacks necessary blobs to fall back on 3-way merge." |
4b15eb22 CD |
5345 | msgstr "" |
5346 | "Repositorio carece de los blobs necesarios para retroceder en una fusión de " | |
33ac3e89 | 5347 | "3-vías." |
fb0e25bc | 5348 | |
33ac3e89 | 5349 | #: builtin/am.c:1556 |
fb0e25bc CD |
5350 | msgid "Using index info to reconstruct a base tree..." |
5351 | msgstr "Usando la información del índice para reconstruir un árbol base..." | |
5352 | ||
33ac3e89 | 5353 | #: builtin/am.c:1575 |
fb0e25bc CD |
5354 | msgid "" |
5355 | "Did you hand edit your patch?\n" | |
5356 | "It does not apply to blobs recorded in its index." | |
5357 | msgstr "" | |
5358 | "Editaste el parche a mano?\n" | |
5359 | "No aplica a blobs guardados en su índice." | |
5360 | ||
33ac3e89 | 5361 | #: builtin/am.c:1581 |
fb0e25bc | 5362 | msgid "Falling back to patching base and 3-way merge..." |
9df63a4a | 5363 | msgstr "Retrocediendo para parchar base y fusión de 3-vías..." |
fb0e25bc | 5364 | |
33ac3e89 | 5365 | #: builtin/am.c:1606 |
fb0e25bc CD |
5366 | msgid "Failed to merge in the changes." |
5367 | msgstr "Falló al fusionar en los cambios." | |
5368 | ||
33ac3e89 | 5369 | #: builtin/am.c:1637 |
fb0e25bc | 5370 | msgid "applying to an empty history" |
9df63a4a | 5371 | msgstr "aplicando a un historial vacío" |
fb0e25bc | 5372 | |
33ac3e89 | 5373 | #: builtin/am.c:1683 builtin/am.c:1687 |
fb0e25bc CD |
5374 | #, c-format |
5375 | msgid "cannot resume: %s does not exist." | |
33ac3e89 | 5376 | msgstr "no se puede continuar: %s no existe." |
fb0e25bc | 5377 | |
33ac3e89 | 5378 | #: builtin/am.c:1703 |
fb0e25bc | 5379 | msgid "cannot be interactive without stdin connected to a terminal." |
33ac3e89 | 5380 | msgstr "no se puede ser interactivo sin stdin conectado a un terminal." |
fb0e25bc | 5381 | |
33ac3e89 | 5382 | #: builtin/am.c:1708 |
fb0e25bc CD |
5383 | msgid "Commit Body is:" |
5384 | msgstr "Cuerpo de commit es:" | |
5385 | ||
5386 | #. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a] | |
5387 | #. in your translation. The program will only accept English | |
5388 | #. input at this point. | |
4b15eb22 | 5389 | #. |
33ac3e89 | 5390 | #: builtin/am.c:1718 |
fb0e25bc CD |
5391 | msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " |
5392 | msgstr "Aplicar? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " | |
5393 | ||
33ac3e89 | 5394 | #: builtin/am.c:1768 |
fb0e25bc CD |
5395 | #, c-format |
5396 | msgid "Dirty index: cannot apply patches (dirty: %s)" | |
5397 | msgstr "Índice sucio: no se puede aplicar parches (sucio: %s)" | |
5398 | ||
33ac3e89 | 5399 | #: builtin/am.c:1808 builtin/am.c:1879 |
fb0e25bc CD |
5400 | #, c-format |
5401 | msgid "Applying: %.*s" | |
5402 | msgstr "Aplicando: %.*s" | |
5403 | ||
33ac3e89 | 5404 | #: builtin/am.c:1824 |
fb0e25bc CD |
5405 | msgid "No changes -- Patch already applied." |
5406 | msgstr "Sin cambios -- parche ya aplicado." | |
5407 | ||
33ac3e89 | 5408 | #: builtin/am.c:1832 |
fb0e25bc CD |
5409 | #, c-format |
5410 | msgid "Patch failed at %s %.*s" | |
5411 | msgstr "El parche fallo en %s %.*s" | |
5412 | ||
33ac3e89 CDR |
5413 | #: builtin/am.c:1838 |
5414 | msgid "Use 'git am --show-current-patch' to see the failed patch" | |
5415 | msgstr "Use 'git am --show-current-patch' para ver el parche fallido" | |
fb0e25bc | 5416 | |
33ac3e89 | 5417 | #: builtin/am.c:1882 |
fb0e25bc CD |
5418 | msgid "" |
5419 | "No changes - did you forget to use 'git add'?\n" | |
5420 | "If there is nothing left to stage, chances are that something else\n" | |
5421 | "already introduced the same changes; you might want to skip this patch." | |
5422 | msgstr "" | |
5423 | "Sin cambios - olvidaste usar 'git add'?\n" | |
715fc761 | 5424 | "Si no hay nada en el área de stage, las posibilidad es que algo mas\n" |
fb0e25bc CD |
5425 | "ya haya introducido el mismo cambio; tal vez quieras omitir este parche." |
5426 | ||
33ac3e89 | 5427 | #: builtin/am.c:1889 |
fb0e25bc CD |
5428 | msgid "" |
5429 | "You still have unmerged paths in your index.\n" | |
4b15eb22 CD |
5430 | "You should 'git add' each file with resolved conflicts to mark them as " |
5431 | "such.\n" | |
fb0e25bc CD |
5432 | "You might run `git rm` on a file to accept \"deleted by them\" for it." |
5433 | msgstr "" | |
5434 | "Todavía tiene rutas sin fusionar en su índice.\n" | |
4b15eb22 CD |
5435 | "Debe realizar 'git add' cada archivo con conflictos resueltos y marcarlos " |
5436 | "como tal.\n" | |
5437 | "Tal vez ejecute `git rm` en el archivo para aceptar \"borrado por ellos\" en " | |
5438 | "él." | |
fb0e25bc | 5439 | |
33ac3e89 CDR |
5440 | #: builtin/am.c:1996 builtin/am.c:2000 builtin/am.c:2012 builtin/reset.c:324 |
5441 | #: builtin/reset.c:332 | |
fb0e25bc CD |
5442 | #, c-format |
5443 | msgid "Could not parse object '%s'." | |
5444 | msgstr "No se pudo analizar el objeto '%s'." | |
5445 | ||
33ac3e89 | 5446 | #: builtin/am.c:2048 |
fb0e25bc | 5447 | msgid "failed to clean index" |
9df63a4a | 5448 | msgstr "fallo al limpiar el índice" |
fb0e25bc | 5449 | |
33ac3e89 | 5450 | #: builtin/am.c:2083 |
fb0e25bc CD |
5451 | msgid "" |
5452 | "You seem to have moved HEAD since the last 'am' failure.\n" | |
5453 | "Not rewinding to ORIG_HEAD" | |
5454 | msgstr "" | |
5455 | "Parece haber movido HEAD desde el último fallo 'am'.\n" | |
33ac3e89 | 5456 | "No rebobinando a ORIG_HEAD" |
fb0e25bc | 5457 | |
33ac3e89 | 5458 | #: builtin/am.c:2174 |
fb0e25bc CD |
5459 | #, c-format |
5460 | msgid "Invalid value for --patch-format: %s" | |
33ac3e89 | 5461 | msgstr "Valor invalido para --patch-format: %s" |
fb0e25bc | 5462 | |
33ac3e89 | 5463 | #: builtin/am.c:2210 |
fb0e25bc CD |
5464 | msgid "git am [<options>] [(<mbox> | <Maildir>)...]" |
5465 | msgstr "git am [<opciones>] [(<mbox> | <Directorio-de-correo>)...]" | |
5466 | ||
33ac3e89 | 5467 | #: builtin/am.c:2211 |
fb0e25bc CD |
5468 | msgid "git am [<options>] (--continue | --skip | --abort)" |
5469 | msgstr "git am [<opciones>] (--continue | --skip | --abort)" | |
5470 | ||
33ac3e89 | 5471 | #: builtin/am.c:2217 |
fb0e25bc CD |
5472 | msgid "run interactively" |
5473 | msgstr "ejecutar de manera interactiva" | |
5474 | ||
33ac3e89 | 5475 | #: builtin/am.c:2219 |
fb0e25bc | 5476 | msgid "historical option -- no-op" |
715fc761 | 5477 | msgstr "opción histórica -- no-op" |
fb0e25bc | 5478 | |
33ac3e89 | 5479 | #: builtin/am.c:2221 |
fb0e25bc CD |
5480 | msgid "allow fall back on 3way merging if needed" |
5481 | msgstr "permitir retroceso en fusión de 3-vías si es necesario" | |
5482 | ||
33ac3e89 CDR |
5483 | #: builtin/am.c:2222 builtin/init-db.c:484 builtin/prune-packed.c:57 |
5484 | #: builtin/repack.c:182 | |
fb0e25bc CD |
5485 | msgid "be quiet" |
5486 | msgstr "ser silencioso" | |
5487 | ||
33ac3e89 | 5488 | #: builtin/am.c:2224 |
fb0e25bc CD |
5489 | msgid "add a Signed-off-by line to the commit message" |
5490 | msgstr "agregar una línea \"Firmado-por\" al mensaje del commit" | |
5491 | ||
33ac3e89 | 5492 | #: builtin/am.c:2227 |
fb0e25bc CD |
5493 | msgid "recode into utf8 (default)" |
5494 | msgstr "recodificar en utf8 (default)" | |
5495 | ||
33ac3e89 | 5496 | #: builtin/am.c:2229 |
fb0e25bc CD |
5497 | msgid "pass -k flag to git-mailinfo" |
5498 | msgstr "pasar flag -k a git-mailinfo" | |
5499 | ||
33ac3e89 | 5500 | #: builtin/am.c:2231 |
fb0e25bc CD |
5501 | msgid "pass -b flag to git-mailinfo" |
5502 | msgstr "pasar flag -b a git-mailinfo" | |
5503 | ||
33ac3e89 | 5504 | #: builtin/am.c:2233 |
fb0e25bc CD |
5505 | msgid "pass -m flag to git-mailinfo" |
5506 | msgstr "pasar flag -m a git-mailinfo" | |
5507 | ||
33ac3e89 | 5508 | #: builtin/am.c:2235 |
fb0e25bc CD |
5509 | msgid "pass --keep-cr flag to git-mailsplit for mbox format" |
5510 | msgstr "pasar flag --keep-cr a git-mailsplit para formato mbox" | |
5511 | ||
33ac3e89 | 5512 | #: builtin/am.c:2238 |
fb0e25bc | 5513 | msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" |
4b15eb22 CD |
5514 | msgstr "" |
5515 | "no pasar flag --keep-cr a git-mailsplit independientemente de am.keepcr" | |
fb0e25bc | 5516 | |
33ac3e89 | 5517 | #: builtin/am.c:2241 |
fb0e25bc CD |
5518 | msgid "strip everything before a scissors line" |
5519 | msgstr "descubrir todo antes de una línea de tijeras" | |
5520 | ||
33ac3e89 CDR |
5521 | #: builtin/am.c:2243 builtin/am.c:2246 builtin/am.c:2249 builtin/am.c:2252 |
5522 | #: builtin/am.c:2255 builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264 | |
5523 | #: builtin/am.c:2270 | |
fb0e25bc CD |
5524 | msgid "pass it through git-apply" |
5525 | msgstr "pasarlo a través de git-apply" | |
5526 | ||
33ac3e89 CDR |
5527 | #: builtin/am.c:2260 builtin/fmt-merge-msg.c:665 builtin/fmt-merge-msg.c:668 |
5528 | #: builtin/grep.c:853 builtin/merge.c:206 builtin/pull.c:145 builtin/pull.c:203 | |
5529 | #: builtin/repack.c:191 builtin/repack.c:195 builtin/repack.c:197 | |
5530 | #: builtin/show-branch.c:631 builtin/show-ref.c:169 builtin/tag.c:382 | |
5531 | #: parse-options.h:144 parse-options.h:146 parse-options.h:257 | |
fb0e25bc CD |
5532 | msgid "n" |
5533 | msgstr "n" | |
5534 | ||
33ac3e89 CDR |
5535 | #: builtin/am.c:2266 builtin/branch.c:629 builtin/for-each-ref.c:38 |
5536 | #: builtin/replace.c:445 builtin/tag.c:418 builtin/verify-tag.c:39 | |
fb0e25bc CD |
5537 | msgid "format" |
5538 | msgstr "formato" | |
5539 | ||
33ac3e89 | 5540 | #: builtin/am.c:2267 |
fb0e25bc CD |
5541 | msgid "format the patch(es) are in" |
5542 | msgstr "formatear el parche(s)" | |
5543 | ||
33ac3e89 | 5544 | #: builtin/am.c:2273 |
fb0e25bc CD |
5545 | msgid "override error message when patch failure occurs" |
5546 | msgstr "sobrescribir mensajes de error cuando fallos de parchado ocurran" | |
5547 | ||
33ac3e89 | 5548 | #: builtin/am.c:2275 |
fb0e25bc CD |
5549 | msgid "continue applying patches after resolving a conflict" |
5550 | msgstr "continuar aplicando los parches tras resolver conflictos" | |
5551 | ||
33ac3e89 | 5552 | #: builtin/am.c:2278 |
fb0e25bc | 5553 | msgid "synonyms for --continue" |
715fc761 | 5554 | msgstr "sinónimos para --continue" |
fb0e25bc | 5555 | |
33ac3e89 | 5556 | #: builtin/am.c:2281 |
fb0e25bc CD |
5557 | msgid "skip the current patch" |
5558 | msgstr "saltar el parche actual" | |
5559 | ||
33ac3e89 | 5560 | #: builtin/am.c:2284 |
fb0e25bc CD |
5561 | msgid "restore the original branch and abort the patching operation." |
5562 | msgstr "restaurar la rama original y abortar la operación de parchado." | |
5563 | ||
33ac3e89 CDR |
5564 | #: builtin/am.c:2287 |
5565 | msgid "abort the patching operation but keep HEAD where it is." | |
5566 | msgstr "abortar la operación de parchado pero mantener HEAD donde está." | |
5567 | ||
5568 | #: builtin/am.c:2290 | |
5569 | msgid "show the patch being applied." | |
5570 | msgstr "muestra el parche siendo aplicado." | |
5571 | ||
5572 | #: builtin/am.c:2294 | |
fb0e25bc CD |
5573 | msgid "lie about committer date" |
5574 | msgstr "mentir sobre la fecha del committer" | |
5575 | ||
33ac3e89 | 5576 | #: builtin/am.c:2296 |
fb0e25bc CD |
5577 | msgid "use current timestamp for author date" |
5578 | msgstr "usar el timestamp actual para la fecha del autor" | |
5579 | ||
33ac3e89 CDR |
5580 | #: builtin/am.c:2298 builtin/commit.c:1431 builtin/merge.c:237 |
5581 | #: builtin/pull.c:178 builtin/revert.c:112 builtin/tag.c:398 | |
fb0e25bc CD |
5582 | msgid "key-id" |
5583 | msgstr "key-id" | |
5584 | ||
33ac3e89 | 5585 | #: builtin/am.c:2299 |
fb0e25bc | 5586 | msgid "GPG-sign commits" |
33ac3e89 | 5587 | msgstr "Commits con firma GPG" |
fb0e25bc | 5588 | |
33ac3e89 | 5589 | #: builtin/am.c:2302 |
fb0e25bc CD |
5590 | msgid "(internal use for git-rebase)" |
5591 | msgstr "(uso interno para git-rebase)" | |
5592 | ||
33ac3e89 | 5593 | #: builtin/am.c:2320 |
fb0e25bc CD |
5594 | msgid "" |
5595 | "The -b/--binary option has been a no-op for long time, and\n" | |
5596 | "it will be removed. Please do not use it anymore." | |
5597 | msgstr "" | |
5598 | "La opción -b/--binary ha estado deshabilitada por mucho tiempo, y\n" | |
5599 | "será removida. Por favor no la use más." | |
5600 | ||
33ac3e89 | 5601 | #: builtin/am.c:2327 |
fb0e25bc | 5602 | msgid "failed to read the index" |
9df63a4a | 5603 | msgstr "fallo al leer el índice" |
fb0e25bc | 5604 | |
33ac3e89 | 5605 | #: builtin/am.c:2342 |
fb0e25bc CD |
5606 | #, c-format |
5607 | msgid "previous rebase directory %s still exists but mbox given." | |
5608 | msgstr "directorio de rebase previo %s todavía existe en el mbox dado." | |
5609 | ||
33ac3e89 | 5610 | #: builtin/am.c:2366 |
fb0e25bc CD |
5611 | #, c-format |
5612 | msgid "" | |
5613 | "Stray %s directory found.\n" | |
5614 | "Use \"git am --abort\" to remove it." | |
5615 | msgstr "" | |
5616 | "Directorio extraviado %s encontrado.\n" | |
5617 | "Use \"git am --abort\" para borrarlo." | |
5618 | ||
33ac3e89 | 5619 | #: builtin/am.c:2372 |
fb0e25bc CD |
5620 | msgid "Resolve operation not in progress, we are not resuming." |
5621 | msgstr "Operación de resolución no está en progreso, no vamos a continuar." | |
5622 | ||
5623 | #: builtin/apply.c:8 | |
5624 | msgid "git apply [<options>] [<patch>...]" | |
9df63a4a | 5625 | msgstr "git apply [<opciones>] [<parche>...]" |
fb0e25bc CD |
5626 | |
5627 | #: builtin/archive.c:17 | |
5628 | #, c-format | |
5629 | msgid "could not create archive file '%s'" | |
5630 | msgstr "no se pudo crear el archivo comprimido '%s'" | |
5631 | ||
5632 | #: builtin/archive.c:20 | |
5633 | msgid "could not redirect output" | |
715fc761 | 5634 | msgstr "no se pudo direccionar la salida" |
fb0e25bc CD |
5635 | |
5636 | #: builtin/archive.c:37 | |
5637 | msgid "git archive: Remote with no URL" | |
5638 | msgstr "git archive: Remote sin URL" | |
5639 | ||
5640 | #: builtin/archive.c:58 | |
33ac3e89 CDR |
5641 | msgid "git archive: expected ACK/NAK, got a flush packet" |
5642 | msgstr "git archive: se esperaba ACK/NAK, se obtuvo flush packet" | |
fb0e25bc CD |
5643 | |
5644 | #: builtin/archive.c:61 | |
5645 | #, c-format | |
5646 | msgid "git archive: NACK %s" | |
5647 | msgstr "git archive: NACK %s" | |
5648 | ||
5649 | #: builtin/archive.c:64 | |
5650 | msgid "git archive: protocol error" | |
5651 | msgstr "git archive: error de protocolo" | |
5652 | ||
5653 | #: builtin/archive.c:68 | |
5654 | msgid "git archive: expected a flush" | |
5655 | msgstr "git archive: se esperaba un flush" | |
5656 | ||
f8038f5b | 5657 | #: builtin/bisect--helper.c:12 |
fb0e25bc CD |
5658 | msgid "git bisect--helper --next-all [--no-checkout]" |
5659 | msgstr "git bisect--helper --next-all [--no-checkout]" | |
5660 | ||
f8038f5b CDR |
5661 | #: builtin/bisect--helper.c:13 |
5662 | msgid "git bisect--helper --write-terms <bad_term> <good_term>" | |
5663 | msgstr "git bisect--helper --write-terms <mal_término> <buen_término>" | |
5664 | ||
5665 | #: builtin/bisect--helper.c:14 | |
5666 | msgid "git bisect--helper --bisect-clean-state" | |
5667 | msgstr "git bisect--helper --bisect-clean-state" | |
5668 | ||
5669 | #: builtin/bisect--helper.c:46 | |
5670 | #, c-format | |
5671 | msgid "'%s' is not a valid term" | |
33ac3e89 | 5672 | msgstr "'%s' no es un término válido" |
f8038f5b CDR |
5673 | |
5674 | #: builtin/bisect--helper.c:50 | |
5675 | #, c-format | |
5676 | msgid "can't use the builtin command '%s' as a term" | |
5677 | msgstr "no se puede usar el comando nativo '%s' como un término" | |
5678 | ||
5679 | #: builtin/bisect--helper.c:60 | |
5680 | #, c-format | |
5681 | msgid "can't change the meaning of the term '%s'" | |
5682 | msgstr "no se puede cambiar el significado del término '%s'" | |
5683 | ||
5684 | #: builtin/bisect--helper.c:71 | |
5685 | msgid "please use two different terms" | |
5686 | msgstr "por favor use dos términos diferentes" | |
5687 | ||
5688 | #: builtin/bisect--helper.c:78 | |
5689 | msgid "could not open the file BISECT_TERMS" | |
5690 | msgstr "no se pudo abrir el archivo BISECT_TERMS" | |
5691 | ||
5692 | #: builtin/bisect--helper.c:120 | |
fb0e25bc CD |
5693 | msgid "perform 'git bisect next'" |
5694 | msgstr "realiza 'git bisect next'" | |
5695 | ||
f8038f5b CDR |
5696 | #: builtin/bisect--helper.c:122 |
5697 | msgid "write the terms to .git/BISECT_TERMS" | |
5698 | msgstr "escribe los términos a .git/BISECT_TERMS" | |
5699 | ||
5700 | #: builtin/bisect--helper.c:124 | |
5701 | msgid "cleanup the bisection state" | |
5702 | msgstr "limpiar el estado de bisección" | |
5703 | ||
5704 | #: builtin/bisect--helper.c:126 | |
5705 | msgid "check for expected revs" | |
5706 | msgstr "revisar por revs esperados" | |
5707 | ||
5708 | #: builtin/bisect--helper.c:128 | |
fb0e25bc CD |
5709 | msgid "update BISECT_HEAD instead of checking out the current commit" |
5710 | msgstr "actualiza BISECT_HEAD en lugar de revisar el commit actual" | |
5711 | ||
f8038f5b CDR |
5712 | #: builtin/bisect--helper.c:143 |
5713 | msgid "--write-terms requires two arguments" | |
5714 | msgstr "--write-terms requiere dos argumentos" | |
5715 | ||
5716 | #: builtin/bisect--helper.c:147 | |
5717 | msgid "--bisect-clean-state requires no arguments" | |
5718 | msgstr "--bisect-clean-state no requiere argumentos" | |
5719 | ||
fb0e25bc CD |
5720 | #: builtin/blame.c:27 |
5721 | msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>" | |
5722 | msgstr "git blame [<opciones>] [<opciones-rev>] [<revision>] [--] <archivo>" | |
5723 | ||
5724 | #: builtin/blame.c:32 | |
5725 | msgid "<rev-opts> are documented in git-rev-list(1)" | |
715fc761 | 5726 | msgstr "<rev-opts> están documentadas en git-rev-list(1)" |
fb0e25bc | 5727 | |
33ac3e89 | 5728 | #: builtin/blame.c:677 |
fb0e25bc CD |
5729 | msgid "Show blame entries as we find them, incrementally" |
5730 | msgstr "Mostrar las entradas blame como las encontramos, incrementalmente" | |
5731 | ||
33ac3e89 | 5732 | #: builtin/blame.c:678 |
fb0e25bc CD |
5733 | msgid "Show blank SHA-1 for boundary commits (Default: off)" |
5734 | msgstr "Mostrar SHA-1 en blanco para commits extremos (Default: off)" | |
5735 | ||
33ac3e89 | 5736 | #: builtin/blame.c:679 |
fb0e25bc CD |
5737 | msgid "Do not treat root commits as boundaries (Default: off)" |
5738 | msgstr "No tratar commits raíces como extremos (Default: off)" | |
5739 | ||
33ac3e89 | 5740 | #: builtin/blame.c:680 |
fb0e25bc | 5741 | msgid "Show work cost statistics" |
715fc761 | 5742 | msgstr "Mostrar estadísticas de costo de trabajo" |
fb0e25bc | 5743 | |
33ac3e89 | 5744 | #: builtin/blame.c:681 |
fb0e25bc CD |
5745 | msgid "Force progress reporting" |
5746 | msgstr "Forzar el reporte de progreso" | |
5747 | ||
33ac3e89 | 5748 | #: builtin/blame.c:682 |
fb0e25bc CD |
5749 | msgid "Show output score for blame entries" |
5750 | msgstr "Mostrar la puntuación de salida de las entradas de blame" | |
5751 | ||
33ac3e89 | 5752 | #: builtin/blame.c:683 |
fb0e25bc CD |
5753 | msgid "Show original filename (Default: auto)" |
5754 | msgstr "Mostrar nombre original del archivo (Default: auto)" | |
5755 | ||
33ac3e89 | 5756 | #: builtin/blame.c:684 |
fb0e25bc CD |
5757 | msgid "Show original linenumber (Default: off)" |
5758 | msgstr "Mostrar número de línea original (Default: off)" | |
5759 | ||
33ac3e89 | 5760 | #: builtin/blame.c:685 |
fb0e25bc CD |
5761 | msgid "Show in a format designed for machine consumption" |
5762 | msgstr "Mostrar en un formato diseñado para consumo de máquina" | |
5763 | ||
33ac3e89 | 5764 | #: builtin/blame.c:686 |
fb0e25bc CD |
5765 | msgid "Show porcelain format with per-line commit information" |
5766 | msgstr "Mostrar en formato porcelana con información de commit por línea" | |
5767 | ||
33ac3e89 | 5768 | #: builtin/blame.c:687 |
fb0e25bc CD |
5769 | msgid "Use the same output mode as git-annotate (Default: off)" |
5770 | msgstr "Usar el mismo modo salida como git-annotate (Default: off)" | |
5771 | ||
33ac3e89 | 5772 | #: builtin/blame.c:688 |
fb0e25bc CD |
5773 | msgid "Show raw timestamp (Default: off)" |
5774 | msgstr "Mostrar timestamp en formato raw (Default: off)" | |
5775 | ||
33ac3e89 | 5776 | #: builtin/blame.c:689 |
fb0e25bc CD |
5777 | msgid "Show long commit SHA1 (Default: off)" |
5778 | msgstr "Mostrar SHA1 del commit en formato largo (Default: off)" | |
5779 | ||
33ac3e89 | 5780 | #: builtin/blame.c:690 |
fb0e25bc CD |
5781 | msgid "Suppress author name and timestamp (Default: off)" |
5782 | msgstr "Suprimir nombre del autor y timestamp (Default: off)" | |
5783 | ||
33ac3e89 | 5784 | #: builtin/blame.c:691 |
fb0e25bc CD |
5785 | msgid "Show author email instead of name (Default: off)" |
5786 | msgstr "Mostrar en cambio el email del autor (Default: off)" | |
5787 | ||
33ac3e89 | 5788 | #: builtin/blame.c:692 |
fb0e25bc CD |
5789 | msgid "Ignore whitespace differences" |
5790 | msgstr "Ignorar diferencias de espacios en blanco" | |
5791 | ||
33ac3e89 | 5792 | #: builtin/blame.c:699 |
fb0e25bc CD |
5793 | msgid "Use an experimental heuristic to improve diffs" |
5794 | msgstr "Usar un heurístico experimental para mejorar los diffs" | |
5795 | ||
33ac3e89 | 5796 | #: builtin/blame.c:701 |
fb0e25bc CD |
5797 | msgid "Spend extra cycles to find better match" |
5798 | msgstr "Ocupo más ciclos para encontrar mejoras resultados" | |
5799 | ||
33ac3e89 | 5800 | #: builtin/blame.c:702 |
fb0e25bc CD |
5801 | msgid "Use revisions from <file> instead of calling git-rev-list" |
5802 | msgstr "Use revisiones desde <archivo> en lugar de llamar git-rev-list" | |
5803 | ||
33ac3e89 | 5804 | #: builtin/blame.c:703 |
fb0e25bc CD |
5805 | msgid "Use <file>'s contents as the final image" |
5806 | msgstr "Usar contenido de <archivo> como imagen final" | |
5807 | ||
33ac3e89 | 5808 | #: builtin/blame.c:704 builtin/blame.c:705 |
fb0e25bc CD |
5809 | msgid "score" |
5810 | msgstr "puntaje" | |
5811 | ||
33ac3e89 | 5812 | #: builtin/blame.c:704 |
fb0e25bc CD |
5813 | msgid "Find line copies within and across files" |
5814 | msgstr "Encontrar copias de líneas entre y a través de archivos" | |
5815 | ||
33ac3e89 | 5816 | #: builtin/blame.c:705 |
fb0e25bc CD |
5817 | msgid "Find line movements within and across files" |
5818 | msgstr "Encontrar movimientos de líneas entre y a través de archivos" | |
5819 | ||
33ac3e89 | 5820 | #: builtin/blame.c:706 |
fb0e25bc CD |
5821 | msgid "n,m" |
5822 | msgstr "n,m" | |
5823 | ||
33ac3e89 | 5824 | #: builtin/blame.c:706 |
fb0e25bc CD |
5825 | msgid "Process only line range n,m, counting from 1" |
5826 | msgstr "Procesar solo el rango de líneas n,m, contando desde 1" | |
5827 | ||
33ac3e89 | 5828 | #: builtin/blame.c:753 |
fb0e25bc CD |
5829 | msgid "--progress can't be used with --incremental or porcelain formats" |
5830 | msgstr "--progress no puede ser usado con --incremental o formatos porcelana" | |
5831 | ||
5832 | #. TRANSLATORS: This string is used to tell us the | |
5833 | #. maximum display width for a relative timestamp in | |
5834 | #. "git blame" output. For C locale, "4 years, 11 | |
5835 | #. months ago", which takes 22 places, is the longest | |
5836 | #. among various forms of relative timestamps, but | |
5837 | #. your language may need more or fewer display | |
5838 | #. columns. | |
4b15eb22 | 5839 | #. |
33ac3e89 | 5840 | #: builtin/blame.c:804 |
fb0e25bc CD |
5841 | msgid "4 years, 11 months ago" |
5842 | msgstr "hace 4 años, 11 meses" | |
5843 | ||
33ac3e89 | 5844 | #: builtin/blame.c:890 |
fb0e25bc CD |
5845 | #, c-format |
5846 | msgid "file %s has only %lu line" | |
5847 | msgid_plural "file %s has only %lu lines" | |
5848 | msgstr[0] "archivo %s tiene solo %lu línea" | |
5849 | msgstr[1] "archivo %s tiene solo %lu líneas" | |
5850 | ||
33ac3e89 | 5851 | #: builtin/blame.c:936 |
fb0e25bc CD |
5852 | msgid "Blaming lines" |
5853 | msgstr "Blaming a líneas" | |
5854 | ||
5855 | #: builtin/branch.c:27 | |
5856 | msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]" | |
5857 | msgstr "git branch [<opciones>] [-r | -a] [--merged | --no-merged]" | |
5858 | ||
5859 | #: builtin/branch.c:28 | |
5860 | msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]" | |
5861 | msgstr "git branch [<opciones>] [-l] [-f] <nombre-de-rama> [<punto-inicial>]" | |
5862 | ||
5863 | #: builtin/branch.c:29 | |
5864 | msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..." | |
5865 | msgstr "git branch [<opciones>] [-r] (-d | -D) <nombre-de-rama>..." | |
5866 | ||
5867 | #: builtin/branch.c:30 | |
5868 | msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>" | |
5869 | msgstr "git branch [<opciones>] (-m | -M) [<rama-vieja>] <rama-nueva>" | |
5870 | ||
5871 | #: builtin/branch.c:31 | |
4b15eb22 CD |
5872 | msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>" |
5873 | msgstr "git branch [<opciones>] (-c | -C) [<rama-vieja>] <rama-nueva>" | |
5874 | ||
5875 | #: builtin/branch.c:32 | |
fb0e25bc CD |
5876 | msgid "git branch [<options>] [-r | -a] [--points-at]" |
5877 | msgstr "git branch [<opciones>] [-r | -a] [--points-at]" | |
5878 | ||
4b15eb22 | 5879 | #: builtin/branch.c:33 |
fb0e25bc CD |
5880 | msgid "git branch [<options>] [-r | -a] [--format]" |
5881 | msgstr "git branch [<opciones>] [-r | -a] [--formato]" | |
5882 | ||
4b15eb22 | 5883 | #: builtin/branch.c:146 |
fb0e25bc CD |
5884 | #, c-format |
5885 | msgid "" | |
5886 | "deleting branch '%s' that has been merged to\n" | |
5887 | " '%s', but not yet merged to HEAD." | |
5888 | msgstr "" | |
5889 | "borrando la rama '%s' que ha sido fusionada en\n" | |
5890 | " '%s', pero aún no ha sido fusionada a HEAD." | |
5891 | ||
4b15eb22 | 5892 | #: builtin/branch.c:150 |
fb0e25bc CD |
5893 | #, c-format |
5894 | msgid "" | |
5895 | "not deleting branch '%s' that is not yet merged to\n" | |
5896 | " '%s', even though it is merged to HEAD." | |
5897 | msgstr "" | |
5898 | "no borrando rama '%s' que todavía no ha sido fusionada \n" | |
5899 | "\ta '%s', aunque se fusione con HEAD." | |
5900 | ||
4b15eb22 | 5901 | #: builtin/branch.c:164 |
fb0e25bc CD |
5902 | #, c-format |
5903 | msgid "Couldn't look up commit object for '%s'" | |
5904 | msgstr "No se pudo encontrar el objeto commit para '%s'" | |
5905 | ||
4b15eb22 | 5906 | #: builtin/branch.c:168 |
fb0e25bc CD |
5907 | #, c-format |
5908 | msgid "" | |
5909 | "The branch '%s' is not fully merged.\n" | |
5910 | "If you are sure you want to delete it, run 'git branch -D %s'." | |
5911 | msgstr "" | |
5912 | "La rama '%s' no ha sido fusionada completamente.\n" | |
5913 | "Si está seguro de querer borrarla, ejecute 'git branch -D %s'." | |
5914 | ||
4b15eb22 | 5915 | #: builtin/branch.c:181 |
fb0e25bc | 5916 | msgid "Update of config-file failed" |
715fc761 | 5917 | msgstr "Fallo de actualización de config-file" |
fb0e25bc | 5918 | |
4b15eb22 | 5919 | #: builtin/branch.c:212 |
fb0e25bc CD |
5920 | msgid "cannot use -a with -d" |
5921 | msgstr "no se puede usar-a con -d" | |
5922 | ||
4b15eb22 | 5923 | #: builtin/branch.c:218 |
fb0e25bc CD |
5924 | msgid "Couldn't look up commit object for HEAD" |
5925 | msgstr "No se pudo revisar el objeto commit para HEAD" | |
5926 | ||
4b15eb22 | 5927 | #: builtin/branch.c:232 |
fb0e25bc CD |
5928 | #, c-format |
5929 | msgid "Cannot delete branch '%s' checked out at '%s'" | |
5930 | msgstr "No se puede borrar rama '%s' que cuenta con checkout en '%s'" | |
5931 | ||
4b15eb22 | 5932 | #: builtin/branch.c:247 |
fb0e25bc CD |
5933 | #, c-format |
5934 | msgid "remote-tracking branch '%s' not found." | |
5935 | msgstr "rama de rastreo remoto '%s' no encontrada." | |
5936 | ||
4b15eb22 | 5937 | #: builtin/branch.c:248 |
fb0e25bc CD |
5938 | #, c-format |
5939 | msgid "branch '%s' not found." | |
5940 | msgstr "rama '%s' no encontrada." | |
5941 | ||
4b15eb22 | 5942 | #: builtin/branch.c:263 |
fb0e25bc CD |
5943 | #, c-format |
5944 | msgid "Error deleting remote-tracking branch '%s'" | |
5945 | msgstr "Error al eliminar la rama de rastreo remota '%s'" | |
5946 | ||
4b15eb22 | 5947 | #: builtin/branch.c:264 |
fb0e25bc CD |
5948 | #, c-format |
5949 | msgid "Error deleting branch '%s'" | |
5950 | msgstr "Error al eliminar la rama '%s'" | |
5951 | ||
4b15eb22 | 5952 | #: builtin/branch.c:271 |
fb0e25bc CD |
5953 | #, c-format |
5954 | msgid "Deleted remote-tracking branch %s (was %s).\n" | |
5955 | msgstr "Eliminada la rama de rastreo remota %s (era %s).\n" | |
5956 | ||
4b15eb22 | 5957 | #: builtin/branch.c:272 |
fb0e25bc CD |
5958 | #, c-format |
5959 | msgid "Deleted branch %s (was %s).\n" | |
5960 | msgstr "Eliminada la rama %s (era %s)..\n" | |
5961 | ||
4b15eb22 CD |
5962 | #: builtin/branch.c:417 builtin/tag.c:58 |
5963 | msgid "unable to parse format string" | |
5964 | msgstr "no es posible analizar el string de formato" | |
5965 | ||
5966 | #: builtin/branch.c:450 | |
fb0e25bc CD |
5967 | #, c-format |
5968 | msgid "Branch %s is being rebased at %s" | |
5969 | msgstr "Rama %s está siendo rebasada en %s" | |
5970 | ||
4b15eb22 | 5971 | #: builtin/branch.c:454 |
fb0e25bc CD |
5972 | #, c-format |
5973 | msgid "Branch %s is being bisected at %s" | |
5974 | msgstr "Rama %s está siendo bisecada en %s" | |
5975 | ||
f8038f5b | 5976 | #: builtin/branch.c:471 |
4b15eb22 CD |
5977 | msgid "cannot copy the current branch while not on any." |
5978 | msgstr "no se puede copiar la rama actual mientras no se está en ninguna." | |
5979 | ||
f8038f5b | 5980 | #: builtin/branch.c:473 |
fb0e25bc CD |
5981 | msgid "cannot rename the current branch while not on any." |
5982 | msgstr "no se puede renombrar la rama actual mientras no se está en ninguna." | |
5983 | ||
f8038f5b | 5984 | #: builtin/branch.c:484 |
fb0e25bc CD |
5985 | #, c-format |
5986 | msgid "Invalid branch name: '%s'" | |
5987 | msgstr "Nombre de rama invalido: '%s'" | |
5988 | ||
f8038f5b | 5989 | #: builtin/branch.c:511 |
fb0e25bc CD |
5990 | msgid "Branch rename failed" |
5991 | msgstr "Cambio de nombre de rama fallido" | |
5992 | ||
f8038f5b | 5993 | #: builtin/branch.c:513 |
4b15eb22 CD |
5994 | msgid "Branch copy failed" |
5995 | msgstr "Copiado de rama fallido" | |
5996 | ||
f8038f5b | 5997 | #: builtin/branch.c:517 |
4b15eb22 | 5998 | #, c-format |
f8038f5b | 5999 | msgid "Created a copy of a misnamed branch '%s'" |
33ac3e89 | 6000 | msgstr "Copia creada de la rama malnombrada '%s'" |
4b15eb22 | 6001 | |
f8038f5b | 6002 | #: builtin/branch.c:520 |
fb0e25bc CD |
6003 | #, c-format |
6004 | msgid "Renamed a misnamed branch '%s' away" | |
6005 | msgstr "Rama mal llamada '%s' renombrada" | |
6006 | ||
f8038f5b | 6007 | #: builtin/branch.c:526 |
fb0e25bc CD |
6008 | #, c-format |
6009 | msgid "Branch renamed to %s, but HEAD is not updated!" | |
6010 | msgstr "¡Rama renombrada a %s, pero HEAD no está actualizado!" | |
6011 | ||
f8038f5b | 6012 | #: builtin/branch.c:535 |
fb0e25bc | 6013 | msgid "Branch is renamed, but update of config-file failed" |
4b15eb22 CD |
6014 | msgstr "" |
6015 | "La rama está renombrada, pero falló la actualización del archivo de " | |
6016 | "configuración" | |
6017 | ||
f8038f5b | 6018 | #: builtin/branch.c:537 |
4b15eb22 CD |
6019 | msgid "Branch is copied, but update of config-file failed" |
6020 | msgstr "" | |
6021 | "La rama está copiada, pero falló la actualización del archivo de " | |
6022 | "configuración" | |
fb0e25bc | 6023 | |
f8038f5b | 6024 | #: builtin/branch.c:553 |
fb0e25bc CD |
6025 | #, c-format |
6026 | msgid "" | |
6027 | "Please edit the description for the branch\n" | |
6028 | " %s\n" | |
6029 | "Lines starting with '%c' will be stripped.\n" | |
6030 | msgstr "" | |
6031 | "Por favor, edita la descripción para la rama\n" | |
6032 | "%s\n" | |
6033 | "Las líneas que comiencen con '%c' serán removidas.\n" | |
6034 | ||
f8038f5b | 6035 | #: builtin/branch.c:586 |
fb0e25bc | 6036 | msgid "Generic options" |
9df63a4a | 6037 | msgstr "Opciones genéricas" |
fb0e25bc | 6038 | |
f8038f5b | 6039 | #: builtin/branch.c:588 |
fb0e25bc CD |
6040 | msgid "show hash and subject, give twice for upstream branch" |
6041 | msgstr "mostrar hash y tema, dar dos veces para rama upstream" | |
6042 | ||
f8038f5b | 6043 | #: builtin/branch.c:589 |
fb0e25bc | 6044 | msgid "suppress informational messages" |
33ac3e89 | 6045 | msgstr "suprimir mensajes informativos" |
fb0e25bc | 6046 | |
f8038f5b | 6047 | #: builtin/branch.c:590 |
fb0e25bc CD |
6048 | msgid "set up tracking mode (see git-pull(1))" |
6049 | msgstr "configurando modo tracking (mirar git-pull(1))" | |
6050 | ||
f8038f5b | 6051 | #: builtin/branch.c:592 |
4b15eb22 CD |
6052 | msgid "do not use" |
6053 | msgstr "no usar" | |
fb0e25bc | 6054 | |
f8038f5b | 6055 | #: builtin/branch.c:594 |
fb0e25bc CD |
6056 | msgid "upstream" |
6057 | msgstr "upstream" | |
6058 | ||
f8038f5b | 6059 | #: builtin/branch.c:594 |
fb0e25bc CD |
6060 | msgid "change the upstream info" |
6061 | msgstr "cambiar info de upstream" | |
6062 | ||
f8038f5b | 6063 | #: builtin/branch.c:595 |
fb0e25bc CD |
6064 | msgid "Unset the upstream info" |
6065 | msgstr "Desconfigurando la info de upstream" | |
6066 | ||
f8038f5b | 6067 | #: builtin/branch.c:596 |
fb0e25bc CD |
6068 | msgid "use colored output" |
6069 | msgstr "usar salida con colores" | |
6070 | ||
f8038f5b | 6071 | #: builtin/branch.c:597 |
fb0e25bc CD |
6072 | msgid "act on remote-tracking branches" |
6073 | msgstr "actuar en ramas de traqueo remoto" | |
6074 | ||
f8038f5b | 6075 | #: builtin/branch.c:599 builtin/branch.c:601 |
fb0e25bc CD |
6076 | msgid "print only branches that contain the commit" |
6077 | msgstr "mostrar solo ramas que contienen el commit" | |
6078 | ||
f8038f5b | 6079 | #: builtin/branch.c:600 builtin/branch.c:602 |
fb0e25bc CD |
6080 | msgid "print only branches that don't contain the commit" |
6081 | msgstr "mostrar solo ramas que no contienen el commit" | |
6082 | ||
f8038f5b | 6083 | #: builtin/branch.c:605 |
fb0e25bc CD |
6084 | msgid "Specific git-branch actions:" |
6085 | msgstr "Acciones específicas de git-branch:" | |
6086 | ||
f8038f5b | 6087 | #: builtin/branch.c:606 |
fb0e25bc CD |
6088 | msgid "list both remote-tracking and local branches" |
6089 | msgstr "listar ramas de remote-tracking y locales" | |
6090 | ||
f8038f5b | 6091 | #: builtin/branch.c:608 |
fb0e25bc CD |
6092 | msgid "delete fully merged branch" |
6093 | msgstr "borrar ramas totalmente fusionadas" | |
6094 | ||
f8038f5b | 6095 | #: builtin/branch.c:609 |
fb0e25bc | 6096 | msgid "delete branch (even if not merged)" |
9df63a4a | 6097 | msgstr "borrar rama (incluso si no esta fusionada)" |
fb0e25bc | 6098 | |
f8038f5b | 6099 | #: builtin/branch.c:610 |
fb0e25bc CD |
6100 | msgid "move/rename a branch and its reflog" |
6101 | msgstr "mover/renombrar una rama y su reflog" | |
6102 | ||
f8038f5b | 6103 | #: builtin/branch.c:611 |
fb0e25bc CD |
6104 | msgid "move/rename a branch, even if target exists" |
6105 | msgstr "mover/renombrar una rama, incluso si el destino existe" | |
6106 | ||
f8038f5b | 6107 | #: builtin/branch.c:612 |
4b15eb22 CD |
6108 | msgid "copy a branch and its reflog" |
6109 | msgstr "copiar una rama y su reflog" | |
6110 | ||
f8038f5b | 6111 | #: builtin/branch.c:613 |
4b15eb22 CD |
6112 | msgid "copy a branch, even if target exists" |
6113 | msgstr "copiar una rama, incluso si el objetivo existe" | |
6114 | ||
f8038f5b | 6115 | #: builtin/branch.c:614 |
fb0e25bc CD |
6116 | msgid "list branch names" |
6117 | msgstr "listar nombres de ramas" | |
6118 | ||
f8038f5b | 6119 | #: builtin/branch.c:615 |
fb0e25bc CD |
6120 | msgid "create the branch's reflog" |
6121 | msgstr "crea el reflog de la rama" | |
6122 | ||
f8038f5b | 6123 | #: builtin/branch.c:617 |
fb0e25bc | 6124 | msgid "edit the description for the branch" |
715fc761 | 6125 | msgstr "edita la descripción de la rama" |
fb0e25bc | 6126 | |
f8038f5b | 6127 | #: builtin/branch.c:618 |
fb0e25bc | 6128 | msgid "force creation, move/rename, deletion" |
715fc761 | 6129 | msgstr "fuerza la creación,movimiento/renombrado,borrado" |
fb0e25bc | 6130 | |
f8038f5b | 6131 | #: builtin/branch.c:619 |
fb0e25bc CD |
6132 | msgid "print only branches that are merged" |
6133 | msgstr "muestra solo ramas que han sido fusionadas" | |
6134 | ||
f8038f5b | 6135 | #: builtin/branch.c:620 |
fb0e25bc CD |
6136 | msgid "print only branches that are not merged" |
6137 | msgstr "muestra solo ramas que no han sido fusionadas" | |
6138 | ||
f8038f5b | 6139 | #: builtin/branch.c:621 |
fb0e25bc CD |
6140 | msgid "list branches in columns" |
6141 | msgstr "muestra las ramas en columnas" | |
6142 | ||
33ac3e89 | 6143 | #: builtin/branch.c:622 builtin/for-each-ref.c:40 builtin/tag.c:411 |
fb0e25bc CD |
6144 | msgid "key" |
6145 | msgstr "clave" | |
6146 | ||
33ac3e89 | 6147 | #: builtin/branch.c:623 builtin/for-each-ref.c:41 builtin/tag.c:412 |
fb0e25bc CD |
6148 | msgid "field name to sort on" |
6149 | msgstr "nombre del campo por el cuál ordenar" | |
6150 | ||
f8038f5b | 6151 | #: builtin/branch.c:625 builtin/for-each-ref.c:43 builtin/notes.c:408 |
4b15eb22 | 6152 | #: builtin/notes.c:411 builtin/notes.c:571 builtin/notes.c:574 |
33ac3e89 | 6153 | #: builtin/tag.c:414 |
fb0e25bc CD |
6154 | msgid "object" |
6155 | msgstr "objeto" | |
6156 | ||
f8038f5b | 6157 | #: builtin/branch.c:626 |
fb0e25bc CD |
6158 | msgid "print only branches of the object" |
6159 | msgstr "imprimir sólo las ramas del objeto" | |
6160 | ||
33ac3e89 | 6161 | #: builtin/branch.c:628 builtin/for-each-ref.c:49 builtin/tag.c:421 |
fb0e25bc | 6162 | msgid "sorting and filtering are case insensitive" |
715fc761 | 6163 | msgstr "ordenamiento y filtrado son case-insensitive" |
fb0e25bc | 6164 | |
33ac3e89 | 6165 | #: builtin/branch.c:629 builtin/for-each-ref.c:38 builtin/tag.c:419 |
4b15eb22 | 6166 | #: builtin/verify-tag.c:39 |
fb0e25bc CD |
6167 | msgid "format to use for the output" |
6168 | msgstr "formato para usar para el output" | |
6169 | ||
33ac3e89 | 6170 | #: builtin/branch.c:652 builtin/clone.c:735 |
fb0e25bc CD |
6171 | msgid "HEAD not found below refs/heads!" |
6172 | msgstr "HEAD no encontrado abajo de refs/heads!" | |
6173 | ||
f8038f5b | 6174 | #: builtin/branch.c:675 |
fb0e25bc CD |
6175 | msgid "--column and --verbose are incompatible" |
6176 | msgstr "--column y --verbose son incompatibles" | |
6177 | ||
f8038f5b | 6178 | #: builtin/branch.c:690 builtin/branch.c:742 builtin/branch.c:751 |
fb0e25bc CD |
6179 | msgid "branch name required" |
6180 | msgstr "se necesita el nombre de la rama" | |
6181 | ||
f8038f5b | 6182 | #: builtin/branch.c:718 |
fb0e25bc CD |
6183 | msgid "Cannot give description to detached HEAD" |
6184 | msgstr "No se puede dar descripción al HEAD desacoplado" | |
6185 | ||
f8038f5b | 6186 | #: builtin/branch.c:723 |
fb0e25bc CD |
6187 | msgid "cannot edit description of more than one branch" |
6188 | msgstr "no se puede editar la descripción de más de una rama" | |
6189 | ||
f8038f5b | 6190 | #: builtin/branch.c:730 |
fb0e25bc CD |
6191 | #, c-format |
6192 | msgid "No commit on branch '%s' yet." | |
715fc761 | 6193 | msgstr "Aún no hay commits en la rama '%s'." |
fb0e25bc | 6194 | |
f8038f5b | 6195 | #: builtin/branch.c:733 |
fb0e25bc CD |
6196 | #, c-format |
6197 | msgid "No branch named '%s'." | |
6198 | msgstr "No hay ninguna rama llamada '%s'." | |
6199 | ||
f8038f5b | 6200 | #: builtin/branch.c:748 |
4b15eb22 CD |
6201 | msgid "too many branches for a copy operation" |
6202 | msgstr "demasiadas ramas para una operación de copiado" | |
fb0e25bc | 6203 | |
f8038f5b | 6204 | #: builtin/branch.c:757 |
4b15eb22 CD |
6205 | msgid "too many arguments for a rename operation" |
6206 | msgstr "demasiados argumentos para una operación de renombrado" | |
fb0e25bc | 6207 | |
f8038f5b | 6208 | #: builtin/branch.c:762 |
4b15eb22 CD |
6209 | msgid "too many arguments to set new upstream" |
6210 | msgstr "demasiados argumentos para configurar un nuevo upstream" | |
6211 | ||
f8038f5b | 6212 | #: builtin/branch.c:766 |
fb0e25bc | 6213 | #, c-format |
4b15eb22 CD |
6214 | msgid "" |
6215 | "could not set upstream of HEAD to %s when it does not point to any branch." | |
6216 | msgstr "" | |
6217 | "no se pudo configurar upstream de HEAD a %s cuando este no apunta a ninguna " | |
6218 | "rama." | |
fb0e25bc | 6219 | |
f8038f5b | 6220 | #: builtin/branch.c:769 builtin/branch.c:791 builtin/branch.c:807 |
fb0e25bc CD |
6221 | #, c-format |
6222 | msgid "no such branch '%s'" | |
6223 | msgstr "no hay tal rama '%s'" | |
6224 | ||
f8038f5b | 6225 | #: builtin/branch.c:773 |
fb0e25bc CD |
6226 | #, c-format |
6227 | msgid "branch '%s' does not exist" | |
6228 | msgstr "la rama '%s' no existe" | |
6229 | ||
f8038f5b | 6230 | #: builtin/branch.c:785 |
4b15eb22 CD |
6231 | msgid "too many arguments to unset upstream" |
6232 | msgstr "demasiados argumentos para desconfigurar upstream" | |
fb0e25bc | 6233 | |
f8038f5b | 6234 | #: builtin/branch.c:789 |
fb0e25bc | 6235 | msgid "could not unset upstream of HEAD when it does not point to any branch." |
4b15eb22 CD |
6236 | msgstr "" |
6237 | "no se puede desconfigurar upstream de HEAD cuando este no apunta a ninguna " | |
6238 | "rama." | |
fb0e25bc | 6239 | |
f8038f5b | 6240 | #: builtin/branch.c:795 |
fb0e25bc CD |
6241 | #, c-format |
6242 | msgid "Branch '%s' has no upstream information" | |
715fc761 | 6243 | msgstr "Rama '%s' no tiene información de upstream" |
fb0e25bc | 6244 | |
f8038f5b | 6245 | #: builtin/branch.c:810 |
fb0e25bc | 6246 | msgid "-a and -r options to 'git branch' do not make sense with a branch name" |
4b15eb22 CD |
6247 | msgstr "" |
6248 | "opciones -a y -r para 'git branch' no tienen sentido con un nombre de rama" | |
fb0e25bc | 6249 | |
f8038f5b | 6250 | #: builtin/branch.c:813 |
fb0e25bc | 6251 | msgid "" |
4b15eb22 CD |
6252 | "the '--set-upstream' option is no longer supported. Please use '--track' or " |
6253 | "'--set-upstream-to' instead." | |
fb0e25bc | 6254 | msgstr "" |
33ac3e89 | 6255 | "la opción '--set-upstream' ya no es soportada. Considere usar '--track' o '--" |
4b15eb22 | 6256 | "set-upstream-to' en cambio." |
fb0e25bc CD |
6257 | |
6258 | #: builtin/bundle.c:45 | |
6259 | #, c-format | |
6260 | msgid "%s is okay\n" | |
6261 | msgstr "%s está bien\n" | |
6262 | ||
6263 | #: builtin/bundle.c:58 | |
6264 | msgid "Need a repository to create a bundle." | |
6265 | msgstr "Se necesita un repositorio para agrupar." | |
6266 | ||
6267 | #: builtin/bundle.c:62 | |
6268 | msgid "Need a repository to unbundle." | |
6269 | msgstr "Se necesita un repositorio para desagrupar." | |
6270 | ||
33ac3e89 | 6271 | #: builtin/cat-file.c:523 |
4b15eb22 CD |
6272 | msgid "" |
6273 | "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" | |
6274 | "p | <type> | --textconv | --filters) [--path=<path>] <object>" | |
6275 | msgstr "" | |
6276 | "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" | |
6277 | "p | <tipo> | --textconv | --filters) [--path=<ruta>] <objeto>" | |
fb0e25bc | 6278 | |
33ac3e89 | 6279 | #: builtin/cat-file.c:524 |
4b15eb22 CD |
6280 | msgid "" |
6281 | "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" | |
6282 | "filters]" | |
6283 | msgstr "" | |
6284 | "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" | |
6285 | "filters]" | |
fb0e25bc | 6286 | |
33ac3e89 | 6287 | #: builtin/cat-file.c:561 |
fb0e25bc CD |
6288 | msgid "<type> can be one of: blob, tree, commit, tag" |
6289 | msgstr "<tipo> puede ser: blob, tree, commit, tag" | |
6290 | ||
33ac3e89 | 6291 | #: builtin/cat-file.c:562 |
fb0e25bc CD |
6292 | msgid "show object type" |
6293 | msgstr "mostrar el tipo del objeto" | |
6294 | ||
33ac3e89 | 6295 | #: builtin/cat-file.c:563 |
fb0e25bc | 6296 | msgid "show object size" |
715fc761 | 6297 | msgstr "mostrar el tamaño del objeto" |
fb0e25bc | 6298 | |
33ac3e89 | 6299 | #: builtin/cat-file.c:565 |
fb0e25bc CD |
6300 | msgid "exit with zero when there's no error" |
6301 | msgstr "salir con cero cuando no haya error" | |
6302 | ||
33ac3e89 | 6303 | #: builtin/cat-file.c:566 |
fb0e25bc CD |
6304 | msgid "pretty-print object's content" |
6305 | msgstr "realizar pretty-print del contenido del objeto" | |
6306 | ||
33ac3e89 | 6307 | #: builtin/cat-file.c:568 |
fb0e25bc CD |
6308 | msgid "for blob objects, run textconv on object's content" |
6309 | msgstr "para objetos blob, ejecuta textconv en el contenido del objeto" | |
6310 | ||
33ac3e89 | 6311 | #: builtin/cat-file.c:570 |
fb0e25bc CD |
6312 | msgid "for blob objects, run filters on object's content" |
6313 | msgstr "para objetos blob, ejecuta filters en el contenido del objeto" | |
6314 | ||
33ac3e89 | 6315 | #: builtin/cat-file.c:571 git-submodule.sh:878 |
fb0e25bc CD |
6316 | msgid "blob" |
6317 | msgstr "blob" | |
6318 | ||
33ac3e89 | 6319 | #: builtin/cat-file.c:572 |
fb0e25bc CD |
6320 | msgid "use a specific path for --textconv/--filters" |
6321 | msgstr "use una ruta específica para --textconv/--filters" | |
6322 | ||
33ac3e89 | 6323 | #: builtin/cat-file.c:574 |
fb0e25bc CD |
6324 | msgid "allow -s and -t to work with broken/corrupt objects" |
6325 | msgstr "permita -s y -t para trabajar con objetos rotos o corruptos" | |
6326 | ||
33ac3e89 | 6327 | #: builtin/cat-file.c:575 |
fb0e25bc | 6328 | msgid "buffer --batch output" |
33ac3e89 | 6329 | msgstr "salida buffer --batch" |
fb0e25bc | 6330 | |
33ac3e89 | 6331 | #: builtin/cat-file.c:577 |
fb0e25bc CD |
6332 | msgid "show info and content of objects fed from the standard input" |
6333 | msgstr "mostrar info y content de los objetos alimentados por standard input" | |
6334 | ||
33ac3e89 | 6335 | #: builtin/cat-file.c:580 |
fb0e25bc CD |
6336 | msgid "show info about objects fed from the standard input" |
6337 | msgstr "mostrar info de los objetos alimentados por standard input" | |
6338 | ||
33ac3e89 | 6339 | #: builtin/cat-file.c:583 |
fb0e25bc | 6340 | msgid "follow in-tree symlinks (used with --batch or --batch-check)" |
715fc761 CDR |
6341 | msgstr "" |
6342 | "seguir los enlaces simbólicos en el árbol (usado con --batch o --batch-check)" | |
fb0e25bc | 6343 | |
33ac3e89 | 6344 | #: builtin/cat-file.c:585 |
fb0e25bc CD |
6345 | msgid "show all objects with --batch or --batch-check" |
6346 | msgstr "mostrar todos los objetos con --batch o --batch-check" | |
6347 | ||
6348 | #: builtin/check-attr.c:12 | |
6349 | msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..." | |
6350 | msgstr "git check-attr [-a | --all | <attr>...] [--] <nombre-de-ruta>..." | |
6351 | ||
6352 | #: builtin/check-attr.c:13 | |
6353 | msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]" | |
6354 | msgstr "git check-attr --stdin [-z] [-a | --all | <attr>...]" | |
6355 | ||
6356 | #: builtin/check-attr.c:20 | |
6357 | msgid "report all attributes set on file" | |
6358 | msgstr "reportar todos los atributos configurados en el archivo" | |
6359 | ||
6360 | #: builtin/check-attr.c:21 | |
6361 | msgid "use .gitattributes only from the index" | |
6362 | msgstr "use .gitattributes solo desde el índice" | |
6363 | ||
33ac3e89 | 6364 | #: builtin/check-attr.c:22 builtin/check-ignore.c:24 builtin/hash-object.c:100 |
fb0e25bc CD |
6365 | msgid "read file names from stdin" |
6366 | msgstr "leer nombres de archivos de stdin" | |
6367 | ||
6368 | #: builtin/check-attr.c:24 builtin/check-ignore.c:26 | |
6369 | msgid "terminate input and output records by a NUL character" | |
715fc761 | 6370 | msgstr "terminar registros de entrada y salida con un carácter NUL" |
fb0e25bc | 6371 | |
33ac3e89 | 6372 | #: builtin/check-ignore.c:20 builtin/checkout.c:1106 builtin/gc.c:358 |
fb0e25bc CD |
6373 | msgid "suppress progress reporting" |
6374 | msgstr "suprimir el reporte de progreso" | |
6375 | ||
6376 | #: builtin/check-ignore.c:28 | |
6377 | msgid "show non-matching input paths" | |
6378 | msgstr "mostrar rutas de entrada que no concuerdan" | |
6379 | ||
6380 | #: builtin/check-ignore.c:30 | |
6381 | msgid "ignore index when checking" | |
6382 | msgstr "ignorar el índice cuando se revise" | |
6383 | ||
33ac3e89 | 6384 | #: builtin/check-ignore.c:159 |
fb0e25bc CD |
6385 | msgid "cannot specify pathnames with --stdin" |
6386 | msgstr "no se puede especificar los nombres de rutas con --stdin" | |
6387 | ||
33ac3e89 | 6388 | #: builtin/check-ignore.c:162 |
fb0e25bc CD |
6389 | msgid "-z only makes sense with --stdin" |
6390 | msgstr "-z sólo tiene sentido con --stdin" | |
6391 | ||
33ac3e89 | 6392 | #: builtin/check-ignore.c:164 |
fb0e25bc CD |
6393 | msgid "no path specified" |
6394 | msgstr "ruta no especificada" | |
6395 | ||
33ac3e89 | 6396 | #: builtin/check-ignore.c:168 |
fb0e25bc CD |
6397 | msgid "--quiet is only valid with a single pathname" |
6398 | msgstr "--quiet solo es válido con un nombre de ruta único" | |
6399 | ||
33ac3e89 | 6400 | #: builtin/check-ignore.c:170 |
fb0e25bc CD |
6401 | msgid "cannot have both --quiet and --verbose" |
6402 | msgstr "no se puede tener ambos --quiet y --verbose" | |
6403 | ||
33ac3e89 | 6404 | #: builtin/check-ignore.c:173 |
fb0e25bc CD |
6405 | msgid "--non-matching is only valid with --verbose" |
6406 | msgstr "--non-matching sólo es válida con --verbose" | |
6407 | ||
6408 | #: builtin/check-mailmap.c:9 | |
6409 | msgid "git check-mailmap [<options>] <contact>..." | |
6410 | msgstr "git check-mailmap [<opciones>] <contacto>..." | |
6411 | ||
6412 | #: builtin/check-mailmap.c:14 | |
6413 | msgid "also read contacts from stdin" | |
6414 | msgstr "también leer contactos desde stdin" | |
6415 | ||
6416 | #: builtin/check-mailmap.c:25 | |
6417 | #, c-format | |
6418 | msgid "unable to parse contact: %s" | |
6419 | msgstr "no es posible analizar el contacto: %s" | |
6420 | ||
6421 | #: builtin/check-mailmap.c:48 | |
6422 | msgid "no contacts specified" | |
6423 | msgstr "contactos no especificados" | |
6424 | ||
6425 | #: builtin/checkout-index.c:128 | |
6426 | msgid "git checkout-index [<options>] [--] [<file>...]" | |
6427 | msgstr "git checkout-index [<opciones>] [--] [<archivo>...]" | |
6428 | ||
f8038f5b | 6429 | #: builtin/checkout-index.c:143 |
fb0e25bc CD |
6430 | msgid "stage should be between 1 and 3 or all" |
6431 | msgstr "stage tiene que estar entre 1 y 3 o all" | |
6432 | ||
f8038f5b | 6433 | #: builtin/checkout-index.c:159 |
fb0e25bc | 6434 | msgid "check out all files in the index" |
9df63a4a | 6435 | msgstr "revisar todos los archivos en el índice" |
fb0e25bc | 6436 | |
f8038f5b | 6437 | #: builtin/checkout-index.c:160 |
fb0e25bc CD |
6438 | msgid "force overwrite of existing files" |
6439 | msgstr "forzar sobreescritura de los archivos existentes" | |
6440 | ||
f8038f5b | 6441 | #: builtin/checkout-index.c:162 |
fb0e25bc | 6442 | msgid "no warning for existing files and files not in index" |
4b15eb22 CD |
6443 | msgstr "" |
6444 | "no hay advertencias para los archivos existentes y los archivos no están en " | |
6445 | "el índice" | |
fb0e25bc | 6446 | |
f8038f5b | 6447 | #: builtin/checkout-index.c:164 |
fb0e25bc CD |
6448 | msgid "don't checkout new files" |
6449 | msgstr "no revisar archivos nuevos" | |
6450 | ||
f8038f5b | 6451 | #: builtin/checkout-index.c:166 |
fb0e25bc CD |
6452 | msgid "update stat information in the index file" |
6453 | msgstr "actualizar información de estado en el archivo índice" | |
6454 | ||
f8038f5b | 6455 | #: builtin/checkout-index.c:170 |
fb0e25bc CD |
6456 | msgid "read list of paths from the standard input" |
6457 | msgstr "leer lista de rutas desde standard input" | |
6458 | ||
f8038f5b | 6459 | #: builtin/checkout-index.c:172 |
fb0e25bc CD |
6460 | msgid "write the content to temporary files" |
6461 | msgstr "escribir el contenido en un archivo temporal" | |
6462 | ||
f8038f5b | 6463 | #: builtin/checkout-index.c:173 builtin/column.c:31 |
33ac3e89 CDR |
6464 | #: builtin/submodule--helper.c:1203 builtin/submodule--helper.c:1206 |
6465 | #: builtin/submodule--helper.c:1212 builtin/submodule--helper.c:1574 | |
6466 | #: builtin/worktree.c:570 | |
fb0e25bc CD |
6467 | msgid "string" |
6468 | msgstr "string" | |
6469 | ||
f8038f5b | 6470 | #: builtin/checkout-index.c:174 |
fb0e25bc CD |
6471 | msgid "when creating files, prepend <string>" |
6472 | msgstr "cuando cree archivos, anteponer <string>" | |
6473 | ||
f8038f5b | 6474 | #: builtin/checkout-index.c:176 |
fb0e25bc CD |
6475 | msgid "copy out the files from named stage" |
6476 | msgstr "copiar los archivos del stage nombrado" | |
6477 | ||
f8038f5b | 6478 | #: builtin/checkout.c:27 |
fb0e25bc CD |
6479 | msgid "git checkout [<options>] <branch>" |
6480 | msgstr "git checkout [<opciones>] <rama>" | |
6481 | ||
f8038f5b | 6482 | #: builtin/checkout.c:28 |
fb0e25bc CD |
6483 | msgid "git checkout [<options>] [<branch>] -- <file>..." |
6484 | msgstr "git checkout [<opciones>] [<rama>] -- <archivo>..." | |
6485 | ||
f8038f5b | 6486 | #: builtin/checkout.c:136 builtin/checkout.c:169 |
fb0e25bc CD |
6487 | #, c-format |
6488 | msgid "path '%s' does not have our version" | |
6489 | msgstr "ruta '%s' no tiene nuestra versión" | |
6490 | ||
f8038f5b | 6491 | #: builtin/checkout.c:138 builtin/checkout.c:171 |
fb0e25bc CD |
6492 | #, c-format |
6493 | msgid "path '%s' does not have their version" | |
6494 | msgstr "ruta '%s' no tiene su versión" | |
6495 | ||
f8038f5b | 6496 | #: builtin/checkout.c:154 |
fb0e25bc CD |
6497 | #, c-format |
6498 | msgid "path '%s' does not have all necessary versions" | |
6499 | msgstr "ruta '%s' no tiene todas las versiones necesarias" | |
6500 | ||
f8038f5b | 6501 | #: builtin/checkout.c:198 |
fb0e25bc CD |
6502 | #, c-format |
6503 | msgid "path '%s' does not have necessary versions" | |
6504 | msgstr "ruta '%s' no tiene versiones necesarias" | |
6505 | ||
f8038f5b | 6506 | #: builtin/checkout.c:215 |
fb0e25bc CD |
6507 | #, c-format |
6508 | msgid "path '%s': cannot merge" | |
6509 | msgstr "ruta '%s': no se puede fusionar" | |
6510 | ||
33ac3e89 | 6511 | #: builtin/checkout.c:231 |
fb0e25bc CD |
6512 | #, c-format |
6513 | msgid "Unable to add merge result for '%s'" | |
6514 | msgstr "Incapaz de agregar resultados de fusión a '%s'" | |
6515 | ||
33ac3e89 CDR |
6516 | #: builtin/checkout.c:253 builtin/checkout.c:256 builtin/checkout.c:259 |
6517 | #: builtin/checkout.c:262 | |
fb0e25bc CD |
6518 | #, c-format |
6519 | msgid "'%s' cannot be used with updating paths" | |
6520 | msgstr "'%s' no puede ser usada con rutas actualizadas" | |
6521 | ||
33ac3e89 | 6522 | #: builtin/checkout.c:265 builtin/checkout.c:268 |
fb0e25bc CD |
6523 | #, c-format |
6524 | msgid "'%s' cannot be used with %s" | |
6525 | msgstr "'%s' no puede ser usado con %s" | |
6526 | ||
33ac3e89 | 6527 | #: builtin/checkout.c:271 |
fb0e25bc CD |
6528 | #, c-format |
6529 | msgid "Cannot update paths and switch to branch '%s' at the same time." | |
33ac3e89 | 6530 | msgstr "No se puede actualizar rutas y cambiar a la rama '%s' al mismo tiempo." |
fb0e25bc | 6531 | |
33ac3e89 | 6532 | #: builtin/checkout.c:340 builtin/checkout.c:347 |
fb0e25bc CD |
6533 | #, c-format |
6534 | msgid "path '%s' is unmerged" | |
6535 | msgstr "ruta '%s' no esta fusionada" | |
6536 | ||
33ac3e89 | 6537 | #: builtin/checkout.c:505 |
fb0e25bc CD |
6538 | msgid "you need to resolve your current index first" |
6539 | msgstr "necesita resolver su índice actual primero" | |
6540 | ||
33ac3e89 | 6541 | #: builtin/checkout.c:636 |
fb0e25bc CD |
6542 | #, c-format |
6543 | msgid "Can not do reflog for '%s': %s\n" | |
6544 | msgstr "No se puede hacer reflog para '%s': %s\n" | |
6545 | ||
33ac3e89 | 6546 | #: builtin/checkout.c:677 |
fb0e25bc CD |
6547 | msgid "HEAD is now at" |
6548 | msgstr "HEAD está ahora en" | |
6549 | ||
33ac3e89 | 6550 | #: builtin/checkout.c:681 builtin/clone.c:689 |
fb0e25bc CD |
6551 | msgid "unable to update HEAD" |
6552 | msgstr "no es posible actualizar HEAD" | |
6553 | ||
33ac3e89 | 6554 | #: builtin/checkout.c:685 |
fb0e25bc CD |
6555 | #, c-format |
6556 | msgid "Reset branch '%s'\n" | |
6557 | msgstr "Reiniciar rama '%s'\n" | |
6558 | ||
33ac3e89 | 6559 | #: builtin/checkout.c:688 |
fb0e25bc CD |
6560 | #, c-format |
6561 | msgid "Already on '%s'\n" | |
6562 | msgstr "Ya en '%s'\n" | |
6563 | ||
33ac3e89 | 6564 | #: builtin/checkout.c:692 |
fb0e25bc CD |
6565 | #, c-format |
6566 | msgid "Switched to and reset branch '%s'\n" | |
6567 | msgstr "Rama reiniciada y cambiada a '%s'\n" | |
6568 | ||
33ac3e89 | 6569 | #: builtin/checkout.c:694 builtin/checkout.c:1039 |
fb0e25bc CD |
6570 | #, c-format |
6571 | msgid "Switched to a new branch '%s'\n" | |
6572 | msgstr "Cambiado a nueva rama '%s'\n" | |
6573 | ||
33ac3e89 | 6574 | #: builtin/checkout.c:696 |
fb0e25bc CD |
6575 | #, c-format |
6576 | msgid "Switched to branch '%s'\n" | |
6577 | msgstr "Cambiado a rama '%s'\n" | |
6578 | ||
33ac3e89 | 6579 | #: builtin/checkout.c:747 |
fb0e25bc CD |
6580 | #, c-format |
6581 | msgid " ... and %d more.\n" | |
6582 | msgstr " ... y %d más.\n" | |
6583 | ||
33ac3e89 | 6584 | #: builtin/checkout.c:753 |
fb0e25bc CD |
6585 | #, c-format |
6586 | msgid "" | |
6587 | "Warning: you are leaving %d commit behind, not connected to\n" | |
6588 | "any of your branches:\n" | |
6589 | "\n" | |
6590 | "%s\n" | |
6591 | msgid_plural "" | |
6592 | "Warning: you are leaving %d commits behind, not connected to\n" | |
6593 | "any of your branches:\n" | |
6594 | "\n" | |
6595 | "%s\n" | |
6596 | msgstr[0] "" | |
6597 | "Peligro: está saliendo %d commit atrás, no está conectado\n" | |
6598 | "a ninguna rama:\n" | |
6599 | "\n" | |
6600 | "%s\n" | |
6601 | msgstr[1] "" | |
9df63a4a | 6602 | "Peligro: está saliendo %d commits atrás, no está conectado\n" |
fb0e25bc CD |
6603 | "a ninguna rama:\n" |
6604 | "\n" | |
6605 | "%s\n" | |
6606 | ||
33ac3e89 | 6607 | #: builtin/checkout.c:772 |
fb0e25bc CD |
6608 | #, c-format |
6609 | msgid "" | |
6610 | "If you want to keep it by creating a new branch, this may be a good time\n" | |
6611 | "to do so with:\n" | |
6612 | "\n" | |
6613 | " git branch <new-branch-name> %s\n" | |
6614 | "\n" | |
6615 | msgid_plural "" | |
6616 | "If you want to keep them by creating a new branch, this may be a good time\n" | |
6617 | "to do so with:\n" | |
6618 | "\n" | |
6619 | " git branch <new-branch-name> %s\n" | |
6620 | "\n" | |
6621 | msgstr[0] "" | |
6622 | "Si quiere conservarlo creando una nueva rama, este es un buen momento\n" | |
6623 | "para hacerlo:\n" | |
6624 | "\n" | |
6625 | " git branch <nuevo-nombre-de-rama> %s\n" | |
6626 | "\n" | |
6627 | msgstr[1] "" | |
6628 | "Si quiere conservarlos creando una nueva rama, este es un buen momento\n" | |
6629 | "para hacerlo:\n" | |
6630 | "\n" | |
6631 | " git branch <nombre-de-rama> %s\n" | |
6632 | "\n" | |
6633 | ||
33ac3e89 | 6634 | #: builtin/checkout.c:804 |
fb0e25bc | 6635 | msgid "internal error in revision walk" |
9df63a4a | 6636 | msgstr "error interno en camino de revisión" |
fb0e25bc | 6637 | |
33ac3e89 | 6638 | #: builtin/checkout.c:808 |
fb0e25bc | 6639 | msgid "Previous HEAD position was" |
715fc761 | 6640 | msgstr "La posición previa de HEAD era" |
fb0e25bc | 6641 | |
33ac3e89 | 6642 | #: builtin/checkout.c:836 builtin/checkout.c:1034 |
fb0e25bc | 6643 | msgid "You are on a branch yet to be born" |
9df63a4a | 6644 | msgstr "Estás en una rama por nacer" |
fb0e25bc | 6645 | |
33ac3e89 | 6646 | #: builtin/checkout.c:940 |
fb0e25bc CD |
6647 | #, c-format |
6648 | msgid "only one reference expected, %d given." | |
6649 | msgstr "solo una referencia esperada, %d entregadas." | |
6650 | ||
33ac3e89 | 6651 | #: builtin/checkout.c:980 builtin/worktree.c:249 |
fb0e25bc CD |
6652 | #, c-format |
6653 | msgid "invalid reference: %s" | |
6654 | msgstr "referencia invalida: %s" | |
6655 | ||
33ac3e89 | 6656 | #: builtin/checkout.c:1009 |
fb0e25bc CD |
6657 | #, c-format |
6658 | msgid "reference is not a tree: %s" | |
715fc761 | 6659 | msgstr "la referencia no es n árbol: %s" |
fb0e25bc | 6660 | |
33ac3e89 | 6661 | #: builtin/checkout.c:1048 |
fb0e25bc CD |
6662 | msgid "paths cannot be used with switching branches" |
6663 | msgstr "rutas no pueden ser usadas con cambios de rama" | |
6664 | ||
33ac3e89 | 6665 | #: builtin/checkout.c:1051 builtin/checkout.c:1055 |
fb0e25bc CD |
6666 | #, c-format |
6667 | msgid "'%s' cannot be used with switching branches" | |
6668 | msgstr "'%s' no puede ser usado con cambios de ramas" | |
6669 | ||
33ac3e89 CDR |
6670 | #: builtin/checkout.c:1059 builtin/checkout.c:1062 builtin/checkout.c:1067 |
6671 | #: builtin/checkout.c:1070 | |
fb0e25bc CD |
6672 | #, c-format |
6673 | msgid "'%s' cannot be used with '%s'" | |
6674 | msgstr "'%s' no puede ser usado con '%s'" | |
6675 | ||
33ac3e89 | 6676 | #: builtin/checkout.c:1075 |
fb0e25bc CD |
6677 | #, c-format |
6678 | msgid "Cannot switch branch to a non-commit '%s'" | |
6679 | msgstr "No se puede cambiar rama a un '%s' sin commits" | |
6680 | ||
33ac3e89 CDR |
6681 | #: builtin/checkout.c:1107 builtin/checkout.c:1109 builtin/clone.c:116 |
6682 | #: builtin/remote.c:166 builtin/remote.c:168 builtin/worktree.c:387 | |
6683 | #: builtin/worktree.c:389 | |
fb0e25bc CD |
6684 | msgid "branch" |
6685 | msgstr "rama" | |
6686 | ||
33ac3e89 | 6687 | #: builtin/checkout.c:1108 |
fb0e25bc CD |
6688 | msgid "create and checkout a new branch" |
6689 | msgstr "crear y hacer checkout a una nueva rama" | |
6690 | ||
33ac3e89 | 6691 | #: builtin/checkout.c:1110 |
fb0e25bc CD |
6692 | msgid "create/reset and checkout a branch" |
6693 | msgstr "crear/reiniciar y hacer checkout a una rama" | |
6694 | ||
33ac3e89 | 6695 | #: builtin/checkout.c:1111 |
fb0e25bc CD |
6696 | msgid "create reflog for new branch" |
6697 | msgstr "crear un reflog para una nueva rama" | |
6698 | ||
33ac3e89 | 6699 | #: builtin/checkout.c:1112 builtin/worktree.c:391 |
fb0e25bc CD |
6700 | msgid "detach HEAD at named commit" |
6701 | msgstr "desacoplar HEAD en el commit nombrado" | |
6702 | ||
33ac3e89 | 6703 | #: builtin/checkout.c:1113 |
fb0e25bc CD |
6704 | msgid "set upstream info for new branch" |
6705 | msgstr "configurar info de upstream para una rama nueva" | |
6706 | ||
33ac3e89 | 6707 | #: builtin/checkout.c:1115 |
fb0e25bc CD |
6708 | msgid "new-branch" |
6709 | msgstr "nueva-rama" | |
6710 | ||
33ac3e89 | 6711 | #: builtin/checkout.c:1115 |
fb0e25bc CD |
6712 | msgid "new unparented branch" |
6713 | msgstr "nueva rama no emparentada" | |
6714 | ||
33ac3e89 | 6715 | #: builtin/checkout.c:1116 |
fb0e25bc | 6716 | msgid "checkout our version for unmerged files" |
715fc761 | 6717 | msgstr "hacer checkout a nuestra versión para archivos sin fusionar" |
fb0e25bc | 6718 | |
33ac3e89 | 6719 | #: builtin/checkout.c:1118 |
fb0e25bc | 6720 | msgid "checkout their version for unmerged files" |
715fc761 | 6721 | msgstr "hacer checkout a su versión para los archivos sin fusionar" |
fb0e25bc | 6722 | |
33ac3e89 | 6723 | #: builtin/checkout.c:1120 |
fb0e25bc CD |
6724 | msgid "force checkout (throw away local modifications)" |
6725 | msgstr "forzar el checkout (descartar modificaciones locales)" | |
6726 | ||
33ac3e89 | 6727 | #: builtin/checkout.c:1122 |
fb0e25bc | 6728 | msgid "perform a 3-way merge with the new branch" |
715fc761 | 6729 | msgstr "realizar una fusión de tres vías con la rama nueva" |
fb0e25bc | 6730 | |
33ac3e89 | 6731 | #: builtin/checkout.c:1124 builtin/merge.c:239 |
fb0e25bc CD |
6732 | msgid "update ignored files (default)" |
6733 | msgstr "actualizar archivos ignorados (default)" | |
6734 | ||
33ac3e89 | 6735 | #: builtin/checkout.c:1126 builtin/log.c:1499 parse-options.h:263 |
fb0e25bc CD |
6736 | msgid "style" |
6737 | msgstr "estilo" | |
6738 | ||
33ac3e89 | 6739 | #: builtin/checkout.c:1127 |
fb0e25bc CD |
6740 | msgid "conflict style (merge or diff3)" |
6741 | msgstr "conflicto de estilos (merge o diff3)" | |
6742 | ||
33ac3e89 | 6743 | #: builtin/checkout.c:1130 |
fb0e25bc CD |
6744 | msgid "do not limit pathspecs to sparse entries only" |
6745 | msgstr "no limitar pathspecs a dispersar entradas solamente" | |
6746 | ||
33ac3e89 | 6747 | #: builtin/checkout.c:1132 |
fb0e25bc CD |
6748 | msgid "second guess 'git checkout <no-such-branch>'" |
6749 | msgstr "segunda opción 'git checkout <no-hay-tal-rama>'" | |
6750 | ||
33ac3e89 | 6751 | #: builtin/checkout.c:1134 |
fb0e25bc CD |
6752 | msgid "do not check if another worktree is holding the given ref" |
6753 | msgstr "no revise si otro árbol de trabajo contiene la ref entregada" | |
6754 | ||
33ac3e89 CDR |
6755 | #: builtin/checkout.c:1138 builtin/clone.c:83 builtin/fetch.c:150 |
6756 | #: builtin/merge.c:236 builtin/pull.c:123 builtin/push.c:556 | |
4b15eb22 | 6757 | #: builtin/send-pack.c:173 |
fb0e25bc CD |
6758 | msgid "force progress reporting" |
6759 | msgstr "forzar el reporte de progreso" | |
6760 | ||
33ac3e89 | 6761 | #: builtin/checkout.c:1168 |
fb0e25bc CD |
6762 | msgid "-b, -B and --orphan are mutually exclusive" |
6763 | msgstr "-b, -B y --orphan son mutuamente exclusivas" | |
6764 | ||
33ac3e89 | 6765 | #: builtin/checkout.c:1185 |
fb0e25bc CD |
6766 | msgid "--track needs a branch name" |
6767 | msgstr "--track necesita el nombre de una rama" | |
6768 | ||
33ac3e89 | 6769 | #: builtin/checkout.c:1190 |
fb0e25bc CD |
6770 | msgid "Missing branch name; try -b" |
6771 | msgstr "Falta nombre de rama; prueba -b" | |
6772 | ||
33ac3e89 | 6773 | #: builtin/checkout.c:1226 |
fb0e25bc | 6774 | msgid "invalid path specification" |
33ac3e89 | 6775 | msgstr "especificación de ruta invalida" |
fb0e25bc | 6776 | |
33ac3e89 | 6777 | #: builtin/checkout.c:1233 |
fb0e25bc CD |
6778 | #, c-format |
6779 | msgid "'%s' is not a commit and a branch '%s' cannot be created from it" | |
6780 | msgstr "'%s' no es un commit y una rama '%s' no puede ser creada desde este" | |
6781 | ||
33ac3e89 | 6782 | #: builtin/checkout.c:1237 |
fb0e25bc CD |
6783 | #, c-format |
6784 | msgid "git checkout: --detach does not take a path argument '%s'" | |
6785 | msgstr "git checkout: --detach no toma un argumento de ruta '%s'" | |
6786 | ||
33ac3e89 | 6787 | #: builtin/checkout.c:1241 |
fb0e25bc CD |
6788 | msgid "" |
6789 | "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" | |
6790 | "checking out of the index." | |
6791 | msgstr "" | |
6792 | "git checkout: --ours/--theirs, --force y --merge son incompatibles cuando\n" | |
6793 | "se revisa fuera del índice." | |
6794 | ||
6795 | #: builtin/clean.c:26 | |
4b15eb22 CD |
6796 | msgid "" |
6797 | "git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..." | |
6798 | msgstr "" | |
6799 | "git clean [-d] [-f] [-i] [-n] [-q] [-e <patrón>] [-x | -X] [--] <rutas>..." | |
fb0e25bc CD |
6800 | |
6801 | #: builtin/clean.c:30 | |
6802 | #, c-format | |
6803 | msgid "Removing %s\n" | |
6804 | msgstr "Borrando %s\n" | |
6805 | ||
6806 | #: builtin/clean.c:31 | |
6807 | #, c-format | |
6808 | msgid "Would remove %s\n" | |
6809 | msgstr "Sera borrado %s\n" | |
6810 | ||
6811 | #: builtin/clean.c:32 | |
6812 | #, c-format | |
6813 | msgid "Skipping repository %s\n" | |
6814 | msgstr "Saltando repositorio %s\n" | |
6815 | ||
6816 | #: builtin/clean.c:33 | |
6817 | #, c-format | |
6818 | msgid "Would skip repository %s\n" | |
6819 | msgstr "Se saltara repositorio %s\n" | |
6820 | ||
6821 | #: builtin/clean.c:34 | |
6822 | #, c-format | |
6823 | msgid "failed to remove %s" | |
6824 | msgstr "fallo al borrar %s" | |
6825 | ||
f8038f5b | 6826 | #: builtin/clean.c:302 git-add--interactive.perl:572 |
fb0e25bc CD |
6827 | #, c-format |
6828 | msgid "" | |
6829 | "Prompt help:\n" | |
6830 | "1 - select a numbered item\n" | |
6831 | "foo - select item based on unique prefix\n" | |
6832 | " - (empty) select nothing\n" | |
6833 | msgstr "" | |
715fc761 | 6834 | "Ayuda rápida:\n" |
fb0e25bc | 6835 | "1 - selecciona un objeto por numero\n" |
715fc761 CDR |
6836 | "foo - selecciona un objeto basado en un prefijo único\n" |
6837 | " - (vacío) no elegir nada\n" | |
fb0e25bc | 6838 | |
f8038f5b | 6839 | #: builtin/clean.c:306 git-add--interactive.perl:581 |
fb0e25bc CD |
6840 | #, c-format |
6841 | msgid "" | |
6842 | "Prompt help:\n" | |
6843 | "1 - select a single item\n" | |
6844 | "3-5 - select a range of items\n" | |
6845 | "2-3,6-9 - select multiple ranges\n" | |
6846 | "foo - select item based on unique prefix\n" | |
6847 | "-... - unselect specified items\n" | |
6848 | "* - choose all items\n" | |
6849 | " - (empty) finish selecting\n" | |
6850 | msgstr "" | |
715fc761 CDR |
6851 | "Ayuda rápida:\n" |
6852 | "1 - selecciona un objeto único\n" | |
6853 | "3-5 - selecciona un rango de objetos\n" | |
6854 | "2-3,6-9 - selecciona múltiples rangos\n" | |
6855 | "foo - selecciona un objeto basado en un prefijo único\n" | |
6856 | "-... - de-seleccionar objetos especificados\n" | |
fb0e25bc | 6857 | "* - escoger todos los objetos\n" |
715fc761 | 6858 | " - (vacío) terminar selección\n" |
fb0e25bc | 6859 | |
f8038f5b | 6860 | #: builtin/clean.c:522 git-add--interactive.perl:547 |
4b15eb22 | 6861 | #: git-add--interactive.perl:552 |
fb0e25bc CD |
6862 | #, c-format, perl-format |
6863 | msgid "Huh (%s)?\n" | |
6864 | msgstr "Ahh (%s)?\n" | |
6865 | ||
f8038f5b | 6866 | #: builtin/clean.c:664 |
fb0e25bc CD |
6867 | #, c-format |
6868 | msgid "Input ignore patterns>> " | |
6869 | msgstr "Input ignora los patrones >> " | |
6870 | ||
f8038f5b | 6871 | #: builtin/clean.c:701 |
fb0e25bc CD |
6872 | #, c-format |
6873 | msgid "WARNING: Cannot find items matched by: %s" | |
6874 | msgstr "PELIGRO: No se puede encontrar objetos que concuerden con: %s" | |
6875 | ||
f8038f5b | 6876 | #: builtin/clean.c:722 |
fb0e25bc CD |
6877 | msgid "Select items to delete" |
6878 | msgstr "Seleccionar objetos para borrar" | |
6879 | ||
6880 | #. TRANSLATORS: Make sure to keep [y/N] as is | |
f8038f5b | 6881 | #: builtin/clean.c:763 |
fb0e25bc CD |
6882 | #, c-format |
6883 | msgid "Remove %s [y/N]? " | |
6884 | msgstr "Borrar %s [y/N]? " | |
6885 | ||
33ac3e89 | 6886 | #: builtin/clean.c:788 git-add--interactive.perl:1710 |
fb0e25bc CD |
6887 | #, c-format |
6888 | msgid "Bye.\n" | |
715fc761 | 6889 | msgstr "Adiós.\n" |
fb0e25bc | 6890 | |
f8038f5b | 6891 | #: builtin/clean.c:796 |
fb0e25bc CD |
6892 | msgid "" |
6893 | "clean - start cleaning\n" | |
6894 | "filter by pattern - exclude items from deletion\n" | |
6895 | "select by numbers - select items to be deleted by numbers\n" | |
6896 | "ask each - confirm each deletion (like \"rm -i\")\n" | |
6897 | "quit - stop cleaning\n" | |
6898 | "help - this screen\n" | |
6899 | "? - help for prompt selection" | |
6900 | msgstr "" | |
6901 | "clean - comenzar la limpieza\n" | |
715fc761 CDR |
6902 | "filtrar por patrón - excluye objetos del borrado \n" |
6903 | "elegir por números - selecciona objetos a ser borrados por numero\n" | |
fb0e25bc CD |
6904 | "preguntar cada uno - confirmar cada borrado (como \"rm -i\")\n" |
6905 | "quit - parar limpieza\n" | |
6906 | "help - esta ventana\n" | |
715fc761 | 6907 | "? - ayuda para selección de opciones" |
fb0e25bc | 6908 | |
33ac3e89 | 6909 | #: builtin/clean.c:823 git-add--interactive.perl:1786 |
fb0e25bc CD |
6910 | msgid "*** Commands ***" |
6911 | msgstr "*** Comandos ***" | |
6912 | ||
33ac3e89 | 6913 | #: builtin/clean.c:824 git-add--interactive.perl:1783 |
fb0e25bc CD |
6914 | msgid "What now" |
6915 | msgstr "Ahora que" | |
6916 | ||
f8038f5b | 6917 | #: builtin/clean.c:832 |
fb0e25bc CD |
6918 | msgid "Would remove the following item:" |
6919 | msgid_plural "Would remove the following items:" | |
33ac3e89 | 6920 | msgstr[0] "Se removerá el siguiente objeto:" |
715fc761 | 6921 | msgstr[1] "Se removerán los siguientes objetos:" |
fb0e25bc | 6922 | |
f8038f5b | 6923 | #: builtin/clean.c:848 |
fb0e25bc CD |
6924 | msgid "No more files to clean, exiting." |
6925 | msgstr "No hay mas archivos para limpiar, saliendo." | |
6926 | ||
f8038f5b | 6927 | #: builtin/clean.c:910 |
fb0e25bc CD |
6928 | msgid "do not print names of files removed" |
6929 | msgstr "no imprimir nombres de archivos borrados" | |
6930 | ||
f8038f5b | 6931 | #: builtin/clean.c:912 |
fb0e25bc CD |
6932 | msgid "force" |
6933 | msgstr "forzar" | |
6934 | ||
f8038f5b | 6935 | #: builtin/clean.c:913 |
fb0e25bc CD |
6936 | msgid "interactive cleaning" |
6937 | msgstr "limpieza interactiva" | |
6938 | ||
f8038f5b | 6939 | #: builtin/clean.c:915 |
fb0e25bc CD |
6940 | msgid "remove whole directories" |
6941 | msgstr "borrar directorios completos" | |
6942 | ||
33ac3e89 CDR |
6943 | #: builtin/clean.c:916 builtin/describe.c:533 builtin/describe.c:535 |
6944 | #: builtin/grep.c:871 builtin/log.c:157 builtin/log.c:159 | |
f8038f5b CDR |
6945 | #: builtin/ls-files.c:548 builtin/name-rev.c:397 builtin/name-rev.c:399 |
6946 | #: builtin/show-ref.c:176 | |
fb0e25bc | 6947 | msgid "pattern" |
9df63a4a | 6948 | msgstr "patrón" |
fb0e25bc | 6949 | |
f8038f5b | 6950 | #: builtin/clean.c:917 |
fb0e25bc | 6951 | msgid "add <pattern> to ignore rules" |
715fc761 | 6952 | msgstr "agregar <patrón> para ignorar reglas" |
fb0e25bc | 6953 | |
f8038f5b | 6954 | #: builtin/clean.c:918 |
fb0e25bc | 6955 | msgid "remove ignored files, too" |
9df63a4a | 6956 | msgstr "borrar archivos ignorados, también" |
fb0e25bc | 6957 | |
f8038f5b | 6958 | #: builtin/clean.c:920 |
fb0e25bc CD |
6959 | msgid "remove only ignored files" |
6960 | msgstr "borrar solo archivos ignorados" | |
6961 | ||
f8038f5b | 6962 | #: builtin/clean.c:938 |
fb0e25bc CD |
6963 | msgid "-x and -X cannot be used together" |
6964 | msgstr "-x y -X no pueden ser usadas juntas" | |
6965 | ||
f8038f5b | 6966 | #: builtin/clean.c:942 |
4b15eb22 CD |
6967 | msgid "" |
6968 | "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " | |
6969 | "clean" | |
6970 | msgstr "" | |
6971 | "clean.requireForce configurado como true y ninguno -i, -n, ni -f entregados; " | |
6972 | "rehusando el clean" | |
6973 | ||
f8038f5b | 6974 | #: builtin/clean.c:945 |
4b15eb22 CD |
6975 | msgid "" |
6976 | "clean.requireForce defaults to true and neither -i, -n, nor -f given; " | |
6977 | "refusing to clean" | |
6978 | msgstr "" | |
6979 | "clean.requireForce default en true y ninguno -i, -n, ni -f entregados; " | |
6980 | "rehusando el clean" | |
fb0e25bc | 6981 | |
33ac3e89 | 6982 | #: builtin/clone.c:40 |
fb0e25bc CD |
6983 | msgid "git clone [<options>] [--] <repo> [<dir>]" |
6984 | msgstr "git clone [<opciones>] [--] <repo> [<directorio>]" | |
6985 | ||
33ac3e89 | 6986 | #: builtin/clone.c:85 |
fb0e25bc CD |
6987 | msgid "don't create a checkout" |
6988 | msgstr "no crear checkout" | |
6989 | ||
33ac3e89 | 6990 | #: builtin/clone.c:86 builtin/clone.c:88 builtin/init-db.c:479 |
fb0e25bc | 6991 | msgid "create a bare repository" |
9df63a4a | 6992 | msgstr "crear un repositorio vacío" |
fb0e25bc | 6993 | |
33ac3e89 | 6994 | #: builtin/clone.c:90 |
fb0e25bc | 6995 | msgid "create a mirror repository (implies bare)" |
715fc761 | 6996 | msgstr "crear un repositorio espejo (implica vacío)" |
fb0e25bc | 6997 | |
33ac3e89 | 6998 | #: builtin/clone.c:92 |
fb0e25bc CD |
6999 | msgid "to clone from a local repository" |
7000 | msgstr "clonar de un repositorio local" | |
7001 | ||
33ac3e89 | 7002 | #: builtin/clone.c:94 |
fb0e25bc CD |
7003 | msgid "don't use local hardlinks, always copy" |
7004 | msgstr "no usar hardlinks, siempre copiar" | |
7005 | ||
33ac3e89 | 7006 | #: builtin/clone.c:96 |
fb0e25bc CD |
7007 | msgid "setup as shared repository" |
7008 | msgstr "configurar como repositorio compartido" | |
7009 | ||
33ac3e89 | 7010 | #: builtin/clone.c:98 builtin/clone.c:102 |
fb0e25bc CD |
7011 | msgid "pathspec" |
7012 | msgstr "pathspec" | |
7013 | ||
33ac3e89 | 7014 | #: builtin/clone.c:98 builtin/clone.c:102 |
fb0e25bc | 7015 | msgid "initialize submodules in the clone" |
9df63a4a | 7016 | msgstr "inicializar submódulos en el clonado" |
fb0e25bc | 7017 | |
33ac3e89 | 7018 | #: builtin/clone.c:105 |
fb0e25bc | 7019 | msgid "number of submodules cloned in parallel" |
9df63a4a | 7020 | msgstr "numero de submódulos clonados en paralelo" |
fb0e25bc | 7021 | |
33ac3e89 | 7022 | #: builtin/clone.c:106 builtin/init-db.c:476 |
fb0e25bc CD |
7023 | msgid "template-directory" |
7024 | msgstr "directorio-template" | |
7025 | ||
33ac3e89 | 7026 | #: builtin/clone.c:107 builtin/init-db.c:477 |
fb0e25bc | 7027 | msgid "directory from which templates will be used" |
715fc761 | 7028 | msgstr "directorio del cual los templates serán usados" |
fb0e25bc | 7029 | |
33ac3e89 CDR |
7030 | #: builtin/clone.c:109 builtin/clone.c:111 builtin/submodule--helper.c:1210 |
7031 | #: builtin/submodule--helper.c:1577 | |
fb0e25bc CD |
7032 | msgid "reference repository" |
7033 | msgstr "repositorio de referencia" | |
7034 | ||
33ac3e89 | 7035 | #: builtin/clone.c:113 |
fb0e25bc | 7036 | msgid "use --reference only while cloning" |
715fc761 | 7037 | msgstr "usa--reference solamente si estas clonado" |
fb0e25bc | 7038 | |
33ac3e89 | 7039 | #: builtin/clone.c:114 builtin/column.c:27 builtin/merge-file.c:44 |
fb0e25bc CD |
7040 | msgid "name" |
7041 | msgstr "nombre" | |
7042 | ||
33ac3e89 | 7043 | #: builtin/clone.c:115 |
fb0e25bc CD |
7044 | msgid "use <name> instead of 'origin' to track upstream" |
7045 | msgstr "use <nombre> en lugar de 'origin' para rastrear upstream" | |
7046 | ||
33ac3e89 | 7047 | #: builtin/clone.c:117 |
fb0e25bc CD |
7048 | msgid "checkout <branch> instead of the remote's HEAD" |
7049 | msgstr "checkout <rama> en lugar de HEAD remota" | |
7050 | ||
33ac3e89 | 7051 | #: builtin/clone.c:119 |
fb0e25bc CD |
7052 | msgid "path to git-upload-pack on the remote" |
7053 | msgstr "ruta para git-upload-pack en el remoto" | |
7054 | ||
33ac3e89 | 7055 | #: builtin/clone.c:120 builtin/fetch.c:151 builtin/grep.c:813 |
f8038f5b | 7056 | #: builtin/pull.c:211 |
fb0e25bc CD |
7057 | msgid "depth" |
7058 | msgstr "profundidad" | |
7059 | ||
33ac3e89 | 7060 | #: builtin/clone.c:121 |
fb0e25bc CD |
7061 | msgid "create a shallow clone of that depth" |
7062 | msgstr "crear un clon superficial para esa profundidad" | |
7063 | ||
33ac3e89 CDR |
7064 | #: builtin/clone.c:122 builtin/fetch.c:153 builtin/pack-objects.c:3017 |
7065 | #: parse-options.h:154 | |
fb0e25bc CD |
7066 | msgid "time" |
7067 | msgstr "tiempo" | |
7068 | ||
33ac3e89 | 7069 | #: builtin/clone.c:123 |
fb0e25bc CD |
7070 | msgid "create a shallow clone since a specific time" |
7071 | msgstr "crear un clon superficial desde el tiempo específico" | |
7072 | ||
33ac3e89 | 7073 | #: builtin/clone.c:124 builtin/fetch.c:155 |
fb0e25bc CD |
7074 | msgid "revision" |
7075 | msgstr "revision" | |
7076 | ||
33ac3e89 | 7077 | #: builtin/clone.c:125 builtin/fetch.c:156 |
fb0e25bc CD |
7078 | msgid "deepen history of shallow clone, excluding rev" |
7079 | msgstr "ahondando historia de clon superficial, excluyendo rev" | |
7080 | ||
33ac3e89 | 7081 | #: builtin/clone.c:127 |
fb0e25bc CD |
7082 | msgid "clone only one branch, HEAD or --branch" |
7083 | msgstr "clonar solo una rama,HEAD o --branch" | |
7084 | ||
33ac3e89 | 7085 | #: builtin/clone.c:129 |
fb0e25bc | 7086 | msgid "don't clone any tags, and make later fetches not to follow them" |
9df63a4a | 7087 | msgstr "no clonar ningún tag, y hacer que los subsiguientes fetch no los sigan" |
fb0e25bc | 7088 | |
33ac3e89 | 7089 | #: builtin/clone.c:131 |
fb0e25bc CD |
7090 | msgid "any cloned submodules will be shallow" |
7091 | msgstr "cualquier submódulo clonado será superficial" | |
7092 | ||
33ac3e89 | 7093 | #: builtin/clone.c:132 builtin/init-db.c:485 |
fb0e25bc CD |
7094 | msgid "gitdir" |
7095 | msgstr "gitdir" | |
7096 | ||
33ac3e89 | 7097 | #: builtin/clone.c:133 builtin/init-db.c:486 |
fb0e25bc CD |
7098 | msgid "separate git dir from working tree" |
7099 | msgstr "separa git dir del árbol de trabajo" | |
7100 | ||
33ac3e89 | 7101 | #: builtin/clone.c:134 |
fb0e25bc CD |
7102 | msgid "key=value" |
7103 | msgstr "llave=valor" | |
7104 | ||
33ac3e89 | 7105 | #: builtin/clone.c:135 |
fb0e25bc CD |
7106 | msgid "set config inside the new repository" |
7107 | msgstr "configurar config dentro del nuevo repositorio" | |
7108 | ||
33ac3e89 | 7109 | #: builtin/clone.c:136 builtin/fetch.c:173 builtin/pull.c:224 |
f8038f5b | 7110 | #: builtin/push.c:567 |
fb0e25bc CD |
7111 | msgid "use IPv4 addresses only" |
7112 | msgstr "solo usar direcciones IPv4" | |
7113 | ||
33ac3e89 | 7114 | #: builtin/clone.c:138 builtin/fetch.c:175 builtin/pull.c:227 |
f8038f5b | 7115 | #: builtin/push.c:569 |
fb0e25bc CD |
7116 | msgid "use IPv6 addresses only" |
7117 | msgstr "solo usar direcciones IPv6" | |
7118 | ||
33ac3e89 | 7119 | #: builtin/clone.c:276 |
fb0e25bc CD |
7120 | msgid "" |
7121 | "No directory name could be guessed.\n" | |
7122 | "Please specify a directory on the command line" | |
7123 | msgstr "" | |
7124 | "No se pudo adivinar ningún nombre de directorio.\n" | |
7125 | "Por favor especifique un directorio en la línea de comando" | |
7126 | ||
33ac3e89 | 7127 | #: builtin/clone.c:329 |
fb0e25bc CD |
7128 | #, c-format |
7129 | msgid "info: Could not add alternate for '%s': %s\n" | |
7130 | msgstr "info: No se pudo agregar un alterno para '%s': %s\n" | |
7131 | ||
33ac3e89 | 7132 | #: builtin/clone.c:401 |
fb0e25bc CD |
7133 | #, c-format |
7134 | msgid "failed to open '%s'" | |
7135 | msgstr "fallo al abrir '%s'" | |
7136 | ||
33ac3e89 | 7137 | #: builtin/clone.c:409 |
fb0e25bc CD |
7138 | #, c-format |
7139 | msgid "%s exists and is not a directory" | |
7140 | msgstr "%s existe pero no es un directorio" | |
7141 | ||
33ac3e89 | 7142 | #: builtin/clone.c:423 |
fb0e25bc CD |
7143 | #, c-format |
7144 | msgid "failed to stat %s\n" | |
7145 | msgstr "falló al analizar %s\n" | |
7146 | ||
33ac3e89 | 7147 | #: builtin/clone.c:445 |
fb0e25bc CD |
7148 | #, c-format |
7149 | msgid "failed to create link '%s'" | |
7150 | msgstr "fallo al crear link '%s'" | |
7151 | ||
33ac3e89 | 7152 | #: builtin/clone.c:449 |
fb0e25bc CD |
7153 | #, c-format |
7154 | msgid "failed to copy file to '%s'" | |
7155 | msgstr "fallo al copiar archivo a '%s'" | |
7156 | ||
33ac3e89 | 7157 | #: builtin/clone.c:475 |
fb0e25bc CD |
7158 | #, c-format |
7159 | msgid "done.\n" | |
7160 | msgstr "hecho.\n" | |
7161 | ||
33ac3e89 | 7162 | #: builtin/clone.c:489 |
fb0e25bc CD |
7163 | msgid "" |
7164 | "Clone succeeded, but checkout failed.\n" | |
7165 | "You can inspect what was checked out with 'git status'\n" | |
7166 | "and retry the checkout with 'git checkout -f HEAD'\n" | |
7167 | msgstr "" | |
7168 | "Clonado exitoso, pero falló el checkout.\n" | |
7169 | "Puede inspeccionar a qué se hizo checkout con 'git status'\n" | |
7170 | "y volver a intentarlo con 'git checkout -f HEAD'\n" | |
7171 | ||
33ac3e89 | 7172 | #: builtin/clone.c:566 |
fb0e25bc CD |
7173 | #, c-format |
7174 | msgid "Could not find remote branch %s to clone." | |
33ac3e89 | 7175 | msgstr "No se pudo encontrar la rama remota %s para clonar." |
fb0e25bc | 7176 | |
33ac3e89 | 7177 | #: builtin/clone.c:661 |
fb0e25bc | 7178 | msgid "remote did not send all necessary objects" |
9df63a4a | 7179 | msgstr "remoto no mando todos los objetos necesarios" |
fb0e25bc | 7180 | |
33ac3e89 | 7181 | #: builtin/clone.c:677 |
fb0e25bc CD |
7182 | #, c-format |
7183 | msgid "unable to update %s" | |
7184 | msgstr "incapaz de actualizar %s" | |
7185 | ||
33ac3e89 | 7186 | #: builtin/clone.c:726 |
fb0e25bc | 7187 | msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" |
4b15eb22 | 7188 | msgstr "" |
33ac3e89 | 7189 | "remoto HEAD refiere a un ref inexistente, no se puede hacer checkout.\n" |
fb0e25bc | 7190 | |
33ac3e89 | 7191 | #: builtin/clone.c:756 |
fb0e25bc | 7192 | msgid "unable to checkout working tree" |
715fc761 | 7193 | msgstr "no es posible realizar checkout en el árbol de trabajo" |
fb0e25bc | 7194 | |
33ac3e89 | 7195 | #: builtin/clone.c:801 |
fb0e25bc | 7196 | msgid "unable to write parameters to config file" |
715fc761 | 7197 | msgstr "no es posible escribir parámetros al archivo config" |
fb0e25bc | 7198 | |
33ac3e89 | 7199 | #: builtin/clone.c:864 |
fb0e25bc CD |
7200 | msgid "cannot repack to clean up" |
7201 | msgstr "no se puede reempaquetar para limpiar" | |
7202 | ||
33ac3e89 | 7203 | #: builtin/clone.c:866 |
fb0e25bc CD |
7204 | msgid "cannot unlink temporary alternates file" |
7205 | msgstr "no se puede desvincular archivos alternos temporales" | |
7206 | ||
33ac3e89 | 7207 | #: builtin/clone.c:906 builtin/receive-pack.c:1946 |
fb0e25bc CD |
7208 | msgid "Too many arguments." |
7209 | msgstr "Muchos argumentos." | |
7210 | ||
33ac3e89 | 7211 | #: builtin/clone.c:910 |
fb0e25bc | 7212 | msgid "You must specify a repository to clone." |
33ac3e89 | 7213 | msgstr "Tienes que especificar un repositorio para clonar." |
fb0e25bc | 7214 | |
33ac3e89 | 7215 | #: builtin/clone.c:923 |
fb0e25bc CD |
7216 | #, c-format |
7217 | msgid "--bare and --origin %s options are incompatible." | |
7218 | msgstr "Las opciones --bare y --origin %s son incompatibles." | |
7219 | ||
33ac3e89 | 7220 | #: builtin/clone.c:926 |
fb0e25bc CD |
7221 | msgid "--bare and --separate-git-dir are incompatible." |
7222 | msgstr "--bare y --separate-git-dir son incompatibles." | |
7223 | ||
33ac3e89 | 7224 | #: builtin/clone.c:939 |
fb0e25bc CD |
7225 | #, c-format |
7226 | msgid "repository '%s' does not exist" | |
7227 | msgstr "repositorio '%s' no existe" | |
7228 | ||
33ac3e89 | 7229 | #: builtin/clone.c:945 builtin/fetch.c:1455 |
fb0e25bc CD |
7230 | #, c-format |
7231 | msgid "depth %s is not a positive number" | |
7232 | msgstr "profundidad %s no es un numero positivo" | |
7233 | ||
33ac3e89 | 7234 | #: builtin/clone.c:955 |
fb0e25bc CD |
7235 | #, c-format |
7236 | msgid "destination path '%s' already exists and is not an empty directory." | |
33ac3e89 | 7237 | msgstr "la ruta de destino '%s' ya existe y no es un directorio vacío." |
fb0e25bc | 7238 | |
33ac3e89 | 7239 | #: builtin/clone.c:965 |
fb0e25bc CD |
7240 | #, c-format |
7241 | msgid "working tree '%s' already exists." | |
7242 | msgstr "directorio de trabajo '%s' ya existe." | |
7243 | ||
33ac3e89 CDR |
7244 | #: builtin/clone.c:980 builtin/clone.c:1001 builtin/difftool.c:270 |
7245 | #: builtin/worktree.c:255 builtin/worktree.c:285 | |
fb0e25bc CD |
7246 | #, c-format |
7247 | msgid "could not create leading directories of '%s'" | |
7248 | msgstr "no se pudo crear directorios principales de '%s'" | |
7249 | ||
33ac3e89 | 7250 | #: builtin/clone.c:985 |
fb0e25bc CD |
7251 | #, c-format |
7252 | msgid "could not create work tree dir '%s'" | |
715fc761 | 7253 | msgstr "no se pudo crear un árbol de trabajo '%s'" |
fb0e25bc | 7254 | |
33ac3e89 | 7255 | #: builtin/clone.c:1005 |
fb0e25bc CD |
7256 | #, c-format |
7257 | msgid "Cloning into bare repository '%s'...\n" | |
9df63a4a | 7258 | msgstr "Clonando en un repositorio vacío '%s'...\n" |
fb0e25bc | 7259 | |
33ac3e89 | 7260 | #: builtin/clone.c:1007 |
fb0e25bc CD |
7261 | #, c-format |
7262 | msgid "Cloning into '%s'...\n" | |
7263 | msgstr "Clonando en '%s'...\n" | |
7264 | ||
33ac3e89 | 7265 | #: builtin/clone.c:1031 |
4b15eb22 CD |
7266 | msgid "" |
7267 | "clone --recursive is not compatible with both --reference and --reference-if-" | |
7268 | "able" | |
7269 | msgstr "" | |
7270 | "clone --recursive no es compatible con --reference y --reference-if-able al " | |
7271 | "mismo tiempo" | |
fb0e25bc | 7272 | |
33ac3e89 | 7273 | #: builtin/clone.c:1093 |
fb0e25bc CD |
7274 | msgid "--depth is ignored in local clones; use file:// instead." |
7275 | msgstr "--depth es ignorada en clonaciones locales; usa file:// más bien." | |
7276 | ||
33ac3e89 | 7277 | #: builtin/clone.c:1095 |
fb0e25bc CD |
7278 | msgid "--shallow-since is ignored in local clones; use file:// instead." |
7279 | msgstr "--shallow-since es ignorado en el clon local; use file:// ." | |
7280 | ||
33ac3e89 | 7281 | #: builtin/clone.c:1097 |
fb0e25bc CD |
7282 | msgid "--shallow-exclude is ignored in local clones; use file:// instead." |
7283 | msgstr "--shallow-exclude es ignorado en clones locales; use file://." | |
7284 | ||
33ac3e89 CDR |
7285 | #: builtin/clone.c:1099 |
7286 | msgid "--filter is ignored in local clones; use file:// instead." | |
7287 | msgstr "--filter es ignorado en clones locales; usa file:// en su lugar." | |
7288 | ||
7289 | #: builtin/clone.c:1102 | |
fb0e25bc CD |
7290 | msgid "source repository is shallow, ignoring --local" |
7291 | msgstr "repositorio fuente es superficial, ignorando --local" | |
7292 | ||
33ac3e89 | 7293 | #: builtin/clone.c:1107 |
fb0e25bc CD |
7294 | msgid "--local is ignored" |
7295 | msgstr "--local es ignorado" | |
7296 | ||
33ac3e89 | 7297 | #: builtin/clone.c:1169 builtin/clone.c:1177 |
fb0e25bc CD |
7298 | #, c-format |
7299 | msgid "Remote branch %s not found in upstream %s" | |
7300 | msgstr "Rama remota %s no encontrada en upstream %s" | |
7301 | ||
33ac3e89 | 7302 | #: builtin/clone.c:1180 |
fb0e25bc CD |
7303 | msgid "You appear to have cloned an empty repository." |
7304 | msgstr "Pareces haber clonado un repositorio sin contenido." | |
7305 | ||
7306 | #: builtin/column.c:10 | |
7307 | msgid "git column [<options>]" | |
7308 | msgstr "git column [<opciones>]" | |
7309 | ||
7310 | #: builtin/column.c:27 | |
7311 | msgid "lookup config vars" | |
33ac3e89 | 7312 | msgstr "revisa las variables de configuraciones" |
fb0e25bc CD |
7313 | |
7314 | #: builtin/column.c:28 builtin/column.c:29 | |
7315 | msgid "layout to use" | |
7316 | msgstr "capa a usar" | |
7317 | ||
7318 | #: builtin/column.c:30 | |
7319 | msgid "Maximum width" | |
9df63a4a | 7320 | msgstr "Ancho máximo" |
fb0e25bc CD |
7321 | |
7322 | #: builtin/column.c:31 | |
7323 | msgid "Padding space on left border" | |
7324 | msgstr "Realizando padding en el borde izquierdo" | |
7325 | ||
7326 | #: builtin/column.c:32 | |
7327 | msgid "Padding space on right border" | |
7328 | msgstr "Realizando padding en el borde derecho" | |
7329 | ||
7330 | #: builtin/column.c:33 | |
7331 | msgid "Padding space between columns" | |
7332 | msgstr "Realizando padding entre columnas" | |
7333 | ||
7334 | #: builtin/column.c:52 | |
7335 | msgid "--command must be the first argument" | |
7336 | msgstr "--command debe ser el primer argumento" | |
7337 | ||
33ac3e89 | 7338 | #: builtin/commit.c:37 |
fb0e25bc | 7339 | msgid "git commit [<options>] [--] <pathspec>..." |
715fc761 | 7340 | msgstr "git commit [<opciones>] [--] <especificación-de-ruta>..." |
fb0e25bc | 7341 | |
33ac3e89 | 7342 | #: builtin/commit.c:42 |
fb0e25bc | 7343 | msgid "git status [<options>] [--] <pathspec>..." |
715fc761 | 7344 | msgstr "git status [<opciones>] [--] <especificación-de-ruta>..." |
fb0e25bc | 7345 | |
33ac3e89 | 7346 | #: builtin/commit.c:47 |
fb0e25bc CD |
7347 | msgid "" |
7348 | "You asked to amend the most recent commit, but doing so would make\n" | |
7349 | "it empty. You can repeat your command with --allow-empty, or you can\n" | |
7350 | "remove the commit entirely with \"git reset HEAD^\".\n" | |
7351 | msgstr "" | |
7352 | "Has solicitado un amend en tu commit mas reciente, pero hacerlo lo \n" | |
9df63a4a | 7353 | "vaciaría. Puedes repetir el comando con --alow-empty, o puedes remover \n" |
fb0e25bc CD |
7354 | "el commit completamente con \"git reset HEAD^\".\n" |
7355 | ||
33ac3e89 | 7356 | #: builtin/commit.c:52 |
fb0e25bc CD |
7357 | msgid "" |
7358 | "The previous cherry-pick is now empty, possibly due to conflict resolution.\n" | |
7359 | "If you wish to commit it anyway, use:\n" | |
7360 | "\n" | |
7361 | " git commit --allow-empty\n" | |
7362 | "\n" | |
7363 | msgstr "" | |
715fc761 CDR |
7364 | "El cherry-pick anterior ahora esta vacío, posiblemente por un conflicto de " |
7365 | "resolución.\n" | |
fb0e25bc CD |
7366 | "Si desea realizar un commit de todas maneras, use:\n" |
7367 | "\n" | |
7368 | " git commit --allow-empty\n" | |
7369 | "\n" | |
7370 | ||
33ac3e89 | 7371 | #: builtin/commit.c:59 |
fb0e25bc CD |
7372 | msgid "Otherwise, please use 'git reset'\n" |
7373 | msgstr "Caso contrario, por favor usa 'git reset'\n" | |
7374 | ||
33ac3e89 | 7375 | #: builtin/commit.c:62 |
fb0e25bc CD |
7376 | msgid "" |
7377 | "If you wish to skip this commit, use:\n" | |
7378 | "\n" | |
7379 | " git reset\n" | |
7380 | "\n" | |
7381 | "Then \"git cherry-pick --continue\" will resume cherry-picking\n" | |
7382 | "the remaining commits.\n" | |
7383 | msgstr "" | |
7384 | "Si quiere saltar este commit, use:\n" | |
7385 | "\n" | |
7386 | " git reset\n" | |
7387 | "\n" | |
7388 | "Luego \"git cherry-pick --continue\" continuara el cherry-picking\n" | |
7389 | "para los commits restantes.\n" | |
7390 | ||
33ac3e89 | 7391 | #: builtin/commit.c:284 |
fb0e25bc CD |
7392 | msgid "failed to unpack HEAD tree object" |
7393 | msgstr "fallo al desempaquetar objeto del árbol HEAD" | |
7394 | ||
33ac3e89 | 7395 | #: builtin/commit.c:325 |
fb0e25bc | 7396 | msgid "unable to create temporary index" |
715fc761 | 7397 | msgstr "no es posible crear un índice temporal" |
fb0e25bc | 7398 | |
33ac3e89 | 7399 | #: builtin/commit.c:331 |
fb0e25bc | 7400 | msgid "interactive add failed" |
715fc761 | 7401 | msgstr "adición interactiva fallida" |
fb0e25bc | 7402 | |
33ac3e89 | 7403 | #: builtin/commit.c:344 |
fb0e25bc | 7404 | msgid "unable to update temporary index" |
715fc761 | 7405 | msgstr "no es posible actualizar el índice temporal" |
fb0e25bc | 7406 | |
33ac3e89 | 7407 | #: builtin/commit.c:346 |
fb0e25bc | 7408 | msgid "Failed to update main cache tree" |
715fc761 | 7409 | msgstr "Fallo al actualizar el cache principal del árbol" |
fb0e25bc | 7410 | |
33ac3e89 | 7411 | #: builtin/commit.c:371 builtin/commit.c:395 builtin/commit.c:444 |
fb0e25bc | 7412 | msgid "unable to write new_index file" |
9df63a4a | 7413 | msgstr "no es posible escribir archivo new_index" |
fb0e25bc | 7414 | |
33ac3e89 | 7415 | #: builtin/commit.c:427 |
fb0e25bc | 7416 | msgid "cannot do a partial commit during a merge." |
715fc761 | 7417 | msgstr "no se puede realizar un commit parcial durante una fusión." |
fb0e25bc | 7418 | |
33ac3e89 | 7419 | #: builtin/commit.c:429 |
fb0e25bc CD |
7420 | msgid "cannot do a partial commit during a cherry-pick." |
7421 | msgstr "no se puede realizar un commit parcial durante un cherry-pick." | |
7422 | ||
33ac3e89 | 7423 | #: builtin/commit.c:437 |
fb0e25bc | 7424 | msgid "cannot read the index" |
33ac3e89 | 7425 | msgstr "no se puede leer el índice" |
fb0e25bc | 7426 | |
33ac3e89 | 7427 | #: builtin/commit.c:456 |
fb0e25bc | 7428 | msgid "unable to write temporary index file" |
33ac3e89 | 7429 | msgstr "no es posible escribir el índice temporal" |
fb0e25bc | 7430 | |
33ac3e89 | 7431 | #: builtin/commit.c:553 |
fb0e25bc CD |
7432 | #, c-format |
7433 | msgid "commit '%s' lacks author header" | |
33ac3e89 | 7434 | msgstr "commit '%s' requiere cabecera de autor" |
fb0e25bc | 7435 | |
33ac3e89 | 7436 | #: builtin/commit.c:555 |
fb0e25bc CD |
7437 | #, c-format |
7438 | msgid "commit '%s' has malformed author line" | |
715fc761 | 7439 | msgstr "el commit '%s' tiene una línea de autor mal formada" |
fb0e25bc | 7440 | |
33ac3e89 | 7441 | #: builtin/commit.c:574 |
fb0e25bc | 7442 | msgid "malformed --author parameter" |
9df63a4a | 7443 | msgstr "parámetro --author mal formado" |
fb0e25bc | 7444 | |
33ac3e89 | 7445 | #: builtin/commit.c:626 |
fb0e25bc CD |
7446 | msgid "" |
7447 | "unable to select a comment character that is not used\n" | |
7448 | "in the current commit message" | |
7449 | msgstr "" | |
715fc761 | 7450 | "no es posible seleccionar un carácter de comentario que no es usado\n" |
fb0e25bc CD |
7451 | "en el mensaje de commit actual" |
7452 | ||
33ac3e89 | 7453 | #: builtin/commit.c:663 builtin/commit.c:696 builtin/commit.c:1024 |
fb0e25bc CD |
7454 | #, c-format |
7455 | msgid "could not lookup commit %s" | |
7456 | msgstr "no se pudo revisar el commit %s" | |
7457 | ||
33ac3e89 | 7458 | #: builtin/commit.c:675 builtin/shortlog.c:309 |
fb0e25bc CD |
7459 | #, c-format |
7460 | msgid "(reading log message from standard input)\n" | |
7461 | msgstr "(leyendo mensajes de logs desde standard input)\n" | |
7462 | ||
33ac3e89 | 7463 | #: builtin/commit.c:677 |
fb0e25bc CD |
7464 | msgid "could not read log from standard input" |
7465 | msgstr "no se pudo leer log desde standard input" | |
7466 | ||
33ac3e89 | 7467 | #: builtin/commit.c:681 |
fb0e25bc CD |
7468 | #, c-format |
7469 | msgid "could not read log file '%s'" | |
7470 | msgstr "no se pudo leer el log '%s'" | |
7471 | ||
33ac3e89 | 7472 | #: builtin/commit.c:710 builtin/commit.c:718 |
fb0e25bc CD |
7473 | msgid "could not read SQUASH_MSG" |
7474 | msgstr "no se pudo leer SQUASH_MSG" | |
7475 | ||
33ac3e89 | 7476 | #: builtin/commit.c:715 |
fb0e25bc CD |
7477 | msgid "could not read MERGE_MSG" |
7478 | msgstr "no se pudo leer MERGE_MSG" | |
7479 | ||
33ac3e89 | 7480 | #: builtin/commit.c:769 |
fb0e25bc | 7481 | msgid "could not write commit template" |
715fc761 | 7482 | msgstr "no se pudo escribir el template del commit" |
fb0e25bc | 7483 | |
33ac3e89 | 7484 | #: builtin/commit.c:787 |
fb0e25bc CD |
7485 | #, c-format |
7486 | msgid "" | |
7487 | "\n" | |
7488 | "It looks like you may be committing a merge.\n" | |
7489 | "If this is not correct, please remove the file\n" | |
7490 | "\t%s\n" | |
7491 | "and try again.\n" | |
7492 | msgstr "" | |
7493 | "\n" | |
715fc761 | 7494 | "Parece que estas haciendo un commit con una fusión dentro.\n" |
fb0e25bc CD |
7495 | "Si esto no es correcto, por favor remueve el archivo\n" |
7496 | "\t%s\n" | |
7497 | "y vuelve a intentar.\n" | |
7498 | ||
33ac3e89 | 7499 | #: builtin/commit.c:792 |
fb0e25bc CD |
7500 | #, c-format |
7501 | msgid "" | |
7502 | "\n" | |
7503 | "It looks like you may be committing a cherry-pick.\n" | |
7504 | "If this is not correct, please remove the file\n" | |
7505 | "\t%s\n" | |
7506 | "and try again.\n" | |
7507 | msgstr "" | |
7508 | "\n" | |
7509 | "Parece que puede estar haciendo un commit a un cherry-pick.\n" | |
7510 | "Si esto no es correcto, por favor elimine el archivo\n" | |
7511 | "\t%s\n" | |
7512 | "y vuelva a intentar.\n" | |
7513 | ||
33ac3e89 | 7514 | #: builtin/commit.c:805 |
fb0e25bc CD |
7515 | #, c-format |
7516 | msgid "" | |
7517 | "Please enter the commit message for your changes. Lines starting\n" | |
7518 | "with '%c' will be ignored, and an empty message aborts the commit.\n" | |
7519 | msgstr "" | |
4b15eb22 CD |
7520 | "Por favor ingrese el mensaje del commit para sus cambios. Las líneas que " |
7521 | "comiencen\n" | |
fb0e25bc CD |
7522 | "con '%c' serán ignoradas, y un mensaje vacío aborta el commit.\n" |
7523 | ||
33ac3e89 | 7524 | #: builtin/commit.c:813 |
fb0e25bc CD |
7525 | #, c-format |
7526 | msgid "" | |
7527 | "Please enter the commit message for your changes. Lines starting\n" | |
7528 | "with '%c' will be kept; you may remove them yourself if you want to.\n" | |
7529 | "An empty message aborts the commit.\n" | |
7530 | msgstr "" | |
4b15eb22 CD |
7531 | "Por favor ingrese el mensaje del commit para sus cambios. Las líneas que " |
7532 | "comiencen\n" | |
fb0e25bc CD |
7533 | "con '%c' serán guardadas; puede removerlas usted mismo si desea.\n" |
7534 | "Un mensaje vacío aborta el commit.\n" | |
7535 | ||
33ac3e89 | 7536 | #: builtin/commit.c:830 |
fb0e25bc CD |
7537 | #, c-format |
7538 | msgid "%sAuthor: %.*s <%.*s>" | |
7539 | msgstr "%sAutor: %.*s <%.*s>" | |
7540 | ||
33ac3e89 | 7541 | #: builtin/commit.c:838 |
fb0e25bc CD |
7542 | #, c-format |
7543 | msgid "%sDate: %s" | |
7544 | msgstr "%sFecha: %s" | |
7545 | ||
33ac3e89 | 7546 | #: builtin/commit.c:845 |
fb0e25bc CD |
7547 | #, c-format |
7548 | msgid "%sCommitter: %.*s <%.*s>" | |
7549 | msgstr "%sCommitter: %.*s <%.*s>" | |
7550 | ||
33ac3e89 | 7551 | #: builtin/commit.c:862 |
fb0e25bc CD |
7552 | msgid "Cannot read index" |
7553 | msgstr "No se puede leer el índice" | |
7554 | ||
33ac3e89 | 7555 | #: builtin/commit.c:928 |
fb0e25bc CD |
7556 | msgid "Error building trees" |
7557 | msgstr "Error al construir los árboles" | |
7558 | ||
33ac3e89 | 7559 | #: builtin/commit.c:942 builtin/tag.c:256 |
fb0e25bc CD |
7560 | #, c-format |
7561 | msgid "Please supply the message using either -m or -F option.\n" | |
7562 | msgstr "Por favor suministra el mensaje usando las opciones -m o -F.\n" | |
7563 | ||
33ac3e89 | 7564 | #: builtin/commit.c:986 |
fb0e25bc CD |
7565 | #, c-format |
7566 | msgid "--author '%s' is not 'Name <email>' and matches no existing author" | |
4b15eb22 CD |
7567 | msgstr "" |
7568 | "--author '%s' no está en el formato 'Name <email>' y no concuerda con ningún " | |
7569 | "autor existente" | |
fb0e25bc | 7570 | |
33ac3e89 | 7571 | #: builtin/commit.c:1000 |
f8038f5b CDR |
7572 | #, c-format |
7573 | msgid "Invalid ignored mode '%s'" | |
7574 | msgstr "Modo ignorado inválido '%s'" | |
7575 | ||
33ac3e89 | 7576 | #: builtin/commit.c:1014 builtin/commit.c:1264 |
fb0e25bc CD |
7577 | #, c-format |
7578 | msgid "Invalid untracked files mode '%s'" | |
7579 | msgstr "Modo inválido de los archivos no rastreados '%s'" | |
7580 | ||
33ac3e89 | 7581 | #: builtin/commit.c:1052 |
fb0e25bc CD |
7582 | msgid "--long and -z are incompatible" |
7583 | msgstr "--long y -z son incompatibles" | |
7584 | ||
33ac3e89 | 7585 | #: builtin/commit.c:1085 |
fb0e25bc CD |
7586 | msgid "Using both --reset-author and --author does not make sense" |
7587 | msgstr "Usar ambos --reset-author y --author no tiene sentido" | |
7588 | ||
33ac3e89 | 7589 | #: builtin/commit.c:1094 |
fb0e25bc CD |
7590 | msgid "You have nothing to amend." |
7591 | msgstr "No tienes nada que enmendar." | |
7592 | ||
33ac3e89 | 7593 | #: builtin/commit.c:1097 |
fb0e25bc CD |
7594 | msgid "You are in the middle of a merge -- cannot amend." |
7595 | msgstr "Estás en medio de una fusión -- no puedes enmendar." | |
7596 | ||
33ac3e89 | 7597 | #: builtin/commit.c:1099 |
fb0e25bc CD |
7598 | msgid "You are in the middle of a cherry-pick -- cannot amend." |
7599 | msgstr "Está en medio de un cherry-pick -- no se puede enmendar." | |
7600 | ||
33ac3e89 | 7601 | #: builtin/commit.c:1102 |
fb0e25bc CD |
7602 | msgid "Options --squash and --fixup cannot be used together" |
7603 | msgstr "Opciones --squash y --fixup no pueden ser usadas juntas" | |
7604 | ||
33ac3e89 | 7605 | #: builtin/commit.c:1112 |
fb0e25bc | 7606 | msgid "Only one of -c/-C/-F/--fixup can be used." |
9df63a4a | 7607 | msgstr "Solo uno de -c/-C/-F/--fixup puede ser usado." |
fb0e25bc | 7608 | |
33ac3e89 CDR |
7609 | #: builtin/commit.c:1114 |
7610 | msgid "Option -m cannot be combined with -c/-C/-F." | |
7611 | msgstr "La opción -m no puede ser combinada con -c/-C/-F." | |
fb0e25bc | 7612 | |
33ac3e89 | 7613 | #: builtin/commit.c:1122 |
fb0e25bc CD |
7614 | msgid "--reset-author can be used only with -C, -c or --amend." |
7615 | msgstr "--reset-author sólo puede ser usada con -C, -c o --amend." | |
7616 | ||
33ac3e89 | 7617 | #: builtin/commit.c:1139 |
fb0e25bc | 7618 | msgid "Only one of --include/--only/--all/--interactive/--patch can be used." |
4b15eb22 CD |
7619 | msgstr "" |
7620 | "Solo uno de --include/--only/--all/--interactive/--patch puede ser usado." | |
fb0e25bc | 7621 | |
33ac3e89 | 7622 | #: builtin/commit.c:1141 |
fb0e25bc CD |
7623 | msgid "No paths with --include/--only does not make sense." |
7624 | msgstr "No hay rutas con --include/--only no tiene sentido." | |
7625 | ||
33ac3e89 | 7626 | #: builtin/commit.c:1155 builtin/tag.c:542 |
fb0e25bc CD |
7627 | #, c-format |
7628 | msgid "Invalid cleanup mode %s" | |
7629 | msgstr "Modo cleanup invalido %s" | |
7630 | ||
33ac3e89 | 7631 | #: builtin/commit.c:1160 |
fb0e25bc CD |
7632 | msgid "Paths with -a does not make sense." |
7633 | msgstr "Rutas con -a no tiene sentido." | |
7634 | ||
33ac3e89 | 7635 | #: builtin/commit.c:1278 builtin/commit.c:1443 |
fb0e25bc CD |
7636 | msgid "show status concisely" |
7637 | msgstr "mostrar status de manera concisa" | |
7638 | ||
33ac3e89 | 7639 | #: builtin/commit.c:1280 builtin/commit.c:1445 |
fb0e25bc | 7640 | msgid "show branch information" |
715fc761 | 7641 | msgstr "mostrar información de la rama" |
fb0e25bc | 7642 | |
33ac3e89 | 7643 | #: builtin/commit.c:1282 |
fb0e25bc | 7644 | msgid "show stash information" |
715fc761 | 7645 | msgstr "mostrar información del stash" |
fb0e25bc | 7646 | |
33ac3e89 CDR |
7647 | #: builtin/commit.c:1284 builtin/commit.c:1447 |
7648 | msgid "compute full ahead/behind values" | |
7649 | msgstr "calcular todos los valores delante/atrás" | |
7650 | ||
7651 | #: builtin/commit.c:1286 | |
fb0e25bc CD |
7652 | msgid "version" |
7653 | msgstr "version" | |
7654 | ||
33ac3e89 CDR |
7655 | #: builtin/commit.c:1286 builtin/commit.c:1449 builtin/push.c:542 |
7656 | #: builtin/worktree.c:541 | |
fb0e25bc CD |
7657 | msgid "machine-readable output" |
7658 | msgstr "output formato-maquina" | |
7659 | ||
33ac3e89 | 7660 | #: builtin/commit.c:1289 builtin/commit.c:1451 |
fb0e25bc CD |
7661 | msgid "show status in long format (default)" |
7662 | msgstr "mostrar status en formato largo (default)" | |
7663 | ||
33ac3e89 | 7664 | #: builtin/commit.c:1292 builtin/commit.c:1454 |
fb0e25bc CD |
7665 | msgid "terminate entries with NUL" |
7666 | msgstr "terminar entradas con NUL" | |
7667 | ||
33ac3e89 CDR |
7668 | #: builtin/commit.c:1294 builtin/commit.c:1298 builtin/commit.c:1457 |
7669 | #: builtin/fast-export.c:999 builtin/fast-export.c:1002 builtin/tag.c:396 | |
fb0e25bc CD |
7670 | msgid "mode" |
7671 | msgstr "modo" | |
7672 | ||
33ac3e89 | 7673 | #: builtin/commit.c:1295 builtin/commit.c:1457 |
fb0e25bc | 7674 | msgid "show untracked files, optional modes: all, normal, no. (Default: all)" |
4b15eb22 CD |
7675 | msgstr "" |
7676 | "mostrar archivos sin seguimiento, modos opcionales: all, normal, no. " | |
7677 | "(Predeterminado: all)" | |
fb0e25bc | 7678 | |
33ac3e89 | 7679 | #: builtin/commit.c:1299 |
f8038f5b CDR |
7680 | msgid "" |
7681 | "show ignored files, optional modes: traditional, matching, no. (Default: " | |
7682 | "traditional)" | |
7683 | msgstr "" | |
7684 | "mostrar archivos ignorados, modos opcionales: traditional, matching, no. " | |
7685 | "(Predeterminado: traditional)" | |
fb0e25bc | 7686 | |
33ac3e89 | 7687 | #: builtin/commit.c:1301 parse-options.h:167 |
fb0e25bc CD |
7688 | msgid "when" |
7689 | msgstr "cuando" | |
7690 | ||
33ac3e89 | 7691 | #: builtin/commit.c:1302 |
4b15eb22 CD |
7692 | msgid "" |
7693 | "ignore changes to submodules, optional when: all, dirty, untracked. " | |
7694 | "(Default: all)" | |
7695 | msgstr "" | |
9df63a4a | 7696 | "ignorar cambios en submódulos, opcional cuando: all,dirty,untracked. " |
4b15eb22 | 7697 | "(Default: all)" |
fb0e25bc | 7698 | |
33ac3e89 | 7699 | #: builtin/commit.c:1304 |
fb0e25bc CD |
7700 | msgid "list untracked files in columns" |
7701 | msgstr "listar en columnas los archivos sin seguimiento" | |
7702 | ||
33ac3e89 | 7703 | #: builtin/commit.c:1323 |
f8038f5b CDR |
7704 | msgid "Unsupported combination of ignored and untracked-files arguments" |
7705 | msgstr "" | |
7706 | "Combinación de argumentos de archivos ignorados y no rastreados no soportada" | |
7707 | ||
33ac3e89 | 7708 | #: builtin/commit.c:1413 |
fb0e25bc CD |
7709 | msgid "suppress summary after successful commit" |
7710 | msgstr "suprime summary tras un commit exitoso" | |
7711 | ||
33ac3e89 | 7712 | #: builtin/commit.c:1414 |
fb0e25bc CD |
7713 | msgid "show diff in commit message template" |
7714 | msgstr "mostrar diff en el template del mensaje de commit" | |
7715 | ||
33ac3e89 | 7716 | #: builtin/commit.c:1416 |
fb0e25bc | 7717 | msgid "Commit message options" |
715fc761 | 7718 | msgstr "Opciones para el mensaje del commit" |
fb0e25bc | 7719 | |
33ac3e89 | 7720 | #: builtin/commit.c:1417 builtin/tag.c:393 |
fb0e25bc CD |
7721 | msgid "read message from file" |
7722 | msgstr "leer mensaje desde un archivo" | |
7723 | ||
33ac3e89 | 7724 | #: builtin/commit.c:1418 |
fb0e25bc CD |
7725 | msgid "author" |
7726 | msgstr "autor" | |
7727 | ||
33ac3e89 | 7728 | #: builtin/commit.c:1418 |
fb0e25bc | 7729 | msgid "override author for commit" |
715fc761 | 7730 | msgstr "sobrescribe el autor del commit" |
fb0e25bc | 7731 | |
33ac3e89 | 7732 | #: builtin/commit.c:1419 builtin/gc.c:359 |
fb0e25bc CD |
7733 | msgid "date" |
7734 | msgstr "fecha" | |
7735 | ||
33ac3e89 | 7736 | #: builtin/commit.c:1419 |
fb0e25bc | 7737 | msgid "override date for commit" |
715fc761 | 7738 | msgstr "sobrescribe la fecha del commit" |
fb0e25bc | 7739 | |
33ac3e89 CDR |
7740 | #: builtin/commit.c:1420 builtin/merge.c:226 builtin/notes.c:402 |
7741 | #: builtin/notes.c:565 builtin/tag.c:391 | |
fb0e25bc CD |
7742 | msgid "message" |
7743 | msgstr "mensaje" | |
7744 | ||
33ac3e89 | 7745 | #: builtin/commit.c:1420 |
fb0e25bc | 7746 | msgid "commit message" |
715fc761 | 7747 | msgstr "mensaje del commit" |
fb0e25bc | 7748 | |
33ac3e89 CDR |
7749 | #: builtin/commit.c:1421 builtin/commit.c:1422 builtin/commit.c:1423 |
7750 | #: builtin/commit.c:1424 parse-options.h:269 ref-filter.h:92 | |
fb0e25bc CD |
7751 | msgid "commit" |
7752 | msgstr "confirmar" | |
7753 | ||
33ac3e89 | 7754 | #: builtin/commit.c:1421 |
fb0e25bc CD |
7755 | msgid "reuse and edit message from specified commit" |
7756 | msgstr "reusar y editar el mensaje de un commit especifico" | |
7757 | ||
33ac3e89 | 7758 | #: builtin/commit.c:1422 |
fb0e25bc CD |
7759 | msgid "reuse message from specified commit" |
7760 | msgstr "reusar el mensaje de un commit especifico" | |
7761 | ||
33ac3e89 | 7762 | #: builtin/commit.c:1423 |
fb0e25bc | 7763 | msgid "use autosquash formatted message to fixup specified commit" |
4b15eb22 CD |
7764 | msgstr "" |
7765 | "usar mensaje de formato autosquash para arreglar el commit especificado" | |
fb0e25bc | 7766 | |
33ac3e89 | 7767 | #: builtin/commit.c:1424 |
fb0e25bc | 7768 | msgid "use autosquash formatted message to squash specified commit" |
4b15eb22 CD |
7769 | msgstr "" |
7770 | "usar el mensaje de formato autosquash para realizar squash al commit " | |
7771 | "especificado" | |
fb0e25bc | 7772 | |
33ac3e89 | 7773 | #: builtin/commit.c:1425 |
fb0e25bc CD |
7774 | msgid "the commit is authored by me now (used with -C/-c/--amend)" |
7775 | msgstr "el autor del commit soy yo ahora (usado con -C/-c/--amend)" | |
7776 | ||
33ac3e89 | 7777 | #: builtin/commit.c:1426 builtin/log.c:1446 builtin/merge.c:240 |
f8038f5b | 7778 | #: builtin/pull.c:149 builtin/revert.c:105 |
fb0e25bc CD |
7779 | msgid "add Signed-off-by:" |
7780 | msgstr "agregar Signed-off-by: (firmado por)" | |
7781 | ||
33ac3e89 | 7782 | #: builtin/commit.c:1427 |
fb0e25bc | 7783 | msgid "use specified template file" |
715fc761 | 7784 | msgstr "usar archivo de template especificado" |
fb0e25bc | 7785 | |
33ac3e89 | 7786 | #: builtin/commit.c:1428 |
fb0e25bc | 7787 | msgid "force edit of commit" |
715fc761 | 7788 | msgstr "forzar la edición del commit" |
fb0e25bc | 7789 | |
33ac3e89 | 7790 | #: builtin/commit.c:1429 |
fb0e25bc CD |
7791 | msgid "default" |
7792 | msgstr "default" | |
7793 | ||
33ac3e89 | 7794 | #: builtin/commit.c:1429 builtin/tag.c:397 |
fb0e25bc CD |
7795 | msgid "how to strip spaces and #comments from message" |
7796 | msgstr "cómo quitar espacios y #comentarios de mensajes" | |
7797 | ||
33ac3e89 | 7798 | #: builtin/commit.c:1430 |
fb0e25bc CD |
7799 | msgid "include status in commit message template" |
7800 | msgstr "incluir status en el template del mensaje de commit" | |
7801 | ||
33ac3e89 | 7802 | #: builtin/commit.c:1432 builtin/merge.c:238 builtin/pull.c:179 |
4b15eb22 | 7803 | #: builtin/revert.c:113 |
fb0e25bc | 7804 | msgid "GPG sign commit" |
33ac3e89 | 7805 | msgstr "Firmar commit con GPG" |
fb0e25bc | 7806 | |
33ac3e89 | 7807 | #: builtin/commit.c:1435 |
fb0e25bc | 7808 | msgid "Commit contents options" |
715fc761 | 7809 | msgstr "Opciones para el contenido del commit" |
fb0e25bc | 7810 | |
33ac3e89 | 7811 | #: builtin/commit.c:1436 |
fb0e25bc CD |
7812 | msgid "commit all changed files" |
7813 | msgstr "confirmar todos los archivos cambiados" | |
7814 | ||
33ac3e89 | 7815 | #: builtin/commit.c:1437 |
fb0e25bc CD |
7816 | msgid "add specified files to index for commit" |
7817 | msgstr "agregar archivos específicos al índice para confirmar" | |
7818 | ||
33ac3e89 | 7819 | #: builtin/commit.c:1438 |
fb0e25bc CD |
7820 | msgid "interactively add files" |
7821 | msgstr "agregar archivos interactivamente" | |
7822 | ||
33ac3e89 | 7823 | #: builtin/commit.c:1439 |
fb0e25bc CD |
7824 | msgid "interactively add changes" |
7825 | msgstr "agregar cambios interactivamente" | |
7826 | ||
33ac3e89 | 7827 | #: builtin/commit.c:1440 |
fb0e25bc CD |
7828 | msgid "commit only specified files" |
7829 | msgstr "sólo confirmar archivos específicos" | |
7830 | ||
33ac3e89 | 7831 | #: builtin/commit.c:1441 |
fb0e25bc | 7832 | msgid "bypass pre-commit and commit-msg hooks" |
f8038f5b | 7833 | msgstr "evitar los capturadores (hooks) de pre-commit y commit-msg" |
fb0e25bc | 7834 | |
33ac3e89 | 7835 | #: builtin/commit.c:1442 |
fb0e25bc | 7836 | msgid "show what would be committed" |
9df63a4a | 7837 | msgstr "mostrar lo que sería incluido en el commit" |
fb0e25bc | 7838 | |
33ac3e89 | 7839 | #: builtin/commit.c:1455 |
fb0e25bc | 7840 | msgid "amend previous commit" |
715fc761 | 7841 | msgstr "enmendar commit previo" |
fb0e25bc | 7842 | |
33ac3e89 | 7843 | #: builtin/commit.c:1456 |
fb0e25bc CD |
7844 | msgid "bypass post-rewrite hook" |
7845 | msgstr "gancho bypass post reescritura" | |
7846 | ||
33ac3e89 | 7847 | #: builtin/commit.c:1461 |
fb0e25bc | 7848 | msgid "ok to record an empty change" |
9df63a4a | 7849 | msgstr "ok al grabar un cambio vacío" |
fb0e25bc | 7850 | |
33ac3e89 | 7851 | #: builtin/commit.c:1463 |
fb0e25bc | 7852 | msgid "ok to record a change with an empty message" |
9df63a4a | 7853 | msgstr "ok al grabar un cambio con un mensaje vacío" |
fb0e25bc | 7854 | |
33ac3e89 | 7855 | #: builtin/commit.c:1536 |
fb0e25bc CD |
7856 | #, c-format |
7857 | msgid "Corrupt MERGE_HEAD file (%s)" | |
7858 | msgstr "Archivo MERGE_HEAD (%s) corrupto" | |
7859 | ||
33ac3e89 | 7860 | #: builtin/commit.c:1543 |
fb0e25bc CD |
7861 | msgid "could not read MERGE_MODE" |
7862 | msgstr "no se pudo leer MERGE_MODE" | |
7863 | ||
33ac3e89 | 7864 | #: builtin/commit.c:1562 |
fb0e25bc CD |
7865 | #, c-format |
7866 | msgid "could not read commit message: %s" | |
7867 | msgstr "no se pudo leer el mensaje de commit: %s" | |
7868 | ||
33ac3e89 | 7869 | #: builtin/commit.c:1573 |
fb0e25bc CD |
7870 | #, c-format |
7871 | msgid "Aborting commit due to empty commit message.\n" | |
715fc761 | 7872 | msgstr "Abortando commit debido que el mensaje está en blanco.\n" |
fb0e25bc | 7873 | |
33ac3e89 | 7874 | #: builtin/commit.c:1578 |
4b15eb22 CD |
7875 | #, c-format |
7876 | msgid "Aborting commit; you did not edit the message.\n" | |
7877 | msgstr "Abortando commit; no se ha editado el mensaje\n" | |
7878 | ||
33ac3e89 | 7879 | #: builtin/commit.c:1613 |
fb0e25bc CD |
7880 | msgid "" |
7881 | "Repository has been updated, but unable to write\n" | |
7882 | "new_index file. Check that disk is not full and quota is\n" | |
7883 | "not exceeded, and then \"git reset HEAD\" to recover." | |
7884 | msgstr "" | |
7885 | "El repositorio ha sido actualizado, pero no se pudo escribir el archivo\n" | |
7886 | "new_index. Verifique que el disco no este lleno y la quota no ha\n" | |
7887 | "sido superada, y luego \"git reset HEAD\" para recuperar." | |
7888 | ||
7889 | #: builtin/config.c:10 | |
7890 | msgid "git config [<options>]" | |
7891 | msgstr "git config [<opciones>]" | |
7892 | ||
f8038f5b | 7893 | #: builtin/config.c:58 |
fb0e25bc | 7894 | msgid "Config file location" |
33ac3e89 | 7895 | msgstr "Ubicación del archivo configuración" |
fb0e25bc | 7896 | |
f8038f5b | 7897 | #: builtin/config.c:59 |
fb0e25bc CD |
7898 | msgid "use global config file" |
7899 | msgstr "usar archivo de config global" | |
7900 | ||
f8038f5b | 7901 | #: builtin/config.c:60 |
fb0e25bc CD |
7902 | msgid "use system config file" |
7903 | msgstr "usar archivo de config del sistema" | |
7904 | ||
f8038f5b | 7905 | #: builtin/config.c:61 |
fb0e25bc CD |
7906 | msgid "use repository config file" |
7907 | msgstr "usar archivo de config del repositorio" | |
7908 | ||
f8038f5b | 7909 | #: builtin/config.c:62 |
fb0e25bc CD |
7910 | msgid "use given config file" |
7911 | msgstr "usar archivo config especificado" | |
7912 | ||
f8038f5b | 7913 | #: builtin/config.c:63 |
fb0e25bc CD |
7914 | msgid "blob-id" |
7915 | msgstr "blob-id" | |
7916 | ||
f8038f5b | 7917 | #: builtin/config.c:63 |
fb0e25bc CD |
7918 | msgid "read config from given blob object" |
7919 | msgstr "leer config del objeto blob suministrado" | |
7920 | ||
f8038f5b | 7921 | #: builtin/config.c:64 |
fb0e25bc | 7922 | msgid "Action" |
715fc761 | 7923 | msgstr "Acción" |
fb0e25bc | 7924 | |
f8038f5b | 7925 | #: builtin/config.c:65 |
fb0e25bc CD |
7926 | msgid "get value: name [value-regex]" |
7927 | msgstr "obtener valor: nombre [valor-regex]" | |
7928 | ||
f8038f5b | 7929 | #: builtin/config.c:66 |
fb0e25bc CD |
7930 | msgid "get all values: key [value-regex]" |
7931 | msgstr "obtener todos los valores: llave [valores-regex]" | |
7932 | ||
f8038f5b | 7933 | #: builtin/config.c:67 |
fb0e25bc CD |
7934 | msgid "get values for regexp: name-regex [value-regex]" |
7935 | msgstr "obtener valores para una regexp: nombre-regex [valor-regex]" | |
7936 | ||
f8038f5b | 7937 | #: builtin/config.c:68 |
fb0e25bc | 7938 | msgid "get value specific for the URL: section[.var] URL" |
715fc761 | 7939 | msgstr "obtener valor especifico para el URL: sección[.var] URL" |
fb0e25bc | 7940 | |
f8038f5b | 7941 | #: builtin/config.c:69 |
fb0e25bc | 7942 | msgid "replace all matching variables: name value [value_regex]" |
4b15eb22 CD |
7943 | msgstr "" |
7944 | "remplazar todas las variables que concuerden: nombre valor [valor_regex]" | |
fb0e25bc | 7945 | |
f8038f5b | 7946 | #: builtin/config.c:70 |
fb0e25bc | 7947 | msgid "add a new variable: name value" |
33ac3e89 | 7948 | msgstr "agregar nueva variable: nombre valor" |
fb0e25bc | 7949 | |
f8038f5b | 7950 | #: builtin/config.c:71 |
fb0e25bc CD |
7951 | msgid "remove a variable: name [value-regex]" |
7952 | msgstr "borrar una variable. nombre [valor-regex]" | |
7953 | ||
f8038f5b | 7954 | #: builtin/config.c:72 |
fb0e25bc CD |
7955 | msgid "remove all matches: name [value-regex]" |
7956 | msgstr "borrar todas las concurrencias: nombre [valor-regex]" | |
7957 | ||
f8038f5b | 7958 | #: builtin/config.c:73 |
fb0e25bc | 7959 | msgid "rename section: old-name new-name" |
715fc761 | 7960 | msgstr "renombrar sección: nombre-viejo nombre-nuevo" |
fb0e25bc | 7961 | |
f8038f5b | 7962 | #: builtin/config.c:74 |
fb0e25bc | 7963 | msgid "remove a section: name" |
715fc761 | 7964 | msgstr "borrar una sección: nombre" |
fb0e25bc | 7965 | |
f8038f5b | 7966 | #: builtin/config.c:75 |
fb0e25bc CD |
7967 | msgid "list all" |
7968 | msgstr "listar todo" | |
7969 | ||
f8038f5b | 7970 | #: builtin/config.c:76 |
fb0e25bc CD |
7971 | msgid "open an editor" |
7972 | msgstr "abrir el editor" | |
7973 | ||
f8038f5b | 7974 | #: builtin/config.c:77 |
fb0e25bc CD |
7975 | msgid "find the color configured: slot [default]" |
7976 | msgstr "encontrar el color configurado: slot [default]" | |
7977 | ||
f8038f5b | 7978 | #: builtin/config.c:78 |
fb0e25bc CD |
7979 | msgid "find the color setting: slot [stdout-is-tty]" |
7980 | msgstr "encontrar las opciones del color: slot [stdout-es-tty]" | |
7981 | ||
f8038f5b | 7982 | #: builtin/config.c:79 |
fb0e25bc CD |
7983 | msgid "Type" |
7984 | msgstr "Tipo" | |
7985 | ||
f8038f5b | 7986 | #: builtin/config.c:80 |
fb0e25bc CD |
7987 | msgid "value is \"true\" or \"false\"" |
7988 | msgstr "valor es \"true\" o \"false\"" | |
7989 | ||
f8038f5b | 7990 | #: builtin/config.c:81 |
fb0e25bc CD |
7991 | msgid "value is decimal number" |
7992 | msgstr "valor es un numero decimal" | |
7993 | ||
f8038f5b | 7994 | #: builtin/config.c:82 |
fb0e25bc CD |
7995 | msgid "value is --bool or --int" |
7996 | msgstr "valor es --bool o --int" | |
7997 | ||
f8038f5b | 7998 | #: builtin/config.c:83 |
fb0e25bc CD |
7999 | msgid "value is a path (file or directory name)" |
8000 | msgstr "valor es una ruta (archivo o nombre de directorio)" | |
8001 | ||
f8038f5b CDR |
8002 | #: builtin/config.c:84 |
8003 | msgid "value is an expiry date" | |
8004 | msgstr "valor es una fecha de expiración" | |
8005 | ||
8006 | #: builtin/config.c:85 | |
fb0e25bc CD |
8007 | msgid "Other" |
8008 | msgstr "Otro" | |
8009 | ||
f8038f5b | 8010 | #: builtin/config.c:86 |
fb0e25bc | 8011 | msgid "terminate values with NUL byte" |
33ac3e89 | 8012 | msgstr "terminar valores con un byte NULL" |
fb0e25bc | 8013 | |
f8038f5b | 8014 | #: builtin/config.c:87 |
fb0e25bc CD |
8015 | msgid "show variable names only" |
8016 | msgstr "mostrar solo nombres de variables" | |
8017 | ||
f8038f5b | 8018 | #: builtin/config.c:88 |
fb0e25bc | 8019 | msgid "respect include directives on lookup" |
9df63a4a | 8020 | msgstr "respetar directivas include en la búsqueda" |
fb0e25bc | 8021 | |
f8038f5b | 8022 | #: builtin/config.c:89 |
fb0e25bc | 8023 | msgid "show origin of config (file, standard input, blob, command line)" |
715fc761 | 8024 | msgstr "mostrar el origen de configuración (archivo, stdin, blob, comando)" |
fb0e25bc | 8025 | |
f8038f5b | 8026 | #: builtin/config.c:335 |
fb0e25bc | 8027 | msgid "unable to parse default color value" |
33ac3e89 | 8028 | msgstr "no es posible analizar el valor por defecto de color" |
fb0e25bc | 8029 | |
f8038f5b | 8030 | #: builtin/config.c:479 |
fb0e25bc CD |
8031 | #, c-format |
8032 | msgid "" | |
8033 | "# This is Git's per-user configuration file.\n" | |
8034 | "[user]\n" | |
8035 | "# Please adapt and uncomment the following lines:\n" | |
8036 | "#\tname = %s\n" | |
8037 | "#\temail = %s\n" | |
8038 | msgstr "" | |
8039 | "# Este es el archivo de configuración de Git por usuario.\n" | |
8040 | "[user]\n" | |
8041 | "# Por favor, adapta y descomenta las siguientes líneas:\n" | |
8042 | "#\tname = %s\n" | |
8043 | "#\temail = %s\n" | |
8044 | ||
f8038f5b | 8045 | #: builtin/config.c:507 |
fb0e25bc CD |
8046 | msgid "--local can only be used inside a git repository" |
8047 | msgstr "--local solo puedo ser usado dentro de un repositorio" | |
8048 | ||
f8038f5b | 8049 | #: builtin/config.c:632 |
fb0e25bc CD |
8050 | #, c-format |
8051 | msgid "cannot create configuration file %s" | |
8052 | msgstr "no se puede crear el archivo de configuración %s" | |
8053 | ||
f8038f5b | 8054 | #: builtin/config.c:645 |
fb0e25bc CD |
8055 | #, c-format |
8056 | msgid "" | |
8057 | "cannot overwrite multiple values with a single value\n" | |
8058 | " Use a regexp, --add or --replace-all to change %s." | |
8059 | msgstr "" | |
8060 | "no se puede sobrescribir múltiples valores con un único valor\n" | |
8061 | "\tUse una regexp, --add o --replace-all para cambiar %s." | |
8062 | ||
4b15eb22 | 8063 | #: builtin/count-objects.c:88 |
fb0e25bc CD |
8064 | msgid "git count-objects [-v] [-H | --human-readable]" |
8065 | msgstr "git count-objects [-v] [-H | --human-readable]" | |
8066 | ||
4b15eb22 | 8067 | #: builtin/count-objects.c:98 |
fb0e25bc CD |
8068 | msgid "print sizes in human readable format" |
8069 | msgstr "mostrar tamaños en formato legible para humano" | |
8070 | ||
f8038f5b | 8071 | #: builtin/describe.c:22 |
fb0e25bc CD |
8072 | msgid "git describe [<options>] [<commit-ish>...]" |
8073 | msgstr "git describe [<opciones>] [<commit-ish>...]" | |
8074 | ||
f8038f5b | 8075 | #: builtin/describe.c:23 |
fb0e25bc CD |
8076 | msgid "git describe [<options>] --dirty" |
8077 | msgstr "git describe [<opciones>] --dirty" | |
8078 | ||
f8038f5b | 8079 | #: builtin/describe.c:57 |
fb0e25bc CD |
8080 | msgid "head" |
8081 | msgstr "head" | |
8082 | ||
f8038f5b | 8083 | #: builtin/describe.c:57 |
fb0e25bc CD |
8084 | msgid "lightweight" |
8085 | msgstr "ligero" | |
8086 | ||
f8038f5b | 8087 | #: builtin/describe.c:57 |
fb0e25bc CD |
8088 | msgid "annotated" |
8089 | msgstr "anotado" | |
8090 | ||
f8038f5b | 8091 | #: builtin/describe.c:267 |
fb0e25bc CD |
8092 | #, c-format |
8093 | msgid "annotated tag %s not available" | |
8094 | msgstr "tag anotado %s no disponible" | |
8095 | ||
f8038f5b | 8096 | #: builtin/describe.c:271 |
fb0e25bc CD |
8097 | #, c-format |
8098 | msgid "annotated tag %s has no embedded name" | |
33ac3e89 | 8099 | msgstr "tag anotado %s no tiene nombre embebido" |
fb0e25bc | 8100 | |
f8038f5b | 8101 | #: builtin/describe.c:273 |
fb0e25bc CD |
8102 | #, c-format |
8103 | msgid "tag '%s' is really '%s' here" | |
8104 | msgstr "tag '%s' es realmente '%s' aquí" | |
8105 | ||
33ac3e89 | 8106 | #: builtin/describe.c:317 |
fb0e25bc CD |
8107 | #, c-format |
8108 | msgid "no tag exactly matches '%s'" | |
8109 | msgstr "no hay tag que concuerde exactamente con '%s'" | |
8110 | ||
33ac3e89 | 8111 | #: builtin/describe.c:319 |
fb0e25bc | 8112 | #, c-format |
f8038f5b CDR |
8113 | msgid "No exact match on refs or tags, searching to describe\n" |
8114 | msgstr "No hay coincidencia exacta en refs o tags, buscando en describe\n" | |
fb0e25bc | 8115 | |
33ac3e89 | 8116 | #: builtin/describe.c:366 |
fb0e25bc CD |
8117 | #, c-format |
8118 | msgid "finished search at %s\n" | |
715fc761 | 8119 | msgstr "búsqueda finalizada a las %s\n" |
fb0e25bc | 8120 | |
33ac3e89 | 8121 | #: builtin/describe.c:392 |
fb0e25bc CD |
8122 | #, c-format |
8123 | msgid "" | |
8124 | "No annotated tags can describe '%s'.\n" | |
8125 | "However, there were unannotated tags: try --tags." | |
8126 | msgstr "" | |
8127 | "No hay tags anotados que puedan describir '%s'.\n" | |
8128 | "Sin embargo, hubieron tags no anotados: intente --tags." | |
8129 | ||
33ac3e89 | 8130 | #: builtin/describe.c:396 |
fb0e25bc CD |
8131 | #, c-format |
8132 | msgid "" | |
8133 | "No tags can describe '%s'.\n" | |
8134 | "Try --always, or create some tags." | |
8135 | msgstr "" | |
8136 | "Ningún tag puede describit '%s'.\n" | |
8137 | "Intente --always, o cree algunos tags." | |
8138 | ||
33ac3e89 | 8139 | #: builtin/describe.c:426 |
fb0e25bc CD |
8140 | #, c-format |
8141 | msgid "traversed %lu commits\n" | |
8142 | msgstr "%lu commits cruzados\n" | |
8143 | ||
33ac3e89 | 8144 | #: builtin/describe.c:429 |
fb0e25bc CD |
8145 | #, c-format |
8146 | msgid "" | |
8147 | "more than %i tags found; listed %i most recent\n" | |
8148 | "gave up search at %s\n" | |
8149 | msgstr "" | |
8150 | "se encontró más de %i tags; se mostró %i más reciente\n" | |
8151 | "fin de la búsqueda en %s\n" | |
8152 | ||
33ac3e89 | 8153 | #: builtin/describe.c:497 |
f8038f5b CDR |
8154 | #, c-format |
8155 | msgid "describe %s\n" | |
8156 | msgstr "describe %s\n" | |
8157 | ||
33ac3e89 | 8158 | #: builtin/describe.c:500 builtin/log.c:502 |
f8038f5b CDR |
8159 | #, c-format |
8160 | msgid "Not a valid object name %s" | |
8161 | msgstr "Nombre de objeto %s no válido" | |
8162 | ||
33ac3e89 | 8163 | #: builtin/describe.c:508 |
f8038f5b CDR |
8164 | #, c-format |
8165 | msgid "%s is neither a commit nor blob" | |
8166 | msgstr "%s no es un commit ni un blob" | |
8167 | ||
33ac3e89 | 8168 | #: builtin/describe.c:522 |
fb0e25bc CD |
8169 | msgid "find the tag that comes after the commit" |
8170 | msgstr "encontrar el tag que viene después del commit" | |
8171 | ||
33ac3e89 | 8172 | #: builtin/describe.c:523 |
fb0e25bc CD |
8173 | msgid "debug search strategy on stderr" |
8174 | msgstr "hacer debug a la estrategia de búsqueda en stderr" | |
8175 | ||
33ac3e89 | 8176 | #: builtin/describe.c:524 |
fb0e25bc CD |
8177 | msgid "use any ref" |
8178 | msgstr "use cualquier ref" | |
8179 | ||
33ac3e89 | 8180 | #: builtin/describe.c:525 |
fb0e25bc CD |
8181 | msgid "use any tag, even unannotated" |
8182 | msgstr "use cualquier tag, incluso los no anotados" | |
8183 | ||
33ac3e89 | 8184 | #: builtin/describe.c:526 |
fb0e25bc CD |
8185 | msgid "always use long format" |
8186 | msgstr "siempre usar formato largo" | |
8187 | ||
33ac3e89 | 8188 | #: builtin/describe.c:527 |
fb0e25bc CD |
8189 | msgid "only follow first parent" |
8190 | msgstr "solo seguir el primer patrón" | |
8191 | ||
33ac3e89 | 8192 | #: builtin/describe.c:530 |
fb0e25bc CD |
8193 | msgid "only output exact matches" |
8194 | msgstr "solo mostrar concordancias exactas" | |
8195 | ||
33ac3e89 | 8196 | #: builtin/describe.c:532 |
fb0e25bc CD |
8197 | msgid "consider <n> most recent tags (default: 10)" |
8198 | msgstr "considerar <n> tags más recientes (default:10)" | |
8199 | ||
33ac3e89 | 8200 | #: builtin/describe.c:534 |
fb0e25bc CD |
8201 | msgid "only consider tags matching <pattern>" |
8202 | msgstr "solo considerar tags que concuerden con <patrón>" | |
8203 | ||
33ac3e89 | 8204 | #: builtin/describe.c:536 |
fb0e25bc CD |
8205 | msgid "do not consider tags matching <pattern>" |
8206 | msgstr "no considerar tags que concuerden con <patrón>" | |
8207 | ||
33ac3e89 | 8208 | #: builtin/describe.c:538 builtin/name-rev.c:406 |
fb0e25bc CD |
8209 | msgid "show abbreviated commit object as fallback" |
8210 | msgstr "mostrar el objeto commit abreviado como fallback" | |
8211 | ||
33ac3e89 | 8212 | #: builtin/describe.c:539 builtin/describe.c:542 |
fb0e25bc CD |
8213 | msgid "mark" |
8214 | msgstr "marca" | |
8215 | ||
33ac3e89 | 8216 | #: builtin/describe.c:540 |
fb0e25bc CD |
8217 | msgid "append <mark> on dirty working tree (default: \"-dirty\")" |
8218 | msgstr "adjuntar <marca> en el árbol de trabajo sucio (default: \"-dirty\")" | |
8219 | ||
33ac3e89 | 8220 | #: builtin/describe.c:543 |
fb0e25bc | 8221 | msgid "append <mark> on broken working tree (default: \"-broken\")" |
9df63a4a | 8222 | msgstr "adjuntar <marca> en un árbol de trabajo roto (default: \"-broken\")" |
fb0e25bc | 8223 | |
33ac3e89 | 8224 | #: builtin/describe.c:561 |
fb0e25bc CD |
8225 | msgid "--long is incompatible with --abbrev=0" |
8226 | msgstr "--long es incompatible con --abbrev=0" | |
8227 | ||
33ac3e89 | 8228 | #: builtin/describe.c:590 |
fb0e25bc CD |
8229 | msgid "No names found, cannot describe anything." |
8230 | msgstr "No se encontraron nombres, no se puede describir nada." | |
8231 | ||
33ac3e89 | 8232 | #: builtin/describe.c:640 |
fb0e25bc | 8233 | msgid "--dirty is incompatible with commit-ishes" |
715fc761 | 8234 | msgstr "--dirty es incompatible con commit-ismos" |
fb0e25bc | 8235 | |
33ac3e89 | 8236 | #: builtin/describe.c:642 |
fb0e25bc CD |
8237 | msgid "--broken is incompatible with commit-ishes" |
8238 | msgstr "--broken es incompatible con commit-ismos" | |
8239 | ||
8240 | #: builtin/diff.c:83 | |
8241 | #, c-format | |
8242 | msgid "'%s': not a regular file or symlink" | |
8243 | msgstr "'%s': no es un archivo regular o un enlace simbólico" | |
8244 | ||
f8038f5b | 8245 | #: builtin/diff.c:234 |
fb0e25bc CD |
8246 | #, c-format |
8247 | msgid "invalid option: %s" | |
8248 | msgstr "opción inválida: %s" | |
8249 | ||
f8038f5b | 8250 | #: builtin/diff.c:356 |
fb0e25bc CD |
8251 | msgid "Not a git repository" |
8252 | msgstr "No es un repositorio git" | |
8253 | ||
f8038f5b | 8254 | #: builtin/diff.c:399 |
fb0e25bc CD |
8255 | #, c-format |
8256 | msgid "invalid object '%s' given." | |
33ac3e89 | 8257 | msgstr "objeto '%s' entregado no es válido." |
fb0e25bc | 8258 | |
f8038f5b | 8259 | #: builtin/diff.c:408 |
fb0e25bc CD |
8260 | #, c-format |
8261 | msgid "more than two blobs given: '%s'" | |
8262 | msgstr "más de dos blobs entregados: '%s'" | |
8263 | ||
f8038f5b | 8264 | #: builtin/diff.c:413 |
fb0e25bc CD |
8265 | #, c-format |
8266 | msgid "unhandled object '%s' given." | |
8267 | msgstr "objeto no manejado '%s' entregado." | |
8268 | ||
8269 | #: builtin/difftool.c:29 | |
8270 | msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]" | |
8271 | msgstr "git difftool [<opciones>] [<commit> [<commit>]] [--] [<ruta>...]" | |
8272 | ||
4b15eb22 | 8273 | #: builtin/difftool.c:259 |
fb0e25bc CD |
8274 | #, c-format |
8275 | msgid "failed: %d" | |
8276 | msgstr "falló: %d" | |
8277 | ||
4b15eb22 | 8278 | #: builtin/difftool.c:301 |
fb0e25bc CD |
8279 | #, c-format |
8280 | msgid "could not read symlink %s" | |
8281 | msgstr "no se pudo leer el symlink %s" | |
8282 | ||
4b15eb22 | 8283 | #: builtin/difftool.c:303 |
fb0e25bc CD |
8284 | #, c-format |
8285 | msgid "could not read symlink file %s" | |
8286 | msgstr "no se pudo leer el archivo symlink %s" | |
8287 | ||
4b15eb22 | 8288 | #: builtin/difftool.c:311 |
fb0e25bc CD |
8289 | #, c-format |
8290 | msgid "could not read object %s for symlink %s" | |
8291 | msgstr "no se pudo leer el objeto %s para el symlink %s" | |
8292 | ||
4b15eb22 | 8293 | #: builtin/difftool.c:412 |
fb0e25bc CD |
8294 | msgid "" |
8295 | "combined diff formats('-c' and '--cc') are not supported in\n" | |
8296 | "directory diff mode('-d' and '--dir-diff')." | |
8297 | msgstr "" | |
8298 | "formatos combinados de diff ('-c' y '--cc') no soportados en\n" | |
8299 | "modo diff para directorio('-d' y '--dir-diff')." | |
8300 | ||
f8038f5b | 8301 | #: builtin/difftool.c:632 |
fb0e25bc CD |
8302 | #, c-format |
8303 | msgid "both files modified: '%s' and '%s'." | |
8304 | msgstr "ambos archivos modificados: '%s' y '%s'." | |
8305 | ||
f8038f5b | 8306 | #: builtin/difftool.c:634 |
fb0e25bc CD |
8307 | msgid "working tree file has been left." |
8308 | msgstr "archivo del árbol de trabajo ha sido dejado." | |
8309 | ||
f8038f5b | 8310 | #: builtin/difftool.c:645 |
fb0e25bc CD |
8311 | #, c-format |
8312 | msgid "temporary files exist in '%s'." | |
8313 | msgstr "archivo temporal existe en '%s'." | |
8314 | ||
f8038f5b | 8315 | #: builtin/difftool.c:646 |
fb0e25bc CD |
8316 | msgid "you may want to cleanup or recover these." |
8317 | msgstr "tal vez desee limpiar o recuperar estos." | |
8318 | ||
f8038f5b | 8319 | #: builtin/difftool.c:695 |
fb0e25bc CD |
8320 | msgid "use `diff.guitool` instead of `diff.tool`" |
8321 | msgstr "use `diff.guitool` en lugar de `diff.tool`" | |
8322 | ||
f8038f5b | 8323 | #: builtin/difftool.c:697 |
fb0e25bc CD |
8324 | msgid "perform a full-directory diff" |
8325 | msgstr "realizar un diff de todo el directorio" | |
8326 | ||
f8038f5b | 8327 | #: builtin/difftool.c:699 |
fb0e25bc CD |
8328 | msgid "do not prompt before launching a diff tool" |
8329 | msgstr "no mostrar antes de lanzar una herramienta de diff" | |
8330 | ||
f8038f5b | 8331 | #: builtin/difftool.c:705 |
fb0e25bc | 8332 | msgid "use symlinks in dir-diff mode" |
715fc761 | 8333 | msgstr "usar enlaces simbólicos en modo dir-diff" |
fb0e25bc | 8334 | |
f8038f5b | 8335 | #: builtin/difftool.c:706 |
fb0e25bc CD |
8336 | msgid "<tool>" |
8337 | msgstr "<herramienta>" | |
8338 | ||
f8038f5b | 8339 | #: builtin/difftool.c:707 |
fb0e25bc CD |
8340 | msgid "use the specified diff tool" |
8341 | msgstr "usar la herramienta de diff especificada" | |
8342 | ||
f8038f5b | 8343 | #: builtin/difftool.c:709 |
fb0e25bc | 8344 | msgid "print a list of diff tools that may be used with `--tool`" |
4b15eb22 CD |
8345 | msgstr "" |
8346 | "mostrar una lista de herramientas de diff que pueden ser usadas con `--tool`" | |
fb0e25bc | 8347 | |
f8038f5b | 8348 | #: builtin/difftool.c:712 |
4b15eb22 CD |
8349 | msgid "" |
8350 | "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit " | |
8351 | "code" | |
8352 | msgstr "" | |
8353 | "hacer que 'git-difftool' salga cuando una herramienta de diff retorne un " | |
8354 | "código de salida distinto de cero" | |
fb0e25bc | 8355 | |
f8038f5b | 8356 | #: builtin/difftool.c:714 |
fb0e25bc CD |
8357 | msgid "<command>" |
8358 | msgstr "<comando>" | |
8359 | ||
f8038f5b | 8360 | #: builtin/difftool.c:715 |
fb0e25bc CD |
8361 | msgid "specify a custom command for viewing diffs" |
8362 | msgstr "especificar un comando personalizado para ver diffs" | |
8363 | ||
f8038f5b | 8364 | #: builtin/difftool.c:739 |
fb0e25bc | 8365 | msgid "no <tool> given for --tool=<tool>" |
715fc761 | 8366 | msgstr "no se ha proporcionado <herramienta> para --tool=<herramienta>" |
fb0e25bc | 8367 | |
f8038f5b | 8368 | #: builtin/difftool.c:746 |
fb0e25bc CD |
8369 | msgid "no <cmd> given for --extcmd=<cmd>" |
8370 | msgstr "no se ha entregado <comando> para --extcmd=<comando>" | |
8371 | ||
8372 | #: builtin/fast-export.c:26 | |
8373 | msgid "git fast-export [rev-list-opts]" | |
8374 | msgstr "git fast-export [rev-list-opts]" | |
8375 | ||
4b15eb22 | 8376 | #: builtin/fast-export.c:998 |
fb0e25bc CD |
8377 | msgid "show progress after <n> objects" |
8378 | msgstr "mostrar progreso después de <n> objetos" | |
8379 | ||
4b15eb22 | 8380 | #: builtin/fast-export.c:1000 |
fb0e25bc CD |
8381 | msgid "select handling of signed tags" |
8382 | msgstr "seleccionar el manejo de tags firmados" | |
8383 | ||
4b15eb22 | 8384 | #: builtin/fast-export.c:1003 |
fb0e25bc CD |
8385 | msgid "select handling of tags that tag filtered objects" |
8386 | msgstr "seleccionar el manejo de tags que son tags de objetos filtrados" | |
8387 | ||
4b15eb22 | 8388 | #: builtin/fast-export.c:1006 |
fb0e25bc CD |
8389 | msgid "Dump marks to this file" |
8390 | msgstr "Volcar marcas a este archivo" | |
8391 | ||
4b15eb22 | 8392 | #: builtin/fast-export.c:1008 |
fb0e25bc CD |
8393 | msgid "Import marks from this file" |
8394 | msgstr "Importar marcas de este archivo" | |
8395 | ||
4b15eb22 | 8396 | #: builtin/fast-export.c:1010 |
fb0e25bc CD |
8397 | msgid "Fake a tagger when tags lack one" |
8398 | msgstr "Falsificar un tagger cuando les falta uno" | |
8399 | ||
4b15eb22 | 8400 | #: builtin/fast-export.c:1012 |
fb0e25bc CD |
8401 | msgid "Output full tree for each commit" |
8402 | msgstr "Mostrar todo el árbol para cada commit" | |
8403 | ||
4b15eb22 | 8404 | #: builtin/fast-export.c:1014 |
fb0e25bc CD |
8405 | msgid "Use the done feature to terminate the stream" |
8406 | msgstr "Use el feature done para terminar el stream" | |
8407 | ||
4b15eb22 | 8408 | #: builtin/fast-export.c:1015 |
fb0e25bc CD |
8409 | msgid "Skip output of blob data" |
8410 | msgstr "Saltar el output de data blob" | |
8411 | ||
4b15eb22 | 8412 | #: builtin/fast-export.c:1016 |
fb0e25bc CD |
8413 | msgid "refspec" |
8414 | msgstr "refspec" | |
8415 | ||
4b15eb22 | 8416 | #: builtin/fast-export.c:1017 |
fb0e25bc CD |
8417 | msgid "Apply refspec to exported refs" |
8418 | msgstr "Aplicar refspec para los refs exportados" | |
8419 | ||
4b15eb22 | 8420 | #: builtin/fast-export.c:1018 |
fb0e25bc CD |
8421 | msgid "anonymize output" |
8422 | msgstr "anonimizar la salida" | |
8423 | ||
33ac3e89 | 8424 | #: builtin/fetch.c:25 |
fb0e25bc CD |
8425 | msgid "git fetch [<options>] [<repository> [<refspec>...]]" |
8426 | msgstr "git fetch [<opciones>] [<repositorio> [<refspec>...]]" | |
8427 | ||
33ac3e89 | 8428 | #: builtin/fetch.c:26 |
fb0e25bc CD |
8429 | msgid "git fetch [<options>] <group>" |
8430 | msgstr "git fetch [<opciones>] <grupo>" | |
8431 | ||
33ac3e89 | 8432 | #: builtin/fetch.c:27 |
fb0e25bc CD |
8433 | msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" |
8434 | msgstr "git fetch --multiple [<opciones>] [(<repositorio> | <grupo>)...]" | |
8435 | ||
33ac3e89 | 8436 | #: builtin/fetch.c:28 |
fb0e25bc CD |
8437 | msgid "git fetch --all [<options>]" |
8438 | msgstr "git fetch --all [<opciones>]" | |
8439 | ||
33ac3e89 | 8440 | #: builtin/fetch.c:124 builtin/pull.c:188 |
fb0e25bc CD |
8441 | msgid "fetch from all remotes" |
8442 | msgstr "extraer de todos los remotos" | |
8443 | ||
33ac3e89 | 8444 | #: builtin/fetch.c:126 builtin/pull.c:191 |
fb0e25bc CD |
8445 | msgid "append to .git/FETCH_HEAD instead of overwriting" |
8446 | msgstr "adjuntar a .git/FETCH_HEAD en lugar de sobrescribir" | |
8447 | ||
33ac3e89 | 8448 | #: builtin/fetch.c:128 builtin/pull.c:194 |
fb0e25bc CD |
8449 | msgid "path to upload pack on remote end" |
8450 | msgstr "ruta para cargar el paquete al final del remoto" | |
8451 | ||
33ac3e89 | 8452 | #: builtin/fetch.c:129 builtin/pull.c:196 |
fb0e25bc CD |
8453 | msgid "force overwrite of local branch" |
8454 | msgstr "forzar sobrescritura de la rama local" | |
8455 | ||
33ac3e89 | 8456 | #: builtin/fetch.c:131 |
fb0e25bc CD |
8457 | msgid "fetch from multiple remotes" |
8458 | msgstr "extraer de múltiples remotos" | |
8459 | ||
33ac3e89 | 8460 | #: builtin/fetch.c:133 builtin/pull.c:198 |
fb0e25bc CD |
8461 | msgid "fetch all tags and associated objects" |
8462 | msgstr "extraer todos los tags y objetos asociados" | |
8463 | ||
33ac3e89 | 8464 | #: builtin/fetch.c:135 |
fb0e25bc CD |
8465 | msgid "do not fetch all tags (--no-tags)" |
8466 | msgstr "no extraer todos los tags (--no-tags)" | |
8467 | ||
33ac3e89 | 8468 | #: builtin/fetch.c:137 |
fb0e25bc CD |
8469 | msgid "number of submodules fetched in parallel" |
8470 | msgstr "número de submódulos extraídos en paralelo" | |
8471 | ||
33ac3e89 | 8472 | #: builtin/fetch.c:139 builtin/pull.c:201 |
fb0e25bc | 8473 | msgid "prune remote-tracking branches no longer on remote" |
33ac3e89 | 8474 | msgstr "limpiar ramas remotas rastreadas que ya no están en el remoto" |
fb0e25bc | 8475 | |
33ac3e89 CDR |
8476 | #: builtin/fetch.c:141 |
8477 | msgid "prune local tags no longer on remote and clobber changed tags" | |
8478 | msgstr "" | |
8479 | "limpiar tags locales que no se encuentran en el remoto y eliminar tags " | |
8480 | "cambiados" | |
8481 | ||
8482 | #: builtin/fetch.c:142 builtin/fetch.c:165 builtin/pull.c:126 | |
fb0e25bc CD |
8483 | msgid "on-demand" |
8484 | msgstr "en demanda" | |
8485 | ||
33ac3e89 | 8486 | #: builtin/fetch.c:143 |
fb0e25bc CD |
8487 | msgid "control recursive fetching of submodules" |
8488 | msgstr "controlar extracción recursiva de submódulos" | |
8489 | ||
33ac3e89 | 8490 | #: builtin/fetch.c:147 builtin/pull.c:209 |
fb0e25bc CD |
8491 | msgid "keep downloaded pack" |
8492 | msgstr "mantener el paquete descargado" | |
8493 | ||
33ac3e89 | 8494 | #: builtin/fetch.c:149 |
fb0e25bc CD |
8495 | msgid "allow updating of HEAD ref" |
8496 | msgstr "permitir actualizar la ref HEAD" | |
8497 | ||
33ac3e89 | 8498 | #: builtin/fetch.c:152 builtin/fetch.c:158 builtin/pull.c:212 |
fb0e25bc CD |
8499 | msgid "deepen history of shallow clone" |
8500 | msgstr "historia profunda de un clon superficial" | |
8501 | ||
33ac3e89 | 8502 | #: builtin/fetch.c:154 |
fb0e25bc CD |
8503 | msgid "deepen history of shallow repository based on time" |
8504 | msgstr "historia profunda de un repositorio superficial basado en tiempo" | |
8505 | ||
33ac3e89 | 8506 | #: builtin/fetch.c:160 builtin/pull.c:215 |
fb0e25bc CD |
8507 | msgid "convert to a complete repository" |
8508 | msgstr "convertir a un repositorio completo" | |
8509 | ||
33ac3e89 | 8510 | #: builtin/fetch.c:162 builtin/log.c:1466 |
fb0e25bc CD |
8511 | msgid "dir" |
8512 | msgstr "dir" | |
8513 | ||
33ac3e89 | 8514 | #: builtin/fetch.c:163 |
fb0e25bc | 8515 | msgid "prepend this to submodule path output" |
33ac3e89 | 8516 | msgstr "anteponer esto a salida de la ruta del submódulo" |
fb0e25bc | 8517 | |
33ac3e89 | 8518 | #: builtin/fetch.c:166 |
4b15eb22 CD |
8519 | msgid "" |
8520 | "default for recursive fetching of submodules (lower priority than config " | |
8521 | "files)" | |
8522 | msgstr "" | |
8523 | "default para extracción recursiva de submódulos (menor prioridad que " | |
8524 | "archivos de configuración)" | |
fb0e25bc | 8525 | |
33ac3e89 | 8526 | #: builtin/fetch.c:170 builtin/pull.c:218 |
fb0e25bc CD |
8527 | msgid "accept refs that update .git/shallow" |
8528 | msgstr "aceptar refs que actualicen .git/shallow" | |
8529 | ||
33ac3e89 | 8530 | #: builtin/fetch.c:171 builtin/pull.c:220 |
fb0e25bc CD |
8531 | msgid "refmap" |
8532 | msgstr "refmap" | |
8533 | ||
33ac3e89 | 8534 | #: builtin/fetch.c:172 builtin/pull.c:221 |
fb0e25bc CD |
8535 | msgid "specify fetch refmap" |
8536 | msgstr "especificar extracción de refmap" | |
8537 | ||
33ac3e89 | 8538 | #: builtin/fetch.c:431 |
fb0e25bc CD |
8539 | msgid "Couldn't find remote ref HEAD" |
8540 | msgstr "No se puedo encontrar ref remota HEAD" | |
8541 | ||
33ac3e89 | 8542 | #: builtin/fetch.c:549 |
fb0e25bc CD |
8543 | #, c-format |
8544 | msgid "configuration fetch.output contains invalid value %s" | |
8545 | msgstr "la configuración fetch.output contiene el valor inválido %s" | |
8546 | ||
33ac3e89 | 8547 | #: builtin/fetch.c:642 |
fb0e25bc CD |
8548 | #, c-format |
8549 | msgid "object %s not found" | |
8550 | msgstr "objeto %s no encontrado" | |
8551 | ||
33ac3e89 | 8552 | #: builtin/fetch.c:646 |
fb0e25bc CD |
8553 | msgid "[up to date]" |
8554 | msgstr "[actualizado]" | |
8555 | ||
33ac3e89 | 8556 | #: builtin/fetch.c:659 builtin/fetch.c:739 |
fb0e25bc CD |
8557 | msgid "[rejected]" |
8558 | msgstr "[rechazado]" | |
8559 | ||
33ac3e89 | 8560 | #: builtin/fetch.c:660 |
fb0e25bc CD |
8561 | msgid "can't fetch in current branch" |
8562 | msgstr "no se puede traer en la rama actual" | |
8563 | ||
33ac3e89 | 8564 | #: builtin/fetch.c:669 |
fb0e25bc | 8565 | msgid "[tag update]" |
715fc761 | 8566 | msgstr "[actualización de tag]" |
fb0e25bc | 8567 | |
33ac3e89 CDR |
8568 | #: builtin/fetch.c:670 builtin/fetch.c:703 builtin/fetch.c:719 |
8569 | #: builtin/fetch.c:734 | |
fb0e25bc CD |
8570 | msgid "unable to update local ref" |
8571 | msgstr "no se posible actualizar el ref local" | |
8572 | ||
33ac3e89 | 8573 | #: builtin/fetch.c:689 |
fb0e25bc | 8574 | msgid "[new tag]" |
715fc761 | 8575 | msgstr "[nuevo tag]" |
fb0e25bc | 8576 | |
33ac3e89 | 8577 | #: builtin/fetch.c:692 |
fb0e25bc CD |
8578 | msgid "[new branch]" |
8579 | msgstr "[nueva rama]" | |
8580 | ||
33ac3e89 | 8581 | #: builtin/fetch.c:695 |
fb0e25bc CD |
8582 | msgid "[new ref]" |
8583 | msgstr "[nueva referencia]" | |
8584 | ||
33ac3e89 | 8585 | #: builtin/fetch.c:734 |
fb0e25bc CD |
8586 | msgid "forced update" |
8587 | msgstr "actualización forzada" | |
8588 | ||
33ac3e89 | 8589 | #: builtin/fetch.c:739 |
fb0e25bc CD |
8590 | msgid "non-fast-forward" |
8591 | msgstr "avance lento" | |
8592 | ||
33ac3e89 | 8593 | #: builtin/fetch.c:784 |
fb0e25bc CD |
8594 | #, c-format |
8595 | msgid "%s did not send all necessary objects\n" | |
8596 | msgstr "%s no envió todos los objetos necesarios\n" | |
8597 | ||
33ac3e89 | 8598 | #: builtin/fetch.c:804 |
fb0e25bc CD |
8599 | #, c-format |
8600 | msgid "reject %s because shallow roots are not allowed to be updated" | |
8601 | msgstr "rechazado %s porque raíces superficiales no pueden ser actualizadas" | |
8602 | ||
33ac3e89 | 8603 | #: builtin/fetch.c:892 builtin/fetch.c:988 |
fb0e25bc CD |
8604 | #, c-format |
8605 | msgid "From %.*s\n" | |
8606 | msgstr "Desde %.*s\n" | |
8607 | ||
33ac3e89 | 8608 | #: builtin/fetch.c:903 |
fb0e25bc CD |
8609 | #, c-format |
8610 | msgid "" | |
8611 | "some local refs could not be updated; try running\n" | |
8612 | " 'git remote prune %s' to remove any old, conflicting branches" | |
8613 | msgstr "" | |
8614 | "algunos refs locales no pudieron ser actualizados; intente ejecutar\n" | |
8615 | " 'git remote prune %s' para remover cualquier rama vieja o conflictiva" | |
8616 | ||
33ac3e89 | 8617 | #: builtin/fetch.c:958 |
fb0e25bc CD |
8618 | #, c-format |
8619 | msgid " (%s will become dangling)" | |
8620 | msgstr " (%s se pondrá colgado)" | |
8621 | ||
33ac3e89 | 8622 | #: builtin/fetch.c:959 |
fb0e25bc CD |
8623 | #, c-format |
8624 | msgid " (%s has become dangling)" | |
8625 | msgstr " (%s se ha colgado)" | |
8626 | ||
33ac3e89 | 8627 | #: builtin/fetch.c:991 |
fb0e25bc CD |
8628 | msgid "[deleted]" |
8629 | msgstr "[eliminado]" | |
8630 | ||
33ac3e89 | 8631 | #: builtin/fetch.c:992 builtin/remote.c:1024 |
fb0e25bc CD |
8632 | msgid "(none)" |
8633 | msgstr "(nada)" | |
8634 | ||
33ac3e89 | 8635 | #: builtin/fetch.c:1015 |
fb0e25bc CD |
8636 | #, c-format |
8637 | msgid "Refusing to fetch into current branch %s of non-bare repository" | |
8638 | msgstr "Rehusando extraer en la rama actual %s de un repositorio no vacío" | |
8639 | ||
33ac3e89 | 8640 | #: builtin/fetch.c:1034 |
fb0e25bc CD |
8641 | #, c-format |
8642 | msgid "Option \"%s\" value \"%s\" is not valid for %s" | |
8643 | msgstr "Opción \"%s\" valor \"%s\" no es válido para %s" | |
8644 | ||
33ac3e89 | 8645 | #: builtin/fetch.c:1037 |
fb0e25bc CD |
8646 | #, c-format |
8647 | msgid "Option \"%s\" is ignored for %s\n" | |
8648 | msgstr "Opción \"%s\" es ignorada por %s\n" | |
8649 | ||
33ac3e89 | 8650 | #: builtin/fetch.c:1277 |
fb0e25bc CD |
8651 | #, c-format |
8652 | msgid "Fetching %s\n" | |
8653 | msgstr "Extrayendo %s\n" | |
8654 | ||
33ac3e89 | 8655 | #: builtin/fetch.c:1279 builtin/remote.c:97 |
fb0e25bc CD |
8656 | #, c-format |
8657 | msgid "Could not fetch %s" | |
8658 | msgstr "No se pudo extraer %s" | |
8659 | ||
33ac3e89 CDR |
8660 | #: builtin/fetch.c:1325 builtin/fetch.c:1498 |
8661 | msgid "" | |
8662 | "--filter can only be used with the remote configured in core.partialClone" | |
8663 | msgstr "" | |
8664 | "--filter solo puede ser usado con el remoto configurado en core.partialClone" | |
8665 | ||
8666 | #: builtin/fetch.c:1350 | |
fb0e25bc CD |
8667 | msgid "" |
8668 | "No remote repository specified. Please, specify either a URL or a\n" | |
8669 | "remote name from which new revisions should be fetched." | |
8670 | msgstr "" | |
8671 | "No hay repositorio remoto especificado. Por favor, especifique un URL o un\n" | |
8672 | "nombre remoto del cual las nuevas revisiones deben ser extraídas." | |
8673 | ||
33ac3e89 | 8674 | #: builtin/fetch.c:1394 |
fb0e25bc CD |
8675 | msgid "You need to specify a tag name." |
8676 | msgstr "Tiene que especificar un nombre de tag." | |
8677 | ||
33ac3e89 | 8678 | #: builtin/fetch.c:1439 |
fb0e25bc | 8679 | msgid "Negative depth in --deepen is not supported" |
715fc761 | 8680 | msgstr "Profundidad negativa en --deepen no soportada" |
fb0e25bc | 8681 | |
33ac3e89 | 8682 | #: builtin/fetch.c:1441 |
fb0e25bc | 8683 | msgid "--deepen and --depth are mutually exclusive" |
9df63a4a | 8684 | msgstr "--deepen y --depth son mutuamente exclusivas" |
fb0e25bc | 8685 | |
33ac3e89 | 8686 | #: builtin/fetch.c:1446 |
fb0e25bc CD |
8687 | msgid "--depth and --unshallow cannot be used together" |
8688 | msgstr "--depth y --unshallow no pueden ser usadas juntas" | |
8689 | ||
33ac3e89 | 8690 | #: builtin/fetch.c:1448 |
fb0e25bc CD |
8691 | msgid "--unshallow on a complete repository does not make sense" |
8692 | msgstr "--unshallow no tiene sentido en un repositorio completo" | |
8693 | ||
33ac3e89 | 8694 | #: builtin/fetch.c:1464 |
fb0e25bc CD |
8695 | msgid "fetch --all does not take a repository argument" |
8696 | msgstr "fetch --all no toma un argumento de repositorio" | |
8697 | ||
33ac3e89 | 8698 | #: builtin/fetch.c:1466 |
fb0e25bc CD |
8699 | msgid "fetch --all does not make sense with refspecs" |
8700 | msgstr "fetch --all no tiene sentido con refspecs" | |
8701 | ||
33ac3e89 | 8702 | #: builtin/fetch.c:1475 |
fb0e25bc CD |
8703 | #, c-format |
8704 | msgid "No such remote or remote group: %s" | |
8705 | msgstr "No existe el remoto o grupo remoto: %s" | |
8706 | ||
33ac3e89 | 8707 | #: builtin/fetch.c:1482 |
fb0e25bc CD |
8708 | msgid "Fetching a group and specifying refspecs does not make sense" |
8709 | msgstr "Extraer un grupo y especificar un refspecs no tiene sentido" | |
8710 | ||
8711 | #: builtin/fmt-merge-msg.c:15 | |
4b15eb22 CD |
8712 | msgid "" |
8713 | "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]" | |
8714 | msgstr "" | |
8715 | "git fmt-merge-msg [-m <mensaje>] [--log[=<n>] | --no-log] [--file <archivo>]" | |
fb0e25bc | 8716 | |
f8038f5b | 8717 | #: builtin/fmt-merge-msg.c:666 |
fb0e25bc CD |
8718 | msgid "populate log with at most <n> entries from shortlog" |
8719 | msgstr "poblar el log con máximo <n> entradas del shorlog" | |
8720 | ||
f8038f5b | 8721 | #: builtin/fmt-merge-msg.c:669 |
fb0e25bc CD |
8722 | msgid "alias for --log (deprecated)" |
8723 | msgstr "alias para --log (deprecado)" | |
8724 | ||
f8038f5b | 8725 | #: builtin/fmt-merge-msg.c:672 |
fb0e25bc CD |
8726 | msgid "text" |
8727 | msgstr "texto" | |
8728 | ||
f8038f5b | 8729 | #: builtin/fmt-merge-msg.c:673 |
fb0e25bc CD |
8730 | msgid "use <text> as start of message" |
8731 | msgstr "use <text> como comienzo de mensaje" | |
8732 | ||
f8038f5b | 8733 | #: builtin/fmt-merge-msg.c:674 |
fb0e25bc CD |
8734 | msgid "file to read from" |
8735 | msgstr "archivo del cual leer" | |
8736 | ||
8737 | #: builtin/for-each-ref.c:10 | |
8738 | msgid "git for-each-ref [<options>] [<pattern>]" | |
8739 | msgstr "git for-each-ref [<opciones>] [<patrón>]" | |
8740 | ||
8741 | #: builtin/for-each-ref.c:11 | |
8742 | msgid "git for-each-ref [--points-at <object>]" | |
8743 | msgstr "git for-each-ref [--points-at <objeto>]" | |
8744 | ||
8745 | #: builtin/for-each-ref.c:12 | |
8746 | msgid "git for-each-ref [(--merged | --no-merged) [<commit>]]" | |
8747 | msgstr "git for-each-ref [(--merged | --no-merged) [<commit>]]" | |
8748 | ||
8749 | #: builtin/for-each-ref.c:13 | |
8750 | msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]" | |
8751 | msgstr "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]" | |
8752 | ||
8753 | #: builtin/for-each-ref.c:28 | |
8754 | msgid "quote placeholders suitably for shells" | |
33ac3e89 | 8755 | msgstr "cite los marcadores de posición adecuadamente para los shells" |
fb0e25bc CD |
8756 | |
8757 | #: builtin/for-each-ref.c:30 | |
8758 | msgid "quote placeholders suitably for perl" | |
33ac3e89 | 8759 | msgstr "cite los marcadores de posición adecuadamente para perl" |
fb0e25bc CD |
8760 | |
8761 | #: builtin/for-each-ref.c:32 | |
8762 | msgid "quote placeholders suitably for python" | |
33ac3e89 | 8763 | msgstr "cite los marcadores de posición adecuadamente para python" |
fb0e25bc CD |
8764 | |
8765 | #: builtin/for-each-ref.c:34 | |
8766 | msgid "quote placeholders suitably for Tcl" | |
33ac3e89 | 8767 | msgstr "cite los marcadores de posición adecuadamente para Tcl" |
fb0e25bc CD |
8768 | |
8769 | #: builtin/for-each-ref.c:37 | |
8770 | msgid "show only <n> matched refs" | |
8771 | msgstr "mostrar solo <n> refs encontradas" | |
8772 | ||
33ac3e89 | 8773 | #: builtin/for-each-ref.c:39 builtin/tag.c:420 |
4b15eb22 CD |
8774 | msgid "respect format colors" |
8775 | msgstr "respetar el formato de colores" | |
8776 | ||
8777 | #: builtin/for-each-ref.c:43 | |
fb0e25bc CD |
8778 | msgid "print only refs which points at the given object" |
8779 | msgstr "mostrar solo refs que apunten al objeto dado" | |
8780 | ||
4b15eb22 | 8781 | #: builtin/for-each-ref.c:45 |
fb0e25bc CD |
8782 | msgid "print only refs that are merged" |
8783 | msgstr "mostrar solo refs que son fusionadas" | |
8784 | ||
4b15eb22 | 8785 | #: builtin/for-each-ref.c:46 |
fb0e25bc CD |
8786 | msgid "print only refs that are not merged" |
8787 | msgstr "mostrar solo refs que no son fusionadas" | |
8788 | ||
4b15eb22 | 8789 | #: builtin/for-each-ref.c:47 |
fb0e25bc CD |
8790 | msgid "print only refs which contain the commit" |
8791 | msgstr "mostrar solo refs que contienen el commit" | |
8792 | ||
4b15eb22 | 8793 | #: builtin/for-each-ref.c:48 |
fb0e25bc CD |
8794 | msgid "print only refs which don't contain the commit" |
8795 | msgstr "mostrar solo refs que no contienen el commit" | |
8796 | ||
33ac3e89 | 8797 | #: builtin/fsck.c:568 |
fb0e25bc CD |
8798 | msgid "Checking object directories" |
8799 | msgstr "Revisando objetos directorios" | |
8800 | ||
33ac3e89 | 8801 | #: builtin/fsck.c:660 |
fb0e25bc CD |
8802 | msgid "git fsck [<options>] [<object>...]" |
8803 | msgstr "git fsck [<opciones>] [<objeto>...]" | |
8804 | ||
33ac3e89 | 8805 | #: builtin/fsck.c:666 |
fb0e25bc CD |
8806 | msgid "show unreachable objects" |
8807 | msgstr "mostrar objetos ilegibles" | |
8808 | ||
33ac3e89 | 8809 | #: builtin/fsck.c:667 |
fb0e25bc CD |
8810 | msgid "show dangling objects" |
8811 | msgstr "mostrar objetos colgados" | |
8812 | ||
33ac3e89 | 8813 | #: builtin/fsck.c:668 |
fb0e25bc CD |
8814 | msgid "report tags" |
8815 | msgstr "reportar tags" | |
8816 | ||
33ac3e89 | 8817 | #: builtin/fsck.c:669 |
fb0e25bc CD |
8818 | msgid "report root nodes" |
8819 | msgstr "reportar nodos raíz" | |
8820 | ||
33ac3e89 | 8821 | #: builtin/fsck.c:670 |
fb0e25bc CD |
8822 | msgid "make index objects head nodes" |
8823 | msgstr "hacer objetos índices cabezas de nodos" | |
8824 | ||
33ac3e89 | 8825 | #: builtin/fsck.c:671 |
fb0e25bc CD |
8826 | msgid "make reflogs head nodes (default)" |
8827 | msgstr "hacer reflogs cabeza de nodos (default)" | |
8828 | ||
33ac3e89 | 8829 | #: builtin/fsck.c:672 |
fb0e25bc CD |
8830 | msgid "also consider packs and alternate objects" |
8831 | msgstr "también considerar paquetes y objetos alternos" | |
8832 | ||
33ac3e89 | 8833 | #: builtin/fsck.c:673 |
fb0e25bc | 8834 | msgid "check only connectivity" |
9df63a4a | 8835 | msgstr "revisar solo conectividad" |
fb0e25bc | 8836 | |
33ac3e89 | 8837 | #: builtin/fsck.c:674 |
fb0e25bc CD |
8838 | msgid "enable more strict checking" |
8839 | msgstr "habilitar revisión más estricta" | |
8840 | ||
33ac3e89 | 8841 | #: builtin/fsck.c:676 |
fb0e25bc CD |
8842 | msgid "write dangling objects in .git/lost-found" |
8843 | msgstr "escribir objetos colgados en .git/lost-found" | |
8844 | ||
33ac3e89 | 8845 | #: builtin/fsck.c:677 builtin/prune.c:108 |
fb0e25bc | 8846 | msgid "show progress" |
9df63a4a | 8847 | msgstr "mostrar progreso" |
fb0e25bc | 8848 | |
33ac3e89 | 8849 | #: builtin/fsck.c:678 |
fb0e25bc CD |
8850 | msgid "show verbose names for reachable objects" |
8851 | msgstr "mostrar nombres verboso para objetos alcanzables" | |
8852 | ||
33ac3e89 | 8853 | #: builtin/fsck.c:742 |
fb0e25bc CD |
8854 | msgid "Checking objects" |
8855 | msgstr "Revisando objetos" | |
8856 | ||
4b15eb22 | 8857 | #: builtin/gc.c:27 |
fb0e25bc CD |
8858 | msgid "git gc [<options>]" |
8859 | msgstr "git gc [<opciones>]" | |
8860 | ||
4b15eb22 | 8861 | #: builtin/gc.c:80 |
fb0e25bc CD |
8862 | #, c-format |
8863 | msgid "Failed to fstat %s: %s" | |
8864 | msgstr "Falló el fstat %s: %s" | |
8865 | ||
4b15eb22 | 8866 | #: builtin/gc.c:312 |
fb0e25bc CD |
8867 | #, c-format |
8868 | msgid "Can't stat %s" | |
8869 | msgstr "No se puede definir %s" | |
8870 | ||
4b15eb22 | 8871 | #: builtin/gc.c:321 |
fb0e25bc CD |
8872 | #, c-format |
8873 | msgid "" | |
8874 | "The last gc run reported the following. Please correct the root cause\n" | |
8875 | "and remove %s.\n" | |
8876 | "Automatic cleanup will not be performed until the file is removed.\n" | |
8877 | "\n" | |
8878 | "%s" | |
8879 | msgstr "" | |
715fc761 | 8880 | "El último gc reportó lo siguiente. Por favor corrige la causa\n" |
fb0e25bc CD |
8881 | "y remueva %s.\n" |
8882 | "Limpieza automática no se realizará hasta que el archivo sea removido.\n" | |
8883 | "\n" | |
8884 | "%s" | |
8885 | ||
4b15eb22 | 8886 | #: builtin/gc.c:360 |
fb0e25bc CD |
8887 | msgid "prune unreferenced objects" |
8888 | msgstr "limpiar objetos no referenciados" | |
8889 | ||
4b15eb22 | 8890 | #: builtin/gc.c:362 |
fb0e25bc CD |
8891 | msgid "be more thorough (increased runtime)" |
8892 | msgstr "ser más exhaustivo (aumentar runtime)" | |
8893 | ||
4b15eb22 | 8894 | #: builtin/gc.c:363 |
fb0e25bc CD |
8895 | msgid "enable auto-gc mode" |
8896 | msgstr "habilitar modo auto-gc" | |
8897 | ||
33ac3e89 | 8898 | #: builtin/gc.c:366 |
fb0e25bc CD |
8899 | msgid "force running gc even if there may be another gc running" |
8900 | msgstr "forzar la ejecución de gc incluso si puede haber otro gc ejecutándose" | |
8901 | ||
33ac3e89 | 8902 | #: builtin/gc.c:384 |
fb0e25bc CD |
8903 | #, c-format |
8904 | msgid "Failed to parse gc.logexpiry value %s" | |
8905 | msgstr "Falló al analizar valor %s de gc.logexpirity" | |
8906 | ||
33ac3e89 | 8907 | #: builtin/gc.c:412 |
fb0e25bc CD |
8908 | #, c-format |
8909 | msgid "Auto packing the repository in background for optimum performance.\n" | |
4b15eb22 CD |
8910 | msgstr "" |
8911 | "Auto empaquetado del repositorio en segundo plano para un performance " | |
8912 | "óptimo.\n" | |
fb0e25bc | 8913 | |
33ac3e89 | 8914 | #: builtin/gc.c:414 |
fb0e25bc CD |
8915 | #, c-format |
8916 | msgid "Auto packing the repository for optimum performance.\n" | |
8917 | msgstr "Auto empaquetado del repositorio para performance óptimo.\n" | |
8918 | ||
33ac3e89 | 8919 | #: builtin/gc.c:415 |
fb0e25bc CD |
8920 | #, c-format |
8921 | msgid "See \"git help gc\" for manual housekeeping.\n" | |
8922 | msgstr "Vea \"git help gc\" para limpieza manual.\n" | |
8923 | ||
33ac3e89 | 8924 | #: builtin/gc.c:440 |
fb0e25bc | 8925 | #, c-format |
4b15eb22 CD |
8926 | msgid "" |
8927 | "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" | |
8928 | msgstr "" | |
8929 | "gc ya está ejecutándose en la máquina '%s' pid %<PRIuMAX> (use --force so no " | |
8930 | "es así)" | |
fb0e25bc | 8931 | |
33ac3e89 | 8932 | #: builtin/gc.c:487 |
4b15eb22 CD |
8933 | msgid "" |
8934 | "There are too many unreachable loose objects; run 'git prune' to remove them." | |
8935 | msgstr "" | |
8936 | "Hay muchos objetos sueltos inalcanzables; ejecute 'git prune' para " | |
8937 | "removerlos." | |
fb0e25bc CD |
8938 | |
8939 | #: builtin/grep.c:27 | |
8940 | msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]" | |
8941 | msgstr "git grep [<opciones>] [-e] <patrón> [<rev>...] [[--] <ruta>...]" | |
8942 | ||
33ac3e89 | 8943 | #: builtin/grep.c:225 |
fb0e25bc CD |
8944 | #, c-format |
8945 | msgid "grep: failed to create thread: %s" | |
8946 | msgstr "grep: falló al crear el hilo: %s" | |
8947 | ||
33ac3e89 | 8948 | #: builtin/grep.c:283 |
fb0e25bc CD |
8949 | #, c-format |
8950 | msgid "invalid number of threads specified (%d) for %s" | |
8951 | msgstr "número inválido de hilos especificado (%d) para %s" | |
8952 | ||
8953 | #. TRANSLATORS: %s is the configuration | |
8954 | #. variable for tweaking threads, currently | |
8955 | #. grep.threads | |
4b15eb22 | 8956 | #. |
33ac3e89 | 8957 | #: builtin/grep.c:292 builtin/index-pack.c:1523 builtin/index-pack.c:1712 |
fb0e25bc CD |
8958 | #, c-format |
8959 | msgid "no threads support, ignoring %s" | |
8960 | msgstr "no hay soporte para hilos, ignorando %s" | |
8961 | ||
33ac3e89 | 8962 | #: builtin/grep.c:460 builtin/grep.c:580 builtin/grep.c:622 |
fb0e25bc CD |
8963 | #, c-format |
8964 | msgid "unable to read tree (%s)" | |
8965 | msgstr "no es posible leer el árbol (%s)" | |
8966 | ||
33ac3e89 | 8967 | #: builtin/grep.c:637 |
fb0e25bc CD |
8968 | #, c-format |
8969 | msgid "unable to grep from object of type %s" | |
8970 | msgstr "no es posible realizar grep del objeto de tipo %s" | |
8971 | ||
33ac3e89 | 8972 | #: builtin/grep.c:703 |
fb0e25bc CD |
8973 | #, c-format |
8974 | msgid "switch `%c' expects a numerical value" | |
8975 | msgstr "switch `%c' espera un valor numérico" | |
8976 | ||
33ac3e89 | 8977 | #: builtin/grep.c:790 |
fb0e25bc CD |
8978 | msgid "search in index instead of in the work tree" |
8979 | msgstr "buscar en el índice en lugar del árbol de trabajo" | |
8980 | ||
33ac3e89 | 8981 | #: builtin/grep.c:792 |
fb0e25bc CD |
8982 | msgid "find in contents not managed by git" |
8983 | msgstr "encontrar en contenidos no manejados por git" | |
8984 | ||
33ac3e89 | 8985 | #: builtin/grep.c:794 |
fb0e25bc CD |
8986 | msgid "search in both tracked and untracked files" |
8987 | msgstr "buscar en archivos rastreados y no rastreados" | |
8988 | ||
33ac3e89 | 8989 | #: builtin/grep.c:796 |
fb0e25bc | 8990 | msgid "ignore files specified via '.gitignore'" |
715fc761 | 8991 | msgstr "ignorar archivos especificados via '.gitignore'" |
fb0e25bc | 8992 | |
33ac3e89 | 8993 | #: builtin/grep.c:798 |
fb0e25bc CD |
8994 | msgid "recursively search in each submodule" |
8995 | msgstr "búsqueda recursiva en cada submódulo" | |
8996 | ||
33ac3e89 | 8997 | #: builtin/grep.c:801 |
fb0e25bc CD |
8998 | msgid "show non-matching lines" |
8999 | msgstr "mostrar líneas que no concuerdan" | |
9000 | ||
33ac3e89 | 9001 | #: builtin/grep.c:803 |
fb0e25bc CD |
9002 | msgid "case insensitive matching" |
9003 | msgstr "búsqueda insensible a mayúsculas" | |
9004 | ||
33ac3e89 | 9005 | #: builtin/grep.c:805 |
fb0e25bc CD |
9006 | msgid "match patterns only at word boundaries" |
9007 | msgstr "concordar patrón solo a los límites de las palabras" | |
9008 | ||
33ac3e89 | 9009 | #: builtin/grep.c:807 |
fb0e25bc CD |
9010 | msgid "process binary files as text" |
9011 | msgstr "procesar archivos binarios como texto" | |
9012 | ||
33ac3e89 | 9013 | #: builtin/grep.c:809 |
fb0e25bc CD |
9014 | msgid "don't match patterns in binary files" |
9015 | msgstr "no concordar patrones en archivos binarios" | |
9016 | ||
33ac3e89 | 9017 | #: builtin/grep.c:812 |
fb0e25bc | 9018 | msgid "process binary files with textconv filters" |
33ac3e89 | 9019 | msgstr "procesar archivos binarios con filtros textconv" |
fb0e25bc | 9020 | |
33ac3e89 | 9021 | #: builtin/grep.c:814 |
fb0e25bc CD |
9022 | msgid "descend at most <depth> levels" |
9023 | msgstr "descender como máximo <valor-de-profundiad> niveles" | |
9024 | ||
33ac3e89 | 9025 | #: builtin/grep.c:818 |
fb0e25bc CD |
9026 | msgid "use extended POSIX regular expressions" |
9027 | msgstr "usar expresiones regulares POSIX extendidas" | |
9028 | ||
33ac3e89 | 9029 | #: builtin/grep.c:821 |
fb0e25bc CD |
9030 | msgid "use basic POSIX regular expressions (default)" |
9031 | msgstr "usar expresiones regulares POSIX (default)" | |
9032 | ||
33ac3e89 | 9033 | #: builtin/grep.c:824 |
fb0e25bc CD |
9034 | msgid "interpret patterns as fixed strings" |
9035 | msgstr "interpretar patrones como strings arreglados" | |
9036 | ||
33ac3e89 | 9037 | #: builtin/grep.c:827 |
fb0e25bc CD |
9038 | msgid "use Perl-compatible regular expressions" |
9039 | msgstr "usar expresiones regulares compatibles con Perl" | |
9040 | ||
33ac3e89 | 9041 | #: builtin/grep.c:830 |
fb0e25bc CD |
9042 | msgid "show line numbers" |
9043 | msgstr "mostrar números de línea" | |
9044 | ||
33ac3e89 | 9045 | #: builtin/grep.c:831 |
fb0e25bc CD |
9046 | msgid "don't show filenames" |
9047 | msgstr "no mostrar nombres de archivo" | |
9048 | ||
33ac3e89 | 9049 | #: builtin/grep.c:832 |
fb0e25bc CD |
9050 | msgid "show filenames" |
9051 | msgstr "mostrar nombres de archivo" | |
9052 | ||
33ac3e89 | 9053 | #: builtin/grep.c:834 |
fb0e25bc CD |
9054 | msgid "show filenames relative to top directory" |
9055 | msgstr "mostrar nombres de archivo relativos al directorio superior" | |
9056 | ||
33ac3e89 | 9057 | #: builtin/grep.c:836 |
fb0e25bc CD |
9058 | msgid "show only filenames instead of matching lines" |
9059 | msgstr "mostrar solo nombres de archivos en lugar de líneas encontradas" | |
9060 | ||
33ac3e89 | 9061 | #: builtin/grep.c:838 |
fb0e25bc CD |
9062 | msgid "synonym for --files-with-matches" |
9063 | msgstr "sinónimo para --files-with-matches" | |
9064 | ||
33ac3e89 | 9065 | #: builtin/grep.c:841 |
fb0e25bc CD |
9066 | msgid "show only the names of files without match" |
9067 | msgstr "mostrar solo los nombres de archivos sin coincidencias" | |
9068 | ||
33ac3e89 | 9069 | #: builtin/grep.c:843 |
fb0e25bc CD |
9070 | msgid "print NUL after filenames" |
9071 | msgstr "imprimir NUL después del nombre de archivo" | |
9072 | ||
33ac3e89 | 9073 | #: builtin/grep.c:846 |
fb0e25bc | 9074 | msgid "show the number of matches instead of matching lines" |
33ac3e89 | 9075 | msgstr "mostrar el número de concordancias en lugar de las líneas concordantes" |
fb0e25bc | 9076 | |
33ac3e89 | 9077 | #: builtin/grep.c:847 |
fb0e25bc CD |
9078 | msgid "highlight matches" |
9079 | msgstr "resaltar concordancias" | |
9080 | ||
33ac3e89 | 9081 | #: builtin/grep.c:849 |
fb0e25bc | 9082 | msgid "print empty line between matches from different files" |
715fc761 | 9083 | msgstr "imprimir una línea vacía entre coincidencias de diferentes archivos" |
fb0e25bc | 9084 | |
33ac3e89 | 9085 | #: builtin/grep.c:851 |
fb0e25bc | 9086 | msgid "show filename only once above matches from same file" |
4b15eb22 CD |
9087 | msgstr "" |
9088 | "mostrar el nombre de archivo solo una vez para concordancias en el mismo " | |
9089 | "archivo" | |
fb0e25bc | 9090 | |
33ac3e89 | 9091 | #: builtin/grep.c:854 |
fb0e25bc CD |
9092 | msgid "show <n> context lines before and after matches" |
9093 | msgstr "mostrar <n> líneas de contexto antes y después de la concordancia" | |
9094 | ||
33ac3e89 | 9095 | #: builtin/grep.c:857 |
fb0e25bc CD |
9096 | msgid "show <n> context lines before matches" |
9097 | msgstr "mostrar <n> líneas de contexto antes de las concordancias" | |
9098 | ||
33ac3e89 | 9099 | #: builtin/grep.c:859 |
fb0e25bc CD |
9100 | msgid "show <n> context lines after matches" |
9101 | msgstr "mostrar <n> líneas de context después de las concordancias" | |
9102 | ||
33ac3e89 | 9103 | #: builtin/grep.c:861 |
fb0e25bc CD |
9104 | msgid "use <n> worker threads" |
9105 | msgstr "usar <n> hilos de trabajo" | |
9106 | ||
33ac3e89 | 9107 | #: builtin/grep.c:862 |
fb0e25bc CD |
9108 | msgid "shortcut for -C NUM" |
9109 | msgstr "atajo para -C NUM" | |
9110 | ||
33ac3e89 | 9111 | #: builtin/grep.c:865 |
fb0e25bc | 9112 | msgid "show a line with the function name before matches" |
4b15eb22 CD |
9113 | msgstr "" |
9114 | "mostrar una línea con el nombre de la función antes de las concordancias" | |
fb0e25bc | 9115 | |
33ac3e89 | 9116 | #: builtin/grep.c:867 |
fb0e25bc CD |
9117 | msgid "show the surrounding function" |
9118 | msgstr "mostrar la función circundante" | |
9119 | ||
33ac3e89 | 9120 | #: builtin/grep.c:870 |
fb0e25bc CD |
9121 | msgid "read patterns from file" |
9122 | msgstr "leer patrones del archivo" | |
9123 | ||
33ac3e89 | 9124 | #: builtin/grep.c:872 |
fb0e25bc CD |
9125 | msgid "match <pattern>" |
9126 | msgstr "concordar <patrón>" | |
9127 | ||
33ac3e89 | 9128 | #: builtin/grep.c:874 |
fb0e25bc CD |
9129 | msgid "combine patterns specified with -e" |
9130 | msgstr "combinar patrones especificados con -e" | |
9131 | ||
33ac3e89 | 9132 | #: builtin/grep.c:886 |
fb0e25bc CD |
9133 | msgid "indicate hit with exit status without output" |
9134 | msgstr "indicar concordancia con exit status sin output" | |
9135 | ||
33ac3e89 | 9136 | #: builtin/grep.c:888 |
fb0e25bc | 9137 | msgid "show only matches from files that match all patterns" |
4b15eb22 CD |
9138 | msgstr "" |
9139 | "mostrar solo concordancias con archivos que concuerdan todos los patrones" | |
fb0e25bc | 9140 | |
33ac3e89 | 9141 | #: builtin/grep.c:890 |
fb0e25bc CD |
9142 | msgid "show parse tree for grep expression" |
9143 | msgstr "mostrar árbol analizado para la expresión grep" | |
9144 | ||
33ac3e89 | 9145 | #: builtin/grep.c:894 |
fb0e25bc CD |
9146 | msgid "pager" |
9147 | msgstr "paginador" | |
9148 | ||
33ac3e89 | 9149 | #: builtin/grep.c:894 |
fb0e25bc CD |
9150 | msgid "show matching files in the pager" |
9151 | msgstr "mostrar archivos concordantes en el paginador" | |
9152 | ||
33ac3e89 | 9153 | #: builtin/grep.c:898 |
fb0e25bc CD |
9154 | msgid "allow calling of grep(1) (ignored by this build)" |
9155 | msgstr "permitir el llamado de grep(1) (ignorado por esta build)" | |
9156 | ||
33ac3e89 | 9157 | #: builtin/grep.c:962 |
fb0e25bc | 9158 | msgid "no pattern given." |
33ac3e89 | 9159 | msgstr "no se ha entregado patrón." |
fb0e25bc | 9160 | |
33ac3e89 | 9161 | #: builtin/grep.c:994 |
fb0e25bc CD |
9162 | msgid "--no-index or --untracked cannot be used with revs" |
9163 | msgstr "--no-index o --untracked no se puede usar con revs" | |
9164 | ||
33ac3e89 | 9165 | #: builtin/grep.c:1001 |
fb0e25bc CD |
9166 | #, c-format |
9167 | msgid "unable to resolve revision: %s" | |
9168 | msgstr "no se posible resolver revisión: %s" | |
9169 | ||
33ac3e89 | 9170 | #: builtin/grep.c:1036 builtin/index-pack.c:1519 |
fb0e25bc CD |
9171 | #, c-format |
9172 | msgid "invalid number of threads specified (%d)" | |
9173 | msgstr "número inválido de hilos especificado (%d)" | |
9174 | ||
33ac3e89 | 9175 | #: builtin/grep.c:1041 |
fb0e25bc CD |
9176 | msgid "no threads support, ignoring --threads" |
9177 | msgstr "no se soportan hilos, ignorando --threads" | |
9178 | ||
33ac3e89 | 9179 | #: builtin/grep.c:1065 |
fb0e25bc CD |
9180 | msgid "--open-files-in-pager only works on the worktree" |
9181 | msgstr "--open-files-in-pager solo funciona en el árbol de trabajo" | |
9182 | ||
33ac3e89 | 9183 | #: builtin/grep.c:1088 |
fb0e25bc CD |
9184 | msgid "option not supported with --recurse-submodules." |
9185 | msgstr "opción no soportada con --recurse-submodules." | |
9186 | ||
33ac3e89 | 9187 | #: builtin/grep.c:1094 |
fb0e25bc CD |
9188 | msgid "--cached or --untracked cannot be used with --no-index." |
9189 | msgstr "--cached o --untracked no pueden ser usadas con --no-index." | |
9190 | ||
33ac3e89 | 9191 | #: builtin/grep.c:1100 |
fb0e25bc CD |
9192 | msgid "--[no-]exclude-standard cannot be used for tracked contents." |
9193 | msgstr "--[no-]exclude-standard no puede ser usada para contenido rastreado." | |
9194 | ||
33ac3e89 | 9195 | #: builtin/grep.c:1108 |
fb0e25bc CD |
9196 | msgid "both --cached and trees are given." |
9197 | msgstr "--cached y árboles han sido entregados." | |
9198 | ||
33ac3e89 | 9199 | #: builtin/hash-object.c:83 |
4b15eb22 CD |
9200 | msgid "" |
9201 | "git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] " | |
9202 | "[--] <file>..." | |
9203 | msgstr "" | |
9204 | "git hash-object [-t <tipo>] [-w] [--path=<archivo> | --no-filters] [--stdin] " | |
9205 | "[--] <archivo>..." | |
fb0e25bc | 9206 | |
33ac3e89 | 9207 | #: builtin/hash-object.c:84 |
fb0e25bc CD |
9208 | msgid "git hash-object --stdin-paths" |
9209 | msgstr "git hash-object --stdin-paths" | |
9210 | ||
33ac3e89 | 9211 | #: builtin/hash-object.c:96 |
fb0e25bc CD |
9212 | msgid "type" |
9213 | msgstr "tipo" | |
9214 | ||
33ac3e89 | 9215 | #: builtin/hash-object.c:96 |
fb0e25bc CD |
9216 | msgid "object type" |
9217 | msgstr "tipo de objeto" | |
9218 | ||
33ac3e89 | 9219 | #: builtin/hash-object.c:97 |
fb0e25bc CD |
9220 | msgid "write the object into the object database" |
9221 | msgstr "escribir el objeto en la base de datos de objetos" | |
9222 | ||
33ac3e89 | 9223 | #: builtin/hash-object.c:99 |
fb0e25bc CD |
9224 | msgid "read the object from stdin" |
9225 | msgstr "leer el objeto de stdin" | |
9226 | ||
33ac3e89 | 9227 | #: builtin/hash-object.c:101 |
fb0e25bc CD |
9228 | msgid "store file as is without filters" |
9229 | msgstr "guardar el archivo como es sin filtros" | |
9230 | ||
33ac3e89 | 9231 | #: builtin/hash-object.c:102 |
4b15eb22 CD |
9232 | msgid "" |
9233 | "just hash any random garbage to create corrupt objects for debugging Git" | |
9234 | msgstr "" | |
9235 | "solo realizar un hash a cualquier basura random para crear un objeto " | |
9236 | "corrupto para hacer debugging de Gti" | |
fb0e25bc | 9237 | |
33ac3e89 | 9238 | #: builtin/hash-object.c:103 |
fb0e25bc CD |
9239 | msgid "process file as it were from this path" |
9240 | msgstr "procesar el archivo como si fuera de esta ruta" | |
9241 | ||
9242 | #: builtin/help.c:43 | |
9243 | msgid "print all available commands" | |
9244 | msgstr "mostrar todos los comandos disponibles" | |
9245 | ||
9246 | #: builtin/help.c:44 | |
9247 | msgid "exclude guides" | |
9248 | msgstr "excluir las guias" | |
9249 | ||
9250 | #: builtin/help.c:45 | |
9251 | msgid "print list of useful guides" | |
9252 | msgstr "mostrar una lista de nociones utiles" | |
9253 | ||
9254 | #: builtin/help.c:46 | |
9255 | msgid "show man page" | |
9256 | msgstr "mostrar la pagina del manual" | |
9257 | ||
9258 | #: builtin/help.c:47 | |
9259 | msgid "show manual in web browser" | |
9260 | msgstr "mostrar la pagina del manual en un navegador web" | |
9261 | ||
9262 | #: builtin/help.c:49 | |
9263 | msgid "show info page" | |
9264 | msgstr "mostrar la pagina de info" | |
9265 | ||
9266 | #: builtin/help.c:55 | |
9267 | msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]" | |
9268 | msgstr "git help [--all] [--guides] [--man | --web | --info] [<comando>]" | |
9269 | ||
9270 | #: builtin/help.c:67 | |
9271 | #, c-format | |
9272 | msgid "unrecognized help format '%s'" | |
9273 | msgstr "formato help no reconocido '%s'" | |
9274 | ||
9275 | #: builtin/help.c:94 | |
9276 | msgid "Failed to start emacsclient." | |
9277 | msgstr "Fallo al iniciar emacsclient." | |
9278 | ||
9279 | #: builtin/help.c:107 | |
9280 | msgid "Failed to parse emacsclient version." | |
715fc761 | 9281 | msgstr "Fallo al analizar la versión de emacsclient." |
fb0e25bc CD |
9282 | |
9283 | #: builtin/help.c:115 | |
9284 | #, c-format | |
9285 | msgid "emacsclient version '%d' too old (< 22)." | |
715fc761 | 9286 | msgstr "la versión '%d' de emacsclient es muy antigua (<22)." |
fb0e25bc | 9287 | |
4b15eb22 | 9288 | #: builtin/help.c:133 builtin/help.c:155 builtin/help.c:165 builtin/help.c:173 |
fb0e25bc CD |
9289 | #, c-format |
9290 | msgid "failed to exec '%s'" | |
9291 | msgstr "fallo al ejecutar '%s'" | |
9292 | ||
4b15eb22 | 9293 | #: builtin/help.c:211 |
fb0e25bc CD |
9294 | #, c-format |
9295 | msgid "" | |
9296 | "'%s': path for unsupported man viewer.\n" | |
9297 | "Please consider using 'man.<tool>.cmd' instead." | |
9298 | msgstr "" | |
9299 | "'%s': ruta para el visualizador del manual no soportada.\n" | |
9300 | "Por favor considere usar 'man.<herramienta.cmd'." | |
9301 | ||
4b15eb22 | 9302 | #: builtin/help.c:223 |
fb0e25bc CD |
9303 | #, c-format |
9304 | msgid "" | |
9305 | "'%s': cmd for supported man viewer.\n" | |
9306 | "Please consider using 'man.<tool>.path' instead." | |
9307 | msgstr "" | |
9308 | "'%s': comando no soportado para man viewer.\n" | |
9309 | "Por favor considere usar 'man.<herramienta>.path." | |
9310 | ||
4b15eb22 | 9311 | #: builtin/help.c:340 |
fb0e25bc CD |
9312 | #, c-format |
9313 | msgid "'%s': unknown man viewer." | |
33ac3e89 | 9314 | msgstr "'%s': visualizador de man desconocido." |
fb0e25bc | 9315 | |
4b15eb22 | 9316 | #: builtin/help.c:357 |
fb0e25bc | 9317 | msgid "no man viewer handled the request" |
9df63a4a | 9318 | msgstr "ningún visualizador de manual proceso la petición" |
fb0e25bc | 9319 | |
4b15eb22 | 9320 | #: builtin/help.c:365 |
fb0e25bc | 9321 | msgid "no info viewer handled the request" |
9df63a4a | 9322 | msgstr "ningún visor de info manejo la petición" |
fb0e25bc | 9323 | |
4b15eb22 | 9324 | #: builtin/help.c:407 |
fb0e25bc | 9325 | msgid "Defining attributes per path" |
715fc761 | 9326 | msgstr "Definiendo atributos por ruta" |
fb0e25bc | 9327 | |
4b15eb22 | 9328 | #: builtin/help.c:408 |
fb0e25bc | 9329 | msgid "Everyday Git With 20 Commands Or So" |
9df63a4a | 9330 | msgstr "Git diario con 20 comandos o algo así" |
fb0e25bc | 9331 | |
4b15eb22 | 9332 | #: builtin/help.c:409 |
fb0e25bc CD |
9333 | msgid "A Git glossary" |
9334 | msgstr "Un glosario de Git" | |
9335 | ||
4b15eb22 | 9336 | #: builtin/help.c:410 |
fb0e25bc CD |
9337 | msgid "Specifies intentionally untracked files to ignore" |
9338 | msgstr "Especifica de forma intencional archivos sin seguimiento a ignorar" | |
9339 | ||
4b15eb22 | 9340 | #: builtin/help.c:411 |
fb0e25bc | 9341 | msgid "Defining submodule properties" |
9df63a4a | 9342 | msgstr "Definiendo las propiedades del submódulo" |
fb0e25bc | 9343 | |
4b15eb22 | 9344 | #: builtin/help.c:412 |
fb0e25bc CD |
9345 | msgid "Specifying revisions and ranges for Git" |
9346 | msgstr "Especificando revisiones y rangos para Git" | |
9347 | ||
4b15eb22 | 9348 | #: builtin/help.c:413 |
fb0e25bc | 9349 | msgid "A tutorial introduction to Git (for version 1.5.1 or newer)" |
715fc761 | 9350 | msgstr "Un tutorial de introducción para Git ( para versiones 1.5.1 o mayores)" |
fb0e25bc | 9351 | |
4b15eb22 | 9352 | #: builtin/help.c:414 |
fb0e25bc | 9353 | msgid "An overview of recommended workflows with Git" |
715fc761 | 9354 | msgstr "Una visión general de flujos de trabajo recomendados con Git" |
fb0e25bc | 9355 | |
4b15eb22 | 9356 | #: builtin/help.c:426 |
fb0e25bc | 9357 | msgid "The common Git guides are:\n" |
715fc761 | 9358 | msgstr "Las guías comunes de Git son:\n" |
fb0e25bc | 9359 | |
4b15eb22 | 9360 | #: builtin/help.c:444 |
fb0e25bc | 9361 | #, c-format |
4b15eb22 CD |
9362 | msgid "'%s' is aliased to '%s'" |
9363 | msgstr "'%s' tiene el alias '%s'" | |
fb0e25bc | 9364 | |
4b15eb22 | 9365 | #: builtin/help.c:466 builtin/help.c:483 |
fb0e25bc CD |
9366 | #, c-format |
9367 | msgid "usage: %s%s" | |
9368 | msgstr "uso: %s%s" | |
9369 | ||
33ac3e89 | 9370 | #: builtin/index-pack.c:157 |
fb0e25bc CD |
9371 | #, c-format |
9372 | msgid "unable to open %s" | |
9373 | msgstr "no es posible abrir %s" | |
9374 | ||
33ac3e89 | 9375 | #: builtin/index-pack.c:207 |
fb0e25bc CD |
9376 | #, c-format |
9377 | msgid "object type mismatch at %s" | |
9378 | msgstr "el tipo del objeto no concuerda en %s" | |
9379 | ||
33ac3e89 | 9380 | #: builtin/index-pack.c:227 |
fb0e25bc CD |
9381 | #, c-format |
9382 | msgid "did not receive expected object %s" | |
9383 | msgstr "no se recibió el objeto esperado %s" | |
9384 | ||
33ac3e89 | 9385 | #: builtin/index-pack.c:230 |
fb0e25bc CD |
9386 | #, c-format |
9387 | msgid "object %s: expected type %s, found %s" | |
9388 | msgstr "objeto %s: tipo esperado %s, encontrado %s" | |
9389 | ||
33ac3e89 | 9390 | #: builtin/index-pack.c:272 |
fb0e25bc CD |
9391 | #, c-format |
9392 | msgid "cannot fill %d byte" | |
9393 | msgid_plural "cannot fill %d bytes" | |
9394 | msgstr[0] "no se puede llenar %d byte" | |
9395 | msgstr[1] "no se pueden llenar %d bytes" | |
9396 | ||
33ac3e89 | 9397 | #: builtin/index-pack.c:282 |
fb0e25bc CD |
9398 | msgid "early EOF" |
9399 | msgstr "EOF temprano" | |
9400 | ||
33ac3e89 | 9401 | #: builtin/index-pack.c:283 |
fb0e25bc CD |
9402 | msgid "read error on input" |
9403 | msgstr "leer error en input" | |
9404 | ||
33ac3e89 | 9405 | #: builtin/index-pack.c:295 |
fb0e25bc CD |
9406 | msgid "used more bytes than were available" |
9407 | msgstr "se usaron más bytes de los disponibles" | |
9408 | ||
33ac3e89 | 9409 | #: builtin/index-pack.c:302 |
fb0e25bc | 9410 | msgid "pack too large for current definition of off_t" |
715fc761 | 9411 | msgstr "paquete muy grande para la definición actual de off_t" |
fb0e25bc | 9412 | |
33ac3e89 | 9413 | #: builtin/index-pack.c:305 builtin/unpack-objects.c:93 |
fb0e25bc CD |
9414 | msgid "pack exceeds maximum allowed size" |
9415 | msgstr "paquete excede el máximo tamaño permitido" | |
9416 | ||
33ac3e89 | 9417 | #: builtin/index-pack.c:320 |
fb0e25bc CD |
9418 | #, c-format |
9419 | msgid "unable to create '%s'" | |
9420 | msgstr "no se puede crear '%s'" | |
9421 | ||
33ac3e89 | 9422 | #: builtin/index-pack.c:326 |
fb0e25bc CD |
9423 | #, c-format |
9424 | msgid "cannot open packfile '%s'" | |
9425 | msgstr "no se puede abrir el archivo de paquete '%s'" | |
9426 | ||
33ac3e89 | 9427 | #: builtin/index-pack.c:340 |
fb0e25bc CD |
9428 | msgid "pack signature mismatch" |
9429 | msgstr "firma del paquete no concuerda" | |
9430 | ||
33ac3e89 | 9431 | #: builtin/index-pack.c:342 |
fb0e25bc CD |
9432 | #, c-format |
9433 | msgid "pack version %<PRIu32> unsupported" | |
9434 | msgstr "versión de paquete %<PRIu32> no soportada" | |
9435 | ||
33ac3e89 | 9436 | #: builtin/index-pack.c:360 |
fb0e25bc CD |
9437 | #, c-format |
9438 | msgid "pack has bad object at offset %<PRIuMAX>: %s" | |
9439 | msgstr "paquete tiene un mal objeto en el offset %<PRIuMAX>: %s" | |
9440 | ||
33ac3e89 | 9441 | #: builtin/index-pack.c:481 |
fb0e25bc CD |
9442 | #, c-format |
9443 | msgid "inflate returned %d" | |
9444 | msgstr "inflate retornó %d" | |
9445 | ||
33ac3e89 | 9446 | #: builtin/index-pack.c:530 |
fb0e25bc CD |
9447 | msgid "offset value overflow for delta base object" |
9448 | msgstr "valor de offset desbordado para el objeto base delta" | |
9449 | ||
33ac3e89 | 9450 | #: builtin/index-pack.c:538 |
fb0e25bc CD |
9451 | msgid "delta base offset is out of bound" |
9452 | msgstr "offset de base delta está fuera de límites" | |
9453 | ||
33ac3e89 | 9454 | #: builtin/index-pack.c:546 |
fb0e25bc CD |
9455 | #, c-format |
9456 | msgid "unknown object type %d" | |
9457 | msgstr "tipo de objeto %d desconocido" | |
9458 | ||
33ac3e89 | 9459 | #: builtin/index-pack.c:577 |
fb0e25bc CD |
9460 | msgid "cannot pread pack file" |
9461 | msgstr "no se puede propagar el paquete" | |
9462 | ||
33ac3e89 | 9463 | #: builtin/index-pack.c:579 |
fb0e25bc CD |
9464 | #, c-format |
9465 | msgid "premature end of pack file, %<PRIuMAX> byte missing" | |
9466 | msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing" | |
9467 | msgstr[0] "final prematuro de archivo de paquete, %<PRIuMAX> byte faltante" | |
9468 | msgstr[1] "final prematuro de archivo de paquete, %<PRIuMAX> bytes faltantes" | |
9469 | ||
33ac3e89 | 9470 | #: builtin/index-pack.c:605 |
fb0e25bc CD |
9471 | msgid "serious inflate inconsistency" |
9472 | msgstr "inconsistencia seria en inflate" | |
9473 | ||
33ac3e89 CDR |
9474 | #: builtin/index-pack.c:750 builtin/index-pack.c:756 builtin/index-pack.c:779 |
9475 | #: builtin/index-pack.c:818 builtin/index-pack.c:827 | |
fb0e25bc CD |
9476 | #, c-format |
9477 | msgid "SHA1 COLLISION FOUND WITH %s !" | |
715fc761 | 9478 | msgstr "COLISIÓN DE TIPO SHA1 ENCONTRADA CON %s !" |
fb0e25bc | 9479 | |
33ac3e89 CDR |
9480 | #: builtin/index-pack.c:753 builtin/pack-objects.c:182 |
9481 | #: builtin/pack-objects.c:276 | |
fb0e25bc CD |
9482 | #, c-format |
9483 | msgid "unable to read %s" | |
9484 | msgstr "no se posible leer %s" | |
9485 | ||
33ac3e89 | 9486 | #: builtin/index-pack.c:816 |
fb0e25bc CD |
9487 | #, c-format |
9488 | msgid "cannot read existing object info %s" | |
9489 | msgstr "no se puede leer la información existente del objeto %s" | |
9490 | ||
33ac3e89 | 9491 | #: builtin/index-pack.c:824 |
fb0e25bc CD |
9492 | #, c-format |
9493 | msgid "cannot read existing object %s" | |
9494 | msgstr "no se puede leer el objeto existente %s" | |
9495 | ||
33ac3e89 | 9496 | #: builtin/index-pack.c:838 |
fb0e25bc CD |
9497 | #, c-format |
9498 | msgid "invalid blob object %s" | |
9499 | msgstr "objeto blob %s inválido" | |
9500 | ||
33ac3e89 | 9501 | #: builtin/index-pack.c:853 |
fb0e25bc CD |
9502 | #, c-format |
9503 | msgid "invalid %s" | |
9504 | msgstr "%s inválido" | |
9505 | ||
33ac3e89 | 9506 | #: builtin/index-pack.c:856 |
fb0e25bc CD |
9507 | msgid "Error in object" |
9508 | msgstr "Error en el objeto" | |
9509 | ||
33ac3e89 | 9510 | #: builtin/index-pack.c:858 |
fb0e25bc CD |
9511 | #, c-format |
9512 | msgid "Not all child objects of %s are reachable" | |
9513 | msgstr "No todos los objetos hijos de %s son alcanzables" | |
9514 | ||
33ac3e89 | 9515 | #: builtin/index-pack.c:930 builtin/index-pack.c:961 |
fb0e25bc CD |
9516 | msgid "failed to apply delta" |
9517 | msgstr "falló al aplicar delta" | |
9518 | ||
4b15eb22 | 9519 | #: builtin/index-pack.c:1131 |
fb0e25bc CD |
9520 | msgid "Receiving objects" |
9521 | msgstr "Recibiendo objetos" | |
9522 | ||
4b15eb22 | 9523 | #: builtin/index-pack.c:1131 |
fb0e25bc CD |
9524 | msgid "Indexing objects" |
9525 | msgstr "Indexando objetos" | |
9526 | ||
4b15eb22 | 9527 | #: builtin/index-pack.c:1165 |
fb0e25bc CD |
9528 | msgid "pack is corrupted (SHA1 mismatch)" |
9529 | msgstr "paquete está corrompido (SHA1 no concuerda)" | |
9530 | ||
4b15eb22 | 9531 | #: builtin/index-pack.c:1170 |
fb0e25bc CD |
9532 | msgid "cannot fstat packfile" |
9533 | msgstr "no se puede fstat al archivo de paquete" | |
9534 | ||
4b15eb22 | 9535 | #: builtin/index-pack.c:1173 |
fb0e25bc CD |
9536 | msgid "pack has junk at the end" |
9537 | msgstr "el paquete tiene basura al final" | |
9538 | ||
4b15eb22 | 9539 | #: builtin/index-pack.c:1185 |
fb0e25bc CD |
9540 | msgid "confusion beyond insanity in parse_pack_objects()" |
9541 | msgstr "confusión más allá de la locura en parse_pack_objects()" | |
9542 | ||
4b15eb22 | 9543 | #: builtin/index-pack.c:1208 |
fb0e25bc CD |
9544 | msgid "Resolving deltas" |
9545 | msgstr "Resolviendo deltas" | |
9546 | ||
4b15eb22 | 9547 | #: builtin/index-pack.c:1219 |
fb0e25bc CD |
9548 | #, c-format |
9549 | msgid "unable to create thread: %s" | |
9550 | msgstr "no es posible crear hilo: %s" | |
9551 | ||
4b15eb22 | 9552 | #: builtin/index-pack.c:1261 |
fb0e25bc CD |
9553 | msgid "confusion beyond insanity" |
9554 | msgstr "confusión más allá de la locura" | |
9555 | ||
4b15eb22 | 9556 | #: builtin/index-pack.c:1267 |
fb0e25bc CD |
9557 | #, c-format |
9558 | msgid "completed with %d local object" | |
9559 | msgid_plural "completed with %d local objects" | |
9560 | msgstr[0] "completado con %d objeto local" | |
9561 | msgstr[1] "completado con %d objetos locales" | |
9562 | ||
4b15eb22 | 9563 | #: builtin/index-pack.c:1279 |
fb0e25bc CD |
9564 | #, c-format |
9565 | msgid "Unexpected tail checksum for %s (disk corruption?)" | |
33ac3e89 | 9566 | msgstr "Tail checksum para %s inesperada (corrupción de disco?)" |
fb0e25bc | 9567 | |
4b15eb22 | 9568 | #: builtin/index-pack.c:1283 |
fb0e25bc CD |
9569 | #, c-format |
9570 | msgid "pack has %d unresolved delta" | |
9571 | msgid_plural "pack has %d unresolved deltas" | |
9572 | msgstr[0] "paquete tiene %d delta sin resolver" | |
9573 | msgstr[1] "paquete tiene %d deltas sin resolver" | |
9574 | ||
4b15eb22 | 9575 | #: builtin/index-pack.c:1307 |
fb0e25bc CD |
9576 | #, c-format |
9577 | msgid "unable to deflate appended object (%d)" | |
9578 | msgstr "no es posible desinflar el objeto adjunto (%d)" | |
9579 | ||
4b15eb22 | 9580 | #: builtin/index-pack.c:1383 |
fb0e25bc CD |
9581 | #, c-format |
9582 | msgid "local object %s is corrupt" | |
9583 | msgstr "objeto local %s está corrompido" | |
9584 | ||
33ac3e89 CDR |
9585 | #: builtin/index-pack.c:1397 |
9586 | #, c-format | |
9587 | msgid "packfile name '%s' does not end with '.pack'" | |
9588 | msgstr "nombre '%s' de archivo de paquete no termina con '.pack'" | |
fb0e25bc | 9589 | |
33ac3e89 | 9590 | #: builtin/index-pack.c:1422 |
fb0e25bc | 9591 | #, c-format |
33ac3e89 CDR |
9592 | msgid "cannot write %s file '%s'" |
9593 | msgstr "no se puede escribir %s en el archivo '%s'" | |
fb0e25bc | 9594 | |
33ac3e89 | 9595 | #: builtin/index-pack.c:1430 |
fb0e25bc | 9596 | #, c-format |
33ac3e89 CDR |
9597 | msgid "cannot close written %s file '%s'" |
9598 | msgstr "no se puede cerrar escrito %s en archivo '%s'" | |
fb0e25bc | 9599 | |
33ac3e89 CDR |
9600 | #: builtin/index-pack.c:1454 |
9601 | msgid "error while closing pack file" | |
9602 | msgstr "error mientras se cierra el archivo paquete" | |
9603 | ||
9604 | #: builtin/index-pack.c:1468 | |
fb0e25bc CD |
9605 | msgid "cannot store pack file" |
9606 | msgstr "no se puede guardar el archivo paquete" | |
9607 | ||
33ac3e89 | 9608 | #: builtin/index-pack.c:1476 |
fb0e25bc CD |
9609 | msgid "cannot store index file" |
9610 | msgstr "no se puede guardar el archivo índice" | |
9611 | ||
33ac3e89 | 9612 | #: builtin/index-pack.c:1513 |
fb0e25bc CD |
9613 | #, c-format |
9614 | msgid "bad pack.indexversion=%<PRIu32>" | |
9615 | msgstr "mal pack.indexversion=%<PRIu32>" | |
9616 | ||
33ac3e89 | 9617 | #: builtin/index-pack.c:1581 |
fb0e25bc CD |
9618 | #, c-format |
9619 | msgid "Cannot open existing pack file '%s'" | |
9620 | msgstr "No se puede abrir el archivo paquete existente '%s'" | |
9621 | ||
33ac3e89 | 9622 | #: builtin/index-pack.c:1583 |
fb0e25bc CD |
9623 | #, c-format |
9624 | msgid "Cannot open existing pack idx file for '%s'" | |
9625 | msgstr "No se puede abrir el índice del archivo paquete para '%s'" | |
9626 | ||
33ac3e89 | 9627 | #: builtin/index-pack.c:1631 |
fb0e25bc CD |
9628 | #, c-format |
9629 | msgid "non delta: %d object" | |
9630 | msgid_plural "non delta: %d objects" | |
9631 | msgstr[0] "no delta: %d objeto" | |
9632 | msgstr[1] "no delta: %d objetos" | |
9633 | ||
33ac3e89 | 9634 | #: builtin/index-pack.c:1638 |
fb0e25bc CD |
9635 | #, c-format |
9636 | msgid "chain length = %d: %lu object" | |
9637 | msgid_plural "chain length = %d: %lu objects" | |
9638 | msgstr[0] "largo de cadena = %d: %lu objeto" | |
9639 | msgstr[1] "largo de cadena = %d: %lu objetos" | |
9640 | ||
33ac3e89 CDR |
9641 | #: builtin/index-pack.c:1675 |
9642 | msgid "Cannot come back to cwd" | |
9643 | msgstr "No se puede regresar a cwd" | |
fb0e25bc | 9644 | |
33ac3e89 CDR |
9645 | #: builtin/index-pack.c:1724 builtin/index-pack.c:1727 |
9646 | #: builtin/index-pack.c:1743 builtin/index-pack.c:1747 | |
fb0e25bc CD |
9647 | #, c-format |
9648 | msgid "bad %s" | |
9649 | msgstr "mal %s" | |
9650 | ||
33ac3e89 | 9651 | #: builtin/index-pack.c:1763 |
fb0e25bc CD |
9652 | msgid "--fix-thin cannot be used without --stdin" |
9653 | msgstr "--fix-thin no puede ser usada sin --stdin" | |
9654 | ||
33ac3e89 | 9655 | #: builtin/index-pack.c:1765 |
fb0e25bc CD |
9656 | msgid "--stdin requires a git repository" |
9657 | msgstr "--stdin requiere un repositorio git" | |
9658 | ||
33ac3e89 | 9659 | #: builtin/index-pack.c:1771 |
fb0e25bc CD |
9660 | msgid "--verify with no packfile name given" |
9661 | msgstr "--verify no recibió ningún nombre de archivo de paquete" | |
9662 | ||
9663 | #: builtin/init-db.c:55 | |
9664 | #, c-format | |
9665 | msgid "cannot stat '%s'" | |
9666 | msgstr "no se pudo definir '%s'" | |
9667 | ||
9668 | #: builtin/init-db.c:61 | |
9669 | #, c-format | |
9670 | msgid "cannot stat template '%s'" | |
9671 | msgstr "no se pudo definir template '%s'" | |
9672 | ||
9673 | #: builtin/init-db.c:66 | |
9674 | #, c-format | |
9675 | msgid "cannot opendir '%s'" | |
9676 | msgstr "no se puede abrir directorio '%s'" | |
9677 | ||
9678 | #: builtin/init-db.c:77 | |
9679 | #, c-format | |
9680 | msgid "cannot readlink '%s'" | |
9681 | msgstr "no se puede leer link '%s'" | |
9682 | ||
9683 | #: builtin/init-db.c:79 | |
9684 | #, c-format | |
9685 | msgid "cannot symlink '%s' '%s'" | |
9686 | msgstr "no se puede crear symlink '%s' '%s'" | |
9687 | ||
9688 | #: builtin/init-db.c:85 | |
9689 | #, c-format | |
9690 | msgid "cannot copy '%s' to '%s'" | |
9691 | msgstr "no se puede copiar '%s' a '%s'" | |
9692 | ||
9693 | #: builtin/init-db.c:89 | |
9694 | #, c-format | |
9695 | msgid "ignoring template %s" | |
9696 | msgstr "ignorando template %s" | |
9697 | ||
9698 | #: builtin/init-db.c:120 | |
9699 | #, c-format | |
9700 | msgid "templates not found %s" | |
9701 | msgstr "no se encontraron templates %s" | |
9702 | ||
9703 | #: builtin/init-db.c:135 | |
9704 | #, c-format | |
9705 | msgid "not copying templates from '%s': %s" | |
9706 | msgstr "no se copian templates de '%s': %s" | |
9707 | ||
9708 | #: builtin/init-db.c:328 | |
9709 | #, c-format | |
9710 | msgid "unable to handle file type %d" | |
9711 | msgstr "no es posible manejar el tipo de archivo %d" | |
9712 | ||
9713 | #: builtin/init-db.c:331 | |
9714 | #, c-format | |
9715 | msgid "unable to move %s to %s" | |
9716 | msgstr "no se puede mover %s a %s" | |
9717 | ||
9718 | #: builtin/init-db.c:348 builtin/init-db.c:351 | |
9719 | #, c-format | |
9720 | msgid "%s already exists" | |
9721 | msgstr "%s ya existe" | |
9722 | ||
9723 | #: builtin/init-db.c:404 | |
9724 | #, c-format | |
9725 | msgid "Reinitialized existing shared Git repository in %s%s\n" | |
9726 | msgstr "Reinicializado el repositorio Git compartido existente en %s%s\n" | |
9727 | ||
9728 | #: builtin/init-db.c:405 | |
9729 | #, c-format | |
9730 | msgid "Reinitialized existing Git repository in %s%s\n" | |
9731 | msgstr "Reinicializado el repositorio Git existente en %s%s\n" | |
9732 | ||
9733 | #: builtin/init-db.c:409 | |
9734 | #, c-format | |
9735 | msgid "Initialized empty shared Git repository in %s%s\n" | |
9736 | msgstr "Inicializado repositorio Git compartido vacío en %s%s\n" | |
9737 | ||
9738 | #: builtin/init-db.c:410 | |
9739 | #, c-format | |
9740 | msgid "Initialized empty Git repository in %s%s\n" | |
9741 | msgstr "Inicializado repositorio Git vacío en %s%s\n" | |
9742 | ||
9743 | #: builtin/init-db.c:458 | |
4b15eb22 CD |
9744 | msgid "" |
9745 | "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" | |
9746 | "shared[=<permissions>]] [<directory>]" | |
9747 | msgstr "" | |
9748 | "git init [-q | --quiet] [--bare] [--template=<directorio-template>] [--" | |
9749 | "shared[=<permisos>]] [<directorio>]" | |
fb0e25bc CD |
9750 | |
9751 | #: builtin/init-db.c:481 | |
9752 | msgid "permissions" | |
9753 | msgstr "permisos" | |
9754 | ||
9755 | #: builtin/init-db.c:482 | |
9756 | msgid "specify that the git repository is to be shared amongst several users" | |
4b15eb22 CD |
9757 | msgstr "" |
9758 | "especifica que el repositorio de git será compartido entre varios usuarios" | |
fb0e25bc CD |
9759 | |
9760 | #: builtin/init-db.c:516 builtin/init-db.c:521 | |
9761 | #, c-format | |
9762 | msgid "cannot mkdir %s" | |
9763 | msgstr "no se pude crear directorio %s" | |
9764 | ||
9765 | #: builtin/init-db.c:525 | |
9766 | #, c-format | |
9767 | msgid "cannot chdir to %s" | |
9768 | msgstr "no se puede aplicar chdir a %s" | |
9769 | ||
9770 | #: builtin/init-db.c:546 | |
9771 | #, c-format | |
4b15eb22 CD |
9772 | msgid "" |
9773 | "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" | |
9774 | "dir=<directory>)" | |
9775 | msgstr "" | |
9776 | "%s (o --work-tree=<directorio>) no se permite sin especificar %s (o --git-" | |
9777 | "dir=<directorio>)" | |
fb0e25bc CD |
9778 | |
9779 | #: builtin/init-db.c:574 | |
9780 | #, c-format | |
9781 | msgid "Cannot access work tree '%s'" | |
9782 | msgstr "No se puede acceder al árbol de trabajo '%s'" | |
9783 | ||
9784 | #: builtin/interpret-trailers.c:15 | |
4b15eb22 CD |
9785 | msgid "" |
9786 | "git interpret-trailers [--in-place] [--trim-empty] [(--trailer " | |
9787 | "<token>[(=|:)<value>])...] [<file>...]" | |
9788 | msgstr "" | |
9789 | "git interpret-trailers [--in-place] [--trim-empty] [(--trailer " | |
9790 | "<token>[(=|:)<valor>])...] [<archivo>...]" | |
fb0e25bc | 9791 | |
4b15eb22 | 9792 | #: builtin/interpret-trailers.c:92 |
fb0e25bc CD |
9793 | msgid "edit files in place" |
9794 | msgstr "editar archivos en el lugar" | |
9795 | ||
4b15eb22 | 9796 | #: builtin/interpret-trailers.c:93 |
fb0e25bc CD |
9797 | msgid "trim empty trailers" |
9798 | msgstr "cortar trailers vacíos" | |
9799 | ||
4b15eb22 CD |
9800 | #: builtin/interpret-trailers.c:96 |
9801 | msgid "where to place the new trailer" | |
9802 | msgstr "donde colocar el nuevo trailer" | |
9803 | ||
9804 | #: builtin/interpret-trailers.c:98 | |
9805 | msgid "action if trailer already exists" | |
9806 | msgstr "acción if trailer ya existe" | |
9807 | ||
9808 | #: builtin/interpret-trailers.c:100 | |
9809 | msgid "action if trailer is missing" | |
9810 | msgstr "acción si falta el trailer" | |
9811 | ||
9812 | #: builtin/interpret-trailers.c:102 | |
9813 | msgid "output only the trailers" | |
9814 | msgstr "mostrar solo los trailers" | |
9815 | ||
9816 | #: builtin/interpret-trailers.c:103 | |
9817 | msgid "do not apply config rules" | |
9818 | msgstr "no aplicar reglas de configuración" | |
9819 | ||
9820 | #: builtin/interpret-trailers.c:104 | |
9821 | msgid "join whitespace-continued values" | |
9822 | msgstr "juntar valores con espacios en blanco contiguos" | |
9823 | ||
9824 | #: builtin/interpret-trailers.c:105 | |
9825 | msgid "set parsing options" | |
9826 | msgstr "configurar opciones de análisis" | |
9827 | ||
9828 | #: builtin/interpret-trailers.c:107 | |
fb0e25bc CD |
9829 | msgid "trailer" |
9830 | msgstr "trailer" | |
9831 | ||
4b15eb22 | 9832 | #: builtin/interpret-trailers.c:108 |
fb0e25bc CD |
9833 | msgid "trailer(s) to add" |
9834 | msgstr "trailer(s) para agregar" | |
9835 | ||
4b15eb22 CD |
9836 | #: builtin/interpret-trailers.c:117 |
9837 | msgid "--trailer with --only-input does not make sense" | |
9838 | msgstr "--trailer con --only-input no tiene sentido" | |
9839 | ||
9840 | #: builtin/interpret-trailers.c:127 | |
fb0e25bc CD |
9841 | msgid "no input file given for in-place editing" |
9842 | msgstr "no se entregó archivo de entrada para edición en lugar" | |
9843 | ||
33ac3e89 | 9844 | #: builtin/log.c:48 |
fb0e25bc CD |
9845 | msgid "git log [<options>] [<revision-range>] [[--] <path>...]" |
9846 | msgstr "git log [<opciones>] [<rango-de-revisión>] [[--] <ruta>...]" | |
9847 | ||
33ac3e89 | 9848 | #: builtin/log.c:49 |
fb0e25bc CD |
9849 | msgid "git show [<options>] <object>..." |
9850 | msgstr "git show [<opciones>] <objeto>..." | |
9851 | ||
33ac3e89 | 9852 | #: builtin/log.c:93 |
fb0e25bc CD |
9853 | #, c-format |
9854 | msgid "invalid --decorate option: %s" | |
9855 | msgstr "opción --decorate inválida: %s" | |
9856 | ||
33ac3e89 | 9857 | #: builtin/log.c:153 |
fb0e25bc CD |
9858 | msgid "suppress diff output" |
9859 | msgstr "suprimir salida de diff" | |
9860 | ||
33ac3e89 | 9861 | #: builtin/log.c:154 |
fb0e25bc CD |
9862 | msgid "show source" |
9863 | msgstr "mostrar fuente" | |
9864 | ||
33ac3e89 | 9865 | #: builtin/log.c:155 |
fb0e25bc | 9866 | msgid "Use mail map file" |
33ac3e89 | 9867 | msgstr "Usar archivo de mapa de mail" |
fb0e25bc | 9868 | |
33ac3e89 | 9869 | #: builtin/log.c:157 |
f8038f5b CDR |
9870 | msgid "only decorate refs that match <pattern>" |
9871 | msgstr "solo decorar refs que concuerden con <patrón>" | |
9872 | ||
33ac3e89 | 9873 | #: builtin/log.c:159 |
f8038f5b CDR |
9874 | msgid "do not decorate refs that match <pattern>" |
9875 | msgstr "no decorar refs que concuerden con <patrón>" | |
9876 | ||
33ac3e89 | 9877 | #: builtin/log.c:160 |
fb0e25bc CD |
9878 | msgid "decorate options" |
9879 | msgstr "opciones de decorado" | |
9880 | ||
33ac3e89 | 9881 | #: builtin/log.c:163 |
fb0e25bc CD |
9882 | msgid "Process line range n,m in file, counting from 1" |
9883 | msgstr "Procesar rango de líneas n,m en archivo, contando desde 1" | |
9884 | ||
33ac3e89 | 9885 | #: builtin/log.c:259 |
fb0e25bc CD |
9886 | #, c-format |
9887 | msgid "Final output: %d %s\n" | |
9888 | msgstr "Salida final: %d %s\n" | |
9889 | ||
33ac3e89 | 9890 | #: builtin/log.c:510 |
fb0e25bc CD |
9891 | #, c-format |
9892 | msgid "git show %s: bad file" | |
9893 | msgstr "git show %s: mal archivo" | |
9894 | ||
33ac3e89 | 9895 | #: builtin/log.c:525 builtin/log.c:619 |
fb0e25bc CD |
9896 | #, c-format |
9897 | msgid "Could not read object %s" | |
9898 | msgstr "No se pudo leer objeto %s" | |
9899 | ||
33ac3e89 | 9900 | #: builtin/log.c:643 |
fb0e25bc CD |
9901 | #, c-format |
9902 | msgid "Unknown type: %d" | |
9903 | msgstr "Tipo desconocido: %d" | |
9904 | ||
33ac3e89 | 9905 | #: builtin/log.c:764 |
fb0e25bc CD |
9906 | msgid "format.headers without value" |
9907 | msgstr "formate.headers. sin valor" | |
9908 | ||
33ac3e89 | 9909 | #: builtin/log.c:865 |
fb0e25bc CD |
9910 | msgid "name of output directory is too long" |
9911 | msgstr "nombre del directorio de salida es muy largo" | |
9912 | ||
33ac3e89 | 9913 | #: builtin/log.c:881 |
fb0e25bc CD |
9914 | #, c-format |
9915 | msgid "Cannot open patch file %s" | |
9916 | msgstr "No se puede abrir archivo patch %s" | |
9917 | ||
33ac3e89 | 9918 | #: builtin/log.c:898 |
fb0e25bc CD |
9919 | msgid "Need exactly one range." |
9920 | msgstr "Exactamente un rango necesario." | |
9921 | ||
33ac3e89 | 9922 | #: builtin/log.c:908 |
fb0e25bc CD |
9923 | msgid "Not a range." |
9924 | msgstr "No es un rango." | |
9925 | ||
33ac3e89 | 9926 | #: builtin/log.c:1014 |
fb0e25bc CD |
9927 | msgid "Cover letter needs email format" |
9928 | msgstr "Letras de portada necesita formato email" | |
9929 | ||
33ac3e89 | 9930 | #: builtin/log.c:1095 |
fb0e25bc CD |
9931 | #, c-format |
9932 | msgid "insane in-reply-to: %s" | |
9933 | msgstr "insano in-reply-to: %s" | |
9934 | ||
33ac3e89 | 9935 | #: builtin/log.c:1122 |
fb0e25bc CD |
9936 | msgid "git format-patch [<options>] [<since> | <revision-range>]" |
9937 | msgstr "git format-patch [<opciones>] [<desde> | <rango-de-revisiones>]" | |
9938 | ||
33ac3e89 | 9939 | #: builtin/log.c:1172 |
fb0e25bc | 9940 | msgid "Two output directories?" |
33ac3e89 | 9941 | msgstr "Dos directorios de salida?" |
fb0e25bc | 9942 | |
33ac3e89 | 9943 | #: builtin/log.c:1279 builtin/log.c:1932 builtin/log.c:1934 builtin/log.c:1946 |
fb0e25bc CD |
9944 | #, c-format |
9945 | msgid "Unknown commit %s" | |
9946 | msgstr "Commit desconocido %s" | |
9947 | ||
33ac3e89 | 9948 | #: builtin/log.c:1289 builtin/notes.c:887 builtin/tag.c:522 |
fb0e25bc CD |
9949 | #, c-format |
9950 | msgid "Failed to resolve '%s' as a valid ref." | |
9951 | msgstr "Falló al resolver '%s' como una ref válida." | |
9952 | ||
33ac3e89 | 9953 | #: builtin/log.c:1294 |
fb0e25bc CD |
9954 | msgid "Could not find exact merge base." |
9955 | msgstr "No se pudo encontrar una base de fusión." | |
9956 | ||
33ac3e89 | 9957 | #: builtin/log.c:1298 |
fb0e25bc CD |
9958 | msgid "" |
9959 | "Failed to get upstream, if you want to record base commit automatically,\n" | |
9960 | "please use git branch --set-upstream-to to track a remote branch.\n" | |
9961 | "Or you could specify base commit by --base=<base-commit-id> manually." | |
9962 | msgstr "" | |
4b15eb22 CD |
9963 | "Falló al conseguir upstream, si quiere grabar un commit base de manera " |
9964 | "automática,\n" | |
fb0e25bc | 9965 | "por favor use git branch --set-upstream-to para rastrear una rama remota.\n" |
4b15eb22 CD |
9966 | "O puede especificar un commit base mediante --base=<id-commit-base> " |
9967 | "manualmente." | |
fb0e25bc | 9968 | |
33ac3e89 | 9969 | #: builtin/log.c:1318 |
fb0e25bc CD |
9970 | msgid "Failed to find exact merge base" |
9971 | msgstr "Fallo al encontrar una base de fusión exacta" | |
9972 | ||
33ac3e89 | 9973 | #: builtin/log.c:1329 |
fb0e25bc CD |
9974 | msgid "base commit should be the ancestor of revision list" |
9975 | msgstr "el commit base debe ser el ancestro de la lista de revisión" | |
9976 | ||
33ac3e89 | 9977 | #: builtin/log.c:1333 |
fb0e25bc CD |
9978 | msgid "base commit shouldn't be in revision list" |
9979 | msgstr "el commit base no debe estar en la lista de revisión" | |
9980 | ||
33ac3e89 | 9981 | #: builtin/log.c:1382 |
fb0e25bc CD |
9982 | msgid "cannot get patch id" |
9983 | msgstr "no se puede obtener id de patch" | |
9984 | ||
33ac3e89 | 9985 | #: builtin/log.c:1441 |
fb0e25bc CD |
9986 | msgid "use [PATCH n/m] even with a single patch" |
9987 | msgstr "use [PATCH n/m] incluso con un único parche" | |
9988 | ||
33ac3e89 | 9989 | #: builtin/log.c:1444 |
fb0e25bc CD |
9990 | msgid "use [PATCH] even with multiple patches" |
9991 | msgstr "use [PATCH] incluso con múltiples parches" | |
9992 | ||
33ac3e89 | 9993 | #: builtin/log.c:1448 |
fb0e25bc CD |
9994 | msgid "print patches to standard out" |
9995 | msgstr "mostrar parches en standard out" | |
9996 | ||
33ac3e89 | 9997 | #: builtin/log.c:1450 |
fb0e25bc CD |
9998 | msgid "generate a cover letter" |
9999 | msgstr "generar letra de cover" | |
10000 | ||
33ac3e89 | 10001 | #: builtin/log.c:1452 |
fb0e25bc | 10002 | msgid "use simple number sequence for output file names" |
4b15eb22 CD |
10003 | msgstr "" |
10004 | "usar una secuencia simple de números para salida de nombres de archivos" | |
fb0e25bc | 10005 | |
33ac3e89 | 10006 | #: builtin/log.c:1453 |
fb0e25bc CD |
10007 | msgid "sfx" |
10008 | msgstr "sfx" | |
10009 | ||
33ac3e89 | 10010 | #: builtin/log.c:1454 |
fb0e25bc CD |
10011 | msgid "use <sfx> instead of '.patch'" |
10012 | msgstr "use <sfx> en lugar de '.patch'" | |
10013 | ||
33ac3e89 | 10014 | #: builtin/log.c:1456 |
fb0e25bc CD |
10015 | msgid "start numbering patches at <n> instead of 1" |
10016 | msgstr "comenzar a numerar los parches desde <n> en lugar de 1" | |
10017 | ||
33ac3e89 | 10018 | #: builtin/log.c:1458 |
fb0e25bc CD |
10019 | msgid "mark the series as Nth re-roll" |
10020 | msgstr "marcar las series como Nth re-roll" | |
10021 | ||
33ac3e89 | 10022 | #: builtin/log.c:1460 |
fb0e25bc CD |
10023 | msgid "Use [RFC PATCH] instead of [PATCH]" |
10024 | msgstr "Use [RFC PATCH] en lugar de [PATCH]" | |
10025 | ||
33ac3e89 | 10026 | #: builtin/log.c:1463 |
fb0e25bc CD |
10027 | msgid "Use [<prefix>] instead of [PATCH]" |
10028 | msgstr "Use [<prefijo>] en lugar de [PATCH]" | |
10029 | ||
33ac3e89 | 10030 | #: builtin/log.c:1466 |
fb0e25bc CD |
10031 | msgid "store resulting files in <dir>" |
10032 | msgstr "guardar archivos resultantes en <dir>" | |
10033 | ||
33ac3e89 | 10034 | #: builtin/log.c:1469 |
fb0e25bc CD |
10035 | msgid "don't strip/add [PATCH]" |
10036 | msgstr "no cortar/agregar [PATCH]" | |
10037 | ||
33ac3e89 | 10038 | #: builtin/log.c:1472 |
fb0e25bc CD |
10039 | msgid "don't output binary diffs" |
10040 | msgstr "no mostrar diffs binarios" | |
10041 | ||
33ac3e89 | 10042 | #: builtin/log.c:1474 |
fb0e25bc | 10043 | msgid "output all-zero hash in From header" |
33ac3e89 | 10044 | msgstr "salida como hash de todos-ceros en la cabecera From" |
fb0e25bc | 10045 | |
33ac3e89 | 10046 | #: builtin/log.c:1476 |
fb0e25bc CD |
10047 | msgid "don't include a patch matching a commit upstream" |
10048 | msgstr "no incluya un parche que coincida con un commit en upstream" | |
10049 | ||
33ac3e89 | 10050 | #: builtin/log.c:1478 |
fb0e25bc CD |
10051 | msgid "show patch format instead of default (patch + stat)" |
10052 | msgstr "mostrar formato de parche en lugar del default (parche + stat)" | |
10053 | ||
33ac3e89 | 10054 | #: builtin/log.c:1480 |
fb0e25bc CD |
10055 | msgid "Messaging" |
10056 | msgstr "Mensajeando" | |
10057 | ||
33ac3e89 | 10058 | #: builtin/log.c:1481 |
fb0e25bc CD |
10059 | msgid "header" |
10060 | msgstr "cabezal" | |
10061 | ||
33ac3e89 | 10062 | #: builtin/log.c:1482 |
fb0e25bc CD |
10063 | msgid "add email header" |
10064 | msgstr "agregar cabecera email" | |
10065 | ||
33ac3e89 | 10066 | #: builtin/log.c:1483 builtin/log.c:1485 |
fb0e25bc CD |
10067 | msgid "email" |
10068 | msgstr "email" | |
10069 | ||
33ac3e89 | 10070 | #: builtin/log.c:1483 |
fb0e25bc CD |
10071 | msgid "add To: header" |
10072 | msgstr "agregar cabecera To:" | |
10073 | ||
33ac3e89 | 10074 | #: builtin/log.c:1485 |
fb0e25bc CD |
10075 | msgid "add Cc: header" |
10076 | msgstr "agregar cabecera Cc:" | |
10077 | ||
33ac3e89 | 10078 | #: builtin/log.c:1487 |
fb0e25bc CD |
10079 | msgid "ident" |
10080 | msgstr "ident" | |
10081 | ||
33ac3e89 | 10082 | #: builtin/log.c:1488 |
fb0e25bc | 10083 | msgid "set From address to <ident> (or committer ident if absent)" |
4b15eb22 CD |
10084 | msgstr "" |
10085 | "configurar dirección From a <ident> ( o identidad de committer si está " | |
10086 | "ausente)" | |
fb0e25bc | 10087 | |
33ac3e89 | 10088 | #: builtin/log.c:1490 |
fb0e25bc CD |
10089 | msgid "message-id" |
10090 | msgstr "id de mensaje" | |
10091 | ||
33ac3e89 | 10092 | #: builtin/log.c:1491 |
fb0e25bc CD |
10093 | msgid "make first mail a reply to <message-id>" |
10094 | msgstr "hacer primer mail una respuesta a <id de mensaje>" | |
10095 | ||
33ac3e89 | 10096 | #: builtin/log.c:1492 builtin/log.c:1495 |
fb0e25bc CD |
10097 | msgid "boundary" |
10098 | msgstr "límite" | |
10099 | ||
33ac3e89 | 10100 | #: builtin/log.c:1493 |
fb0e25bc CD |
10101 | msgid "attach the patch" |
10102 | msgstr "adjuntar el parche" | |
10103 | ||
33ac3e89 | 10104 | #: builtin/log.c:1496 |
fb0e25bc CD |
10105 | msgid "inline the patch" |
10106 | msgstr "poner el parche en línea" | |
10107 | ||
33ac3e89 | 10108 | #: builtin/log.c:1500 |
fb0e25bc CD |
10109 | msgid "enable message threading, styles: shallow, deep" |
10110 | msgstr "habilitar hilos de mensajes, estilos: superficial, profundo" | |
10111 | ||
33ac3e89 | 10112 | #: builtin/log.c:1502 |
fb0e25bc CD |
10113 | msgid "signature" |
10114 | msgstr "firma" | |
10115 | ||
33ac3e89 | 10116 | #: builtin/log.c:1503 |
fb0e25bc CD |
10117 | msgid "add a signature" |
10118 | msgstr "agregar una firma" | |
10119 | ||
33ac3e89 | 10120 | #: builtin/log.c:1504 |
fb0e25bc CD |
10121 | msgid "base-commit" |
10122 | msgstr "commit-base" | |
10123 | ||
33ac3e89 | 10124 | #: builtin/log.c:1505 |
fb0e25bc | 10125 | msgid "add prerequisite tree info to the patch series" |
715fc761 CDR |
10126 | msgstr "" |
10127 | "agregar información de árbol de requisitos previos a la serie de parches" | |
fb0e25bc | 10128 | |
33ac3e89 | 10129 | #: builtin/log.c:1507 |
fb0e25bc CD |
10130 | msgid "add a signature from a file" |
10131 | msgstr "agregar una firma de un archivo" | |
10132 | ||
33ac3e89 | 10133 | #: builtin/log.c:1508 |
fb0e25bc CD |
10134 | msgid "don't print the patch filenames" |
10135 | msgstr "no mostrar los nombres de archivos de los parches" | |
10136 | ||
33ac3e89 | 10137 | #: builtin/log.c:1510 |
4b15eb22 CD |
10138 | msgid "show progress while generating patches" |
10139 | msgstr "mostrar medidor de progreso mientras se generan los parches" | |
10140 | ||
33ac3e89 | 10141 | #: builtin/log.c:1585 |
fb0e25bc CD |
10142 | #, c-format |
10143 | msgid "invalid ident line: %s" | |
715fc761 | 10144 | msgstr "línea de identificación inválida: %s" |
fb0e25bc | 10145 | |
33ac3e89 | 10146 | #: builtin/log.c:1600 |
fb0e25bc CD |
10147 | msgid "-n and -k are mutually exclusive." |
10148 | msgstr "-n y -k son mutuamente exclusivas." | |
10149 | ||
33ac3e89 | 10150 | #: builtin/log.c:1602 |
fb0e25bc CD |
10151 | msgid "--subject-prefix/--rfc and -k are mutually exclusive." |
10152 | msgstr "--subject-prefix/--rfc y -k son mutuamente exclusivos." | |
10153 | ||
33ac3e89 | 10154 | #: builtin/log.c:1610 |
fb0e25bc CD |
10155 | msgid "--name-only does not make sense" |
10156 | msgstr "--name-only no tiene sentido" | |
10157 | ||
33ac3e89 | 10158 | #: builtin/log.c:1612 |
fb0e25bc CD |
10159 | msgid "--name-status does not make sense" |
10160 | msgstr "--name-status no tiene sentido" | |
10161 | ||
33ac3e89 | 10162 | #: builtin/log.c:1614 |
fb0e25bc CD |
10163 | msgid "--check does not make sense" |
10164 | msgstr "--check no tiene sentido" | |
10165 | ||
33ac3e89 | 10166 | #: builtin/log.c:1646 |
fb0e25bc | 10167 | msgid "standard output, or directory, which one?" |
33ac3e89 | 10168 | msgstr "salida standard, o directorio, cual?" |
fb0e25bc | 10169 | |
33ac3e89 | 10170 | #: builtin/log.c:1648 |
fb0e25bc CD |
10171 | #, c-format |
10172 | msgid "Could not create directory '%s'" | |
10173 | msgstr "No se pudo crear el directorio '%s'" | |
10174 | ||
33ac3e89 | 10175 | #: builtin/log.c:1741 |
fb0e25bc CD |
10176 | #, c-format |
10177 | msgid "unable to read signature file '%s'" | |
10178 | msgstr "no se puede leer la firma del archivo '%s'" | |
10179 | ||
33ac3e89 | 10180 | #: builtin/log.c:1773 |
4b15eb22 CD |
10181 | msgid "Generating patches" |
10182 | msgstr "Generando parches" | |
10183 | ||
33ac3e89 | 10184 | #: builtin/log.c:1817 |
fb0e25bc CD |
10185 | msgid "Failed to create output files" |
10186 | msgstr "Falló al crear los archivos de salida" | |
10187 | ||
33ac3e89 | 10188 | #: builtin/log.c:1867 |
fb0e25bc CD |
10189 | msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" |
10190 | msgstr "git cherry [-v] [<upstream> [<head> [<límite>]]]" | |
10191 | ||
33ac3e89 | 10192 | #: builtin/log.c:1921 |
fb0e25bc | 10193 | #, c-format |
4b15eb22 CD |
10194 | msgid "" |
10195 | "Could not find a tracked remote branch, please specify <upstream> manually.\n" | |
10196 | msgstr "" | |
10197 | "No se pudo encontrar una rama remota rastreada, por favor especifique " | |
10198 | "<upstream> manualmente.\n" | |
fb0e25bc | 10199 | |
f8038f5b | 10200 | #: builtin/ls-files.c:468 |
fb0e25bc CD |
10201 | msgid "git ls-files [<options>] [<file>...]" |
10202 | msgstr "git ls-files [<opciones>] [<archivo>...]" | |
10203 | ||
f8038f5b | 10204 | #: builtin/ls-files.c:517 |
fb0e25bc CD |
10205 | msgid "identify the file status with tags" |
10206 | msgstr "identifique el estado del archivo con tags" | |
10207 | ||
f8038f5b | 10208 | #: builtin/ls-files.c:519 |
fb0e25bc CD |
10209 | msgid "use lowercase letters for 'assume unchanged' files" |
10210 | msgstr "usar letras minúsculas para archivos 'asumidos sin cambios'" | |
10211 | ||
f8038f5b CDR |
10212 | #: builtin/ls-files.c:521 |
10213 | msgid "use lowercase letters for 'fsmonitor clean' files" | |
10214 | msgstr "usar letras minúsculas para archivos de 'fsmonitor clean'" | |
10215 | ||
10216 | #: builtin/ls-files.c:523 | |
fb0e25bc CD |
10217 | msgid "show cached files in the output (default)" |
10218 | msgstr "mostrar archivos en caché en la salida (default)" | |
10219 | ||
f8038f5b | 10220 | #: builtin/ls-files.c:525 |
fb0e25bc CD |
10221 | msgid "show deleted files in the output" |
10222 | msgstr "mostrar archivos borrados en la salida" | |
10223 | ||
f8038f5b | 10224 | #: builtin/ls-files.c:527 |
fb0e25bc CD |
10225 | msgid "show modified files in the output" |
10226 | msgstr "mostrar archivos modificados en la salida" | |
10227 | ||
f8038f5b | 10228 | #: builtin/ls-files.c:529 |
fb0e25bc CD |
10229 | msgid "show other files in the output" |
10230 | msgstr "mostrar otros archivos en la salida" | |
10231 | ||
f8038f5b | 10232 | #: builtin/ls-files.c:531 |
fb0e25bc CD |
10233 | msgid "show ignored files in the output" |
10234 | msgstr "mostrar archivos ignorados en la salida" | |
10235 | ||
f8038f5b | 10236 | #: builtin/ls-files.c:534 |
fb0e25bc | 10237 | msgid "show staged contents' object name in the output" |
4b15eb22 CD |
10238 | msgstr "" |
10239 | "mostrar contenido de nombres de objetos en el área de stage en la salida" | |
fb0e25bc | 10240 | |
f8038f5b | 10241 | #: builtin/ls-files.c:536 |
fb0e25bc CD |
10242 | msgid "show files on the filesystem that need to be removed" |
10243 | msgstr "mostrar archivos en el filesystem que necesitan ser borrados" | |
10244 | ||
f8038f5b | 10245 | #: builtin/ls-files.c:538 |
fb0e25bc CD |
10246 | msgid "show 'other' directories' names only" |
10247 | msgstr "mostrar solo nombres de 'directorios otros'" | |
10248 | ||
f8038f5b | 10249 | #: builtin/ls-files.c:540 |
fb0e25bc CD |
10250 | msgid "show line endings of files" |
10251 | msgstr "mostrar finales de línea de archivos" | |
10252 | ||
f8038f5b | 10253 | #: builtin/ls-files.c:542 |
fb0e25bc CD |
10254 | msgid "don't show empty directories" |
10255 | msgstr "no mostrar directorios vacíos" | |
10256 | ||
f8038f5b | 10257 | #: builtin/ls-files.c:545 |
fb0e25bc CD |
10258 | msgid "show unmerged files in the output" |
10259 | msgstr "mostrar archivos no fusionados en la salida" | |
10260 | ||
f8038f5b | 10261 | #: builtin/ls-files.c:547 |
fb0e25bc CD |
10262 | msgid "show resolve-undo information" |
10263 | msgstr "mostrar información resolver-deshacer" | |
10264 | ||
f8038f5b | 10265 | #: builtin/ls-files.c:549 |
fb0e25bc CD |
10266 | msgid "skip files matching pattern" |
10267 | msgstr "saltar archivos que concuerden con el patrón" | |
10268 | ||
f8038f5b | 10269 | #: builtin/ls-files.c:552 |
fb0e25bc CD |
10270 | msgid "exclude patterns are read from <file>" |
10271 | msgstr "excluir patrones leídos de <archivo>" | |
10272 | ||
f8038f5b | 10273 | #: builtin/ls-files.c:555 |
fb0e25bc | 10274 | msgid "read additional per-directory exclude patterns in <file>" |
4b15eb22 CD |
10275 | msgstr "" |
10276 | "leer patrones de exclusión de manera adicional por directorio en <archivo>" | |
fb0e25bc | 10277 | |
f8038f5b | 10278 | #: builtin/ls-files.c:557 |
fb0e25bc CD |
10279 | msgid "add the standard git exclusions" |
10280 | msgstr "agregar las exclusiones standard de git" | |
10281 | ||
f8038f5b | 10282 | #: builtin/ls-files.c:560 |
fb0e25bc | 10283 | msgid "make the output relative to the project top directory" |
9df63a4a | 10284 | msgstr "hacer la salida relativa al directorio principal del proyecto" |
fb0e25bc | 10285 | |
f8038f5b | 10286 | #: builtin/ls-files.c:563 |
fb0e25bc CD |
10287 | msgid "recurse through submodules" |
10288 | msgstr "recurrir a través de submódulos" | |
10289 | ||
f8038f5b | 10290 | #: builtin/ls-files.c:565 |
fb0e25bc CD |
10291 | msgid "if any <file> is not in the index, treat this as an error" |
10292 | msgstr "si cualquier <archivo> no está en el índice, tratarlo como un error" | |
10293 | ||
f8038f5b | 10294 | #: builtin/ls-files.c:566 |
fb0e25bc | 10295 | msgid "tree-ish" |
715fc761 | 10296 | msgstr "árbol-ismo" |
fb0e25bc | 10297 | |
f8038f5b | 10298 | #: builtin/ls-files.c:567 |
fb0e25bc | 10299 | msgid "pretend that paths removed since <tree-ish> are still present" |
4b15eb22 | 10300 | msgstr "" |
715fc761 | 10301 | "fingir que las rutas han sido borradas ya que todavía hay <árbol-ismos> " |
4b15eb22 | 10302 | "presentes" |
fb0e25bc | 10303 | |
f8038f5b | 10304 | #: builtin/ls-files.c:569 |
fb0e25bc CD |
10305 | msgid "show debugging data" |
10306 | msgstr "mostrar data de debug" | |
10307 | ||
10308 | #: builtin/ls-remote.c:7 | |
10309 | msgid "" | |
10310 | "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n" | |
10311 | " [-q | --quiet] [--exit-code] [--get-url]\n" | |
10312 | " [--symref] [<repository> [<refs>...]]" | |
10313 | msgstr "" | |
10314 | "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n" | |
10315 | " [-q | --quiet] [--exit-code] [--get-url]\n" | |
10316 | " [--symref] [<repositorio> [<refs>...]]" | |
10317 | ||
10318 | #: builtin/ls-remote.c:52 | |
10319 | msgid "do not print remote URL" | |
10320 | msgstr "no mostrar el URL remoto" | |
10321 | ||
10322 | #: builtin/ls-remote.c:53 builtin/ls-remote.c:55 | |
10323 | msgid "exec" | |
10324 | msgstr "ejecutar" | |
10325 | ||
10326 | #: builtin/ls-remote.c:54 builtin/ls-remote.c:56 | |
10327 | msgid "path of git-upload-pack on the remote host" | |
10328 | msgstr "ruta de git-upload-pack en el host remoto" | |
10329 | ||
10330 | #: builtin/ls-remote.c:58 | |
10331 | msgid "limit to tags" | |
10332 | msgstr "limitar a tags" | |
10333 | ||
10334 | #: builtin/ls-remote.c:59 | |
10335 | msgid "limit to heads" | |
10336 | msgstr "limitar a heads" | |
10337 | ||
10338 | #: builtin/ls-remote.c:60 | |
10339 | msgid "do not show peeled tags" | |
10340 | msgstr "no mostrar tags pelados" | |
10341 | ||
10342 | #: builtin/ls-remote.c:62 | |
10343 | msgid "take url.<base>.insteadOf into account" | |
10344 | msgstr "tomar url.<base>.insteadOf en cuenta" | |
10345 | ||
10346 | #: builtin/ls-remote.c:64 | |
10347 | msgid "exit with exit code 2 if no matching refs are found" | |
10348 | msgstr "salir con código de salida 2 si no se encuentran refs que concuerden" | |
10349 | ||
33ac3e89 | 10350 | #: builtin/ls-remote.c:67 |
fb0e25bc CD |
10351 | msgid "show underlying ref in addition to the object pointed by it" |
10352 | msgstr "mostrar ref subyacente en adición al objeto apuntado por él" | |
10353 | ||
10354 | #: builtin/ls-tree.c:29 | |
10355 | msgid "git ls-tree [<options>] <tree-ish> [<path>...]" | |
715fc761 | 10356 | msgstr "git ls-tree [<opciones>] <árbol-ismo> [<ruta>...]" |
fb0e25bc CD |
10357 | |
10358 | #: builtin/ls-tree.c:127 | |
10359 | msgid "only show trees" | |
10360 | msgstr "solo mostrar árboles" | |
10361 | ||
10362 | #: builtin/ls-tree.c:129 | |
10363 | msgid "recurse into subtrees" | |
10364 | msgstr "recurrir en subárboles" | |
10365 | ||
10366 | #: builtin/ls-tree.c:131 | |
10367 | msgid "show trees when recursing" | |
10368 | msgstr "mostrar árboles cuando se recurre" | |
10369 | ||
10370 | #: builtin/ls-tree.c:134 | |
10371 | msgid "terminate entries with NUL byte" | |
10372 | msgstr "terminar entradas con byte NUL" | |
10373 | ||
10374 | #: builtin/ls-tree.c:135 | |
10375 | msgid "include object size" | |
10376 | msgstr "incluir tamaño de objeto" | |
10377 | ||
10378 | #: builtin/ls-tree.c:137 builtin/ls-tree.c:139 | |
10379 | msgid "list only filenames" | |
10380 | msgstr "listar solo nombres de archivos" | |
10381 | ||
10382 | #: builtin/ls-tree.c:142 | |
10383 | msgid "use full path names" | |
10384 | msgstr "usar rutas completas" | |
10385 | ||
10386 | #: builtin/ls-tree.c:144 | |
10387 | msgid "list entire tree; not just current directory (implies --full-name)" | |
4b15eb22 CD |
10388 | msgstr "" |
10389 | "mostrar todo el árbol; no solo el directorio actual (implica --full-name)" | |
fb0e25bc CD |
10390 | |
10391 | #: builtin/mailsplit.c:241 | |
10392 | #, c-format | |
10393 | msgid "empty mbox: '%s'" | |
10394 | msgstr "mbox vacío: '%s'" | |
10395 | ||
33ac3e89 | 10396 | #: builtin/merge.c:49 |
fb0e25bc CD |
10397 | msgid "git merge [<options>] [<commit>...]" |
10398 | msgstr "git merge [<opciones>] [<commit>...]" | |
10399 | ||
33ac3e89 | 10400 | #: builtin/merge.c:50 |
fb0e25bc CD |
10401 | msgid "git merge --abort" |
10402 | msgstr "git merge --abort" | |
10403 | ||
33ac3e89 | 10404 | #: builtin/merge.c:51 |
fb0e25bc CD |
10405 | msgid "git merge --continue" |
10406 | msgstr "git merge --continue" | |
10407 | ||
33ac3e89 | 10408 | #: builtin/merge.c:108 |
fb0e25bc CD |
10409 | msgid "switch `m' requires a value" |
10410 | msgstr "cambiar `m' requiere un valor" | |
10411 | ||
33ac3e89 | 10412 | #: builtin/merge.c:145 |
fb0e25bc CD |
10413 | #, c-format |
10414 | msgid "Could not find merge strategy '%s'.\n" | |
10415 | msgstr "No se pudo encontrar estrategia de fusión '%s'.\n" | |
10416 | ||
33ac3e89 | 10417 | #: builtin/merge.c:146 |
fb0e25bc CD |
10418 | #, c-format |
10419 | msgid "Available strategies are:" | |
10420 | msgstr "Estrategias disponibles son:" | |
10421 | ||
33ac3e89 | 10422 | #: builtin/merge.c:151 |
fb0e25bc CD |
10423 | #, c-format |
10424 | msgid "Available custom strategies are:" | |
10425 | msgstr "Estrategias personalizadas disponibles son:" | |
10426 | ||
33ac3e89 | 10427 | #: builtin/merge.c:201 builtin/pull.c:137 |
fb0e25bc CD |
10428 | msgid "do not show a diffstat at the end of the merge" |
10429 | msgstr "no mostrar un diffstat al final de la fusión" | |
10430 | ||
33ac3e89 | 10431 | #: builtin/merge.c:204 builtin/pull.c:140 |
fb0e25bc CD |
10432 | msgid "show a diffstat at the end of the merge" |
10433 | msgstr "mostrar un diffstat al final de la fusión" | |
10434 | ||
33ac3e89 | 10435 | #: builtin/merge.c:205 builtin/pull.c:143 |
fb0e25bc CD |
10436 | msgid "(synonym to --stat)" |
10437 | msgstr "(sinónimo para --stat)" | |
10438 | ||
33ac3e89 | 10439 | #: builtin/merge.c:207 builtin/pull.c:146 |
fb0e25bc | 10440 | msgid "add (at most <n>) entries from shortlog to merge commit message" |
4b15eb22 CD |
10441 | msgstr "" |
10442 | "agregar (como máximo <n>) entradas del shortlog al mensaje del commit de " | |
10443 | "fusión" | |
fb0e25bc | 10444 | |
33ac3e89 | 10445 | #: builtin/merge.c:210 builtin/pull.c:152 |
fb0e25bc CD |
10446 | msgid "create a single commit instead of doing a merge" |
10447 | msgstr "crear un commit único en lugar de hacer una fusión" | |
10448 | ||
33ac3e89 | 10449 | #: builtin/merge.c:212 builtin/pull.c:155 |
fb0e25bc CD |
10450 | msgid "perform a commit if the merge succeeds (default)" |
10451 | msgstr "realizar un commit si la fusión es exitosa (default)" | |
10452 | ||
33ac3e89 | 10453 | #: builtin/merge.c:214 builtin/pull.c:158 |
fb0e25bc CD |
10454 | msgid "edit message before committing" |
10455 | msgstr "editar mensaje antes de realizar commit" | |
10456 | ||
33ac3e89 | 10457 | #: builtin/merge.c:215 |
fb0e25bc CD |
10458 | msgid "allow fast-forward (default)" |
10459 | msgstr "permitir fast-forwars (default)" | |
10460 | ||
33ac3e89 | 10461 | #: builtin/merge.c:217 builtin/pull.c:164 |
fb0e25bc CD |
10462 | msgid "abort if fast-forward is not possible" |
10463 | msgstr "abortar si fast-forward no es posible" | |
10464 | ||
33ac3e89 | 10465 | #: builtin/merge.c:221 builtin/pull.c:167 |
fb0e25bc CD |
10466 | msgid "verify that the named commit has a valid GPG signature" |
10467 | msgstr "verificar que el commit nombrado tiene una firma GPG válida" | |
10468 | ||
33ac3e89 | 10469 | #: builtin/merge.c:222 builtin/notes.c:777 builtin/pull.c:171 |
4b15eb22 | 10470 | #: builtin/revert.c:109 |
fb0e25bc CD |
10471 | msgid "strategy" |
10472 | msgstr "estrategia" | |
10473 | ||
33ac3e89 | 10474 | #: builtin/merge.c:223 builtin/pull.c:172 |
fb0e25bc CD |
10475 | msgid "merge strategy to use" |
10476 | msgstr "estrategia de fusión para usar" | |
10477 | ||
33ac3e89 | 10478 | #: builtin/merge.c:224 builtin/pull.c:175 |
fb0e25bc CD |
10479 | msgid "option=value" |
10480 | msgstr "opción=valor" | |
10481 | ||
33ac3e89 | 10482 | #: builtin/merge.c:225 builtin/pull.c:176 |
fb0e25bc CD |
10483 | msgid "option for selected merge strategy" |
10484 | msgstr "opción para la estrategia de fusión seleccionada" | |
10485 | ||
33ac3e89 | 10486 | #: builtin/merge.c:227 |
fb0e25bc CD |
10487 | msgid "merge commit message (for a non-fast-forward merge)" |
10488 | msgstr "fusionar mensaje de commit (para una fusión no fast-forward)" | |
10489 | ||
33ac3e89 | 10490 | #: builtin/merge.c:231 |
fb0e25bc CD |
10491 | msgid "abort the current in-progress merge" |
10492 | msgstr "abortar la fusión en progreso actual" | |
10493 | ||
33ac3e89 | 10494 | #: builtin/merge.c:233 |
fb0e25bc CD |
10495 | msgid "continue the current in-progress merge" |
10496 | msgstr "continuar la fusión en progreso actual" | |
10497 | ||
33ac3e89 | 10498 | #: builtin/merge.c:235 builtin/pull.c:183 |
fb0e25bc CD |
10499 | msgid "allow merging unrelated histories" |
10500 | msgstr "permitir fusionar historias no relacionadas" | |
10501 | ||
33ac3e89 | 10502 | #: builtin/merge.c:241 |
4b15eb22 CD |
10503 | msgid "verify commit-msg hook" |
10504 | msgstr "verificar el hook commit-msg" | |
10505 | ||
33ac3e89 | 10506 | #: builtin/merge.c:266 |
fb0e25bc CD |
10507 | msgid "could not run stash." |
10508 | msgstr "no se pudo ejecutar stash." | |
10509 | ||
33ac3e89 | 10510 | #: builtin/merge.c:271 |
fb0e25bc CD |
10511 | msgid "stash failed" |
10512 | msgstr "stash falló" | |
10513 | ||
33ac3e89 | 10514 | #: builtin/merge.c:276 |
fb0e25bc CD |
10515 | #, c-format |
10516 | msgid "not a valid object: %s" | |
10517 | msgstr "no es un objeto válido: %s" | |
10518 | ||
33ac3e89 | 10519 | #: builtin/merge.c:298 builtin/merge.c:315 |
fb0e25bc CD |
10520 | msgid "read-tree failed" |
10521 | msgstr "lectura de árbol falló" | |
10522 | ||
33ac3e89 | 10523 | #: builtin/merge.c:345 |
fb0e25bc CD |
10524 | msgid " (nothing to squash)" |
10525 | msgstr " (nada para hacer squash)" | |
10526 | ||
33ac3e89 | 10527 | #: builtin/merge.c:356 |
fb0e25bc CD |
10528 | #, c-format |
10529 | msgid "Squash commit -- not updating HEAD\n" | |
10530 | msgstr "Commit de squash -- no actualizando HEAD\n" | |
10531 | ||
33ac3e89 | 10532 | #: builtin/merge.c:406 |
fb0e25bc CD |
10533 | #, c-format |
10534 | msgid "No merge message -- not updating HEAD\n" | |
10535 | msgstr "No hay mensaje de fusión -- no actualizando HEAD\n" | |
10536 | ||
33ac3e89 | 10537 | #: builtin/merge.c:456 |
fb0e25bc CD |
10538 | #, c-format |
10539 | msgid "'%s' does not point to a commit" | |
9df63a4a | 10540 | msgstr "'%s' no apunta a ningún commit" |
fb0e25bc | 10541 | |
33ac3e89 | 10542 | #: builtin/merge.c:546 |
fb0e25bc CD |
10543 | #, c-format |
10544 | msgid "Bad branch.%s.mergeoptions string: %s" | |
10545 | msgstr "Mal string branch.%s.mergeoptions: %s" | |
10546 | ||
33ac3e89 | 10547 | #: builtin/merge.c:668 |
fb0e25bc CD |
10548 | msgid "Not handling anything other than two heads merge." |
10549 | msgstr "No manejando nada más que fusión de dos heads." | |
10550 | ||
33ac3e89 | 10551 | #: builtin/merge.c:682 |
fb0e25bc CD |
10552 | #, c-format |
10553 | msgid "Unknown option for merge-recursive: -X%s" | |
10554 | msgstr "Opción desconocida para merge-recursive: -X%s" | |
10555 | ||
33ac3e89 | 10556 | #: builtin/merge.c:697 |
fb0e25bc CD |
10557 | #, c-format |
10558 | msgid "unable to write %s" | |
715fc761 | 10559 | msgstr "no es posible escribir %s" |
fb0e25bc | 10560 | |
33ac3e89 | 10561 | #: builtin/merge.c:749 |
fb0e25bc CD |
10562 | #, c-format |
10563 | msgid "Could not read from '%s'" | |
10564 | msgstr "No se puedo leer de '%s'" | |
10565 | ||
33ac3e89 | 10566 | #: builtin/merge.c:758 |
fb0e25bc CD |
10567 | #, c-format |
10568 | msgid "Not committing merge; use 'git commit' to complete the merge.\n" | |
4b15eb22 CD |
10569 | msgstr "" |
10570 | "No se realiza commit de la fusión; use 'git commit' para completar la " | |
10571 | "fusión.\n" | |
fb0e25bc | 10572 | |
33ac3e89 | 10573 | #: builtin/merge.c:764 |
fb0e25bc CD |
10574 | #, c-format |
10575 | msgid "" | |
10576 | "Please enter a commit message to explain why this merge is necessary,\n" | |
10577 | "especially if it merges an updated upstream into a topic branch.\n" | |
10578 | "\n" | |
10579 | "Lines starting with '%c' will be ignored, and an empty message aborts\n" | |
10580 | "the commit.\n" | |
10581 | msgstr "" | |
4b15eb22 CD |
10582 | "Por favor ingrese un mensaje de commit que explique por qué es necesaria " |
10583 | "esta fusión,\n" | |
10584 | "especialmente si esto fusiona un upstream actualizado en una rama de " | |
10585 | "tópico.\n" | |
fb0e25bc CD |
10586 | "\n" |
10587 | "Líneas comenzando con '%c' serán ignoradas, y un mensaje vacío aborta\n" | |
10588 | "el commit.\n" | |
10589 | ||
33ac3e89 | 10590 | #: builtin/merge.c:800 |
fb0e25bc CD |
10591 | msgid "Empty commit message." |
10592 | msgstr "Mensaje de commit vacío." | |
10593 | ||
33ac3e89 | 10594 | #: builtin/merge.c:820 |
fb0e25bc CD |
10595 | #, c-format |
10596 | msgid "Wonderful.\n" | |
10597 | msgstr "Maravilloso.\n" | |
10598 | ||
33ac3e89 | 10599 | #: builtin/merge.c:873 |
fb0e25bc CD |
10600 | #, c-format |
10601 | msgid "Automatic merge failed; fix conflicts and then commit the result.\n" | |
4b15eb22 CD |
10602 | msgstr "" |
10603 | "Fusión automática falló; arregle los conflictos y luego realice un commit " | |
10604 | "con el resultado.\n" | |
fb0e25bc | 10605 | |
33ac3e89 | 10606 | #: builtin/merge.c:912 |
fb0e25bc CD |
10607 | msgid "No current branch." |
10608 | msgstr "No rama actual." | |
10609 | ||
33ac3e89 | 10610 | #: builtin/merge.c:914 |
fb0e25bc CD |
10611 | msgid "No remote for the current branch." |
10612 | msgstr "No hay remoto para la rama actual." | |
10613 | ||
33ac3e89 | 10614 | #: builtin/merge.c:916 |
fb0e25bc | 10615 | msgid "No default upstream defined for the current branch." |
715fc761 | 10616 | msgstr "Por defecto, no hay un upstream definido para la rama actual." |
fb0e25bc | 10617 | |
33ac3e89 | 10618 | #: builtin/merge.c:921 |
fb0e25bc CD |
10619 | #, c-format |
10620 | msgid "No remote-tracking branch for %s from %s" | |
10621 | msgstr "No hay rama de rastreo remoto para %s de %s" | |
10622 | ||
33ac3e89 | 10623 | #: builtin/merge.c:974 |
fb0e25bc CD |
10624 | #, c-format |
10625 | msgid "Bad value '%s' in environment '%s'" | |
10626 | msgstr "Mal valor '%s' en el entorno '%s'" | |
10627 | ||
33ac3e89 | 10628 | #: builtin/merge.c:1076 |
fb0e25bc CD |
10629 | #, c-format |
10630 | msgid "not something we can merge in %s: %s" | |
10631 | msgstr "nada que podamos fusionar en %s: %s" | |
10632 | ||
33ac3e89 | 10633 | #: builtin/merge.c:1110 |
fb0e25bc CD |
10634 | msgid "not something we can merge" |
10635 | msgstr "nada que podamos fusionar" | |
10636 | ||
33ac3e89 | 10637 | #: builtin/merge.c:1212 |
fb0e25bc CD |
10638 | msgid "--abort expects no arguments" |
10639 | msgstr "--abort no espera argumentos" | |
10640 | ||
33ac3e89 | 10641 | #: builtin/merge.c:1216 |
fb0e25bc CD |
10642 | msgid "There is no merge to abort (MERGE_HEAD missing)." |
10643 | msgstr "No hay una fusión para abortar (falta MERGE_HEAD)" | |
10644 | ||
33ac3e89 | 10645 | #: builtin/merge.c:1228 |
fb0e25bc CD |
10646 | msgid "--continue expects no arguments" |
10647 | msgstr "--continue no espera argumentos" | |
10648 | ||
33ac3e89 | 10649 | #: builtin/merge.c:1232 |
fb0e25bc CD |
10650 | msgid "There is no merge in progress (MERGE_HEAD missing)." |
10651 | msgstr "No hay fusión en progreso (falta MERGE_HEAD)." | |
10652 | ||
33ac3e89 | 10653 | #: builtin/merge.c:1248 |
fb0e25bc CD |
10654 | msgid "" |
10655 | "You have not concluded your merge (MERGE_HEAD exists).\n" | |
10656 | "Please, commit your changes before you merge." | |
10657 | msgstr "" | |
10658 | "No ha concluido la fusión (existe MERGE_HEAD).\n" | |
10659 | "Por favor, realice un commit con los cambios antes de fusionar." | |
10660 | ||
33ac3e89 | 10661 | #: builtin/merge.c:1255 |
fb0e25bc CD |
10662 | msgid "" |
10663 | "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" | |
10664 | "Please, commit your changes before you merge." | |
10665 | msgstr "" | |
10666 | "No ha concluido el cherry-pick (existe CHERRY_PICK_HEAD).\n" | |
10667 | "Por favor, realice un commit con los cambios antes de fusionar." | |
10668 | ||
33ac3e89 | 10669 | #: builtin/merge.c:1258 |
fb0e25bc CD |
10670 | msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." |
10671 | msgstr "No ha concluido el cherry-pick (existe CHERRY_PICK_HEAD)." | |
10672 | ||
33ac3e89 | 10673 | #: builtin/merge.c:1267 |
fb0e25bc CD |
10674 | msgid "You cannot combine --squash with --no-ff." |
10675 | msgstr "No se puede combinar --squash con --no-ff." | |
10676 | ||
33ac3e89 | 10677 | #: builtin/merge.c:1275 |
fb0e25bc | 10678 | msgid "No commit specified and merge.defaultToUpstream not set." |
4b15eb22 CD |
10679 | msgstr "" |
10680 | "No hay commit especificado y merge.defaultToUpstream no está configurado." | |
fb0e25bc | 10681 | |
33ac3e89 | 10682 | #: builtin/merge.c:1292 |
fb0e25bc CD |
10683 | msgid "Squash commit into empty head not supported yet" |
10684 | msgstr "Commit aplastado dentro de un head vacío no es soportado todavía" | |
10685 | ||
33ac3e89 | 10686 | #: builtin/merge.c:1294 |
fb0e25bc CD |
10687 | msgid "Non-fast-forward commit does not make sense into an empty head" |
10688 | msgstr "Commit no fast-forward no tiene sentido dentro de un head vacío" | |
10689 | ||
33ac3e89 | 10690 | #: builtin/merge.c:1299 |
fb0e25bc CD |
10691 | #, c-format |
10692 | msgid "%s - not something we can merge" | |
10693 | msgstr "%s - nada que podamos fusionar" | |
10694 | ||
33ac3e89 | 10695 | #: builtin/merge.c:1301 |
fb0e25bc CD |
10696 | msgid "Can merge only exactly one commit into empty head" |
10697 | msgstr "Solo se puede fusionar exactamente un commit en un head vacío" | |
10698 | ||
33ac3e89 | 10699 | #: builtin/merge.c:1335 |
fb0e25bc CD |
10700 | #, c-format |
10701 | msgid "Commit %s has an untrusted GPG signature, allegedly by %s." | |
10702 | msgstr "Commit %s tiene una firma GPG no confiable, pretendidamente por %s." | |
10703 | ||
33ac3e89 | 10704 | #: builtin/merge.c:1338 |
fb0e25bc CD |
10705 | #, c-format |
10706 | msgid "Commit %s has a bad GPG signature allegedly by %s." | |
10707 | msgstr "Commit %s tiene una mala firma GPG pretendidamente por %s." | |
10708 | ||
33ac3e89 | 10709 | #: builtin/merge.c:1341 |
fb0e25bc CD |
10710 | #, c-format |
10711 | msgid "Commit %s does not have a GPG signature." | |
10712 | msgstr "Commit %s no tiene una firma GPG." | |
10713 | ||
33ac3e89 | 10714 | #: builtin/merge.c:1344 |
fb0e25bc CD |
10715 | #, c-format |
10716 | msgid "Commit %s has a good GPG signature by %s\n" | |
715fc761 | 10717 | msgstr "El Commit %s tiene una buena firma GPG por %s\n" |
fb0e25bc | 10718 | |
33ac3e89 | 10719 | #: builtin/merge.c:1403 |
fb0e25bc CD |
10720 | msgid "refusing to merge unrelated histories" |
10721 | msgstr "rehusando fusionar historias no relacionadas" | |
10722 | ||
33ac3e89 | 10723 | #: builtin/merge.c:1412 |
4b15eb22 | 10724 | msgid "Already up to date." |
fb0e25bc CD |
10725 | msgstr "Ya está actualizado." |
10726 | ||
33ac3e89 | 10727 | #: builtin/merge.c:1422 |
fb0e25bc CD |
10728 | #, c-format |
10729 | msgid "Updating %s..%s\n" | |
10730 | msgstr "Actualizando %s..%s\n" | |
10731 | ||
33ac3e89 | 10732 | #: builtin/merge.c:1463 |
fb0e25bc CD |
10733 | #, c-format |
10734 | msgid "Trying really trivial in-index merge...\n" | |
10735 | msgstr "Intentando fusión en índice realmente trivial...\n" | |
10736 | ||
33ac3e89 | 10737 | #: builtin/merge.c:1470 |
fb0e25bc CD |
10738 | #, c-format |
10739 | msgid "Nope.\n" | |
10740 | msgstr "Nop.\n" | |
10741 | ||
33ac3e89 | 10742 | #: builtin/merge.c:1495 |
4b15eb22 CD |
10743 | msgid "Already up to date. Yeeah!" |
10744 | msgstr "Ya está actualizado. ¡Oh, yeaahh!" | |
fb0e25bc | 10745 | |
33ac3e89 | 10746 | #: builtin/merge.c:1501 |
fb0e25bc CD |
10747 | msgid "Not possible to fast-forward, aborting." |
10748 | msgstr "No es posible hacer fast-forward, abortando." | |
10749 | ||
33ac3e89 | 10750 | #: builtin/merge.c:1524 builtin/merge.c:1603 |
fb0e25bc CD |
10751 | #, c-format |
10752 | msgid "Rewinding the tree to pristine...\n" | |
10753 | msgstr "Rebobinando el árbol a original...\n" | |
10754 | ||
33ac3e89 | 10755 | #: builtin/merge.c:1528 |
fb0e25bc CD |
10756 | #, c-format |
10757 | msgid "Trying merge strategy %s...\n" | |
10758 | msgstr "Intentando estrategia de fusión %s...\n" | |
10759 | ||
33ac3e89 | 10760 | #: builtin/merge.c:1594 |
fb0e25bc CD |
10761 | #, c-format |
10762 | msgid "No merge strategy handled the merge.\n" | |
10763 | msgstr "Ninguna estrategia de fusión manejó la fusión.\n" | |
10764 | ||
33ac3e89 | 10765 | #: builtin/merge.c:1596 |
fb0e25bc CD |
10766 | #, c-format |
10767 | msgid "Merge with strategy %s failed.\n" | |
10768 | msgstr "Fusionar con estrategia %s falló.\n" | |
10769 | ||
33ac3e89 | 10770 | #: builtin/merge.c:1605 |
fb0e25bc CD |
10771 | #, c-format |
10772 | msgid "Using the %s to prepare resolving by hand.\n" | |
10773 | msgstr "Usando el %s para preparar resolución a mano.\n" | |
10774 | ||
33ac3e89 | 10775 | #: builtin/merge.c:1617 |
fb0e25bc CD |
10776 | #, c-format |
10777 | msgid "Automatic merge went well; stopped before committing as requested\n" | |
4b15eb22 CD |
10778 | msgstr "" |
10779 | "Fusión automática fue bien; detenida antes del commit como se solicitó\n" | |
fb0e25bc CD |
10780 | |
10781 | #: builtin/merge-base.c:30 | |
10782 | msgid "git merge-base [-a | --all] <commit> <commit>..." | |
10783 | msgstr "git merge-base [-a | --all] <commit> <commit>..." | |
10784 | ||
10785 | #: builtin/merge-base.c:31 | |
10786 | msgid "git merge-base [-a | --all] --octopus <commit>..." | |
10787 | msgstr "git merge-base [-a | --all] --octopus <commit>..." | |
10788 | ||
10789 | #: builtin/merge-base.c:32 | |
10790 | msgid "git merge-base --independent <commit>..." | |
10791 | msgstr "git merge-base --independent <commit>..." | |
10792 | ||
10793 | #: builtin/merge-base.c:33 | |
10794 | msgid "git merge-base --is-ancestor <commit> <commit>" | |
10795 | msgstr "git merge-base --is-ancestor <commit> <commit>" | |
10796 | ||
10797 | #: builtin/merge-base.c:34 | |
10798 | msgid "git merge-base --fork-point <ref> [<commit>]" | |
10799 | msgstr "git merge-base --fork-point <ref> [<commit>]" | |
10800 | ||
f8038f5b | 10801 | #: builtin/merge-base.c:220 |
fb0e25bc CD |
10802 | msgid "output all common ancestors" |
10803 | msgstr "mostrar todos los ancestros comunes" | |
10804 | ||
f8038f5b | 10805 | #: builtin/merge-base.c:222 |
fb0e25bc | 10806 | msgid "find ancestors for a single n-way merge" |
33ac3e89 | 10807 | msgstr "encontrar ancestros para una única fusión de n-vías" |
fb0e25bc | 10808 | |
f8038f5b | 10809 | #: builtin/merge-base.c:224 |
fb0e25bc CD |
10810 | msgid "list revs not reachable from others" |
10811 | msgstr "listar revs no alcanzables desde otros" | |
10812 | ||
f8038f5b | 10813 | #: builtin/merge-base.c:226 |
fb0e25bc CD |
10814 | msgid "is the first one ancestor of the other?" |
10815 | msgstr "es el primer ancestro del otro?" | |
10816 | ||
f8038f5b | 10817 | #: builtin/merge-base.c:228 |
fb0e25bc CD |
10818 | msgid "find where <commit> forked from reflog of <ref>" |
10819 | msgstr "encontrar donde <commit> forjó del reflog de <ref>" | |
10820 | ||
10821 | #: builtin/merge-file.c:9 | |
4b15eb22 CD |
10822 | msgid "" |
10823 | "git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> " | |
10824 | "<orig-file> <file2>" | |
10825 | msgstr "" | |
10826 | "git merge-file [<opciones>] [-L <nombre1> [-L <origen> [-L <nombre2>]]] " | |
10827 | "<archivo1> <archivo-origen> <archivo2>" | |
fb0e25bc CD |
10828 | |
10829 | #: builtin/merge-file.c:33 | |
10830 | msgid "send results to standard output" | |
10831 | msgstr "mandar resultados a standard output" | |
10832 | ||
10833 | #: builtin/merge-file.c:34 | |
10834 | msgid "use a diff3 based merge" | |
33ac3e89 | 10835 | msgstr "usar un fusión basada en diff3" |
fb0e25bc CD |
10836 | |
10837 | #: builtin/merge-file.c:35 | |
10838 | msgid "for conflicts, use our version" | |
10839 | msgstr "por conflictos, usar nuestra versión" | |
10840 | ||
10841 | #: builtin/merge-file.c:37 | |
10842 | msgid "for conflicts, use their version" | |
10843 | msgstr "por conflictos, usar la versión de ellos" | |
10844 | ||
10845 | #: builtin/merge-file.c:39 | |
10846 | msgid "for conflicts, use a union version" | |
10847 | msgstr "por conflictos, usar una versión de unión" | |
10848 | ||
10849 | #: builtin/merge-file.c:42 | |
10850 | msgid "for conflicts, use this marker size" | |
10851 | msgstr "por conflictos, usar el tamaño de este marcador" | |
10852 | ||
10853 | #: builtin/merge-file.c:43 | |
10854 | msgid "do not warn about conflicts" | |
10855 | msgstr "no advertir sobre conflictos" | |
10856 | ||
10857 | #: builtin/merge-file.c:45 | |
10858 | msgid "set labels for file1/orig-file/file2" | |
10859 | msgstr "configurar labels para archivo1/orig-archivo/archivo2" | |
10860 | ||
10861 | #: builtin/merge-recursive.c:45 | |
10862 | #, c-format | |
10863 | msgid "unknown option %s" | |
10864 | msgstr "opción %s desconocida" | |
10865 | ||
10866 | #: builtin/merge-recursive.c:51 | |
10867 | #, c-format | |
10868 | msgid "could not parse object '%s'" | |
10869 | msgstr "no se pudo analizar el objeto '%s'" | |
10870 | ||
10871 | #: builtin/merge-recursive.c:55 | |
10872 | #, c-format | |
10873 | msgid "cannot handle more than %d base. Ignoring %s." | |
10874 | msgid_plural "cannot handle more than %d bases. Ignoring %s." | |
10875 | msgstr[0] "no se puede manejar más de %d base. Ignorando %s." | |
10876 | msgstr[1] "no se puede manejar más de %d bases. Ignorando %s." | |
10877 | ||
10878 | #: builtin/merge-recursive.c:63 | |
10879 | msgid "not handling anything other than two heads merge." | |
10880 | msgstr "no manejando nada distinto a fusiones de dos heads." | |
10881 | ||
10882 | #: builtin/merge-recursive.c:69 builtin/merge-recursive.c:71 | |
10883 | #, c-format | |
10884 | msgid "could not resolve ref '%s'" | |
10885 | msgstr "no se pudo resolver ref '%s'" | |
10886 | ||
10887 | #: builtin/merge-recursive.c:77 | |
10888 | #, c-format | |
10889 | msgid "Merging %s with %s\n" | |
10890 | msgstr "Fusionando %s con %s\n" | |
10891 | ||
10892 | #: builtin/mktree.c:65 | |
10893 | msgid "git mktree [-z] [--missing] [--batch]" | |
10894 | msgstr "git mktree [-z] [--missing] [--batch]" | |
10895 | ||
10896 | #: builtin/mktree.c:153 | |
10897 | msgid "input is NUL terminated" | |
10898 | msgstr "input es terminada con NUL" | |
10899 | ||
10900 | #: builtin/mktree.c:154 builtin/write-tree.c:25 | |
10901 | msgid "allow missing objects" | |
10902 | msgstr "permitir objetos faltantes" | |
10903 | ||
10904 | #: builtin/mktree.c:155 | |
10905 | msgid "allow creation of more than one tree" | |
10906 | msgstr "permitir la creación de más de un árbol" | |
10907 | ||
10908 | #: builtin/mv.c:17 | |
10909 | msgid "git mv [<options>] <source>... <destination>" | |
10910 | msgstr "git mv [<opciones>] <fuente>... <destino>" | |
10911 | ||
10912 | #: builtin/mv.c:83 | |
10913 | #, c-format | |
10914 | msgid "Directory %s is in index and no submodule?" | |
10915 | msgstr "Directorio %s está en el índice y no hay submódulo?" | |
10916 | ||
4b15eb22 | 10917 | #: builtin/mv.c:85 builtin/rm.c:289 |
fb0e25bc | 10918 | msgid "Please stage your changes to .gitmodules or stash them to proceed" |
4b15eb22 CD |
10919 | msgstr "" |
10920 | "Por favor agrega el stage de tus cambios a .gitmodules o realiza un stash " | |
10921 | "para proceder" | |
fb0e25bc CD |
10922 | |
10923 | #: builtin/mv.c:103 | |
10924 | #, c-format | |
10925 | msgid "%.*s is in index" | |
10926 | msgstr "%.*s está en el índice" | |
10927 | ||
10928 | #: builtin/mv.c:125 | |
10929 | msgid "force move/rename even if target exists" | |
10930 | msgstr "forzar mover/renombrar incluso si el objetivo existe" | |
10931 | ||
33ac3e89 | 10932 | #: builtin/mv.c:127 |
fb0e25bc CD |
10933 | msgid "skip move/rename errors" |
10934 | msgstr "saltar errores de mover/renombrar" | |
10935 | ||
33ac3e89 | 10936 | #: builtin/mv.c:168 |
fb0e25bc CD |
10937 | #, c-format |
10938 | msgid "destination '%s' is not a directory" | |
10939 | msgstr "destino '%s' no es un directorio" | |
10940 | ||
33ac3e89 | 10941 | #: builtin/mv.c:179 |
fb0e25bc CD |
10942 | #, c-format |
10943 | msgid "Checking rename of '%s' to '%s'\n" | |
10944 | msgstr "Revisando cambio de nombre de '%s' a '%s'\n" | |
10945 | ||
33ac3e89 | 10946 | #: builtin/mv.c:183 |
fb0e25bc CD |
10947 | msgid "bad source" |
10948 | msgstr "mala fuente" | |
10949 | ||
33ac3e89 | 10950 | #: builtin/mv.c:186 |
fb0e25bc CD |
10951 | msgid "can not move directory into itself" |
10952 | msgstr "no se pude mover un directorio en sí mismo" | |
10953 | ||
33ac3e89 | 10954 | #: builtin/mv.c:189 |
fb0e25bc CD |
10955 | msgid "cannot move directory over file" |
10956 | msgstr "no se puede mover un directorio dentro de un archivo" | |
10957 | ||
33ac3e89 | 10958 | #: builtin/mv.c:198 |
fb0e25bc CD |
10959 | msgid "source directory is empty" |
10960 | msgstr "directorio de fuente está vacío" | |
10961 | ||
33ac3e89 | 10962 | #: builtin/mv.c:223 |
fb0e25bc | 10963 | msgid "not under version control" |
33ac3e89 | 10964 | msgstr "no se encuentra bajo control de versión" |
fb0e25bc | 10965 | |
33ac3e89 | 10966 | #: builtin/mv.c:226 |
fb0e25bc CD |
10967 | msgid "destination exists" |
10968 | msgstr "destino existe" | |
10969 | ||
33ac3e89 | 10970 | #: builtin/mv.c:234 |
fb0e25bc CD |
10971 | #, c-format |
10972 | msgid "overwriting '%s'" | |
10973 | msgstr "sobrescribiendo '%s'" | |
10974 | ||
33ac3e89 | 10975 | #: builtin/mv.c:237 |
fb0e25bc CD |
10976 | msgid "Cannot overwrite" |
10977 | msgstr "No se puede sobrescribir" | |
10978 | ||
33ac3e89 | 10979 | #: builtin/mv.c:240 |
fb0e25bc CD |
10980 | msgid "multiple sources for the same target" |
10981 | msgstr "múltiples fuentes para el mismo objetivo" | |
10982 | ||
33ac3e89 | 10983 | #: builtin/mv.c:242 |
fb0e25bc CD |
10984 | msgid "destination directory does not exist" |
10985 | msgstr "el directorio de destino no existe" | |
10986 | ||
33ac3e89 | 10987 | #: builtin/mv.c:249 |
fb0e25bc CD |
10988 | #, c-format |
10989 | msgid "%s, source=%s, destination=%s" | |
10990 | msgstr "%s, fuente=%s, destino=%s" | |
10991 | ||
33ac3e89 | 10992 | #: builtin/mv.c:270 |
fb0e25bc CD |
10993 | #, c-format |
10994 | msgid "Renaming %s to %s\n" | |
10995 | msgstr "Renombrando %s a %s\n" | |
10996 | ||
33ac3e89 | 10997 | #: builtin/mv.c:276 builtin/remote.c:712 builtin/repack.c:394 |
fb0e25bc CD |
10998 | #, c-format |
10999 | msgid "renaming '%s' failed" | |
33ac3e89 | 11000 | msgstr "renombrando '%s' falló" |
fb0e25bc CD |
11001 | |
11002 | #: builtin/name-rev.c:338 | |
11003 | msgid "git name-rev [<options>] <commit>..." | |
715fc761 | 11004 | msgstr "git name-rev [<opciones>] <commit>..." |
fb0e25bc CD |
11005 | |
11006 | #: builtin/name-rev.c:339 | |
11007 | msgid "git name-rev [<options>] --all" | |
11008 | msgstr "git name-rev [<opciones>] --all" | |
11009 | ||
11010 | #: builtin/name-rev.c:340 | |
11011 | msgid "git name-rev [<options>] --stdin" | |
11012 | msgstr "git name-rev [<opciones>] --stdin" | |
11013 | ||
11014 | #: builtin/name-rev.c:395 | |
11015 | msgid "print only names (no SHA-1)" | |
11016 | msgstr "imprimir sólo nombres (sin SHA-1)" | |
11017 | ||
11018 | #: builtin/name-rev.c:396 | |
11019 | msgid "only use tags to name the commits" | |
715fc761 | 11020 | msgstr "sólo usar tags para nombrar commits" |
fb0e25bc CD |
11021 | |
11022 | #: builtin/name-rev.c:398 | |
11023 | msgid "only use refs matching <pattern>" | |
11024 | msgstr "solo usar refs que concuerden con <patrón>" | |
11025 | ||
11026 | #: builtin/name-rev.c:400 | |
11027 | msgid "ignore refs matching <pattern>" | |
11028 | msgstr "ignorar refs que concuerden con <patrón>" | |
11029 | ||
11030 | #: builtin/name-rev.c:402 | |
11031 | msgid "list all commits reachable from all refs" | |
f8038f5b | 11032 | msgstr "listar todos los commits alcanzables desde todas las referencias" |
fb0e25bc CD |
11033 | |
11034 | #: builtin/name-rev.c:403 | |
11035 | msgid "read from stdin" | |
11036 | msgstr "leer desde stdin" | |
11037 | ||
11038 | #: builtin/name-rev.c:404 | |
11039 | msgid "allow to print `undefined` names (default)" | |
11040 | msgstr "permitir imprimir nombres `undefined` (predeterminado)" | |
11041 | ||
11042 | #: builtin/name-rev.c:410 | |
11043 | msgid "dereference tags in the input (internal use)" | |
715fc761 | 11044 | msgstr "desreferenciar tags en la entrada (uso interno)" |
fb0e25bc CD |
11045 | |
11046 | #: builtin/notes.c:26 | |
11047 | msgid "git notes [--ref <notes-ref>] [list [<object>]]" | |
11048 | msgstr "git notes [--ref <referencia-de-notas>] [list [<objeto>]]" | |
11049 | ||
11050 | #: builtin/notes.c:27 | |
4b15eb22 CD |
11051 | msgid "" |
11052 | "git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> " | |
11053 | "| (-c | -C) <object>] [<object>]" | |
11054 | msgstr "" | |
11055 | "git notes [--ref <referencia-de-notas>] add [-f] [--allow-empty] [-m " | |
11056 | "<mensaje> | -F <archivo> | (-c | -C) <objeto>] [<objeto>]" | |
fb0e25bc CD |
11057 | |
11058 | #: builtin/notes.c:28 | |
11059 | msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>" | |
4b15eb22 CD |
11060 | msgstr "" |
11061 | "git notes [--ref <referencia-de-notas>] copy [-f] <objeto-origen> <objeto-" | |
11062 | "destino>" | |
fb0e25bc CD |
11063 | |
11064 | #: builtin/notes.c:29 | |
4b15eb22 CD |
11065 | msgid "" |
11066 | "git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | " | |
11067 | "(-c | -C) <object>] [<object>]" | |
11068 | msgstr "" | |
11069 | "git notes [--ref <referencia-de-notas>] append [--allow-empty] [-m <mensaje> " | |
11070 | "| -F <archivo> | (-c | -C) <objeto>] [<objeto>]" | |
fb0e25bc CD |
11071 | |
11072 | #: builtin/notes.c:30 | |
11073 | msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]" | |
4b15eb22 CD |
11074 | msgstr "" |
11075 | "git notes [--ref <referencia-de-notas>] edit [--allow-empty] [<objeto>]" | |
fb0e25bc CD |
11076 | |
11077 | #: builtin/notes.c:31 | |
11078 | msgid "git notes [--ref <notes-ref>] show [<object>]" | |
11079 | msgstr "git notes [--ref <referencia-de-notas>] show [<objeto>]" | |
11080 | ||
11081 | #: builtin/notes.c:32 | |
4b15eb22 CD |
11082 | msgid "" |
11083 | "git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>" | |
11084 | msgstr "" | |
11085 | "git notes [--ref <referencia-de notas>] merge [-v | -q] [-s <estrategia>] " | |
11086 | "<referencia-de-notas>" | |
fb0e25bc CD |
11087 | |
11088 | #: builtin/notes.c:33 | |
11089 | msgid "git notes merge --commit [-v | -q]" | |
11090 | msgstr "git notes merge --commit [-v | -q]" | |
11091 | ||
11092 | #: builtin/notes.c:34 | |
11093 | msgid "git notes merge --abort [-v | -q]" | |
11094 | msgstr "git notes merge --abort [-v | -q]" | |
11095 | ||
11096 | #: builtin/notes.c:35 | |
11097 | msgid "git notes [--ref <notes-ref>] remove [<object>...]" | |
11098 | msgstr "git notes [--ref <referencia-de-notas>] remove [<objeto>...]" | |
11099 | ||
11100 | #: builtin/notes.c:36 | |
f8038f5b CDR |
11101 | msgid "git notes [--ref <notes-ref>] prune [-n] [-v]" |
11102 | msgstr "git notes [--ref <referencia-de-notas>] prune [-n] [-v]" | |
fb0e25bc CD |
11103 | |
11104 | #: builtin/notes.c:37 | |
11105 | msgid "git notes [--ref <notes-ref>] get-ref" | |
11106 | msgstr "git notes [--ref <referencia-de-notas>] get-ref" | |
11107 | ||
11108 | #: builtin/notes.c:42 | |
11109 | msgid "git notes [list [<object>]]" | |
11110 | msgstr "git notes [list [<objeto>]]" | |
11111 | ||
11112 | #: builtin/notes.c:47 | |
11113 | msgid "git notes add [<options>] [<object>]" | |
11114 | msgstr "git notes add [<opciones>] [<objeto>]" | |
11115 | ||
11116 | #: builtin/notes.c:52 | |
11117 | msgid "git notes copy [<options>] <from-object> <to-object>" | |
11118 | msgstr "git notes copy [<opciones>] <objeto-origen> <objeto-destino>" | |
11119 | ||
11120 | #: builtin/notes.c:53 | |
11121 | msgid "git notes copy --stdin [<from-object> <to-object>]..." | |
11122 | msgstr "git notes copy --stdin [<objeto-origen> <objeto-destino>]..." | |
11123 | ||
11124 | #: builtin/notes.c:58 | |
11125 | msgid "git notes append [<options>] [<object>]" | |
11126 | msgstr "git notes append [<opciones>] [<objeto>]" | |
11127 | ||
11128 | #: builtin/notes.c:63 | |
11129 | msgid "git notes edit [<object>]" | |
11130 | msgstr "git notes edit [<objeto>]" | |
11131 | ||
11132 | #: builtin/notes.c:68 | |
11133 | msgid "git notes show [<object>]" | |
11134 | msgstr "git notes show [<objeto>]" | |
11135 | ||
11136 | #: builtin/notes.c:73 | |
11137 | msgid "git notes merge [<options>] <notes-ref>" | |
11138 | msgstr "git notes merge [<opciones>] <referencia-de-notas>" | |
11139 | ||
11140 | #: builtin/notes.c:74 | |
11141 | msgid "git notes merge --commit [<options>]" | |
11142 | msgstr "git notes merge --commit [<opciones>]" | |
11143 | ||
11144 | #: builtin/notes.c:75 | |
11145 | msgid "git notes merge --abort [<options>]" | |
11146 | msgstr "git notes merge --abort [<opciones>]" | |
11147 | ||
11148 | #: builtin/notes.c:80 | |
11149 | msgid "git notes remove [<object>]" | |
11150 | msgstr "git notes remove [<objeto>]" | |
11151 | ||
11152 | #: builtin/notes.c:85 | |
11153 | msgid "git notes prune [<options>]" | |
11154 | msgstr "git notes prune [<opciones>]" | |
11155 | ||
11156 | #: builtin/notes.c:90 | |
11157 | msgid "git notes get-ref" | |
11158 | msgstr "git notes get-ref" | |
11159 | ||
11160 | #: builtin/notes.c:95 | |
11161 | msgid "Write/edit the notes for the following object:" | |
11162 | msgstr "Escribe/edita las notas para los siguientes objetos:" | |
11163 | ||
11164 | #: builtin/notes.c:148 | |
11165 | #, c-format | |
11166 | msgid "unable to start 'show' for object '%s'" | |
11167 | msgstr "incapaz de iniciar 'show' para el objeto '%s'" | |
11168 | ||
11169 | #: builtin/notes.c:152 | |
11170 | msgid "could not read 'show' output" | |
11171 | msgstr "no se pudo leer salida de 'show'" | |
11172 | ||
11173 | #: builtin/notes.c:160 | |
11174 | #, c-format | |
11175 | msgid "failed to finish 'show' for object '%s'" | |
11176 | msgstr "falló la finalización de 'show' para el objeto '%s'" | |
11177 | ||
11178 | #: builtin/notes.c:195 | |
11179 | msgid "please supply the note contents using either -m or -F option" | |
11180 | msgstr "por favor suministrar los contenidos de nota usando la opción -m o -F" | |
11181 | ||
11182 | #: builtin/notes.c:204 | |
11183 | msgid "unable to write note object" | |
11184 | msgstr "incapaz de escribir el objeto de nota" | |
11185 | ||
11186 | #: builtin/notes.c:206 | |
11187 | #, c-format | |
11188 | msgid "the note contents have been left in %s" | |
11189 | msgstr "los contenidos de nota han sido dejados en %s" | |
11190 | ||
33ac3e89 | 11191 | #: builtin/notes.c:234 builtin/tag.c:506 |
fb0e25bc CD |
11192 | #, c-format |
11193 | msgid "cannot read '%s'" | |
11194 | msgstr "no se puede leer '%s'" | |
11195 | ||
33ac3e89 | 11196 | #: builtin/notes.c:236 builtin/tag.c:509 |
fb0e25bc CD |
11197 | #, c-format |
11198 | msgid "could not open or read '%s'" | |
11199 | msgstr "no se pudo abrir o leer '%s'" | |
11200 | ||
4b15eb22 CD |
11201 | #: builtin/notes.c:255 builtin/notes.c:306 builtin/notes.c:308 |
11202 | #: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:517 | |
11203 | #: builtin/notes.c:522 builtin/notes.c:600 builtin/notes.c:662 | |
fb0e25bc CD |
11204 | #, c-format |
11205 | msgid "failed to resolve '%s' as a valid ref." | |
11206 | msgstr "falló al resolver '%s' como ref válida." | |
11207 | ||
11208 | #: builtin/notes.c:258 | |
11209 | #, c-format | |
11210 | msgid "failed to read object '%s'." | |
11211 | msgstr "falló al leer objeto '%s'." | |
11212 | ||
11213 | #: builtin/notes.c:262 | |
11214 | #, c-format | |
11215 | msgid "cannot read note data from non-blob object '%s'." | |
11216 | msgstr "no se puede leer la data de la nota de un objeto no-blob '%s'." | |
11217 | ||
11218 | #: builtin/notes.c:302 | |
11219 | #, c-format | |
11220 | msgid "malformed input line: '%s'." | |
11221 | msgstr "línea de entrada mal formada: '%s'." | |
11222 | ||
11223 | #: builtin/notes.c:317 | |
11224 | #, c-format | |
11225 | msgid "failed to copy notes from '%s' to '%s'" | |
11226 | msgstr "falló al copiar notas de '%s' a '%s'" | |
11227 | ||
11228 | #. TRANSLATORS: the first %s will be replaced by a git | |
11229 | #. notes command: 'add', 'merge', 'remove', etc. | |
4b15eb22 CD |
11230 | #. |
11231 | #: builtin/notes.c:349 | |
fb0e25bc CD |
11232 | #, c-format |
11233 | msgid "refusing to %s notes in %s (outside of refs/notes/)" | |
11234 | msgstr "rechazando %s notas en %s (fuera de refs/notes/)" | |
11235 | ||
4b15eb22 CD |
11236 | #: builtin/notes.c:369 builtin/notes.c:424 builtin/notes.c:500 |
11237 | #: builtin/notes.c:512 builtin/notes.c:588 builtin/notes.c:655 | |
11238 | #: builtin/notes.c:805 builtin/notes.c:952 builtin/notes.c:973 | |
fb0e25bc CD |
11239 | msgid "too many parameters" |
11240 | msgstr "demasiados parámetros" | |
11241 | ||
4b15eb22 | 11242 | #: builtin/notes.c:382 builtin/notes.c:668 |
fb0e25bc CD |
11243 | #, c-format |
11244 | msgid "no note found for object %s." | |
11245 | msgstr "no se encontraron notas para objeto %s." | |
11246 | ||
4b15eb22 | 11247 | #: builtin/notes.c:403 builtin/notes.c:566 |
fb0e25bc CD |
11248 | msgid "note contents as a string" |
11249 | msgstr "contenidos de la nota como cadena" | |
11250 | ||
4b15eb22 | 11251 | #: builtin/notes.c:406 builtin/notes.c:569 |
fb0e25bc CD |
11252 | msgid "note contents in a file" |
11253 | msgstr "contenidos de la nota en un archivo" | |
11254 | ||
4b15eb22 | 11255 | #: builtin/notes.c:409 builtin/notes.c:572 |
fb0e25bc CD |
11256 | msgid "reuse and edit specified note object" |
11257 | msgstr "reutilizar y editar el objeto de nota especificada" | |
11258 | ||
4b15eb22 | 11259 | #: builtin/notes.c:412 builtin/notes.c:575 |
fb0e25bc CD |
11260 | msgid "reuse specified note object" |
11261 | msgstr "reutilizar el objeto de nota especificado" | |
11262 | ||
4b15eb22 | 11263 | #: builtin/notes.c:415 builtin/notes.c:578 |
fb0e25bc CD |
11264 | msgid "allow storing empty note" |
11265 | msgstr "permitir almacenar nota vacía" | |
11266 | ||
4b15eb22 | 11267 | #: builtin/notes.c:416 builtin/notes.c:487 |
fb0e25bc CD |
11268 | msgid "replace existing notes" |
11269 | msgstr "reemplazar notas existentes" | |
11270 | ||
4b15eb22 | 11271 | #: builtin/notes.c:441 |
fb0e25bc | 11272 | #, c-format |
4b15eb22 CD |
11273 | msgid "" |
11274 | "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " | |
11275 | "existing notes" | |
11276 | msgstr "" | |
11277 | "No se puede agregar notas. Se encontró notas existentes para objeto %s. Use " | |
11278 | "'-f' para sobrescribir las notas existentes" | |
fb0e25bc | 11279 | |
4b15eb22 | 11280 | #: builtin/notes.c:456 builtin/notes.c:535 |
fb0e25bc CD |
11281 | #, c-format |
11282 | msgid "Overwriting existing notes for object %s\n" | |
11283 | msgstr "Sobrescribiendo notas existentes para objeto %s\n" | |
11284 | ||
4b15eb22 | 11285 | #: builtin/notes.c:467 builtin/notes.c:627 builtin/notes.c:892 |
fb0e25bc CD |
11286 | #, c-format |
11287 | msgid "Removing note for object %s\n" | |
11288 | msgstr "Removiendo nota para objeto %s\n" | |
11289 | ||
4b15eb22 | 11290 | #: builtin/notes.c:488 |
fb0e25bc CD |
11291 | msgid "read objects from stdin" |
11292 | msgstr "leer objetos desde stdin" | |
11293 | ||
4b15eb22 | 11294 | #: builtin/notes.c:490 |
fb0e25bc CD |
11295 | msgid "load rewriting config for <command> (implies --stdin)" |
11296 | msgstr "cargar configuración de reescritura para <comando> (implica --stdin)" | |
11297 | ||
4b15eb22 | 11298 | #: builtin/notes.c:508 |
fb0e25bc CD |
11299 | msgid "too few parameters" |
11300 | msgstr "muy pocos parámetros" | |
11301 | ||
4b15eb22 | 11302 | #: builtin/notes.c:529 |
fb0e25bc | 11303 | #, c-format |
4b15eb22 CD |
11304 | msgid "" |
11305 | "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite " | |
11306 | "existing notes" | |
11307 | msgstr "" | |
11308 | "No se puede copiar notas. Se encontró notas existentes para el objeto %s. " | |
11309 | "Use '-f' para sobrescribir las notes existentes" | |
fb0e25bc | 11310 | |
4b15eb22 | 11311 | #: builtin/notes.c:541 |
fb0e25bc CD |
11312 | #, c-format |
11313 | msgid "missing notes on source object %s. Cannot copy." | |
11314 | msgstr "faltan notas en la fuente del objeto %s. No se puede copiar." | |
11315 | ||
4b15eb22 | 11316 | #: builtin/notes.c:593 |
fb0e25bc CD |
11317 | #, c-format |
11318 | msgid "" | |
11319 | "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n" | |
11320 | "Please use 'git notes add -f -m/-F/-c/-C' instead.\n" | |
11321 | msgstr "" | |
11322 | "Las opciones -m/-F/-c/-C han sido deprecadas por el subcomando 'edit'.\n" | |
11323 | "Por favor use 'git notes add -f -m/-F/-c/-C' en cambio.\n" | |
11324 | ||
4b15eb22 | 11325 | #: builtin/notes.c:688 |
fb0e25bc CD |
11326 | msgid "failed to delete ref NOTES_MERGE_PARTIAL" |
11327 | msgstr "falló al borrar ref NOTES_MERGE_PARTIAL" | |
11328 | ||
4b15eb22 | 11329 | #: builtin/notes.c:690 |
fb0e25bc CD |
11330 | msgid "failed to delete ref NOTES_MERGE_REF" |
11331 | msgstr "falló al borrar ref NOTES_MERGE_REF" | |
11332 | ||
4b15eb22 | 11333 | #: builtin/notes.c:692 |
fb0e25bc CD |
11334 | msgid "failed to remove 'git notes merge' worktree" |
11335 | msgstr "no se pudo eliminar el árbol de trabajo 'git notes merge'" | |
11336 | ||
4b15eb22 | 11337 | #: builtin/notes.c:712 |
fb0e25bc CD |
11338 | msgid "failed to read ref NOTES_MERGE_PARTIAL" |
11339 | msgstr "falló al leer ref NOTES_MERGE_PARTIAL" | |
11340 | ||
4b15eb22 | 11341 | #: builtin/notes.c:714 |
fb0e25bc CD |
11342 | msgid "could not find commit from NOTES_MERGE_PARTIAL." |
11343 | msgstr "no se pudo encontrar commit de NOTES_MERGE_PARTIAL." | |
11344 | ||
4b15eb22 | 11345 | #: builtin/notes.c:716 |
fb0e25bc CD |
11346 | msgid "could not parse commit from NOTES_MERGE_PARTIAL." |
11347 | msgstr "no se pudo analizar commit de NOTES_MERGE_PARTIAL." | |
11348 | ||
4b15eb22 | 11349 | #: builtin/notes.c:729 |
fb0e25bc CD |
11350 | msgid "failed to resolve NOTES_MERGE_REF" |
11351 | msgstr "falló al resolver NOTES_MERGE_REF" | |
11352 | ||
4b15eb22 | 11353 | #: builtin/notes.c:732 |
fb0e25bc CD |
11354 | msgid "failed to finalize notes merge" |
11355 | msgstr "falló al finalizar las notas de fusión" | |
11356 | ||
4b15eb22 | 11357 | #: builtin/notes.c:758 |
fb0e25bc CD |
11358 | #, c-format |
11359 | msgid "unknown notes merge strategy %s" | |
11360 | msgstr "estrategia de fusión de notas %s desconocida" | |
11361 | ||
4b15eb22 | 11362 | #: builtin/notes.c:774 |
fb0e25bc CD |
11363 | msgid "General options" |
11364 | msgstr "Opciones generales" | |
11365 | ||
4b15eb22 | 11366 | #: builtin/notes.c:776 |
fb0e25bc CD |
11367 | msgid "Merge options" |
11368 | msgstr "Opciones de fusión" | |
11369 | ||
4b15eb22 CD |
11370 | #: builtin/notes.c:778 |
11371 | msgid "" | |
11372 | "resolve notes conflicts using the given strategy (manual/ours/theirs/union/" | |
11373 | "cat_sort_uniq)" | |
11374 | msgstr "" | |
11375 | "resolver conflictos de notas usando la estrategia entregadas (manual/ours/" | |
11376 | "theirs/union/cat_sort_uniq)" | |
fb0e25bc | 11377 | |
4b15eb22 | 11378 | #: builtin/notes.c:780 |
fb0e25bc CD |
11379 | msgid "Committing unmerged notes" |
11380 | msgstr "Realizando commit a las notas no fusionadas" | |
11381 | ||
4b15eb22 | 11382 | #: builtin/notes.c:782 |
fb0e25bc | 11383 | msgid "finalize notes merge by committing unmerged notes" |
4b15eb22 CD |
11384 | msgstr "" |
11385 | "finalizar fusión de notas realizando un commit de las notas no fusionadas" | |
fb0e25bc | 11386 | |
4b15eb22 | 11387 | #: builtin/notes.c:784 |
fb0e25bc CD |
11388 | msgid "Aborting notes merge resolution" |
11389 | msgstr "Abortando notas de resolución de fusión" | |
11390 | ||
4b15eb22 | 11391 | #: builtin/notes.c:786 |
fb0e25bc CD |
11392 | msgid "abort notes merge" |
11393 | msgstr "abortar notas de fusión" | |
11394 | ||
4b15eb22 | 11395 | #: builtin/notes.c:797 |
fb0e25bc CD |
11396 | msgid "cannot mix --commit, --abort or -s/--strategy" |
11397 | msgstr "no se pueden mezclar --commit, --abort ó -s/--strategy" | |
11398 | ||
4b15eb22 | 11399 | #: builtin/notes.c:802 |
fb0e25bc | 11400 | msgid "must specify a notes ref to merge" |
715fc761 | 11401 | msgstr "debe especificar una ref de notas a fusionar" |
fb0e25bc | 11402 | |
4b15eb22 | 11403 | #: builtin/notes.c:826 |
fb0e25bc CD |
11404 | #, c-format |
11405 | msgid "unknown -s/--strategy: %s" | |
11406 | msgstr "--strategy/-s desconocida: %s" | |
11407 | ||
4b15eb22 | 11408 | #: builtin/notes.c:863 |
fb0e25bc CD |
11409 | #, c-format |
11410 | msgid "a notes merge into %s is already in-progress at %s" | |
11411 | msgstr "una fusión de notas en %s ya está en progreso en %s" | |
11412 | ||
4b15eb22 | 11413 | #: builtin/notes.c:866 |
fb0e25bc CD |
11414 | #, c-format |
11415 | msgid "failed to store link to current notes ref (%s)" | |
11416 | msgstr "falló al guardar un link para el ref de notas actual (%s)" | |
11417 | ||
4b15eb22 | 11418 | #: builtin/notes.c:868 |
fb0e25bc | 11419 | #, c-format |
4b15eb22 CD |
11420 | msgid "" |
11421 | "Automatic notes merge failed. Fix conflicts in %s and commit the result with " | |
11422 | "'git notes merge --commit', or abort the merge with 'git notes merge --" | |
11423 | "abort'.\n" | |
fb0e25bc | 11424 | msgstr "" |
4b15eb22 CD |
11425 | "Fusión automática de notas falló. Arregle conflictos en %s y realice un " |
11426 | "commit con el resultado 'git notes merge --commit', o aborte la fusión con " | |
11427 | "'git notes merge --abort'.\n" | |
fb0e25bc | 11428 | |
4b15eb22 | 11429 | #: builtin/notes.c:890 |
fb0e25bc CD |
11430 | #, c-format |
11431 | msgid "Object %s has no note\n" | |
11432 | msgstr "El objeto %s no tiene notas\n" | |
11433 | ||
4b15eb22 | 11434 | #: builtin/notes.c:902 |
fb0e25bc CD |
11435 | msgid "attempt to remove non-existent note is not an error" |
11436 | msgstr "intentar remover una nota no existente no es un error" | |
11437 | ||
4b15eb22 | 11438 | #: builtin/notes.c:905 |
fb0e25bc CD |
11439 | msgid "read object names from the standard input" |
11440 | msgstr "leer nombres de objetos de standard input" | |
11441 | ||
33ac3e89 | 11442 | #: builtin/notes.c:943 builtin/prune.c:106 builtin/worktree.c:160 |
fb0e25bc CD |
11443 | msgid "do not remove, show only" |
11444 | msgstr "no remover, solo mostrar" | |
11445 | ||
4b15eb22 | 11446 | #: builtin/notes.c:944 |
fb0e25bc CD |
11447 | msgid "report pruned notes" |
11448 | msgstr "reportar notas recortadas" | |
11449 | ||
4b15eb22 | 11450 | #: builtin/notes.c:986 |
fb0e25bc CD |
11451 | msgid "notes-ref" |
11452 | msgstr "referencia-de-notas" | |
11453 | ||
4b15eb22 | 11454 | #: builtin/notes.c:987 |
fb0e25bc CD |
11455 | msgid "use notes from <notes-ref>" |
11456 | msgstr "usar notas desde <referencia-de-notas>" | |
11457 | ||
4b15eb22 | 11458 | #: builtin/notes.c:1022 |
fb0e25bc CD |
11459 | #, c-format |
11460 | msgid "unknown subcommand: %s" | |
11461 | msgstr "subcomando desconocido: %s" | |
11462 | ||
f8038f5b | 11463 | #: builtin/pack-objects.c:33 |
4b15eb22 CD |
11464 | msgid "" |
11465 | "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]" | |
11466 | msgstr "" | |
11467 | "git pack-objects --stdout [<opciones>...] [< <lista-de-ref> | < <lista-de-" | |
11468 | "objetos>]" | |
11469 | ||
f8038f5b | 11470 | #: builtin/pack-objects.c:34 |
4b15eb22 CD |
11471 | msgid "" |
11472 | "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]" | |
11473 | msgstr "" | |
11474 | "git pack-objects [<opciones>...] <nombre-base> [< <lista-de-refs> | < <lista-" | |
11475 | "de-objetos>]" | |
fb0e25bc | 11476 | |
33ac3e89 | 11477 | #: builtin/pack-objects.c:195 builtin/pack-objects.c:198 |
fb0e25bc CD |
11478 | #, c-format |
11479 | msgid "deflate error (%d)" | |
11480 | msgstr "error al desinflar (%d)" | |
11481 | ||
33ac3e89 | 11482 | #: builtin/pack-objects.c:791 |
fb0e25bc | 11483 | msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit" |
4b15eb22 CD |
11484 | msgstr "" |
11485 | "deshabilitando escritura bitmap, paquetes son divididos debido a pack." | |
11486 | "packSizeLimit" | |
fb0e25bc | 11487 | |
33ac3e89 | 11488 | #: builtin/pack-objects.c:804 |
fb0e25bc CD |
11489 | msgid "Writing objects" |
11490 | msgstr "Escribiendo objetos" | |
11491 | ||
33ac3e89 | 11492 | #: builtin/pack-objects.c:1084 |
fb0e25bc | 11493 | msgid "disabling bitmap writing, as some objects are not being packed" |
4b15eb22 CD |
11494 | msgstr "" |
11495 | "deshabilitando escritura bitmap, ya que algunos objetos no están siendo " | |
11496 | "empaquetados" | |
fb0e25bc | 11497 | |
33ac3e89 | 11498 | #: builtin/pack-objects.c:2454 |
fb0e25bc CD |
11499 | msgid "Compressing objects" |
11500 | msgstr "Comprimiendo objetos" | |
11501 | ||
33ac3e89 | 11502 | #: builtin/pack-objects.c:2625 |
f8038f5b CDR |
11503 | msgid "invalid value for --missing" |
11504 | msgstr "valor inválido para --missing" | |
11505 | ||
33ac3e89 | 11506 | #: builtin/pack-objects.c:2928 |
fb0e25bc CD |
11507 | #, c-format |
11508 | msgid "unsupported index version %s" | |
11509 | msgstr "versión de índice no soportada %s" | |
11510 | ||
33ac3e89 | 11511 | #: builtin/pack-objects.c:2932 |
fb0e25bc CD |
11512 | #, c-format |
11513 | msgid "bad index version '%s'" | |
11514 | msgstr "mala versión del índice '%s'" | |
11515 | ||
33ac3e89 | 11516 | #: builtin/pack-objects.c:2962 |
fb0e25bc CD |
11517 | msgid "do not show progress meter" |
11518 | msgstr "no mostrar medidor de progreso" | |
11519 | ||
33ac3e89 | 11520 | #: builtin/pack-objects.c:2964 |
fb0e25bc CD |
11521 | msgid "show progress meter" |
11522 | msgstr "mostrar medidor de progreso" | |
11523 | ||
33ac3e89 | 11524 | #: builtin/pack-objects.c:2966 |
fb0e25bc CD |
11525 | msgid "show progress meter during object writing phase" |
11526 | msgstr "mostrar medidor de progreso durante la fase de escritura de objeto" | |
11527 | ||
33ac3e89 | 11528 | #: builtin/pack-objects.c:2969 |
fb0e25bc CD |
11529 | msgid "similar to --all-progress when progress meter is shown" |
11530 | msgstr "similar a --all-progress cuando medidor de progreso es mostrado" | |
11531 | ||
33ac3e89 | 11532 | #: builtin/pack-objects.c:2970 |
fb0e25bc CD |
11533 | msgid "version[,offset]" |
11534 | msgstr "versión[,offset]" | |
11535 | ||
33ac3e89 | 11536 | #: builtin/pack-objects.c:2971 |
fb0e25bc | 11537 | msgid "write the pack index file in the specified idx format version" |
4b15eb22 CD |
11538 | msgstr "" |
11539 | "escribir el índice de paquete en la versión de formato idx especificado" | |
fb0e25bc | 11540 | |
33ac3e89 | 11541 | #: builtin/pack-objects.c:2974 |
fb0e25bc CD |
11542 | msgid "maximum size of each output pack file" |
11543 | msgstr "tamaño máximo de cada paquete resultante" | |
11544 | ||
33ac3e89 | 11545 | #: builtin/pack-objects.c:2976 |
fb0e25bc CD |
11546 | msgid "ignore borrowed objects from alternate object store" |
11547 | msgstr "ignorar objetos prestados de otros almacenes de objetos" | |
11548 | ||
33ac3e89 | 11549 | #: builtin/pack-objects.c:2978 |
fb0e25bc CD |
11550 | msgid "ignore packed objects" |
11551 | msgstr "ignorar objetos paquete" | |
11552 | ||
33ac3e89 | 11553 | #: builtin/pack-objects.c:2980 |
fb0e25bc CD |
11554 | msgid "limit pack window by objects" |
11555 | msgstr "limitar ventana de paquete por objetos" | |
11556 | ||
33ac3e89 | 11557 | #: builtin/pack-objects.c:2982 |
fb0e25bc CD |
11558 | msgid "limit pack window by memory in addition to object limit" |
11559 | msgstr "limitar ventana de paquete por memoria en adición a límite de objetos" | |
11560 | ||
33ac3e89 | 11561 | #: builtin/pack-objects.c:2984 |
fb0e25bc CD |
11562 | msgid "maximum length of delta chain allowed in the resulting pack" |
11563 | msgstr "longitud máxima de cadena delta permitida en el paquete resultante" | |
11564 | ||
33ac3e89 | 11565 | #: builtin/pack-objects.c:2986 |
fb0e25bc CD |
11566 | msgid "reuse existing deltas" |
11567 | msgstr "reusar deltas existentes" | |
11568 | ||
33ac3e89 | 11569 | #: builtin/pack-objects.c:2988 |
fb0e25bc CD |
11570 | msgid "reuse existing objects" |
11571 | msgstr "reutilizar objetos existentes" | |
11572 | ||
33ac3e89 | 11573 | #: builtin/pack-objects.c:2990 |
fb0e25bc CD |
11574 | msgid "use OFS_DELTA objects" |
11575 | msgstr "usar objetos OFS_DELTA" | |
11576 | ||
33ac3e89 | 11577 | #: builtin/pack-objects.c:2992 |
fb0e25bc CD |
11578 | msgid "use threads when searching for best delta matches" |
11579 | msgstr "usar hilos cuando se busque para mejores concordancias de delta" | |
11580 | ||
33ac3e89 | 11581 | #: builtin/pack-objects.c:2994 |
fb0e25bc CD |
11582 | msgid "do not create an empty pack output" |
11583 | msgstr "no crear un paquete resultante vacío" | |
11584 | ||
33ac3e89 | 11585 | #: builtin/pack-objects.c:2996 |
fb0e25bc CD |
11586 | msgid "read revision arguments from standard input" |
11587 | msgstr "leer argumentos de revisión de standard input" | |
11588 | ||
33ac3e89 | 11589 | #: builtin/pack-objects.c:2998 |
fb0e25bc CD |
11590 | msgid "limit the objects to those that are not yet packed" |
11591 | msgstr "limitar los objetos a aquellos que no han sido empaquetados todavía" | |
11592 | ||
33ac3e89 | 11593 | #: builtin/pack-objects.c:3001 |
fb0e25bc CD |
11594 | msgid "include objects reachable from any reference" |
11595 | msgstr "incluir objetos alcanzables por cualquier referencia" | |
11596 | ||
33ac3e89 | 11597 | #: builtin/pack-objects.c:3004 |
fb0e25bc CD |
11598 | msgid "include objects referred by reflog entries" |
11599 | msgstr "incluir objetos referidos por entradas de reflog" | |
11600 | ||
33ac3e89 | 11601 | #: builtin/pack-objects.c:3007 |
fb0e25bc CD |
11602 | msgid "include objects referred to by the index" |
11603 | msgstr "incluir objetos referidos por el índice" | |
11604 | ||
33ac3e89 | 11605 | #: builtin/pack-objects.c:3010 |
fb0e25bc CD |
11606 | msgid "output pack to stdout" |
11607 | msgstr "mostrar paquete en stdout" | |
11608 | ||
33ac3e89 | 11609 | #: builtin/pack-objects.c:3012 |
fb0e25bc CD |
11610 | msgid "include tag objects that refer to objects to be packed" |
11611 | msgstr "incluir objetos tag que refieren a objetos a ser empaquetados" | |
11612 | ||
33ac3e89 | 11613 | #: builtin/pack-objects.c:3014 |
fb0e25bc CD |
11614 | msgid "keep unreachable objects" |
11615 | msgstr "mantener objetos inalcanzables" | |
11616 | ||
33ac3e89 | 11617 | #: builtin/pack-objects.c:3016 |
fb0e25bc CD |
11618 | msgid "pack loose unreachable objects" |
11619 | msgstr "empaquetar objetos sueltos inalcanzables" | |
11620 | ||
33ac3e89 | 11621 | #: builtin/pack-objects.c:3018 |
fb0e25bc CD |
11622 | msgid "unpack unreachable objects newer than <time>" |
11623 | msgstr "desempaquetar objetos inalcanzables más nuevos que <tiempo>" | |
11624 | ||
33ac3e89 | 11625 | #: builtin/pack-objects.c:3021 |
fb0e25bc CD |
11626 | msgid "create thin packs" |
11627 | msgstr "crear paquetes delgados" | |
11628 | ||
33ac3e89 | 11629 | #: builtin/pack-objects.c:3023 |
fb0e25bc CD |
11630 | msgid "create packs suitable for shallow fetches" |
11631 | msgstr "crear paquetes adecuados para fetches superficiales" | |
11632 | ||
33ac3e89 | 11633 | #: builtin/pack-objects.c:3025 |
fb0e25bc CD |
11634 | msgid "ignore packs that have companion .keep file" |
11635 | msgstr "ignorar paquetes que tienen un archivo .keep acompañante" | |
11636 | ||
33ac3e89 | 11637 | #: builtin/pack-objects.c:3027 |
fb0e25bc CD |
11638 | msgid "pack compression level" |
11639 | msgstr "nivel de compresión del paquete" | |
11640 | ||
33ac3e89 | 11641 | #: builtin/pack-objects.c:3029 |
fb0e25bc CD |
11642 | msgid "do not hide commits by grafts" |
11643 | msgstr "no ocultar commits por injertos" | |
11644 | ||
33ac3e89 | 11645 | #: builtin/pack-objects.c:3031 |
fb0e25bc | 11646 | msgid "use a bitmap index if available to speed up counting objects" |
4b15eb22 CD |
11647 | msgstr "" |
11648 | "usar un índice bitmap si está disponible para acelerar la cuenta de objetos" | |
fb0e25bc | 11649 | |
33ac3e89 | 11650 | #: builtin/pack-objects.c:3033 |
fb0e25bc CD |
11651 | msgid "write a bitmap index together with the pack index" |
11652 | msgstr "escribir un índice de bitmap junto al índice de paquete" | |
11653 | ||
33ac3e89 | 11654 | #: builtin/pack-objects.c:3036 |
f8038f5b CDR |
11655 | msgid "handling for missing objects" |
11656 | msgstr "manejo de objetos perdidos" | |
11657 | ||
33ac3e89 CDR |
11658 | #: builtin/pack-objects.c:3039 |
11659 | msgid "do not pack objects in promisor packfiles" | |
11660 | msgstr "no se puede empaquetar objetos en packfiles promisores" | |
11661 | ||
11662 | #: builtin/pack-objects.c:3178 | |
fb0e25bc CD |
11663 | msgid "Counting objects" |
11664 | msgstr "Contando objetos" | |
11665 | ||
11666 | #: builtin/pack-refs.c:6 | |
11667 | msgid "git pack-refs [<options>]" | |
11668 | msgstr "git pack-refs [<opciones>]" | |
11669 | ||
11670 | #: builtin/pack-refs.c:14 | |
11671 | msgid "pack everything" | |
11672 | msgstr "empaquetar todo" | |
11673 | ||
11674 | #: builtin/pack-refs.c:15 | |
11675 | msgid "prune loose refs (default)" | |
11676 | msgstr "recortar refs perdidos (default)" | |
11677 | ||
4b15eb22 | 11678 | #: builtin/prune-packed.c:8 |
fb0e25bc CD |
11679 | msgid "git prune-packed [-n | --dry-run] [-q | --quiet]" |
11680 | msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]" | |
11681 | ||
4b15eb22 | 11682 | #: builtin/prune-packed.c:41 |
fb0e25bc CD |
11683 | msgid "Removing duplicate objects" |
11684 | msgstr "Removiendo objetos duplicados" | |
11685 | ||
11686 | #: builtin/prune.c:11 | |
f8038f5b CDR |
11687 | msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]" |
11688 | msgstr "git prune [-n] [-v] [--progress] [--expire <tiempo>] [--] [<head>...]" | |
fb0e25bc | 11689 | |
33ac3e89 | 11690 | #: builtin/prune.c:107 |
fb0e25bc CD |
11691 | msgid "report pruned objects" |
11692 | msgstr "reportar objetos recortados" | |
11693 | ||
33ac3e89 | 11694 | #: builtin/prune.c:110 |
fb0e25bc CD |
11695 | msgid "expire objects older than <time>" |
11696 | msgstr "expirar objetos más viejos a <tiempo>" | |
11697 | ||
33ac3e89 CDR |
11698 | #: builtin/prune.c:112 |
11699 | msgid "limit traversal to objects outside promisor packfiles" | |
11700 | msgstr "limitar el recorrido a objetos fuera de los paquetes del promisor" | |
11701 | ||
11702 | #: builtin/prune.c:126 | |
fb0e25bc CD |
11703 | msgid "cannot prune in a precious-objects repo" |
11704 | msgstr "no se puede recortar en un repositorio de objetos-preciosos" | |
11705 | ||
11706 | #: builtin/pull.c:54 builtin/pull.c:56 | |
11707 | #, c-format | |
11708 | msgid "Invalid value for %s: %s" | |
11709 | msgstr "Valor inválido para %s: %s" | |
11710 | ||
11711 | #: builtin/pull.c:76 | |
11712 | msgid "git pull [<options>] [<repository> [<refspec>...]]" | |
4b15eb22 | 11713 | msgstr "" |
715fc761 | 11714 | "git pull [<opciones>] [<repositorio> [<especificación-de-referencia>...]]" |
fb0e25bc | 11715 | |
f8038f5b | 11716 | #: builtin/pull.c:127 |
fb0e25bc CD |
11717 | msgid "control for recursive fetching of submodules" |
11718 | msgstr "control de fetch recursivo en submódulos" | |
11719 | ||
f8038f5b | 11720 | #: builtin/pull.c:131 |
fb0e25bc CD |
11721 | msgid "Options related to merging" |
11722 | msgstr "Opciones relacionadas a fusión" | |
11723 | ||
f8038f5b | 11724 | #: builtin/pull.c:134 |
fb0e25bc CD |
11725 | msgid "incorporate changes by rebasing rather than merging" |
11726 | msgstr "incorporar cambios por rebase en lugar de fusión" | |
11727 | ||
f8038f5b | 11728 | #: builtin/pull.c:161 builtin/rebase--helper.c:23 builtin/revert.c:121 |
fb0e25bc CD |
11729 | msgid "allow fast-forward" |
11730 | msgstr "permitir fast-forward" | |
11731 | ||
f8038f5b | 11732 | #: builtin/pull.c:170 |
fb0e25bc CD |
11733 | msgid "automatically stash/stash pop before and after rebase" |
11734 | msgstr "ejecutar automáticamente stash/stash pop antes y después de rebase" | |
11735 | ||
f8038f5b | 11736 | #: builtin/pull.c:186 |
fb0e25bc CD |
11737 | msgid "Options related to fetching" |
11738 | msgstr "Opciones relacionadas a fetch" | |
11739 | ||
f8038f5b | 11740 | #: builtin/pull.c:204 |
fb0e25bc | 11741 | msgid "number of submodules pulled in parallel" |
715fc761 | 11742 | msgstr "número de submódulos que realizan pull en paralelo" |
fb0e25bc | 11743 | |
f8038f5b | 11744 | #: builtin/pull.c:299 |
fb0e25bc CD |
11745 | #, c-format |
11746 | msgid "Invalid value for pull.ff: %s" | |
33ac3e89 | 11747 | msgstr "Valor inválido para pull.ff: %s" |
fb0e25bc | 11748 | |
f8038f5b | 11749 | #: builtin/pull.c:415 |
4b15eb22 CD |
11750 | msgid "" |
11751 | "There is no candidate for rebasing against among the refs that you just " | |
11752 | "fetched." | |
fb0e25bc CD |
11753 | msgstr "No hay candidato para rebasar entre las refs que has bajado con fetch." |
11754 | ||
f8038f5b | 11755 | #: builtin/pull.c:417 |
4b15eb22 CD |
11756 | msgid "" |
11757 | "There are no candidates for merging among the refs that you just fetched." | |
11758 | msgstr "" | |
11759 | "No hay candidatos para fusionar entre las refs que has bajado con fetch." | |
fb0e25bc | 11760 | |
f8038f5b | 11761 | #: builtin/pull.c:418 |
fb0e25bc CD |
11762 | msgid "" |
11763 | "Generally this means that you provided a wildcard refspec which had no\n" | |
11764 | "matches on the remote end." | |
11765 | msgstr "" | |
4b15eb22 CD |
11766 | "Generalmente esto significa que has proveído un wildcard de refspec que no " |
11767 | "tiene\n" | |
fb0e25bc CD |
11768 | "concordancia en el final remoto." |
11769 | ||
f8038f5b | 11770 | #: builtin/pull.c:421 |
fb0e25bc CD |
11771 | #, c-format |
11772 | msgid "" | |
11773 | "You asked to pull from the remote '%s', but did not specify\n" | |
11774 | "a branch. Because this is not the default configured remote\n" | |
11775 | "for your current branch, you must specify a branch on the command line." | |
11776 | msgstr "" | |
11777 | "Se ha solicitado un pull del remoto '%s', pero no se ha especificado\n" | |
11778 | "una rama. Porque este no es el remoto configurado por default\n" | |
11779 | "para tu rama actual, tienes que especificar una rama en la línea de comando." | |
11780 | ||
f8038f5b | 11781 | #: builtin/pull.c:426 git-parse-remote.sh:73 |
fb0e25bc CD |
11782 | msgid "You are not currently on a branch." |
11783 | msgstr "No te encuentras actualmente en la rama." | |
11784 | ||
f8038f5b | 11785 | #: builtin/pull.c:428 builtin/pull.c:443 git-parse-remote.sh:79 |
fb0e25bc CD |
11786 | msgid "Please specify which branch you want to rebase against." |
11787 | msgstr "Por favor especifica a qué rama quieres rebasar." | |
11788 | ||
f8038f5b | 11789 | #: builtin/pull.c:430 builtin/pull.c:445 git-parse-remote.sh:82 |
fb0e25bc CD |
11790 | msgid "Please specify which branch you want to merge with." |
11791 | msgstr "Por favor especifica a qué rama quieres fusionar." | |
11792 | ||
f8038f5b | 11793 | #: builtin/pull.c:431 builtin/pull.c:446 |
fb0e25bc CD |
11794 | msgid "See git-pull(1) for details." |
11795 | msgstr "Ver git-pull(1) para detalles." | |
11796 | ||
f8038f5b | 11797 | #: builtin/pull.c:433 builtin/pull.c:439 builtin/pull.c:448 |
4b15eb22 | 11798 | #: git-parse-remote.sh:64 |
fb0e25bc CD |
11799 | msgid "<remote>" |
11800 | msgstr "<remoto>" | |
11801 | ||
33ac3e89 | 11802 | #: builtin/pull.c:433 builtin/pull.c:448 builtin/pull.c:453 git-rebase.sh:477 |
4b15eb22 | 11803 | #: git-parse-remote.sh:65 |
fb0e25bc CD |
11804 | msgid "<branch>" |
11805 | msgstr "<rama>" | |
11806 | ||
f8038f5b | 11807 | #: builtin/pull.c:441 git-parse-remote.sh:75 |
fb0e25bc CD |
11808 | msgid "There is no tracking information for the current branch." |
11809 | msgstr "No hay información de rastreo para la rama actual." | |
11810 | ||
f8038f5b | 11811 | #: builtin/pull.c:450 git-parse-remote.sh:95 |
4b15eb22 CD |
11812 | msgid "" |
11813 | "If you wish to set tracking information for this branch you can do so with:" | |
11814 | msgstr "" | |
11815 | "Si deseas configurar el rastreo de información para esta rama, puedes " | |
11816 | "hacerlo con:" | |
fb0e25bc | 11817 | |
f8038f5b | 11818 | #: builtin/pull.c:455 |
fb0e25bc CD |
11819 | #, c-format |
11820 | msgid "" | |
11821 | "Your configuration specifies to merge with the ref '%s'\n" | |
11822 | "from the remote, but no such ref was fetched." | |
11823 | msgstr "" | |
11824 | "Tu configuración especifica fusionar con la ref '%s'\n" | |
11825 | "de tu remoto, pero no se pudo hacer fetch a esa ref." | |
11826 | ||
33ac3e89 | 11827 | #: builtin/pull.c:819 |
fb0e25bc CD |
11828 | msgid "ignoring --verify-signatures for rebase" |
11829 | msgstr "ignorando --verify-signatures para rebase" | |
11830 | ||
33ac3e89 | 11831 | #: builtin/pull.c:867 |
fb0e25bc CD |
11832 | msgid "--[no-]autostash option is only valid with --rebase." |
11833 | msgstr "La opción --[no-]autostash sólo es válida con --rebase." | |
11834 | ||
33ac3e89 | 11835 | #: builtin/pull.c:875 |
fb0e25bc CD |
11836 | msgid "Updating an unborn branch with changes added to the index." |
11837 | msgstr "Actualizando una rama no nata con cambios agregados al índice." | |
11838 | ||
33ac3e89 | 11839 | #: builtin/pull.c:878 |
fb0e25bc CD |
11840 | msgid "pull with rebase" |
11841 | msgstr "pull con rebase" | |
11842 | ||
33ac3e89 | 11843 | #: builtin/pull.c:879 |
fb0e25bc CD |
11844 | msgid "please commit or stash them." |
11845 | msgstr "por favor realiza un commit o un stash con ellos." | |
11846 | ||
33ac3e89 | 11847 | #: builtin/pull.c:904 |
fb0e25bc CD |
11848 | #, c-format |
11849 | msgid "" | |
11850 | "fetch updated the current branch head.\n" | |
11851 | "fast-forwarding your working tree from\n" | |
11852 | "commit %s." | |
11853 | msgstr "" | |
11854 | "fetch actualizó el head de la rama actual.\n" | |
11855 | "realizando fast-forward al árbol de trabajo\n" | |
11856 | "desde commit %s." | |
11857 | ||
33ac3e89 | 11858 | #: builtin/pull.c:909 |
fb0e25bc CD |
11859 | #, c-format |
11860 | msgid "" | |
11861 | "Cannot fast-forward your working tree.\n" | |
11862 | "After making sure that you saved anything precious from\n" | |
11863 | "$ git diff %s\n" | |
11864 | "output, run\n" | |
11865 | "$ git reset --hard\n" | |
11866 | "to recover." | |
11867 | msgstr "" | |
11868 | "No se puede realizar fast-forward en tu árbol de trabajo.\n" | |
11869 | "Tras asegurarse que ha guardado todo lo preciado de la salida de\n" | |
11870 | "$ git diff %s\n" | |
11871 | ",ejecute\n" | |
11872 | "$ git reset --hard\n" | |
11873 | "para recuperar." | |
11874 | ||
33ac3e89 | 11875 | #: builtin/pull.c:924 |
fb0e25bc CD |
11876 | msgid "Cannot merge multiple branches into empty head." |
11877 | msgstr "No se puede fusionar múltiples ramas en un head vacío." | |
11878 | ||
33ac3e89 | 11879 | #: builtin/pull.c:928 |
fb0e25bc | 11880 | msgid "Cannot rebase onto multiple branches." |
715fc761 | 11881 | msgstr "No se puede rebasar en múltiples ramas." |
fb0e25bc | 11882 | |
33ac3e89 | 11883 | #: builtin/pull.c:935 |
fb0e25bc | 11884 | msgid "cannot rebase with locally recorded submodule modifications" |
4b15eb22 CD |
11885 | msgstr "" |
11886 | "no se puede rebasar con modificaciones de submódulos grabadas localmente" | |
fb0e25bc CD |
11887 | |
11888 | #: builtin/push.c:17 | |
11889 | msgid "git push [<options>] [<repository> [<refspec>...]]" | |
4b15eb22 | 11890 | msgstr "" |
715fc761 | 11891 | "git push [<opciones>] [<repositorio> [<especificaciones-de-referencia>...]]" |
fb0e25bc | 11892 | |
f8038f5b | 11893 | #: builtin/push.c:92 |
fb0e25bc CD |
11894 | msgid "tag shorthand without <tag>" |
11895 | msgstr "taquigrafía de tag sin <tag>" | |
11896 | ||
f8038f5b | 11897 | #: builtin/push.c:102 |
fb0e25bc CD |
11898 | msgid "--delete only accepts plain target ref names" |
11899 | msgstr "--delete solo acepta como objetivos nombres de ref planos" | |
11900 | ||
f8038f5b | 11901 | #: builtin/push.c:146 |
fb0e25bc CD |
11902 | msgid "" |
11903 | "\n" | |
11904 | "To choose either option permanently, see push.default in 'git help config'." | |
11905 | msgstr "" | |
11906 | "\n" | |
715fc761 | 11907 | "Para elegir si la opción es permanente, mira push.default en 'git help " |
4b15eb22 | 11908 | "config'." |
fb0e25bc | 11909 | |
f8038f5b | 11910 | #: builtin/push.c:149 |
fb0e25bc CD |
11911 | #, c-format |
11912 | msgid "" | |
11913 | "The upstream branch of your current branch does not match\n" | |
11914 | "the name of your current branch. To push to the upstream branch\n" | |
11915 | "on the remote, use\n" | |
11916 | "\n" | |
11917 | " git push %s HEAD:%s\n" | |
11918 | "\n" | |
11919 | "To push to the branch of the same name on the remote, use\n" | |
11920 | "\n" | |
11921 | " git push %s %s\n" | |
11922 | "%s" | |
11923 | msgstr "" | |
11924 | "La rama upstream de tu rama actual no concuerda\n" | |
11925 | "con el nombre de tu rama actual. Para hacer un push a la rama upstream\n" | |
11926 | "en el remoto, ejecuta\n" | |
11927 | "\n" | |
11928 | "\tgit push %s HEAD:%s\n" | |
11929 | "\n" | |
11930 | "Para hacer un push a la rama del mismo nombre en el remoto, ejecuta\n" | |
11931 | "\n" | |
11932 | "\tgit push %s %s\n" | |
11933 | "%s" | |
11934 | ||
f8038f5b | 11935 | #: builtin/push.c:164 |
fb0e25bc CD |
11936 | #, c-format |
11937 | msgid "" | |
11938 | "You are not currently on a branch.\n" | |
11939 | "To push the history leading to the current (detached HEAD)\n" | |
11940 | "state now, use\n" | |
11941 | "\n" | |
11942 | " git push %s HEAD:<name-of-remote-branch>\n" | |
11943 | msgstr "" | |
11944 | "Actualmente no estás en una rama.\n" | |
11945 | "Para hacer un push a la historia que lleva al estado actual\n" | |
11946 | "(HEAD desacoplado), use\n" | |
11947 | "\n" | |
11948 | "\tgit push %s HEAD:<nombre-de-rama-remota>\n" | |
11949 | ||
f8038f5b | 11950 | #: builtin/push.c:178 |
fb0e25bc CD |
11951 | #, c-format |
11952 | msgid "" | |
11953 | "The current branch %s has no upstream branch.\n" | |
11954 | "To push the current branch and set the remote as upstream, use\n" | |
11955 | "\n" | |
11956 | " git push --set-upstream %s %s\n" | |
11957 | msgstr "" | |
11958 | "La rama actual %s no tiene una rama upstream.\n" | |
4b15eb22 CD |
11959 | "Para realizar un push de la rama actual y configurar el remoto como " |
11960 | "upstream, use\n" | |
fb0e25bc CD |
11961 | "\n" |
11962 | "\tgit push --set-upstream %s %s\n" | |
11963 | ||
f8038f5b | 11964 | #: builtin/push.c:186 |
fb0e25bc CD |
11965 | #, c-format |
11966 | msgid "The current branch %s has multiple upstream branches, refusing to push." | |
11967 | msgstr "La rama actual %s tiene múltiples ramas upstream, rechazando el push." | |
11968 | ||
f8038f5b | 11969 | #: builtin/push.c:189 |
fb0e25bc CD |
11970 | #, c-format |
11971 | msgid "" | |
11972 | "You are pushing to remote '%s', which is not the upstream of\n" | |
11973 | "your current branch '%s', without telling me what to push\n" | |
11974 | "to update which remote branch." | |
11975 | msgstr "" | |
11976 | "Está haciendo un push al remoto '%s', el cual no es el upstream de\n" | |
11977 | "su rama actual '%s', sin decirme qué poner en el push\n" | |
11978 | "para actualizar en qué rama de remoto." | |
11979 | ||
f8038f5b | 11980 | #: builtin/push.c:248 |
4b15eb22 CD |
11981 | msgid "" |
11982 | "You didn't specify any refspecs to push, and push.default is \"nothing\"." | |
11983 | msgstr "" | |
11984 | "No se especificó ningún refspecs para hacer push, y push.default es \"nada\"." | |
fb0e25bc | 11985 | |
f8038f5b | 11986 | #: builtin/push.c:255 |
fb0e25bc CD |
11987 | msgid "" |
11988 | "Updates were rejected because the tip of your current branch is behind\n" | |
11989 | "its remote counterpart. Integrate the remote changes (e.g.\n" | |
11990 | "'git pull ...') before pushing again.\n" | |
11991 | "See the 'Note about fast-forwards' in 'git push --help' for details." | |
11992 | msgstr "" | |
11993 | "Actualizaciones fueron rechazadas porque la punta de tu rama actual esta\n" | |
715fc761 | 11994 | "detrás de su contraparte remota. Integra los cambios remotos (es decir\n" |
fb0e25bc CD |
11995 | "'git pull ...') antes de hacer push de nuevo.\n" |
11996 | "Mira 'Note about fast-forwards' en 'git push --help' para mas detalles." | |
11997 | ||
f8038f5b | 11998 | #: builtin/push.c:261 |
fb0e25bc CD |
11999 | msgid "" |
12000 | "Updates were rejected because a pushed branch tip is behind its remote\n" | |
12001 | "counterpart. Check out this branch and integrate the remote changes\n" | |
12002 | "(e.g. 'git pull ...') before pushing again.\n" | |
12003 | "See the 'Note about fast-forwards' in 'git push --help' for details." | |
12004 | msgstr "" | |
12005 | "Actualizaciones fueron rechazadas porque una punta de rama en el push está \n" | |
4b15eb22 CD |
12006 | "detrás de su contraparte remota. Verifique esta rama e integre los cambios " |
12007 | "remotos\n" | |
fb0e25bc CD |
12008 | "(ejem. 'git pull ...') antes de volver a hacer push.\n" |
12009 | "Vea las 'Notes about fast-forwards' en 'git push --help' para más detalles." | |
12010 | ||
f8038f5b | 12011 | #: builtin/push.c:267 |
fb0e25bc CD |
12012 | msgid "" |
12013 | "Updates were rejected because the remote contains work that you do\n" | |
12014 | "not have locally. This is usually caused by another repository pushing\n" | |
12015 | "to the same ref. You may want to first integrate the remote changes\n" | |
12016 | "(e.g., 'git pull ...') before pushing again.\n" | |
12017 | "See the 'Note about fast-forwards' in 'git push --help' for details." | |
12018 | msgstr "" | |
12019 | "Actualizaciones fueron rechazadas porque el remoto contiene trabajo que\n" | |
715fc761 | 12020 | "no existe localmente. Esto es causado usualmente por otro repositorio \n" |
fb0e25bc | 12021 | "realizando push a la misma ref. Quizás quiera integrar primero los cambios\n" |
715fc761 | 12022 | "remotos (ej. 'git pull ...') antes de volver a hacer push.\n" |
fb0e25bc CD |
12023 | "Vea 'Notes about fast-forwards0 en 'git push --help' para detalles." |
12024 | ||
f8038f5b | 12025 | #: builtin/push.c:274 |
fb0e25bc | 12026 | msgid "Updates were rejected because the tag already exists in the remote." |
4b15eb22 CD |
12027 | msgstr "" |
12028 | "Actualizaciones fueron rechazadas porque el tag ya existe en el remoto." | |
fb0e25bc | 12029 | |
f8038f5b | 12030 | #: builtin/push.c:277 |
fb0e25bc CD |
12031 | msgid "" |
12032 | "You cannot update a remote ref that points at a non-commit object,\n" | |
12033 | "or update a remote ref to make it point at a non-commit object,\n" | |
12034 | "without using the '--force' option.\n" | |
12035 | msgstr "" | |
12036 | "No puede actualizar un ref remoto que apunta a un objeto no-commit,\n" | |
12037 | "o actualizar un ref remoto para hacer que apunte a un objeto no-commit,\n" | |
12038 | "sin usar la opción '--force'.\n" | |
12039 | ||
f8038f5b | 12040 | #: builtin/push.c:337 |
fb0e25bc CD |
12041 | #, c-format |
12042 | msgid "Pushing to %s\n" | |
715fc761 | 12043 | msgstr "Haciendo push a %s\n" |
fb0e25bc | 12044 | |
f8038f5b | 12045 | #: builtin/push.c:341 |
fb0e25bc CD |
12046 | #, c-format |
12047 | msgid "failed to push some refs to '%s'" | |
12048 | msgstr "fallo el push de algunas referencias a '%s'" | |
12049 | ||
f8038f5b | 12050 | #: builtin/push.c:372 |
fb0e25bc CD |
12051 | #, c-format |
12052 | msgid "bad repository '%s'" | |
12053 | msgstr "mal repositorio '%s'" | |
12054 | ||
f8038f5b | 12055 | #: builtin/push.c:373 |
fb0e25bc CD |
12056 | msgid "" |
12057 | "No configured push destination.\n" | |
4b15eb22 CD |
12058 | "Either specify the URL from the command-line or configure a remote " |
12059 | "repository using\n" | |
fb0e25bc CD |
12060 | "\n" |
12061 | " git remote add <name> <url>\n" | |
12062 | "\n" | |
12063 | "and then push using the remote name\n" | |
12064 | "\n" | |
12065 | " git push <name>\n" | |
12066 | msgstr "" | |
12067 | "No se ha configurado un destino para el push.\n" | |
715fc761 CDR |
12068 | "Puedes o especificar una URL desde la línea de comandos o configurar un " |
12069 | "repositorio remoto usando\n" | |
fb0e25bc CD |
12070 | "\n" |
12071 | " git remote add <nombre> <url>\n" | |
12072 | "\n" | |
12073 | "y luego haciendo push al nombre del remoto\n" | |
12074 | "\n" | |
12075 | " git push <nombre>\n" | |
12076 | ||
f8038f5b | 12077 | #: builtin/push.c:391 |
fb0e25bc CD |
12078 | msgid "--all and --tags are incompatible" |
12079 | msgstr "--all y --tags son incompatibles" | |
12080 | ||
f8038f5b | 12081 | #: builtin/push.c:392 |
fb0e25bc CD |
12082 | msgid "--all can't be combined with refspecs" |
12083 | msgstr "--all no puede ser combinada con refspecs" | |
12084 | ||
f8038f5b | 12085 | #: builtin/push.c:397 |
fb0e25bc CD |
12086 | msgid "--mirror and --tags are incompatible" |
12087 | msgstr "--mirror y --tags son incompatibles" | |
12088 | ||
f8038f5b | 12089 | #: builtin/push.c:398 |
fb0e25bc CD |
12090 | msgid "--mirror can't be combined with refspecs" |
12091 | msgstr "--mirror no puede ser combinado con refspecs" | |
12092 | ||
f8038f5b | 12093 | #: builtin/push.c:403 |
fb0e25bc CD |
12094 | msgid "--all and --mirror are incompatible" |
12095 | msgstr "--all y --mirror son incompatibles" | |
12096 | ||
f8038f5b | 12097 | #: builtin/push.c:535 |
fb0e25bc CD |
12098 | msgid "repository" |
12099 | msgstr "repositorio" | |
12100 | ||
f8038f5b | 12101 | #: builtin/push.c:536 builtin/send-pack.c:163 |
fb0e25bc CD |
12102 | msgid "push all refs" |
12103 | msgstr "realizar push a todas las refs" | |
12104 | ||
f8038f5b | 12105 | #: builtin/push.c:537 builtin/send-pack.c:165 |
fb0e25bc CD |
12106 | msgid "mirror all refs" |
12107 | msgstr "realizar mirror a todas las refs" | |
12108 | ||
f8038f5b | 12109 | #: builtin/push.c:539 |
fb0e25bc CD |
12110 | msgid "delete refs" |
12111 | msgstr "borrar refs" | |
12112 | ||
f8038f5b | 12113 | #: builtin/push.c:540 |
fb0e25bc CD |
12114 | msgid "push tags (can't be used with --all or --mirror)" |
12115 | msgstr "realizar push a tags (no puede ser usado con --all o --mirror)" | |
12116 | ||
f8038f5b | 12117 | #: builtin/push.c:543 builtin/send-pack.c:166 |
fb0e25bc CD |
12118 | msgid "force updates" |
12119 | msgstr "forzar actualizaciones" | |
12120 | ||
f8038f5b | 12121 | #: builtin/push.c:545 builtin/send-pack.c:180 |
fb0e25bc CD |
12122 | msgid "refname>:<expect" |
12123 | msgstr "refname>:<expect" | |
12124 | ||
f8038f5b | 12125 | #: builtin/push.c:546 builtin/send-pack.c:181 |
fb0e25bc CD |
12126 | msgid "require old value of ref to be at this value" |
12127 | msgstr "requiere haber valor viejo de ref en este valor" | |
12128 | ||
f8038f5b | 12129 | #: builtin/push.c:549 |
fb0e25bc CD |
12130 | msgid "control recursive pushing of submodules" |
12131 | msgstr "controlar push recursivo de submódulos" | |
12132 | ||
f8038f5b | 12133 | #: builtin/push.c:551 builtin/send-pack.c:174 |
fb0e25bc CD |
12134 | msgid "use thin pack" |
12135 | msgstr "usar empaquetado delgado" | |
12136 | ||
f8038f5b | 12137 | #: builtin/push.c:552 builtin/push.c:553 builtin/send-pack.c:160 |
4b15eb22 | 12138 | #: builtin/send-pack.c:161 |
fb0e25bc CD |
12139 | msgid "receive pack program" |
12140 | msgstr "recibir programa de paquete" | |
12141 | ||
f8038f5b | 12142 | #: builtin/push.c:554 |
fb0e25bc CD |
12143 | msgid "set upstream for git pull/status" |
12144 | msgstr "configurar upstream para git pulll/status" | |
12145 | ||
f8038f5b | 12146 | #: builtin/push.c:557 |
fb0e25bc CD |
12147 | msgid "prune locally removed refs" |
12148 | msgstr "recortando refs removidas localmente" | |
12149 | ||
f8038f5b | 12150 | #: builtin/push.c:559 |
fb0e25bc CD |
12151 | msgid "bypass pre-push hook" |
12152 | msgstr "hacer un bypass al hook pre-push" | |
12153 | ||
f8038f5b | 12154 | #: builtin/push.c:560 |
fb0e25bc CD |
12155 | msgid "push missing but relevant tags" |
12156 | msgstr "realizar push de tags faltantes pero relevantes" | |
12157 | ||
f8038f5b | 12158 | #: builtin/push.c:563 builtin/send-pack.c:168 |
fb0e25bc | 12159 | msgid "GPG sign the push" |
33ac3e89 | 12160 | msgstr "Firmar con GPG el push" |
fb0e25bc | 12161 | |
f8038f5b | 12162 | #: builtin/push.c:565 builtin/send-pack.c:175 |
fb0e25bc CD |
12163 | msgid "request atomic transaction on remote side" |
12164 | msgstr "solicitar transacción atómica en el lado remoto" | |
12165 | ||
f8038f5b | 12166 | #: builtin/push.c:566 builtin/send-pack.c:171 |
fb0e25bc CD |
12167 | msgid "server-specific" |
12168 | msgstr "especifico-de-servidor" | |
12169 | ||
f8038f5b | 12170 | #: builtin/push.c:566 builtin/send-pack.c:172 |
fb0e25bc CD |
12171 | msgid "option to transmit" |
12172 | msgstr "opción para trasmitir" | |
12173 | ||
f8038f5b | 12174 | #: builtin/push.c:583 |
fb0e25bc CD |
12175 | msgid "--delete is incompatible with --all, --mirror and --tags" |
12176 | msgstr "--delete es incompatible con --all, --mirror y --tags" | |
12177 | ||
f8038f5b | 12178 | #: builtin/push.c:585 |
fb0e25bc CD |
12179 | msgid "--delete doesn't make sense without any refs" |
12180 | msgstr "--delete no tiene sentido sin ninguna referencia" | |
12181 | ||
f8038f5b | 12182 | #: builtin/push.c:604 |
fb0e25bc CD |
12183 | msgid "push options must not have new line characters" |
12184 | msgstr "opciones de push no pueden tener caracteres de línea nueva" | |
12185 | ||
12186 | #: builtin/read-tree.c:40 | |
12187 | msgid "" | |
4b15eb22 CD |
12188 | "git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) " |
12189 | "[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--" | |
12190 | "index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])" | |
fb0e25bc | 12191 | msgstr "" |
4b15eb22 CD |
12192 | "git read-tree [(-m [--trivial] [--aggressive] | --reset | --" |
12193 | "prefix=<prefijo>) [-u [--exclude-per-directory=<gitignore>] | -i]] [--no-" | |
715fc761 CDR |
12194 | "sparse-checkout] [--index-output=<archivo>] (--empty | <árbol-ismo1> [<árbol-" |
12195 | "ismo2> [<árbol-ismo3>]])" | |
fb0e25bc CD |
12196 | |
12197 | #: builtin/read-tree.c:121 | |
12198 | msgid "write resulting index to <file>" | |
12199 | msgstr "escribir índice resultante en <archivo>" | |
12200 | ||
12201 | #: builtin/read-tree.c:124 | |
12202 | msgid "only empty the index" | |
12203 | msgstr "solo vaciar el índice" | |
12204 | ||
12205 | #: builtin/read-tree.c:126 | |
12206 | msgid "Merging" | |
12207 | msgstr "Fusionando" | |
12208 | ||
12209 | #: builtin/read-tree.c:128 | |
12210 | msgid "perform a merge in addition to a read" | |
12211 | msgstr "realizar un merge en adición a una lectura" | |
12212 | ||
12213 | #: builtin/read-tree.c:130 | |
12214 | msgid "3-way merge if no file level merging required" | |
12215 | msgstr "fusión de 3-vías si no se requiere ninguna fusión a nivel de archivo" | |
12216 | ||
12217 | #: builtin/read-tree.c:132 | |
12218 | msgid "3-way merge in presence of adds and removes" | |
12219 | msgstr "fusión en 3-vías en presencia de adiciones y remociones" | |
12220 | ||
12221 | #: builtin/read-tree.c:134 | |
12222 | msgid "same as -m, but discard unmerged entries" | |
12223 | msgstr "igual que -m, pero descarta entradas sin fusionar" | |
12224 | ||
12225 | #: builtin/read-tree.c:135 | |
12226 | msgid "<subdirectory>/" | |
12227 | msgstr "<subdirectorio>/" | |
12228 | ||
12229 | #: builtin/read-tree.c:136 | |
12230 | msgid "read the tree into the index under <subdirectory>/" | |
12231 | msgstr "lea el árbol en el índice bajo <subdirectorio>/" | |
12232 | ||
12233 | #: builtin/read-tree.c:139 | |
12234 | msgid "update working tree with merge result" | |
12235 | msgstr "actualiza el árbol de trabajo con el resultado de la fusión" | |
12236 | ||
12237 | #: builtin/read-tree.c:141 | |
12238 | msgid "gitignore" | |
12239 | msgstr "gitignore" | |
12240 | ||
12241 | #: builtin/read-tree.c:142 | |
12242 | msgid "allow explicitly ignored files to be overwritten" | |
12243 | msgstr "permitir sobrescritura de archivos explícitamente ignorados" | |
12244 | ||
12245 | #: builtin/read-tree.c:145 | |
12246 | msgid "don't check the working tree after merging" | |
12247 | msgstr "no revisar el árbol de trabajo tras fusionar" | |
12248 | ||
12249 | #: builtin/read-tree.c:146 | |
12250 | msgid "don't update the index or the work tree" | |
12251 | msgstr "no actualizar el índice o el árbol de trabajo" | |
12252 | ||
12253 | #: builtin/read-tree.c:148 | |
12254 | msgid "skip applying sparse checkout filter" | |
12255 | msgstr "saltar aplicado de filtro de sparse checkout" | |
12256 | ||
12257 | #: builtin/read-tree.c:150 | |
12258 | msgid "debug unpack-trees" | |
12259 | msgstr "debug de árboles-desempacados" | |
12260 | ||
12261 | #: builtin/rebase--helper.c:8 | |
12262 | msgid "git rebase--helper [<options>]" | |
12263 | msgstr "git rebase--helper [<opciones>]" | |
12264 | ||
f8038f5b | 12265 | #: builtin/rebase--helper.c:24 |
4b15eb22 CD |
12266 | msgid "keep empty commits" |
12267 | msgstr "mantener commits vacíos" | |
12268 | ||
33ac3e89 CDR |
12269 | #: builtin/rebase--helper.c:26 builtin/revert.c:123 |
12270 | msgid "allow commits with empty messages" | |
12271 | msgstr "permitir commits con mensajes vacíos" | |
12272 | ||
12273 | #: builtin/rebase--helper.c:27 | |
fb0e25bc CD |
12274 | msgid "continue rebase" |
12275 | msgstr "continuar rebase" | |
12276 | ||
33ac3e89 | 12277 | #: builtin/rebase--helper.c:29 |
fb0e25bc CD |
12278 | msgid "abort rebase" |
12279 | msgstr "abortar rebase" | |
12280 | ||
33ac3e89 | 12281 | #: builtin/rebase--helper.c:32 |
4b15eb22 CD |
12282 | msgid "make rebase script" |
12283 | msgstr "generar script de rebase" | |
12284 | ||
33ac3e89 | 12285 | #: builtin/rebase--helper.c:34 |
f8038f5b CDR |
12286 | msgid "shorten commit ids in the todo list" |
12287 | msgstr "ids de commits cortos en la lista de pendientes" | |
4b15eb22 | 12288 | |
33ac3e89 | 12289 | #: builtin/rebase--helper.c:36 |
f8038f5b CDR |
12290 | msgid "expand commit ids in the todo list" |
12291 | msgstr "expandir ids de commits en la lista de pendientes" | |
12292 | ||
33ac3e89 | 12293 | #: builtin/rebase--helper.c:38 |
4b15eb22 CD |
12294 | msgid "check the todo list" |
12295 | msgstr "revisar la lista de pendientes" | |
12296 | ||
33ac3e89 | 12297 | #: builtin/rebase--helper.c:40 |
4b15eb22 CD |
12298 | msgid "skip unnecessary picks" |
12299 | msgstr "saltar los picks innecesarios" | |
12300 | ||
33ac3e89 | 12301 | #: builtin/rebase--helper.c:42 |
4b15eb22 CD |
12302 | msgid "rearrange fixup/squash lines" |
12303 | msgstr "reorganizar líneas fixup/squash" | |
12304 | ||
33ac3e89 | 12305 | #: builtin/rebase--helper.c:44 |
f8038f5b CDR |
12306 | msgid "insert exec commands in todo list" |
12307 | msgstr "insertar comando exec en la lista de pendientes" | |
12308 | ||
12309 | #: builtin/receive-pack.c:30 | |
fb0e25bc CD |
12310 | msgid "git receive-pack <git-dir>" |
12311 | msgstr "git receive-pack <git-dir>" | |
12312 | ||
33ac3e89 | 12313 | #: builtin/receive-pack.c:841 |
fb0e25bc CD |
12314 | msgid "" |
12315 | "By default, updating the current branch in a non-bare repository\n" | |
12316 | "is denied, because it will make the index and work tree inconsistent\n" | |
12317 | "with what you pushed, and will require 'git reset --hard' to match\n" | |
12318 | "the work tree to HEAD.\n" | |
12319 | "\n" | |
12320 | "You can set the 'receive.denyCurrentBranch' configuration variable\n" | |
12321 | "to 'ignore' or 'warn' in the remote repository to allow pushing into\n" | |
12322 | "its current branch; however, this is not recommended unless you\n" | |
12323 | "arranged to update its work tree to match what you pushed in some\n" | |
12324 | "other way.\n" | |
12325 | "\n" | |
12326 | "To squelch this message and still keep the default behaviour, set\n" | |
12327 | "'receive.denyCurrentBranch' configuration variable to 'refuse'." | |
12328 | msgstr "" | |
715fc761 | 12329 | "Por defecto, actualizar la rama actual en un repositorio no vacío\n" |
4b15eb22 CD |
12330 | "está denegado, porque eso haría el índice y el árbol de trabajo " |
12331 | "inconsistentes\n" | |
12332 | "con lo que ya se ha hecho push, y requeriría 'git reset --hard' para " | |
12333 | "arreglar\n" | |
fb0e25bc CD |
12334 | "el árbol de trabajo con HEAD.\n" |
12335 | "\n" | |
12336 | "Puede configurar la variable de configuración 'receive.denyCurrentBranch'\n" | |
12337 | "\"ignore\" o \"warn\" en el repositorio remoto para permitir\n" | |
12338 | "su rama actual; Sin embargo, esto no se recomienda a menos que usted\n" | |
4b15eb22 CD |
12339 | "se haya organizado para actualizar su árbol de trabajo para que coincida con " |
12340 | "lo que\n" | |
fb0e25bc CD |
12341 | "enviará con el push de otra manera.\n" |
12342 | "\n" | |
12343 | "Para suprimir este mensaje y mantener el comportamiento predeterminado,\n" | |
12344 | "configure 'receive.denyCurrentBranch' a 'refuse'." | |
12345 | ||
33ac3e89 | 12346 | #: builtin/receive-pack.c:861 |
fb0e25bc CD |
12347 | msgid "" |
12348 | "By default, deleting the current branch is denied, because the next\n" | |
12349 | "'git clone' won't result in any file checked out, causing confusion.\n" | |
12350 | "\n" | |
12351 | "You can set 'receive.denyDeleteCurrent' configuration variable to\n" | |
12352 | "'warn' or 'ignore' in the remote repository to allow deleting the\n" | |
12353 | "current branch, with or without a warning message.\n" | |
12354 | "\n" | |
12355 | "To squelch this message, you can set it to 'refuse'." | |
12356 | msgstr "" | |
715fc761 CDR |
12357 | "Por defecto, borrar la rama actual está prohibido, porque el siguiente\n" |
12358 | "'git clone' no resultara en ningún archivo revisado, causando confusión.\n" | |
fb0e25bc | 12359 | "\n" |
4b15eb22 CD |
12360 | "Se puede configurar la variable 'receive.denyDeleteCurrent' a 'warn' o " |
12361 | "'ignore'\n" | |
fb0e25bc CD |
12362 | "en el repositorio remoto para permitir borrar la rama actual.\n" |
12363 | "con o sin mensaje de advertencia.\n" | |
12364 | "\n" | |
12365 | "Para suprimir este mensaje, puede configurarlo en 'refuse'." | |
12366 | ||
33ac3e89 | 12367 | #: builtin/receive-pack.c:1934 |
fb0e25bc CD |
12368 | msgid "quiet" |
12369 | msgstr "tranquilo" | |
12370 | ||
33ac3e89 | 12371 | #: builtin/receive-pack.c:1948 |
fb0e25bc CD |
12372 | msgid "You must specify a directory." |
12373 | msgstr "Se tiene que especificar un directorio." | |
12374 | ||
33ac3e89 | 12375 | #: builtin/reflog.c:532 builtin/reflog.c:537 |
fb0e25bc CD |
12376 | #, c-format |
12377 | msgid "'%s' is not a valid timestamp" | |
12378 | msgstr "'%s' no es una marca de tiempo válida" | |
12379 | ||
12380 | #: builtin/remote.c:13 | |
12381 | msgid "git remote [-v | --verbose]" | |
12382 | msgstr "git remote [-v | --verbose]" | |
12383 | ||
12384 | #: builtin/remote.c:14 | |
4b15eb22 CD |
12385 | msgid "" |
12386 | "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--" | |
12387 | "mirror=<fetch|push>] <name> <url>" | |
12388 | msgstr "" | |
12389 | "git remote add [-t <rama>] [-m <master>] [-f] [--tags | --no-tags] [--" | |
12390 | "mirror=<fetch|push>] <nombre> <url>" | |
fb0e25bc CD |
12391 | |
12392 | #: builtin/remote.c:15 builtin/remote.c:35 | |
12393 | msgid "git remote rename <old> <new>" | |
12394 | msgstr "git remote rename <viejo> <nuevo>" | |
12395 | ||
12396 | #: builtin/remote.c:16 builtin/remote.c:40 | |
12397 | msgid "git remote remove <name>" | |
12398 | msgstr "git remote remove <nombre>" | |
12399 | ||
12400 | #: builtin/remote.c:17 builtin/remote.c:45 | |
12401 | msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)" | |
12402 | msgstr "git remote set-head <nombre> (-a | --auto | -d | --delete | <rama>)" | |
12403 | ||
12404 | #: builtin/remote.c:18 | |
12405 | msgid "git remote [-v | --verbose] show [-n] <name>" | |
12406 | msgstr "git remote [-v | --verbose] show [-n] <nombre>" | |
12407 | ||
12408 | #: builtin/remote.c:19 | |
12409 | msgid "git remote prune [-n | --dry-run] <name>" | |
12410 | msgstr "git remote prune [-n | --dry-run] <nombre>" | |
12411 | ||
12412 | #: builtin/remote.c:20 | |
4b15eb22 CD |
12413 | msgid "" |
12414 | "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]" | |
12415 | msgstr "" | |
12416 | "git remote [-v | --verbose] update [-p | --prune] [(<grupo> | <remoto>)...]" | |
fb0e25bc CD |
12417 | |
12418 | #: builtin/remote.c:21 | |
12419 | msgid "git remote set-branches [--add] <name> <branch>..." | |
12420 | msgstr "git remote set-branches [--add] <nombre> <rama>..." | |
12421 | ||
12422 | #: builtin/remote.c:22 builtin/remote.c:71 | |
12423 | msgid "git remote get-url [--push] [--all] <name>" | |
12424 | msgstr "git remote get-url [--push] [--all] <nombre>" | |
12425 | ||
12426 | #: builtin/remote.c:23 builtin/remote.c:76 | |
12427 | msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]" | |
12428 | msgstr "git remote set-url [--push] <nombre> <nuevo-url> [<viejo-url>]" | |
12429 | ||
12430 | #: builtin/remote.c:24 builtin/remote.c:77 | |
12431 | msgid "git remote set-url --add <name> <newurl>" | |
12432 | msgstr "git remote set-url --add <nombre> <nuevo-url>" | |
12433 | ||
12434 | #: builtin/remote.c:25 builtin/remote.c:78 | |
12435 | msgid "git remote set-url --delete <name> <url>" | |
12436 | msgstr "git remote set-url --delete <nombre> <url>" | |
12437 | ||
12438 | #: builtin/remote.c:30 | |
12439 | msgid "git remote add [<options>] <name> <url>" | |
12440 | msgstr "git remote add [<opciones>] <nombre> <url>" | |
12441 | ||
12442 | #: builtin/remote.c:50 | |
12443 | msgid "git remote set-branches <name> <branch>..." | |
12444 | msgstr "git remote set-branches <nombre> <rama>..." | |
12445 | ||
12446 | #: builtin/remote.c:51 | |
12447 | msgid "git remote set-branches --add <name> <branch>..." | |
12448 | msgstr "git remote set-branches --add <nombre> <rama>..." | |
12449 | ||
12450 | #: builtin/remote.c:56 | |
12451 | msgid "git remote show [<options>] <name>" | |
12452 | msgstr "git remote show [<opciones>] <nombre>" | |
12453 | ||
12454 | #: builtin/remote.c:61 | |
12455 | msgid "git remote prune [<options>] <name>" | |
12456 | msgstr "git remote prune [<opciones>] <nombre>" | |
12457 | ||
12458 | #: builtin/remote.c:66 | |
12459 | msgid "git remote update [<options>] [<group> | <remote>]..." | |
12460 | msgstr "git remote update [<opciones>] [<grupo> | <remoto>]..." | |
12461 | ||
12462 | #: builtin/remote.c:95 | |
12463 | #, c-format | |
12464 | msgid "Updating %s" | |
12465 | msgstr "Actualizando %s" | |
12466 | ||
12467 | #: builtin/remote.c:127 | |
12468 | msgid "" | |
12469 | "--mirror is dangerous and deprecated; please\n" | |
12470 | "\t use --mirror=fetch or --mirror=push instead" | |
12471 | msgstr "" | |
12472 | "Usar --mirror es peligroso y está desaprobado;\n" | |
12473 | "\t usa más bien --mirror=fetch o --mirror=push" | |
12474 | ||
12475 | #: builtin/remote.c:144 | |
12476 | #, c-format | |
12477 | msgid "unknown mirror argument: %s" | |
12478 | msgstr "argumento mirror desconocido: %s" | |
12479 | ||
12480 | #: builtin/remote.c:160 | |
12481 | msgid "fetch the remote branches" | |
12482 | msgstr "realizar fetch a las ramas remotas" | |
12483 | ||
12484 | #: builtin/remote.c:162 | |
12485 | msgid "import all tags and associated objects when fetching" | |
12486 | msgstr "importar todos los tags y objetos asociados cuando realiza el fetch" | |
12487 | ||
12488 | #: builtin/remote.c:165 | |
12489 | msgid "or do not fetch any tag at all (--no-tags)" | |
12490 | msgstr "o no realziar fetch a ningún tag (--no-tags)" | |
12491 | ||
12492 | #: builtin/remote.c:167 | |
12493 | msgid "branch(es) to track" | |
12494 | msgstr "rama(s) para rastrear" | |
12495 | ||
12496 | #: builtin/remote.c:168 | |
12497 | msgid "master branch" | |
12498 | msgstr "rama master" | |
12499 | ||
12500 | #: builtin/remote.c:169 | |
12501 | msgid "push|fetch" | |
12502 | msgstr "push|fetch" | |
12503 | ||
12504 | #: builtin/remote.c:170 | |
12505 | msgid "set up remote as a mirror to push to or fetch from" | |
4b15eb22 CD |
12506 | msgstr "" |
12507 | "configurar remote como mirror para realizar push o desde el cual realizar " | |
12508 | "fetch" | |
fb0e25bc CD |
12509 | |
12510 | #: builtin/remote.c:182 | |
12511 | msgid "specifying a master branch makes no sense with --mirror" | |
12512 | msgstr "especificar una rama master no tiene sentido con --mirror" | |
12513 | ||
12514 | #: builtin/remote.c:184 | |
12515 | msgid "specifying branches to track makes sense only with fetch mirrors" | |
12516 | msgstr "especificar ramas para rastrear solo tiene sentido con fetch mirrors" | |
12517 | ||
4b15eb22 | 12518 | #: builtin/remote.c:191 builtin/remote.c:631 |
fb0e25bc CD |
12519 | #, c-format |
12520 | msgid "remote %s already exists." | |
12521 | msgstr "remoto %s ya existe." | |
12522 | ||
4b15eb22 | 12523 | #: builtin/remote.c:195 builtin/remote.c:635 |
fb0e25bc CD |
12524 | #, c-format |
12525 | msgid "'%s' is not a valid remote name" | |
12526 | msgstr "'%s' no es un nombre remoto válido" | |
12527 | ||
12528 | #: builtin/remote.c:235 | |
12529 | #, c-format | |
12530 | msgid "Could not setup master '%s'" | |
12531 | msgstr "No se pudo configurar master '%s'" | |
12532 | ||
12533 | #: builtin/remote.c:337 | |
12534 | #, c-format | |
12535 | msgid "Could not get fetch map for refspec %s" | |
12536 | msgstr "No se pudo realizar el fetch al mapa para refspec %s" | |
12537 | ||
12538 | #: builtin/remote.c:438 builtin/remote.c:446 | |
12539 | msgid "(matching)" | |
12540 | msgstr "(concordando)" | |
12541 | ||
12542 | #: builtin/remote.c:450 | |
12543 | msgid "(delete)" | |
12544 | msgstr "(eliminar)" | |
12545 | ||
4b15eb22 | 12546 | #: builtin/remote.c:624 builtin/remote.c:759 builtin/remote.c:858 |
fb0e25bc CD |
12547 | #, c-format |
12548 | msgid "No such remote: %s" | |
12549 | msgstr "No existe el remoto: %s" | |
12550 | ||
4b15eb22 | 12551 | #: builtin/remote.c:641 |
fb0e25bc CD |
12552 | #, c-format |
12553 | msgid "Could not rename config section '%s' to '%s'" | |
12554 | msgstr "No se pudo renombrar la sección de configuración '%s' a '%s'" | |
12555 | ||
4b15eb22 | 12556 | #: builtin/remote.c:661 |
fb0e25bc CD |
12557 | #, c-format |
12558 | msgid "" | |
12559 | "Not updating non-default fetch refspec\n" | |
12560 | "\t%s\n" | |
12561 | "\tPlease update the configuration manually if necessary." | |
12562 | msgstr "" | |
12563 | "No se actualizan refspec de fetch no predeterminada\n" | |
12564 | "\t%s\n" | |
12565 | "\tPor favor actualice la configuración manualmente si es necesario." | |
12566 | ||
4b15eb22 | 12567 | #: builtin/remote.c:697 |
fb0e25bc CD |
12568 | #, c-format |
12569 | msgid "deleting '%s' failed" | |
12570 | msgstr "borrando '%s' falló" | |
12571 | ||
4b15eb22 | 12572 | #: builtin/remote.c:731 |
fb0e25bc CD |
12573 | #, c-format |
12574 | msgid "creating '%s' failed" | |
12575 | msgstr "creando '%s' falló" | |
12576 | ||
4b15eb22 | 12577 | #: builtin/remote.c:796 |
fb0e25bc CD |
12578 | msgid "" |
12579 | "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" | |
12580 | "to delete it, use:" | |
12581 | msgid_plural "" | |
12582 | "Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n" | |
12583 | "to delete them, use:" | |
12584 | msgstr[0] "" | |
12585 | "Nota: Una rama fuera de la jerarquía refs/remotes/ no fue removida;\n" | |
12586 | "para borrarla, use:" | |
12587 | msgstr[1] "" | |
4b15eb22 CD |
12588 | "Nota: Algunas ramas fuera de la jerarquía refs/remotes/ no fueron " |
12589 | "removidas;\n" | |
fb0e25bc CD |
12590 | "para borrarlas, use:" |
12591 | ||
4b15eb22 | 12592 | #: builtin/remote.c:810 |
fb0e25bc CD |
12593 | #, c-format |
12594 | msgid "Could not remove config section '%s'" | |
12595 | msgstr "No se pudo borrar la sección de configuración '%s'" | |
12596 | ||
4b15eb22 | 12597 | #: builtin/remote.c:911 |
fb0e25bc CD |
12598 | #, c-format |
12599 | msgid " new (next fetch will store in remotes/%s)" | |
12600 | msgstr " nuevo (siguiente fetch se guardará en remotes/%s)" | |
12601 | ||
4b15eb22 | 12602 | #: builtin/remote.c:914 |
fb0e25bc CD |
12603 | msgid " tracked" |
12604 | msgstr " rastreada" | |
12605 | ||
4b15eb22 | 12606 | #: builtin/remote.c:916 |
fb0e25bc CD |
12607 | msgid " stale (use 'git remote prune' to remove)" |
12608 | msgstr " viejo ( use 'git remote prune' para remover)" | |
12609 | ||
4b15eb22 | 12610 | #: builtin/remote.c:918 |
fb0e25bc CD |
12611 | msgid " ???" |
12612 | msgstr " ???" | |
12613 | ||
4b15eb22 | 12614 | #: builtin/remote.c:959 |
fb0e25bc CD |
12615 | #, c-format |
12616 | msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch" | |
12617 | msgstr "invalido branch.%s.merge; no se puede rebasar en > 1 rama" | |
12618 | ||
4b15eb22 | 12619 | #: builtin/remote.c:967 |
fb0e25bc CD |
12620 | #, c-format |
12621 | msgid "rebases interactively onto remote %s" | |
12622 | msgstr "rebasa interactivamente en remoto %s" | |
12623 | ||
4b15eb22 | 12624 | #: builtin/remote.c:968 |
fb0e25bc CD |
12625 | #, c-format |
12626 | msgid "rebases onto remote %s" | |
12627 | msgstr "rebasa sobre el remoto %s" | |
12628 | ||
4b15eb22 | 12629 | #: builtin/remote.c:971 |
fb0e25bc CD |
12630 | #, c-format |
12631 | msgid " merges with remote %s" | |
12632 | msgstr " se fusiona con remoto %s" | |
12633 | ||
4b15eb22 | 12634 | #: builtin/remote.c:974 |
fb0e25bc CD |
12635 | #, c-format |
12636 | msgid "merges with remote %s" | |
12637 | msgstr "fusiona con remoto %s" | |
12638 | ||
4b15eb22 | 12639 | #: builtin/remote.c:977 |
fb0e25bc CD |
12640 | #, c-format |
12641 | msgid "%-*s and with remote %s\n" | |
12642 | msgstr "%-*s y con el remoto %s\n" | |
12643 | ||
4b15eb22 | 12644 | #: builtin/remote.c:1020 |
fb0e25bc CD |
12645 | msgid "create" |
12646 | msgstr "crear" | |
12647 | ||
4b15eb22 | 12648 | #: builtin/remote.c:1023 |
fb0e25bc CD |
12649 | msgid "delete" |
12650 | msgstr "borrar" | |
12651 | ||
4b15eb22 | 12652 | #: builtin/remote.c:1027 |
fb0e25bc CD |
12653 | msgid "up to date" |
12654 | msgstr "actualizado" | |
12655 | ||
4b15eb22 | 12656 | #: builtin/remote.c:1030 |
fb0e25bc CD |
12657 | msgid "fast-forwardable" |
12658 | msgstr "puede realizar fast-forward" | |
12659 | ||
4b15eb22 | 12660 | #: builtin/remote.c:1033 |
fb0e25bc CD |
12661 | msgid "local out of date" |
12662 | msgstr "desactualizado local" | |
12663 | ||
4b15eb22 | 12664 | #: builtin/remote.c:1040 |
fb0e25bc CD |
12665 | #, c-format |
12666 | msgid " %-*s forces to %-*s (%s)" | |
12667 | msgstr " %-*s fuerza a %-*s (%s)" | |
12668 | ||
4b15eb22 | 12669 | #: builtin/remote.c:1043 |
fb0e25bc CD |
12670 | #, c-format |
12671 | msgid " %-*s pushes to %-*s (%s)" | |
12672 | msgstr " %-*s publica a %-*s (%s)" | |
12673 | ||
4b15eb22 | 12674 | #: builtin/remote.c:1047 |
fb0e25bc CD |
12675 | #, c-format |
12676 | msgid " %-*s forces to %s" | |
12677 | msgstr " %-*s fuerza a %s" | |
12678 | ||
4b15eb22 | 12679 | #: builtin/remote.c:1050 |
fb0e25bc CD |
12680 | #, c-format |
12681 | msgid " %-*s pushes to %s" | |
12682 | msgstr " %-*s publica a %s" | |
12683 | ||
4b15eb22 | 12684 | #: builtin/remote.c:1118 |
fb0e25bc CD |
12685 | msgid "do not query remotes" |
12686 | msgstr "no consultar remotos" | |
12687 | ||
4b15eb22 | 12688 | #: builtin/remote.c:1145 |
fb0e25bc CD |
12689 | #, c-format |
12690 | msgid "* remote %s" | |
12691 | msgstr "* remoto %s" | |
12692 | ||
4b15eb22 | 12693 | #: builtin/remote.c:1146 |
fb0e25bc CD |
12694 | #, c-format |
12695 | msgid " Fetch URL: %s" | |
12696 | msgstr " URL para obtener: %s" | |
12697 | ||
4b15eb22 | 12698 | #: builtin/remote.c:1147 builtin/remote.c:1163 builtin/remote.c:1302 |
fb0e25bc CD |
12699 | msgid "(no URL)" |
12700 | msgstr "(sin URL)" | |
12701 | ||
12702 | #. TRANSLATORS: the colon ':' should align | |
12703 | #. with the one in " Fetch URL: %s" | |
12704 | #. translation. | |
4b15eb22 CD |
12705 | #. |
12706 | #: builtin/remote.c:1161 builtin/remote.c:1163 | |
fb0e25bc CD |
12707 | #, c-format |
12708 | msgid " Push URL: %s" | |
12709 | msgstr " URL para publicar: %s" | |
12710 | ||
4b15eb22 | 12711 | #: builtin/remote.c:1165 builtin/remote.c:1167 builtin/remote.c:1169 |
fb0e25bc CD |
12712 | #, c-format |
12713 | msgid " HEAD branch: %s" | |
12714 | msgstr " Rama HEAD: %s" | |
12715 | ||
4b15eb22 | 12716 | #: builtin/remote.c:1165 |
fb0e25bc CD |
12717 | msgid "(not queried)" |
12718 | msgstr "(no consultado)" | |
12719 | ||
4b15eb22 | 12720 | #: builtin/remote.c:1167 |
fb0e25bc CD |
12721 | msgid "(unknown)" |
12722 | msgstr "(desconocido)" | |
12723 | ||
4b15eb22 | 12724 | #: builtin/remote.c:1171 |
fb0e25bc | 12725 | #, c-format |
4b15eb22 CD |
12726 | msgid "" |
12727 | " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" | |
12728 | msgstr "" | |
12729 | " HEAD en rama ( HEAD remoto es ambiguo, puede ser uno de los siguientes):\n" | |
fb0e25bc | 12730 | |
4b15eb22 | 12731 | #: builtin/remote.c:1183 |
fb0e25bc CD |
12732 | #, c-format |
12733 | msgid " Remote branch:%s" | |
12734 | msgid_plural " Remote branches:%s" | |
12735 | msgstr[0] " Rama remota:%s" | |
12736 | msgstr[1] " Ramas remotas:%s" | |
12737 | ||
4b15eb22 | 12738 | #: builtin/remote.c:1186 builtin/remote.c:1212 |
fb0e25bc CD |
12739 | msgid " (status not queried)" |
12740 | msgstr " (estado no consultado)" | |
12741 | ||
4b15eb22 | 12742 | #: builtin/remote.c:1195 |
fb0e25bc CD |
12743 | msgid " Local branch configured for 'git pull':" |
12744 | msgid_plural " Local branches configured for 'git pull':" | |
12745 | msgstr[0] " Rama local configurada para 'git pull':" | |
12746 | msgstr[1] " Ramas locales configuradas para 'git pull':" | |
12747 | ||
4b15eb22 | 12748 | #: builtin/remote.c:1203 |
fb0e25bc CD |
12749 | msgid " Local refs will be mirrored by 'git push'" |
12750 | msgstr " Las referencias locales serán reflejadas por 'git push'" | |
12751 | ||
4b15eb22 | 12752 | #: builtin/remote.c:1209 |
fb0e25bc CD |
12753 | #, c-format |
12754 | msgid " Local ref configured for 'git push'%s:" | |
12755 | msgid_plural " Local refs configured for 'git push'%s:" | |
12756 | msgstr[0] " Referencia local configurada para 'git push'%s:" | |
12757 | msgstr[1] " Referencias locales configuradas para 'git push'%s:" | |
12758 | ||
4b15eb22 | 12759 | #: builtin/remote.c:1230 |
fb0e25bc CD |
12760 | msgid "set refs/remotes/<name>/HEAD according to remote" |
12761 | msgstr "configurar refs/remotes/<nombre>/HEAD de acuerdo al remoto" | |
12762 | ||
4b15eb22 | 12763 | #: builtin/remote.c:1232 |
fb0e25bc CD |
12764 | msgid "delete refs/remotes/<name>/HEAD" |
12765 | msgstr "borrar refs/remotos/<nombre>/HEAD" | |
12766 | ||
4b15eb22 | 12767 | #: builtin/remote.c:1247 |
fb0e25bc CD |
12768 | msgid "Cannot determine remote HEAD" |
12769 | msgstr "No se puede determinar el HEAD remoto" | |
12770 | ||
4b15eb22 | 12771 | #: builtin/remote.c:1249 |
fb0e25bc CD |
12772 | msgid "Multiple remote HEAD branches. Please choose one explicitly with:" |
12773 | msgstr "Múltiples ramas HEAD remotas. Por favor escoja una explícitamente con:" | |
12774 | ||
4b15eb22 | 12775 | #: builtin/remote.c:1259 |
fb0e25bc CD |
12776 | #, c-format |
12777 | msgid "Could not delete %s" | |
12778 | msgstr "No se pudo borrar %s" | |
12779 | ||
4b15eb22 | 12780 | #: builtin/remote.c:1267 |
fb0e25bc CD |
12781 | #, c-format |
12782 | msgid "Not a valid ref: %s" | |
12783 | msgstr "No es un ref válido: %s" | |
12784 | ||
4b15eb22 | 12785 | #: builtin/remote.c:1269 |
fb0e25bc CD |
12786 | #, c-format |
12787 | msgid "Could not setup %s" | |
12788 | msgstr "No se pudo configurar %s" | |
12789 | ||
4b15eb22 | 12790 | #: builtin/remote.c:1287 |
fb0e25bc CD |
12791 | #, c-format |
12792 | msgid " %s will become dangling!" | |
12793 | msgstr " %s será colgado!" | |
12794 | ||
4b15eb22 | 12795 | #: builtin/remote.c:1288 |
fb0e25bc CD |
12796 | #, c-format |
12797 | msgid " %s has become dangling!" | |
12798 | msgstr " %s ha sido colgado!" | |
12799 | ||
4b15eb22 | 12800 | #: builtin/remote.c:1298 |
fb0e25bc CD |
12801 | #, c-format |
12802 | msgid "Pruning %s" | |
12803 | msgstr "Recortando %s" | |
12804 | ||
4b15eb22 | 12805 | #: builtin/remote.c:1299 |
fb0e25bc CD |
12806 | #, c-format |
12807 | msgid "URL: %s" | |
12808 | msgstr "URL: %s" | |
12809 | ||
4b15eb22 | 12810 | #: builtin/remote.c:1315 |
fb0e25bc CD |
12811 | #, c-format |
12812 | msgid " * [would prune] %s" | |
12813 | msgstr " * [ejecutará prune] %s" | |
12814 | ||
4b15eb22 | 12815 | #: builtin/remote.c:1318 |
fb0e25bc CD |
12816 | #, c-format |
12817 | msgid " * [pruned] %s" | |
12818 | msgstr " * [prune realizado] %s" | |
12819 | ||
4b15eb22 | 12820 | #: builtin/remote.c:1363 |
fb0e25bc CD |
12821 | msgid "prune remotes after fetching" |
12822 | msgstr "recortar remotos tras realizar fetch" | |
12823 | ||
4b15eb22 | 12824 | #: builtin/remote.c:1426 builtin/remote.c:1480 builtin/remote.c:1548 |
fb0e25bc CD |
12825 | #, c-format |
12826 | msgid "No such remote '%s'" | |
12827 | msgstr "No existe el remoto '%s'" | |
12828 | ||
4b15eb22 | 12829 | #: builtin/remote.c:1442 |
fb0e25bc CD |
12830 | msgid "add branch" |
12831 | msgstr "agregar rama" | |
12832 | ||
4b15eb22 | 12833 | #: builtin/remote.c:1449 |
fb0e25bc CD |
12834 | msgid "no remote specified" |
12835 | msgstr "no hay remotos especificados" | |
12836 | ||
4b15eb22 | 12837 | #: builtin/remote.c:1466 |
fb0e25bc CD |
12838 | msgid "query push URLs rather than fetch URLs" |
12839 | msgstr "consultar URLs de push en lugar de URLs de fetch" | |
12840 | ||
4b15eb22 | 12841 | #: builtin/remote.c:1468 |
fb0e25bc CD |
12842 | msgid "return all URLs" |
12843 | msgstr "retornar todos los URLs" | |
12844 | ||
4b15eb22 | 12845 | #: builtin/remote.c:1496 |
fb0e25bc CD |
12846 | #, c-format |
12847 | msgid "no URLs configured for remote '%s'" | |
12848 | msgstr "no hay URLs configurados para remoto '%s'" | |
12849 | ||
4b15eb22 | 12850 | #: builtin/remote.c:1522 |
fb0e25bc CD |
12851 | msgid "manipulate push URLs" |
12852 | msgstr "manipular URLs de push" | |
12853 | ||
4b15eb22 | 12854 | #: builtin/remote.c:1524 |
fb0e25bc CD |
12855 | msgid "add URL" |
12856 | msgstr "agregar URL" | |
12857 | ||
4b15eb22 | 12858 | #: builtin/remote.c:1526 |
fb0e25bc CD |
12859 | msgid "delete URLs" |
12860 | msgstr "borrar URLs" | |
12861 | ||
4b15eb22 | 12862 | #: builtin/remote.c:1533 |
fb0e25bc CD |
12863 | msgid "--add --delete doesn't make sense" |
12864 | msgstr "--add --delete no tiene sentido" | |
12865 | ||
4b15eb22 | 12866 | #: builtin/remote.c:1572 |
fb0e25bc CD |
12867 | #, c-format |
12868 | msgid "Invalid old URL pattern: %s" | |
12869 | msgstr "Patrón de URL viejo inválido: %s" | |
12870 | ||
4b15eb22 | 12871 | #: builtin/remote.c:1580 |
fb0e25bc CD |
12872 | #, c-format |
12873 | msgid "No such URL found: %s" | |
12874 | msgstr "No se encontró URL: %s" | |
12875 | ||
4b15eb22 | 12876 | #: builtin/remote.c:1582 |
fb0e25bc CD |
12877 | msgid "Will not delete all non-push URLs" |
12878 | msgstr "No borrará todos los URLs de no-push" | |
12879 | ||
4b15eb22 | 12880 | #: builtin/remote.c:1598 |
fb0e25bc CD |
12881 | msgid "be verbose; must be placed before a subcommand" |
12882 | msgstr "ser verboso; tiene que ser agregado antes de un subcomando" | |
12883 | ||
4b15eb22 | 12884 | #: builtin/remote.c:1629 |
fb0e25bc CD |
12885 | #, c-format |
12886 | msgid "Unknown subcommand: %s" | |
12887 | msgstr "Sub-comando desconocido: %s" | |
12888 | ||
12889 | #: builtin/repack.c:18 | |
12890 | msgid "git repack [<options>]" | |
12891 | msgstr "git repack [<opciones>]" | |
12892 | ||
12893 | #: builtin/repack.c:23 | |
12894 | msgid "" | |
12895 | "Incremental repacks are incompatible with bitmap indexes. Use\n" | |
12896 | "--no-write-bitmap-index or disable the pack.writebitmaps configuration." | |
12897 | msgstr "" | |
12898 | "Re empaquetados incrementales son incompatibles con índices bitmap. Use \n" | |
12899 | "--no-write-bitmap-index o deshabilite la configuración pack.writebitmaps." | |
12900 | ||
33ac3e89 | 12901 | #: builtin/repack.c:170 |
fb0e25bc CD |
12902 | msgid "pack everything in a single pack" |
12903 | msgstr "empaquetar todo en un único paquete" | |
12904 | ||
33ac3e89 | 12905 | #: builtin/repack.c:172 |
fb0e25bc CD |
12906 | msgid "same as -a, and turn unreachable objects loose" |
12907 | msgstr "lo mismo que -a, y pierde objetos inaccesibles" | |
12908 | ||
33ac3e89 | 12909 | #: builtin/repack.c:175 |
fb0e25bc CD |
12910 | msgid "remove redundant packs, and run git-prune-packed" |
12911 | msgstr "remover paquetes redundantes, y ejecutar git-prune-packed" | |
12912 | ||
33ac3e89 | 12913 | #: builtin/repack.c:177 |
fb0e25bc CD |
12914 | msgid "pass --no-reuse-delta to git-pack-objects" |
12915 | msgstr "pasar --no-reuse-delta a git-pack-objects" | |
12916 | ||
33ac3e89 | 12917 | #: builtin/repack.c:179 |
fb0e25bc CD |
12918 | msgid "pass --no-reuse-object to git-pack-objects" |
12919 | msgstr "pasar --no-reuse-object a git-pack-objects" | |
12920 | ||
33ac3e89 | 12921 | #: builtin/repack.c:181 |
fb0e25bc CD |
12922 | msgid "do not run git-update-server-info" |
12923 | msgstr "no ejecutar git-update-server-info" | |
12924 | ||
33ac3e89 | 12925 | #: builtin/repack.c:184 |
fb0e25bc CD |
12926 | msgid "pass --local to git-pack-objects" |
12927 | msgstr "pasar --local a git-pack-objects" | |
12928 | ||
33ac3e89 | 12929 | #: builtin/repack.c:186 |
fb0e25bc CD |
12930 | msgid "write bitmap index" |
12931 | msgstr "escribir un índice de bitmap" | |
12932 | ||
33ac3e89 | 12933 | #: builtin/repack.c:187 |
fb0e25bc CD |
12934 | msgid "approxidate" |
12935 | msgstr "aproxime" | |
12936 | ||
33ac3e89 | 12937 | #: builtin/repack.c:188 |
fb0e25bc CD |
12938 | msgid "with -A, do not loosen objects older than this" |
12939 | msgstr "con -A, no perder objetos más antiguos que este" | |
12940 | ||
33ac3e89 | 12941 | #: builtin/repack.c:190 |
fb0e25bc | 12942 | msgid "with -a, repack unreachable objects" |
33ac3e89 | 12943 | msgstr "con -a, re empaquetar objetos inalcanzables" |
fb0e25bc | 12944 | |
33ac3e89 | 12945 | #: builtin/repack.c:192 |
fb0e25bc CD |
12946 | msgid "size of the window used for delta compression" |
12947 | msgstr "tamaño de la ventana usado para la compresión delta" | |
12948 | ||
33ac3e89 | 12949 | #: builtin/repack.c:193 builtin/repack.c:199 |
fb0e25bc CD |
12950 | msgid "bytes" |
12951 | msgstr "bytes" | |
12952 | ||
33ac3e89 | 12953 | #: builtin/repack.c:194 |
fb0e25bc | 12954 | msgid "same as the above, but limit memory size instead of entries count" |
4b15eb22 CD |
12955 | msgstr "" |
12956 | "lo mismo que arriba, pero limita el tamaño de memoria en lugar de contar " | |
12957 | "entradas" | |
fb0e25bc | 12958 | |
33ac3e89 | 12959 | #: builtin/repack.c:196 |
fb0e25bc CD |
12960 | msgid "limits the maximum delta depth" |
12961 | msgstr "limita la profundidad máxima del delta" | |
12962 | ||
33ac3e89 | 12963 | #: builtin/repack.c:198 |
fb0e25bc CD |
12964 | msgid "limits the maximum number of threads" |
12965 | msgstr "limita el número máximo de hilos" | |
12966 | ||
33ac3e89 | 12967 | #: builtin/repack.c:200 |
fb0e25bc CD |
12968 | msgid "maximum size of each packfile" |
12969 | msgstr "tamaño máximo de cada paquete" | |
12970 | ||
33ac3e89 | 12971 | #: builtin/repack.c:202 |
fb0e25bc CD |
12972 | msgid "repack objects in packs marked with .keep" |
12973 | msgstr "re-empaquetar objetos en paquetes marcados con .keep" | |
12974 | ||
33ac3e89 | 12975 | #: builtin/repack.c:212 |
fb0e25bc CD |
12976 | msgid "cannot delete packs in a precious-objects repo" |
12977 | msgstr "no se pueden borrar paquetes en un repositorio de objetos-preciosos" | |
12978 | ||
33ac3e89 | 12979 | #: builtin/repack.c:216 |
fb0e25bc CD |
12980 | msgid "--keep-unreachable and -A are incompatible" |
12981 | msgstr "--keep-unreachable y -A son incompatibles" | |
12982 | ||
33ac3e89 | 12983 | #: builtin/repack.c:410 builtin/worktree.c:148 |
fb0e25bc CD |
12984 | #, c-format |
12985 | msgid "failed to remove '%s'" | |
12986 | msgstr "falló al remover '%s'" | |
12987 | ||
12988 | #: builtin/replace.c:20 | |
12989 | msgid "git replace [-f] <object> <replacement>" | |
12990 | msgstr "git replace [-f] <objeto> <remplazo>" | |
12991 | ||
12992 | #: builtin/replace.c:21 | |
12993 | msgid "git replace [-f] --edit <object>" | |
12994 | msgstr "git replace [-f] --edit <objeto>" | |
12995 | ||
12996 | #: builtin/replace.c:22 | |
12997 | msgid "git replace [-f] --graft <commit> [<parent>...]" | |
12998 | msgstr "git replace [-f] --graft <commit> [<padre>...]" | |
12999 | ||
13000 | #: builtin/replace.c:23 | |
13001 | msgid "git replace -d <object>..." | |
13002 | msgstr "git replace -d <objeto>..." | |
13003 | ||
13004 | #: builtin/replace.c:24 | |
13005 | msgid "git replace [--format=<format>] [-l [<pattern>]]" | |
13006 | msgstr "git replace [--format=<formato>] [-l [<patrón>]]" | |
13007 | ||
13008 | #: builtin/replace.c:331 builtin/replace.c:369 builtin/replace.c:397 | |
13009 | #, c-format | |
13010 | msgid "Not a valid object name: '%s'" | |
13011 | msgstr "Nombre de objeto no válido: '%s'" | |
13012 | ||
13013 | #: builtin/replace.c:361 | |
13014 | #, c-format | |
13015 | msgid "bad mergetag in commit '%s'" | |
13016 | msgstr "mal mergetag en commit '%s'" | |
13017 | ||
13018 | #: builtin/replace.c:363 | |
13019 | #, c-format | |
13020 | msgid "malformed mergetag in commit '%s'" | |
13021 | msgstr "mergetag mal formado en commit '%s'" | |
13022 | ||
13023 | #: builtin/replace.c:374 | |
13024 | #, c-format | |
4b15eb22 CD |
13025 | msgid "" |
13026 | "original commit '%s' contains mergetag '%s' that is discarded; use --edit " | |
13027 | "instead of --graft" | |
13028 | msgstr "" | |
13029 | "commit original '%s' contiene un mergetag '%s' que es descartado; use --edit " | |
13030 | "en lugar de --graft" | |
fb0e25bc CD |
13031 | |
13032 | #: builtin/replace.c:407 | |
13033 | #, c-format | |
13034 | msgid "the original commit '%s' has a gpg signature." | |
13035 | msgstr "el commit original '%s' tiene una firma gpg." | |
13036 | ||
13037 | #: builtin/replace.c:408 | |
13038 | msgid "the signature will be removed in the replacement commit!" | |
13039 | msgstr "la firma será removida en el commit de reemplazo!" | |
13040 | ||
13041 | #: builtin/replace.c:414 | |
13042 | #, c-format | |
13043 | msgid "could not write replacement commit for: '%s'" | |
13044 | msgstr "no se pudo escribir el commit de reemplazo: '%s'" | |
13045 | ||
13046 | #: builtin/replace.c:438 | |
13047 | msgid "list replace refs" | |
33ac3e89 | 13048 | msgstr "listar replace refs" |
fb0e25bc CD |
13049 | |
13050 | #: builtin/replace.c:439 | |
13051 | msgid "delete replace refs" | |
13052 | msgstr "borrar replace refs" | |
13053 | ||
13054 | #: builtin/replace.c:440 | |
13055 | msgid "edit existing object" | |
13056 | msgstr "editar objeto existente" | |
13057 | ||
13058 | #: builtin/replace.c:441 | |
13059 | msgid "change a commit's parents" | |
13060 | msgstr "cambiar un padre de commit" | |
13061 | ||
13062 | #: builtin/replace.c:442 | |
13063 | msgid "replace the ref if it exists" | |
13064 | msgstr "reemplazar el ref si este existe" | |
13065 | ||
33ac3e89 | 13066 | #: builtin/replace.c:444 |
fb0e25bc CD |
13067 | msgid "do not pretty-print contents for --edit" |
13068 | msgstr "no se puede imprimir contenidos para --edit" | |
13069 | ||
33ac3e89 | 13070 | #: builtin/replace.c:445 |
fb0e25bc CD |
13071 | msgid "use this format" |
13072 | msgstr "usar este formato" | |
13073 | ||
13074 | #: builtin/rerere.c:13 | |
13075 | msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]" | |
13076 | msgstr "git rerere [clear | forget <ruta>... | status | remaining | diff | gc]" | |
13077 | ||
13078 | #: builtin/rerere.c:59 | |
13079 | msgid "register clean resolutions in index" | |
13080 | msgstr "registrar resoluciones limpias en el índice" | |
13081 | ||
13082 | #: builtin/reset.c:29 | |
4b15eb22 CD |
13083 | msgid "" |
13084 | "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]" | |
13085 | msgstr "" | |
13086 | "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]" | |
fb0e25bc CD |
13087 | |
13088 | #: builtin/reset.c:30 | |
13089 | msgid "git reset [-q] [<tree-ish>] [--] <paths>..." | |
715fc761 | 13090 | msgstr "git reset [-q] [<árbol-ismo>] [--] <rutas>..." |
fb0e25bc CD |
13091 | |
13092 | #: builtin/reset.c:31 | |
13093 | msgid "git reset --patch [<tree-ish>] [--] [<paths>...]" | |
715fc761 | 13094 | msgstr "git reset --patch [<árbol-ismo>] [--] [<rutas>...]" |
fb0e25bc CD |
13095 | |
13096 | #: builtin/reset.c:37 | |
13097 | msgid "mixed" | |
13098 | msgstr "mezclado" | |
13099 | ||
13100 | #: builtin/reset.c:37 | |
13101 | msgid "soft" | |
13102 | msgstr "suave" | |
13103 | ||
13104 | #: builtin/reset.c:37 | |
13105 | msgid "hard" | |
13106 | msgstr "duro" | |
13107 | ||
13108 | #: builtin/reset.c:37 | |
13109 | msgid "merge" | |
13110 | msgstr "fusionar" | |
13111 | ||
13112 | #: builtin/reset.c:37 | |
13113 | msgid "keep" | |
13114 | msgstr "mantener" | |
13115 | ||
4b15eb22 | 13116 | #: builtin/reset.c:78 |
fb0e25bc | 13117 | msgid "You do not have a valid HEAD." |
33ac3e89 | 13118 | msgstr "No hay un HEAD válido." |
fb0e25bc | 13119 | |
4b15eb22 | 13120 | #: builtin/reset.c:80 |
fb0e25bc | 13121 | msgid "Failed to find tree of HEAD." |
33ac3e89 | 13122 | msgstr "Falló al encontrar el HEAD del árbol." |
fb0e25bc | 13123 | |
4b15eb22 | 13124 | #: builtin/reset.c:86 |
fb0e25bc CD |
13125 | #, c-format |
13126 | msgid "Failed to find tree of %s." | |
13127 | msgstr "Falló al encontrar árbol de %s." | |
13128 | ||
33ac3e89 | 13129 | #: builtin/reset.c:111 |
fb0e25bc CD |
13130 | #, c-format |
13131 | msgid "HEAD is now at %s" | |
13132 | msgstr "HEAD está ahora en %s" | |
13133 | ||
33ac3e89 | 13134 | #: builtin/reset.c:189 |
fb0e25bc CD |
13135 | #, c-format |
13136 | msgid "Cannot do a %s reset in the middle of a merge." | |
33ac3e89 | 13137 | msgstr "No se puede realziar un reset %s en medio de una fusión." |
fb0e25bc | 13138 | |
33ac3e89 | 13139 | #: builtin/reset.c:289 |
fb0e25bc CD |
13140 | msgid "be quiet, only report errors" |
13141 | msgstr "ser silencioso, solo reportar errores" | |
13142 | ||
33ac3e89 | 13143 | #: builtin/reset.c:291 |
fb0e25bc CD |
13144 | msgid "reset HEAD and index" |
13145 | msgstr "reiniciar HEAD e index" | |
13146 | ||
33ac3e89 | 13147 | #: builtin/reset.c:292 |
fb0e25bc CD |
13148 | msgid "reset only HEAD" |
13149 | msgstr "reiniciar solo HEAD" | |
13150 | ||
33ac3e89 | 13151 | #: builtin/reset.c:294 builtin/reset.c:296 |
fb0e25bc CD |
13152 | msgid "reset HEAD, index and working tree" |
13153 | msgstr "reiniciar HEAD, índice y árbol de trabajo" | |
13154 | ||
33ac3e89 | 13155 | #: builtin/reset.c:298 |
fb0e25bc CD |
13156 | msgid "reset HEAD but keep local changes" |
13157 | msgstr "reiniciar HEAD pero mantener cambios locales" | |
13158 | ||
33ac3e89 | 13159 | #: builtin/reset.c:304 |
fb0e25bc | 13160 | msgid "record only the fact that removed paths will be added later" |
4b15eb22 CD |
13161 | msgstr "" |
13162 | "grabar solo el hecho de que las rutas removidas serán agregadas después" | |
fb0e25bc | 13163 | |
33ac3e89 | 13164 | #: builtin/reset.c:321 |
fb0e25bc CD |
13165 | #, c-format |
13166 | msgid "Failed to resolve '%s' as a valid revision." | |
13167 | msgstr "Falló al resolver '%s' como una revisión válida." | |
13168 | ||
33ac3e89 | 13169 | #: builtin/reset.c:329 |
fb0e25bc CD |
13170 | #, c-format |
13171 | msgid "Failed to resolve '%s' as a valid tree." | |
13172 | msgstr "Falló al resolver '%s' como un árbol válido." | |
13173 | ||
33ac3e89 | 13174 | #: builtin/reset.c:338 |
fb0e25bc CD |
13175 | msgid "--patch is incompatible with --{hard,mixed,soft}" |
13176 | msgstr "--patch es incompatible con --{hard,mixed,soft}" | |
13177 | ||
33ac3e89 | 13178 | #: builtin/reset.c:347 |
fb0e25bc | 13179 | msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." |
4b15eb22 CD |
13180 | msgstr "" |
13181 | "--mixed con rutas ha sido deprecado; use 'git reset -- <rutas>' en cambio." | |
fb0e25bc | 13182 | |
33ac3e89 | 13183 | #: builtin/reset.c:349 |
fb0e25bc CD |
13184 | #, c-format |
13185 | msgid "Cannot do %s reset with paths." | |
13186 | msgstr "No se puede hacer un reset %s con rutas." | |
13187 | ||
33ac3e89 | 13188 | #: builtin/reset.c:359 |
fb0e25bc CD |
13189 | #, c-format |
13190 | msgid "%s reset is not allowed in a bare repository" | |
13191 | msgstr "%s reset no está permitido en un repositorio vacío" | |
13192 | ||
33ac3e89 | 13193 | #: builtin/reset.c:363 |
fb0e25bc CD |
13194 | msgid "-N can only be used with --mixed" |
13195 | msgstr "-N sólo puede ser usada con --mixed" | |
13196 | ||
33ac3e89 | 13197 | #: builtin/reset.c:380 |
fb0e25bc CD |
13198 | msgid "Unstaged changes after reset:" |
13199 | msgstr "Cambios fuera del área de stage tras el reset:" | |
13200 | ||
33ac3e89 | 13201 | #: builtin/reset.c:386 |
fb0e25bc CD |
13202 | #, c-format |
13203 | msgid "Could not reset index file to revision '%s'." | |
13204 | msgstr "No se puede reiniciar el índice a la revisión '%s'." | |
13205 | ||
33ac3e89 | 13206 | #: builtin/reset.c:390 |
fb0e25bc CD |
13207 | msgid "Could not write new index file." |
13208 | msgstr "No se puede escribir un nuevo archivo índice." | |
13209 | ||
33ac3e89 CDR |
13210 | #: builtin/rev-list.c:397 |
13211 | msgid "cannot combine --exclude-promisor-objects and --missing" | |
13212 | msgstr "no se puede combinar --exclude-promisor-objects y --missing" | |
13213 | ||
13214 | #: builtin/rev-list.c:455 | |
f8038f5b CDR |
13215 | msgid "object filtering requires --objects" |
13216 | msgstr "filtrado de objetos requiere --objects" | |
13217 | ||
33ac3e89 | 13218 | #: builtin/rev-list.c:458 |
f8038f5b CDR |
13219 | #, c-format |
13220 | msgid "invalid sparse value '%s'" | |
13221 | msgstr "valor disperso inválido: '%s'" | |
13222 | ||
33ac3e89 | 13223 | #: builtin/rev-list.c:499 |
fb0e25bc CD |
13224 | msgid "rev-list does not support display of notes" |
13225 | msgstr "rev-list no soporta mostrar notas" | |
13226 | ||
33ac3e89 | 13227 | #: builtin/rev-list.c:502 |
f8038f5b CDR |
13228 | msgid "cannot combine --use-bitmap-index with object filtering" |
13229 | msgstr "no se puede combinar --use-bitmap-index con objetos de filtrado" | |
13230 | ||
4b15eb22 | 13231 | #: builtin/rev-parse.c:402 |
fb0e25bc CD |
13232 | msgid "git rev-parse --parseopt [<options>] -- [<args>...]" |
13233 | msgstr "git rev-parse --parseopt [<opciones>] -- [<args>...]" | |
13234 | ||
4b15eb22 | 13235 | #: builtin/rev-parse.c:407 |
fb0e25bc CD |
13236 | msgid "keep the `--` passed as an arg" |
13237 | msgstr "mantener el `--` pasado como un arg" | |
13238 | ||
4b15eb22 | 13239 | #: builtin/rev-parse.c:409 |
fb0e25bc CD |
13240 | msgid "stop parsing after the first non-option argument" |
13241 | msgstr "detener análisis tras el primer argumento que no es opción" | |
13242 | ||
4b15eb22 | 13243 | #: builtin/rev-parse.c:412 |
fb0e25bc CD |
13244 | msgid "output in stuck long form" |
13245 | msgstr "salida en formulario largo de atasco" | |
13246 | ||
4b15eb22 | 13247 | #: builtin/rev-parse.c:545 |
fb0e25bc CD |
13248 | msgid "" |
13249 | "git rev-parse --parseopt [<options>] -- [<args>...]\n" | |
13250 | " or: git rev-parse --sq-quote [<arg>...]\n" | |
13251 | " or: git rev-parse [<options>] [<arg>...]\n" | |
13252 | "\n" | |
13253 | "Run \"git rev-parse --parseopt -h\" for more information on the first usage." | |
13254 | msgstr "" | |
13255 | "git rev-parse --parseopt [<opciones>] -- [<args>...]\n" | |
13256 | " or: git rev-parse --sq-quote [<arg>...]\n" | |
13257 | " or: git rev-parse [<opciones>] [<arg>...]\n" | |
13258 | "\n" | |
4b15eb22 CD |
13259 | "Ejecute \"git rev-parse --parseopt -h\" para más información sobre el primer " |
13260 | "uso." | |
fb0e25bc CD |
13261 | |
13262 | #: builtin/revert.c:23 | |
13263 | msgid "git revert [<options>] <commit-ish>..." | |
13264 | msgstr "git revert [<opciones>] <commit-ish>..." | |
13265 | ||
13266 | #: builtin/revert.c:24 | |
13267 | msgid "git revert <subcommand>" | |
13268 | msgstr "git revert <subcomando>" | |
13269 | ||
13270 | #: builtin/revert.c:29 | |
13271 | msgid "git cherry-pick [<options>] <commit-ish>..." | |
13272 | msgstr "git cherry-pick [<opciones>] <commit-ish>..." | |
13273 | ||
13274 | #: builtin/revert.c:30 | |
13275 | msgid "git cherry-pick <subcommand>" | |
13276 | msgstr "git cherry-pick <subcomando>" | |
13277 | ||
13278 | #: builtin/revert.c:90 | |
13279 | #, c-format | |
13280 | msgid "%s: %s cannot be used with %s" | |
13281 | msgstr "%s: %s no puede ser usado con %s" | |
13282 | ||
13283 | #: builtin/revert.c:99 | |
13284 | msgid "end revert or cherry-pick sequence" | |
13285 | msgstr "finalizar secuencia revert o cherry-pick" | |
13286 | ||
13287 | #: builtin/revert.c:100 | |
13288 | msgid "resume revert or cherry-pick sequence" | |
13289 | msgstr "resumir secuencia revert o cherry-pick" | |
13290 | ||
13291 | #: builtin/revert.c:101 | |
13292 | msgid "cancel revert or cherry-pick sequence" | |
13293 | msgstr "cancelar secuencia revert o cherry-pick" | |
13294 | ||
13295 | #: builtin/revert.c:102 | |
13296 | msgid "don't automatically commit" | |
13297 | msgstr "no realizar commit de forma automática" | |
13298 | ||
13299 | #: builtin/revert.c:103 | |
13300 | msgid "edit the commit message" | |
13301 | msgstr "editar el mensaje de commit" | |
13302 | ||
13303 | #: builtin/revert.c:106 | |
13304 | msgid "parent-number" | |
13305 | msgstr "número-de-padre" | |
13306 | ||
13307 | #: builtin/revert.c:107 | |
13308 | msgid "select mainline parent" | |
13309 | msgstr "seleccionar el padre principal" | |
13310 | ||
13311 | #: builtin/revert.c:109 | |
13312 | msgid "merge strategy" | |
13313 | msgstr "estrategia de fusión" | |
13314 | ||
13315 | #: builtin/revert.c:110 | |
13316 | msgid "option" | |
13317 | msgstr "opción" | |
13318 | ||
13319 | #: builtin/revert.c:111 | |
13320 | msgid "option for merge strategy" | |
13321 | msgstr "opción para estrategia de fusión" | |
13322 | ||
13323 | #: builtin/revert.c:120 | |
13324 | msgid "append commit name" | |
13325 | msgstr "adjuntar el nombre del commit" | |
13326 | ||
13327 | #: builtin/revert.c:122 | |
13328 | msgid "preserve initially empty commits" | |
13329 | msgstr "preservar commits iniciales vacíos" | |
13330 | ||
fb0e25bc CD |
13331 | #: builtin/revert.c:124 |
13332 | msgid "keep redundant, empty commits" | |
13333 | msgstr "mantener commits redundantes, vacíos" | |
13334 | ||
4b15eb22 | 13335 | #: builtin/revert.c:214 |
fb0e25bc CD |
13336 | msgid "revert failed" |
13337 | msgstr "falló al revertir" | |
13338 | ||
4b15eb22 | 13339 | #: builtin/revert.c:227 |
fb0e25bc CD |
13340 | msgid "cherry-pick failed" |
13341 | msgstr "cherry-pick falló" | |
13342 | ||
13343 | #: builtin/rm.c:18 | |
13344 | msgid "git rm [<options>] [--] <file>..." | |
13345 | msgstr "git rm [<opciones>] [--] <archivo>..." | |
13346 | ||
13347 | #: builtin/rm.c:206 | |
13348 | msgid "" | |
13349 | "the following file has staged content different from both the\n" | |
13350 | "file and the HEAD:" | |
13351 | msgid_plural "" | |
13352 | "the following files have staged content different from both the\n" | |
13353 | "file and the HEAD:" | |
13354 | msgstr[0] "" | |
33ac3e89 | 13355 | "el siguiente archivo tiene contenido en stage diferente al archivo\n" |
fb0e25bc CD |
13356 | "y a HEAD:" |
13357 | msgstr[1] "" | |
13358 | "los siguientes archivos tienen contenido diferente a los mismos\n" | |
13359 | "y a HEAD:" | |
13360 | ||
13361 | #: builtin/rm.c:211 | |
13362 | msgid "" | |
13363 | "\n" | |
13364 | "(use -f to force removal)" | |
13365 | msgstr "" | |
13366 | "\n" | |
13367 | "(usa -f para forzar su eliminación)" | |
13368 | ||
13369 | #: builtin/rm.c:215 | |
13370 | msgid "the following file has changes staged in the index:" | |
13371 | msgid_plural "the following files have changes staged in the index:" | |
13372 | msgstr[0] "el siguiente archivo tiene cambios en stage en el índice:" | |
13373 | msgstr[1] "los siguientes archivos tienen cambios en stage en el índice:" | |
13374 | ||
13375 | #: builtin/rm.c:219 builtin/rm.c:228 | |
13376 | msgid "" | |
13377 | "\n" | |
13378 | "(use --cached to keep the file, or -f to force removal)" | |
13379 | msgstr "" | |
13380 | "\n" | |
13381 | "(usa --cached para conservar el archivo, o -f para forzar su eliminación)" | |
13382 | ||
13383 | #: builtin/rm.c:225 | |
13384 | msgid "the following file has local modifications:" | |
13385 | msgid_plural "the following files have local modifications:" | |
13386 | msgstr[0] "el siguiente archivo tiene modificaciones locales:" | |
13387 | msgstr[1] "los siguientes archivos tienen modificaciones locales:" | |
13388 | ||
13389 | #: builtin/rm.c:243 | |
13390 | msgid "do not list removed files" | |
13391 | msgstr "no listar archivos removidos" | |
13392 | ||
13393 | #: builtin/rm.c:244 | |
13394 | msgid "only remove from the index" | |
13395 | msgstr "solo remover del índice" | |
13396 | ||
13397 | #: builtin/rm.c:245 | |
13398 | msgid "override the up-to-date check" | |
13399 | msgstr "sobrescribir el check de actualizado" | |
13400 | ||
13401 | #: builtin/rm.c:246 | |
13402 | msgid "allow recursive removal" | |
13403 | msgstr "permitir remover de forma recursiva" | |
13404 | ||
13405 | #: builtin/rm.c:248 | |
13406 | msgid "exit with a zero status even if nothing matched" | |
715fc761 | 13407 | msgstr "salir con estado cero incluso si nada coincide" |
fb0e25bc | 13408 | |
4b15eb22 | 13409 | #: builtin/rm.c:307 |
fb0e25bc CD |
13410 | #, c-format |
13411 | msgid "not removing '%s' recursively without -r" | |
13412 | msgstr "no removiendo '%s' de manera recursiva sin -r" | |
13413 | ||
4b15eb22 | 13414 | #: builtin/rm.c:346 |
fb0e25bc CD |
13415 | #, c-format |
13416 | msgid "git rm: unable to remove %s" | |
13417 | msgstr "git rm: no es posible remover %s" | |
13418 | ||
4b15eb22 | 13419 | #: builtin/rm.c:369 |
fb0e25bc CD |
13420 | #, c-format |
13421 | msgid "could not remove '%s'" | |
13422 | msgstr "no se pudo remover '%s'" | |
13423 | ||
13424 | #: builtin/send-pack.c:19 | |
13425 | msgid "" | |
4b15eb22 CD |
13426 | "git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-" |
13427 | "receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> " | |
13428 | "[<ref>...]\n" | |
fb0e25bc CD |
13429 | " --all and explicit <ref> specification are mutually exclusive." |
13430 | msgstr "" | |
4b15eb22 CD |
13431 | "git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-" |
13432 | "receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> " | |
13433 | "[<ref>...]\n" | |
fb0e25bc CD |
13434 | " --all y especificaciones <ref> explícitas son mutuamente exclusivas." |
13435 | ||
13436 | #: builtin/send-pack.c:162 | |
13437 | msgid "remote name" | |
13438 | msgstr "nombre remoto" | |
13439 | ||
13440 | #: builtin/send-pack.c:176 | |
13441 | msgid "use stateless RPC protocol" | |
13442 | msgstr "usar protocolo RPC sin estado" | |
13443 | ||
13444 | #: builtin/send-pack.c:177 | |
13445 | msgid "read refs from stdin" | |
13446 | msgstr "leer refs de stdin" | |
13447 | ||
13448 | #: builtin/send-pack.c:178 | |
13449 | msgid "print status from remote helper" | |
13450 | msgstr "mostrar status del remote helper" | |
13451 | ||
13452 | #: builtin/shortlog.c:14 | |
13453 | msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]" | |
13454 | msgstr "git shortlog [<opciones>] [<rango-de-revisión>] [[--] [<ruta>...]]" | |
13455 | ||
4b15eb22 | 13456 | #: builtin/shortlog.c:263 |
fb0e25bc CD |
13457 | msgid "Group by committer rather than author" |
13458 | msgstr "Agrupar por committer en lugar de autor" | |
13459 | ||
4b15eb22 | 13460 | #: builtin/shortlog.c:265 |
fb0e25bc CD |
13461 | msgid "sort output according to the number of commits per author" |
13462 | msgstr "ordenar salida de acuerdo al número de commits por autor" | |
13463 | ||
4b15eb22 | 13464 | #: builtin/shortlog.c:267 |
fb0e25bc CD |
13465 | msgid "Suppress commit descriptions, only provides commit count" |
13466 | msgstr "Suprimir descripción de commits, solo proveer cuenta de commits" | |
13467 | ||
4b15eb22 | 13468 | #: builtin/shortlog.c:269 |
fb0e25bc CD |
13469 | msgid "Show the email address of each author" |
13470 | msgstr "Mostrar la dirección de correo de cada autor" | |
13471 | ||
4b15eb22 | 13472 | #: builtin/shortlog.c:270 |
fb0e25bc CD |
13473 | msgid "w[,i1[,i2]]" |
13474 | msgstr "w[,i1[,i2]]" | |
13475 | ||
4b15eb22 | 13476 | #: builtin/shortlog.c:271 |
fb0e25bc CD |
13477 | msgid "Linewrap output" |
13478 | msgstr "Salida de línea" | |
13479 | ||
13480 | #: builtin/show-branch.c:12 | |
13481 | msgid "" | |
13482 | "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n" | |
13483 | "\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n" | |
13484 | "\t\t[--more=<n> | --list | --independent | --merge-base]\n" | |
13485 | "\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]" | |
13486 | msgstr "" | |
13487 | "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n" | |
13488 | "\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n" | |
13489 | "\t\t[--more=<n> | --list | --independent | --merge-base]\n" | |
13490 | "\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]" | |
13491 | ||
13492 | #: builtin/show-branch.c:16 | |
13493 | msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]" | |
13494 | msgstr "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]" | |
13495 | ||
13496 | #: builtin/show-branch.c:376 | |
13497 | #, c-format | |
13498 | msgid "ignoring %s; cannot handle more than %d ref" | |
13499 | msgid_plural "ignoring %s; cannot handle more than %d refs" | |
13500 | msgstr[0] "ignorando %s; no se puede manejar más de %d ref" | |
13501 | msgstr[1] "ignorando %s; no se puede manejar más de %d refs" | |
13502 | ||
13503 | #: builtin/show-branch.c:530 | |
13504 | #, c-format | |
13505 | msgid "no matching refs with %s" | |
13506 | msgstr "no hay refs que concuerden con %s" | |
13507 | ||
13508 | #: builtin/show-branch.c:626 | |
13509 | msgid "show remote-tracking and local branches" | |
13510 | msgstr "mostrar ramas locales y de rastreo remoto" | |
13511 | ||
13512 | #: builtin/show-branch.c:628 | |
13513 | msgid "show remote-tracking branches" | |
13514 | msgstr "mostrar ramas de rastreo remoto" | |
13515 | ||
13516 | #: builtin/show-branch.c:630 | |
13517 | msgid "color '*!+-' corresponding to the branch" | |
13518 | msgstr "color '*!+-' correspondiendo a la rama" | |
13519 | ||
13520 | #: builtin/show-branch.c:632 | |
13521 | msgid "show <n> more commits after the common ancestor" | |
13522 | msgstr "mostrar <n> commits más tras encontrar el ancestro común" | |
13523 | ||
13524 | #: builtin/show-branch.c:634 | |
13525 | msgid "synonym to more=-1" | |
715fc761 | 13526 | msgstr "sinónimo de más=-1" |
fb0e25bc CD |
13527 | |
13528 | #: builtin/show-branch.c:635 | |
13529 | msgid "suppress naming strings" | |
13530 | msgstr "suprimir strings de nombre" | |
13531 | ||
13532 | #: builtin/show-branch.c:637 | |
13533 | msgid "include the current branch" | |
13534 | msgstr "incluir la rama actual" | |
13535 | ||
13536 | #: builtin/show-branch.c:639 | |
13537 | msgid "name commits with their object names" | |
13538 | msgstr "nombrar commits con sus nombres de objeto" | |
13539 | ||
13540 | #: builtin/show-branch.c:641 | |
13541 | msgid "show possible merge bases" | |
13542 | msgstr "mostrar bases de fusión posibles" | |
13543 | ||
13544 | #: builtin/show-branch.c:643 | |
13545 | msgid "show refs unreachable from any other ref" | |
13546 | msgstr "mostrar refs inalcanzables por ningún otro ref" | |
13547 | ||
13548 | #: builtin/show-branch.c:645 | |
13549 | msgid "show commits in topological order" | |
13550 | msgstr "mostrar commits en orden topológico" | |
13551 | ||
13552 | #: builtin/show-branch.c:648 | |
13553 | msgid "show only commits not on the first branch" | |
13554 | msgstr "mostrar solo commits que no están en la primera rama" | |
13555 | ||
13556 | #: builtin/show-branch.c:650 | |
13557 | msgid "show merges reachable from only one tip" | |
13558 | msgstr "mostrar fusiones alcanzables solo por una punta" | |
13559 | ||
13560 | #: builtin/show-branch.c:652 | |
13561 | msgid "topologically sort, maintaining date order where possible" | |
13562 | msgstr "orden topológico, manteniendo el orden de fechas donde sea posible" | |
13563 | ||
13564 | #: builtin/show-branch.c:655 | |
13565 | msgid "<n>[,<base>]" | |
13566 | msgstr "<n>[,<base>]" | |
13567 | ||
13568 | #: builtin/show-branch.c:656 | |
13569 | msgid "show <n> most recent ref-log entries starting at base" | |
13570 | msgstr "mostrar <n> entradas más recientes de ref-log comenzando desde la base" | |
13571 | ||
13572 | #: builtin/show-branch.c:690 | |
4b15eb22 CD |
13573 | msgid "" |
13574 | "--reflog is incompatible with --all, --remotes, --independent or --merge-base" | |
13575 | msgstr "" | |
13576 | "--reflog no es compatible con --all, --remotes, --independent o --merge-base" | |
fb0e25bc CD |
13577 | |
13578 | #: builtin/show-branch.c:714 | |
13579 | msgid "no branches given, and HEAD is not valid" | |
13580 | msgstr "no se dieron ramas, y el HEAD no es válido" | |
13581 | ||
13582 | #: builtin/show-branch.c:717 | |
13583 | msgid "--reflog option needs one branch name" | |
13584 | msgstr "opción --reflog necesita un nombre de rama" | |
13585 | ||
13586 | #: builtin/show-branch.c:720 | |
13587 | #, c-format | |
13588 | msgid "only %d entry can be shown at one time." | |
13589 | msgid_plural "only %d entries can be shown at one time." | |
13590 | msgstr[0] "solo %d entrada puede ser mostrada a la vez." | |
13591 | msgstr[1] "solo %d entradas pueden ser mostradas a la vez." | |
13592 | ||
13593 | #: builtin/show-branch.c:724 | |
13594 | #, c-format | |
13595 | msgid "no such ref %s" | |
13596 | msgstr "no existe el ref %s" | |
13597 | ||
13598 | #: builtin/show-branch.c:808 | |
13599 | #, c-format | |
13600 | msgid "cannot handle more than %d rev." | |
13601 | msgid_plural "cannot handle more than %d revs." | |
13602 | msgstr[0] "no se puede manejar más de %d rev." | |
13603 | msgstr[1] "no se puede manejar más de %d revs." | |
13604 | ||
13605 | #: builtin/show-branch.c:812 | |
13606 | #, c-format | |
13607 | msgid "'%s' is not a valid ref." | |
13608 | msgstr "'%s' no es una ref válida." | |
13609 | ||
13610 | #: builtin/show-branch.c:815 | |
13611 | #, c-format | |
13612 | msgid "cannot find commit %s (%s)" | |
13613 | msgstr "no se puede encontrar el commit %s (%s)" | |
13614 | ||
13615 | #: builtin/show-ref.c:10 | |
4b15eb22 CD |
13616 | msgid "" |
13617 | "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --" | |
13618 | "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]" | |
13619 | msgstr "" | |
13620 | "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --" | |
13621 | "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<patrón>...]" | |
fb0e25bc CD |
13622 | |
13623 | #: builtin/show-ref.c:11 | |
13624 | msgid "git show-ref --exclude-existing[=<pattern>]" | |
13625 | msgstr "git show-ref --exclude-existing[=<patrón>]" | |
13626 | ||
13627 | #: builtin/show-ref.c:159 | |
13628 | msgid "only show tags (can be combined with heads)" | |
13629 | msgstr "solo mostrar tags (puede ser combinado con heads)" | |
13630 | ||
13631 | #: builtin/show-ref.c:160 | |
13632 | msgid "only show heads (can be combined with tags)" | |
13633 | msgstr "solo mostrar heads (puede ser combinado con tags)" | |
13634 | ||
13635 | #: builtin/show-ref.c:161 | |
13636 | msgid "stricter reference checking, requires exact ref path" | |
13637 | msgstr "revisar referencias más estrictamente, requiere ruta de ref exacta" | |
13638 | ||
13639 | #: builtin/show-ref.c:164 builtin/show-ref.c:166 | |
13640 | msgid "show the HEAD reference, even if it would be filtered out" | |
13641 | msgstr "mostrar la referencia de HEAD, incluso si se filtrara" | |
13642 | ||
13643 | #: builtin/show-ref.c:168 | |
13644 | msgid "dereference tags into object IDs" | |
13645 | msgstr "tags de deferencia en IDs de objeto" | |
13646 | ||
13647 | #: builtin/show-ref.c:170 | |
13648 | msgid "only show SHA1 hash using <n> digits" | |
13649 | msgstr "solo mostrar hash SHA1 usando <n> dígitos" | |
13650 | ||
13651 | #: builtin/show-ref.c:174 | |
13652 | msgid "do not print results to stdout (useful with --verify)" | |
13653 | msgstr "no mostrar resultados en stdout (útil con --verify)" | |
13654 | ||
13655 | #: builtin/show-ref.c:176 | |
13656 | msgid "show refs from stdin that aren't in local repository" | |
13657 | msgstr "mostrar refs de stdin que no están en el repositorio local" | |
13658 | ||
13659 | #: builtin/stripspace.c:18 | |
13660 | msgid "git stripspace [-s | --strip-comments]" | |
13661 | msgstr "git stripspace [-s | --strip-comments]" | |
13662 | ||
13663 | #: builtin/stripspace.c:19 | |
13664 | msgid "git stripspace [-c | --comment-lines]" | |
13665 | msgstr "git stripspace [-c | --comment-lines]" | |
13666 | ||
13667 | #: builtin/stripspace.c:36 | |
13668 | msgid "skip and remove all lines starting with comment character" | |
4b15eb22 | 13669 | msgstr "" |
715fc761 | 13670 | "saltar y borrar todas las líneas que comienzan con un carácter de comentario" |
fb0e25bc CD |
13671 | |
13672 | #: builtin/stripspace.c:39 | |
13673 | msgid "prepend comment character and space to each line" | |
715fc761 | 13674 | msgstr "anteponer carácter de comentario y espacio a cada línea" |
fb0e25bc | 13675 | |
33ac3e89 | 13676 | #: builtin/submodule--helper.c:35 builtin/submodule--helper.c:1669 |
fb0e25bc CD |
13677 | #, c-format |
13678 | msgid "No such ref: %s" | |
13679 | msgstr "No existe ref: %s" | |
13680 | ||
33ac3e89 | 13681 | #: builtin/submodule--helper.c:42 builtin/submodule--helper.c:1678 |
fb0e25bc CD |
13682 | #, c-format |
13683 | msgid "Expecting a full ref name, got %s" | |
13684 | msgstr "Se esperaba un nombre de ref completo, se obtuvo %s" | |
13685 | ||
33ac3e89 CDR |
13686 | #: builtin/submodule--helper.c:59 |
13687 | msgid "submodule--helper print-default-remote takes no arguments" | |
13688 | msgstr "subomdule--helper print-default-remote no toma argumentos" | |
13689 | ||
13690 | #: builtin/submodule--helper.c:96 | |
fb0e25bc CD |
13691 | #, c-format |
13692 | msgid "cannot strip one component off url '%s'" | |
13693 | msgstr "no se puede quitar un componente del url '%s'" | |
13694 | ||
33ac3e89 | 13695 | #: builtin/submodule--helper.c:404 builtin/submodule--helper.c:1198 |
fb0e25bc CD |
13696 | msgid "alternative anchor for relative paths" |
13697 | msgstr "ancho alternativo para rutas relativas" | |
13698 | ||
33ac3e89 | 13699 | #: builtin/submodule--helper.c:409 |
fb0e25bc CD |
13700 | msgid "git submodule--helper list [--prefix=<path>] [<path>...]" |
13701 | msgstr "git submodule--helper list [--prefix=<ruta>] [<ruta>...]" | |
13702 | ||
33ac3e89 | 13703 | #: builtin/submodule--helper.c:460 builtin/submodule--helper.c:483 |
fb0e25bc CD |
13704 | #, c-format |
13705 | msgid "No url found for submodule path '%s' in .gitmodules" | |
13706 | msgstr "No se encontró url para la ruta del submódulo '%s' en .gitmodules" | |
13707 | ||
33ac3e89 | 13708 | #: builtin/submodule--helper.c:498 |
fb0e25bc | 13709 | #, c-format |
4b15eb22 CD |
13710 | msgid "" |
13711 | "could not lookup configuration '%s'. Assuming this repository is its own " | |
13712 | "authoritative upstream." | |
13713 | msgstr "" | |
13714 | "no se pudo encontrar configuración '%s'. Asumiendo que este repositorio es " | |
13715 | "su propio upstream autoritativo." | |
fb0e25bc | 13716 | |
33ac3e89 | 13717 | #: builtin/submodule--helper.c:509 |
fb0e25bc CD |
13718 | #, c-format |
13719 | msgid "Failed to register url for submodule path '%s'" | |
13720 | msgstr "Falló al registrar el url para la ruta del submódulo '%s'" | |
13721 | ||
33ac3e89 | 13722 | #: builtin/submodule--helper.c:513 |
fb0e25bc CD |
13723 | #, c-format |
13724 | msgid "Submodule '%s' (%s) registered for path '%s'\n" | |
13725 | msgstr "Submódulo '%s' (%s) registrado para ruta '%s'\n" | |
13726 | ||
33ac3e89 | 13727 | #: builtin/submodule--helper.c:523 |
fb0e25bc CD |
13728 | #, c-format |
13729 | msgid "warning: command update mode suggested for submodule '%s'\n" | |
4b15eb22 CD |
13730 | msgstr "" |
13731 | "peligro: modo de actualización de comandos sugerido para el submódulo '%s'\n" | |
fb0e25bc | 13732 | |
33ac3e89 | 13733 | #: builtin/submodule--helper.c:530 |
fb0e25bc CD |
13734 | #, c-format |
13735 | msgid "Failed to register update mode for submodule path '%s'" | |
4b15eb22 CD |
13736 | msgstr "" |
13737 | "Error al registrar el modo de actualización para la ruta del submódulo '%s'" | |
fb0e25bc | 13738 | |
33ac3e89 | 13739 | #: builtin/submodule--helper.c:552 |
fb0e25bc | 13740 | msgid "Suppress output for initializing a submodule" |
33ac3e89 | 13741 | msgstr "Suprime la salida para inicializar un submódulo" |
fb0e25bc | 13742 | |
33ac3e89 | 13743 | #: builtin/submodule--helper.c:557 |
fb0e25bc CD |
13744 | msgid "git submodule--helper init [<path>]" |
13745 | msgstr "git submodule--helper init [<ruta>]" | |
13746 | ||
33ac3e89 | 13747 | #: builtin/submodule--helper.c:625 builtin/submodule--helper.c:747 |
fb0e25bc CD |
13748 | #, c-format |
13749 | msgid "no submodule mapping found in .gitmodules for path '%s'" | |
4b15eb22 | 13750 | msgstr "" |
33ac3e89 | 13751 | "no se ha encontrado mapeo de submódulos en .gitmodules para la ruta '%s'" |
fb0e25bc | 13752 | |
33ac3e89 | 13753 | #: builtin/submodule--helper.c:660 |
f8038f5b CDR |
13754 | #, c-format |
13755 | msgid "could not resolve HEAD ref inside the submodule '%s'" | |
33ac3e89 | 13756 | msgstr "no pudo resolver ref de HEAD dentro del submódulo '%s'" |
f8038f5b | 13757 | |
33ac3e89 | 13758 | #: builtin/submodule--helper.c:687 builtin/submodule--helper.c:856 |
f8038f5b CDR |
13759 | #, c-format |
13760 | msgid "failed to recurse into submodule '%s'" | |
13761 | msgstr "falló al recursar en el submódulo '%s'" | |
13762 | ||
33ac3e89 | 13763 | #: builtin/submodule--helper.c:711 builtin/submodule--helper.c:1021 |
f8038f5b | 13764 | msgid "Suppress submodule status output" |
33ac3e89 | 13765 | msgstr "Suprimir output del estado del submódulo" |
f8038f5b | 13766 | |
33ac3e89 | 13767 | #: builtin/submodule--helper.c:712 |
f8038f5b CDR |
13768 | msgid "" |
13769 | "Use commit stored in the index instead of the one stored in the submodule " | |
13770 | "HEAD" | |
13771 | msgstr "" | |
13772 | "Usar el commit guardado en el índice en lugar del guardado en el submódulo " | |
13773 | "HEAD" | |
13774 | ||
33ac3e89 | 13775 | #: builtin/submodule--helper.c:713 |
f8038f5b CDR |
13776 | msgid "recurse into nested submodules" |
13777 | msgstr "recursar en submódulos anidados" | |
13778 | ||
33ac3e89 | 13779 | #: builtin/submodule--helper.c:718 |
f8038f5b CDR |
13780 | msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]" |
13781 | msgstr "git submodule status [--quiet] [--cached] [--recursive] [<ruta>...]" | |
13782 | ||
33ac3e89 | 13783 | #: builtin/submodule--helper.c:742 |
f8038f5b CDR |
13784 | msgid "git submodule--helper name <path>" |
13785 | msgstr "git submodule--helper name <ruta>" | |
13786 | ||
33ac3e89 CDR |
13787 | #: builtin/submodule--helper.c:806 |
13788 | #, c-format | |
13789 | msgid "Synchronizing submodule url for '%s'\n" | |
13790 | msgstr "Sincronizando url del submódulo para '%s'\n" | |
13791 | ||
13792 | #: builtin/submodule--helper.c:812 | |
13793 | #, c-format | |
13794 | msgid "failed to register url for submodule path '%s'" | |
13795 | msgstr "falló al registrar el url para la ruta del submódulo '%s'" | |
13796 | ||
13797 | #: builtin/submodule--helper.c:826 | |
13798 | #, c-format | |
13799 | msgid "failed to get the default remote for submodule '%s'" | |
13800 | msgstr "error al conseguir el remoto por defecto para el submódulo '%s'" | |
13801 | ||
13802 | #: builtin/submodule--helper.c:837 | |
13803 | #, c-format | |
13804 | msgid "failed to update remote for submodule '%s'" | |
13805 | msgstr "error al actualizar el remoto para el submódulo '%s'" | |
13806 | ||
13807 | #: builtin/submodule--helper.c:885 | |
13808 | msgid "Suppress output of synchronizing submodule url" | |
13809 | msgstr "Suprime la salida del url del submódulo que se sincroniza" | |
13810 | ||
13811 | #: builtin/submodule--helper.c:887 | |
13812 | msgid "Recurse into nested submodules" | |
13813 | msgstr "Recursar en submódulos anidados" | |
13814 | ||
13815 | #: builtin/submodule--helper.c:892 | |
13816 | msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]" | |
13817 | msgstr "git submodule--helper sync [--quiet] [--recursive] [<ruta>]" | |
13818 | ||
13819 | #: builtin/submodule--helper.c:946 | |
13820 | #, c-format | |
13821 | msgid "" | |
13822 | "Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you " | |
13823 | "really want to remove it including all of its history)" | |
13824 | msgstr "" | |
13825 | "El árbol de trabajo del submódulo '%s' contiene un directorio .git (use 'rm -" | |
13826 | "rf' si realmente quiere removerlo incluyendo todo en su historia)" | |
13827 | ||
13828 | #: builtin/submodule--helper.c:958 | |
13829 | #, c-format | |
13830 | msgid "" | |
13831 | "Submodule work tree '%s' contains local modifications; use '-f' to discard " | |
13832 | "them" | |
13833 | msgstr "" | |
13834 | "El árbol de trabajo del submódulo '%s' contiene modificaciones locales; usa " | |
13835 | "'-f' para descartarlas" | |
13836 | ||
13837 | #: builtin/submodule--helper.c:966 | |
13838 | #, c-format | |
13839 | msgid "Cleared directory '%s'\n" | |
13840 | msgstr "Directorio '%s' limpiado\n" | |
13841 | ||
13842 | #: builtin/submodule--helper.c:968 | |
13843 | #, c-format | |
13844 | msgid "Could not remove submodule work tree '%s'\n" | |
13845 | msgstr "No se pudo eliminar el árbol de trabajo del submódulo '%s'\n" | |
13846 | ||
13847 | #: builtin/submodule--helper.c:977 | |
13848 | #, c-format | |
13849 | msgid "could not create empty submodule directory %s" | |
13850 | msgstr "no se pudo crear directorio vacío de submódulo %s" | |
13851 | ||
13852 | #: builtin/submodule--helper.c:993 | |
13853 | #, c-format | |
13854 | msgid "Submodule '%s' (%s) unregistered for path '%s'\n" | |
13855 | msgstr "Submódulo '%s' (%s) no registrado para ruta '%s'\n" | |
13856 | ||
13857 | #: builtin/submodule--helper.c:1022 | |
13858 | msgid "Remove submodule working trees even if they contain local changes" | |
13859 | msgstr "" | |
13860 | "Remover arboles de trabajo de submódulos incluso si contienen cambios locales" | |
13861 | ||
13862 | #: builtin/submodule--helper.c:1023 | |
13863 | msgid "Unregister all submodules" | |
13864 | msgstr "Quitar todos los submódulos" | |
13865 | ||
13866 | #: builtin/submodule--helper.c:1028 | |
13867 | msgid "" | |
13868 | "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]" | |
13869 | msgstr "" | |
13870 | "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<ruta>...]]" | |
13871 | ||
13872 | #: builtin/submodule--helper.c:1042 | |
13873 | msgid "Use '--all' if you really want to deinitialize all submodules" | |
13874 | msgstr "Usa '--all' si realmente quieres des-inicializar todos los submódulos" | |
13875 | ||
13876 | #: builtin/submodule--helper.c:1133 builtin/submodule--helper.c:1136 | |
fb0e25bc CD |
13877 | #, c-format |
13878 | msgid "submodule '%s' cannot add alternate: %s" | |
13879 | msgstr "submódulo '%s' no puede agregar alterno: %s" | |
13880 | ||
33ac3e89 | 13881 | #: builtin/submodule--helper.c:1172 |
fb0e25bc CD |
13882 | #, c-format |
13883 | msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized" | |
13884 | msgstr "Valor '%s' para submodule.alternateErrorStrategy no es reconocido" | |
13885 | ||
33ac3e89 | 13886 | #: builtin/submodule--helper.c:1179 |
fb0e25bc CD |
13887 | #, c-format |
13888 | msgid "Value '%s' for submodule.alternateLocation is not recognized" | |
13889 | msgstr "Valor '%s' para submodule.alternateLocation no es reconocido" | |
13890 | ||
33ac3e89 | 13891 | #: builtin/submodule--helper.c:1201 |
fb0e25bc CD |
13892 | msgid "where the new submodule will be cloned to" |
13893 | msgstr "a donde el nuevo submódulo será clonado" | |
13894 | ||
33ac3e89 | 13895 | #: builtin/submodule--helper.c:1204 |
fb0e25bc CD |
13896 | msgid "name of the new submodule" |
13897 | msgstr "nombre del nuevo submódulo" | |
13898 | ||
33ac3e89 | 13899 | #: builtin/submodule--helper.c:1207 |
fb0e25bc CD |
13900 | msgid "url where to clone the submodule from" |
13901 | msgstr "url de dónde clonar el submódulo" | |
13902 | ||
33ac3e89 | 13903 | #: builtin/submodule--helper.c:1213 |
fb0e25bc CD |
13904 | msgid "depth for shallow clones" |
13905 | msgstr "profundidad para clones superficiales" | |
13906 | ||
33ac3e89 | 13907 | #: builtin/submodule--helper.c:1216 builtin/submodule--helper.c:1587 |
fb0e25bc CD |
13908 | msgid "force cloning progress" |
13909 | msgstr "forzar el proceso de clonado" | |
13910 | ||
33ac3e89 | 13911 | #: builtin/submodule--helper.c:1221 |
4b15eb22 CD |
13912 | msgid "" |
13913 | "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " | |
13914 | "<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>" | |
13915 | msgstr "" | |
13916 | "git submodule--helper clone [--prefix=<ruta>] [--quiet] [--reference " | |
13917 | "<repositorio>] [--name <nombre>] [--depth <profundidad>] --url <url> --path " | |
13918 | "<ruta>" | |
fb0e25bc | 13919 | |
33ac3e89 | 13920 | #: builtin/submodule--helper.c:1252 |
fb0e25bc CD |
13921 | #, c-format |
13922 | msgid "clone of '%s' into submodule path '%s' failed" | |
13923 | msgstr "clon de '%s' en la ruta de submódulo '%s' falló" | |
13924 | ||
33ac3e89 | 13925 | #: builtin/submodule--helper.c:1267 |
fb0e25bc CD |
13926 | #, c-format |
13927 | msgid "could not get submodule directory for '%s'" | |
13928 | msgstr "no se pudo obtener el directorio de submódulo para '%s'" | |
13929 | ||
33ac3e89 | 13930 | #: builtin/submodule--helper.c:1332 |
fb0e25bc CD |
13931 | #, c-format |
13932 | msgid "Submodule path '%s' not initialized" | |
13933 | msgstr "Ruta de submódulo '%s' no inicializada" | |
13934 | ||
33ac3e89 | 13935 | #: builtin/submodule--helper.c:1336 |
fb0e25bc CD |
13936 | msgid "Maybe you want to use 'update --init'?" |
13937 | msgstr "Tal vez quiere usar 'update --init'?" | |
13938 | ||
33ac3e89 | 13939 | #: builtin/submodule--helper.c:1365 |
fb0e25bc CD |
13940 | #, c-format |
13941 | msgid "Skipping unmerged submodule %s" | |
13942 | msgstr "Saltando submódulo %s no fusionado" | |
13943 | ||
33ac3e89 | 13944 | #: builtin/submodule--helper.c:1394 |
fb0e25bc CD |
13945 | #, c-format |
13946 | msgid "Skipping submodule '%s'" | |
13947 | msgstr "Saltando submódulo '%s'" | |
13948 | ||
33ac3e89 | 13949 | #: builtin/submodule--helper.c:1527 |
fb0e25bc CD |
13950 | #, c-format |
13951 | msgid "Failed to clone '%s'. Retry scheduled" | |
13952 | msgstr "Falló al clonar '%s'. Reintento programado" | |
13953 | ||
33ac3e89 | 13954 | #: builtin/submodule--helper.c:1538 |
fb0e25bc CD |
13955 | #, c-format |
13956 | msgid "Failed to clone '%s' a second time, aborting" | |
13957 | msgstr "Falló al clonar '%s' una segunda vez, abortando" | |
13958 | ||
33ac3e89 | 13959 | #: builtin/submodule--helper.c:1568 builtin/submodule--helper.c:1788 |
fb0e25bc CD |
13960 | msgid "path into the working tree" |
13961 | msgstr "ruta hacia el árbol de trabajo" | |
13962 | ||
33ac3e89 | 13963 | #: builtin/submodule--helper.c:1571 |
fb0e25bc | 13964 | msgid "path into the working tree, across nested submodule boundaries" |
4b15eb22 CD |
13965 | msgstr "" |
13966 | "ruta hacia el árbol de trabajo, a través de extremos de submódulos anidados" | |
fb0e25bc | 13967 | |
33ac3e89 | 13968 | #: builtin/submodule--helper.c:1575 |
fb0e25bc CD |
13969 | msgid "rebase, merge, checkout or none" |
13970 | msgstr "rebase, merge, checkout o none" | |
13971 | ||
33ac3e89 | 13972 | #: builtin/submodule--helper.c:1579 |
fb0e25bc CD |
13973 | msgid "Create a shallow clone truncated to the specified number of revisions" |
13974 | msgstr "Crea un clon superficial truncado al número especificado de revisión" | |
13975 | ||
33ac3e89 | 13976 | #: builtin/submodule--helper.c:1582 |
fb0e25bc CD |
13977 | msgid "parallel jobs" |
13978 | msgstr "trabajos paralelos" | |
13979 | ||
33ac3e89 | 13980 | #: builtin/submodule--helper.c:1584 |
fb0e25bc CD |
13981 | msgid "whether the initial clone should follow the shallow recommendation" |
13982 | msgstr "si el clon inicial debe seguir la recomendación superficial" | |
13983 | ||
33ac3e89 | 13984 | #: builtin/submodule--helper.c:1585 |
fb0e25bc CD |
13985 | msgid "don't print cloning progress" |
13986 | msgstr "no mostrar el progreso de clonado" | |
13987 | ||
33ac3e89 | 13988 | #: builtin/submodule--helper.c:1592 |
fb0e25bc CD |
13989 | msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]" |
13990 | msgstr "git submodule--helper update_clone [--prefix=<ruta>] [<ruta>...]" | |
13991 | ||
33ac3e89 | 13992 | #: builtin/submodule--helper.c:1605 |
fb0e25bc CD |
13993 | msgid "bad value for update parameter" |
13994 | msgstr "mal valor para parámetro update" | |
13995 | ||
33ac3e89 | 13996 | #: builtin/submodule--helper.c:1673 |
fb0e25bc | 13997 | #, c-format |
4b15eb22 CD |
13998 | msgid "" |
13999 | "Submodule (%s) branch configured to inherit branch from superproject, but " | |
14000 | "the superproject is not on any branch" | |
14001 | msgstr "" | |
14002 | "Rama de submódulo (%s) configurada para heredar rama del superproyecto, " | |
14003 | "pero el superproyecto no está en ninguna rama" | |
fb0e25bc | 14004 | |
33ac3e89 | 14005 | #: builtin/submodule--helper.c:1789 |
fb0e25bc CD |
14006 | msgid "recurse into submodules" |
14007 | msgstr "recurrir a submódulos" | |
14008 | ||
33ac3e89 | 14009 | #: builtin/submodule--helper.c:1795 |
fb0e25bc CD |
14010 | msgid "git submodule--helper embed-git-dir [<path>...]" |
14011 | msgstr "git submodule--helper embed-git-dir [<ruta>...]" | |
14012 | ||
33ac3e89 | 14013 | #: builtin/submodule--helper.c:1857 |
fb0e25bc CD |
14014 | #, c-format |
14015 | msgid "%s doesn't support --super-prefix" | |
14016 | msgstr "%s no soporta --super-prefix" | |
14017 | ||
33ac3e89 | 14018 | #: builtin/submodule--helper.c:1863 |
fb0e25bc CD |
14019 | #, c-format |
14020 | msgid "'%s' is not a valid submodule--helper subcommand" | |
14021 | msgstr "'%s' no es un comando submodule--helper valido" | |
14022 | ||
14023 | #: builtin/symbolic-ref.c:8 | |
14024 | msgid "git symbolic-ref [<options>] <name> [<ref>]" | |
14025 | msgstr "git symbolic-ref [<opciones>] <nombre> [<referencia>]" | |
14026 | ||
14027 | #: builtin/symbolic-ref.c:9 | |
14028 | msgid "git symbolic-ref -d [-q] <name>" | |
14029 | msgstr "git symbolic-ref -d [-q] <nombre>" | |
14030 | ||
4b15eb22 | 14031 | #: builtin/symbolic-ref.c:40 |
fb0e25bc CD |
14032 | msgid "suppress error message for non-symbolic (detached) refs" |
14033 | msgstr "suprimir mensajes de error para refs no simbólicos (desacoplados)" | |
14034 | ||
4b15eb22 | 14035 | #: builtin/symbolic-ref.c:41 |
fb0e25bc CD |
14036 | msgid "delete symbolic ref" |
14037 | msgstr "eliminar referencia simbólica" | |
14038 | ||
4b15eb22 | 14039 | #: builtin/symbolic-ref.c:42 |
fb0e25bc CD |
14040 | msgid "shorten ref output" |
14041 | msgstr "salida de referencia más corta" | |
14042 | ||
4b15eb22 | 14043 | #: builtin/symbolic-ref.c:43 builtin/update-ref.c:362 |
fb0e25bc CD |
14044 | msgid "reason" |
14045 | msgstr "razón" | |
14046 | ||
4b15eb22 | 14047 | #: builtin/symbolic-ref.c:43 builtin/update-ref.c:362 |
fb0e25bc CD |
14048 | msgid "reason of the update" |
14049 | msgstr "razón de la actualización" | |
14050 | ||
14051 | #: builtin/tag.c:24 | |
4b15eb22 CD |
14052 | msgid "" |
14053 | "git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> " | |
14054 | "[<head>]" | |
14055 | msgstr "" | |
14056 | "git tag [-a | -s | -u <id-de-clave>] [-f] [-m <mensaje> | -F <archivo>] " | |
715fc761 | 14057 | "<nombre-de-tag> [<head>]" |
fb0e25bc CD |
14058 | |
14059 | #: builtin/tag.c:25 | |
14060 | msgid "git tag -d <tagname>..." | |
715fc761 | 14061 | msgstr "git tag -d <nombre-de-tag>..." |
fb0e25bc CD |
14062 | |
14063 | #: builtin/tag.c:26 | |
14064 | msgid "" | |
4b15eb22 CD |
14065 | "git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--" |
14066 | "points-at <object>]\n" | |
fb0e25bc CD |
14067 | "\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]" |
14068 | msgstr "" | |
4b15eb22 CD |
14069 | "git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--" |
14070 | "points-at <objeto>]\n" | |
fb0e25bc CD |
14071 | "\t\t[--format=<formato>] [--[no-]merged [<commit>]] [<patrón>...]" |
14072 | ||
14073 | #: builtin/tag.c:28 | |
14074 | msgid "git tag -v [--format=<format>] <tagname>..." | |
14075 | msgstr "git tag -v [--format=<formato>] <nombre-de-tag>..." | |
14076 | ||
4b15eb22 | 14077 | #: builtin/tag.c:86 |
fb0e25bc CD |
14078 | #, c-format |
14079 | msgid "tag '%s' not found." | |
715fc761 | 14080 | msgstr "tag '%s' no encontrado." |
fb0e25bc | 14081 | |
4b15eb22 | 14082 | #: builtin/tag.c:102 |
fb0e25bc CD |
14083 | #, c-format |
14084 | msgid "Deleted tag '%s' (was %s)\n" | |
14085 | msgstr "Etiqueta '%s' eliminada (era %s)\n" | |
14086 | ||
4b15eb22 | 14087 | #: builtin/tag.c:131 |
fb0e25bc CD |
14088 | #, c-format |
14089 | msgid "" | |
14090 | "\n" | |
14091 | "Write a message for tag:\n" | |
14092 | " %s\n" | |
14093 | "Lines starting with '%c' will be ignored.\n" | |
14094 | msgstr "" | |
14095 | "\n" | |
715fc761 | 14096 | "Escribe un mensaje para la tag:\n" |
fb0e25bc CD |
14097 | " %s\n" |
14098 | "Las líneas que comienzan con '%c' serán ignoradas.\n" | |
14099 | ||
4b15eb22 | 14100 | #: builtin/tag.c:135 |
fb0e25bc CD |
14101 | #, c-format |
14102 | msgid "" | |
14103 | "\n" | |
14104 | "Write a message for tag:\n" | |
14105 | " %s\n" | |
4b15eb22 CD |
14106 | "Lines starting with '%c' will be kept; you may remove them yourself if you " |
14107 | "want to.\n" | |
fb0e25bc CD |
14108 | msgstr "" |
14109 | "\n" | |
715fc761 | 14110 | "Escribe un mensaje para la tag:\n" |
fb0e25bc | 14111 | " %s\n" |
4b15eb22 CD |
14112 | "Las líneas que comienzan con '%c' serán conservadas; puedes eliminarlas por " |
14113 | "ti mismo si quieres hacerlo.\n" | |
fb0e25bc | 14114 | |
4b15eb22 | 14115 | #: builtin/tag.c:189 |
fb0e25bc | 14116 | msgid "unable to sign the tag" |
715fc761 | 14117 | msgstr "incapaz de firmar tag" |
fb0e25bc | 14118 | |
4b15eb22 | 14119 | #: builtin/tag.c:191 |
fb0e25bc | 14120 | msgid "unable to write tag file" |
715fc761 | 14121 | msgstr "incapaz de escribir el archivo de tag" |
fb0e25bc | 14122 | |
33ac3e89 | 14123 | #: builtin/tag.c:216 |
fb0e25bc CD |
14124 | msgid "bad object type." |
14125 | msgstr "tipo de objeto erróneo." | |
14126 | ||
33ac3e89 | 14127 | #: builtin/tag.c:265 |
fb0e25bc | 14128 | msgid "no tag message?" |
715fc761 | 14129 | msgstr "¿Sin mensaje de tag?" |
fb0e25bc | 14130 | |
33ac3e89 | 14131 | #: builtin/tag.c:272 |
fb0e25bc CD |
14132 | #, c-format |
14133 | msgid "The tag message has been left in %s\n" | |
715fc761 | 14134 | msgstr "El mensaje del tag ha sido dejado en %s\n" |
fb0e25bc | 14135 | |
33ac3e89 | 14136 | #: builtin/tag.c:381 |
fb0e25bc | 14137 | msgid "list tag names" |
715fc761 | 14138 | msgstr "listar nombres de tags" |
fb0e25bc | 14139 | |
33ac3e89 | 14140 | #: builtin/tag.c:383 |
fb0e25bc | 14141 | msgid "print <n> lines of each tag message" |
715fc761 | 14142 | msgstr "imprimir <n> líneas de cada mensaje de tag" |
fb0e25bc | 14143 | |
33ac3e89 | 14144 | #: builtin/tag.c:385 |
fb0e25bc | 14145 | msgid "delete tags" |
715fc761 | 14146 | msgstr "eliminar tags" |
fb0e25bc | 14147 | |
33ac3e89 | 14148 | #: builtin/tag.c:386 |
fb0e25bc | 14149 | msgid "verify tags" |
715fc761 | 14150 | msgstr "verificar tags" |
fb0e25bc | 14151 | |
33ac3e89 | 14152 | #: builtin/tag.c:388 |
fb0e25bc | 14153 | msgid "Tag creation options" |
715fc761 | 14154 | msgstr "Opciones de creación de tags" |
fb0e25bc | 14155 | |
33ac3e89 | 14156 | #: builtin/tag.c:390 |
fb0e25bc | 14157 | msgid "annotated tag, needs a message" |
715fc761 | 14158 | msgstr "tags anotadas necesitan un mensaje" |
fb0e25bc | 14159 | |
33ac3e89 | 14160 | #: builtin/tag.c:392 |
fb0e25bc | 14161 | msgid "tag message" |
715fc761 | 14162 | msgstr "mensaje de tag" |
fb0e25bc | 14163 | |
33ac3e89 CDR |
14164 | #: builtin/tag.c:394 |
14165 | msgid "force edit of tag message" | |
14166 | msgstr "forzar la edición del mensaje de tag" | |
14167 | ||
14168 | #: builtin/tag.c:395 | |
fb0e25bc | 14169 | msgid "annotated and GPG-signed tag" |
715fc761 | 14170 | msgstr "tag anotado y firmado con GPG" |
fb0e25bc | 14171 | |
33ac3e89 | 14172 | #: builtin/tag.c:399 |
fb0e25bc | 14173 | msgid "use another key to sign the tag" |
715fc761 | 14174 | msgstr "usar otra clave para firmar el tag" |
fb0e25bc | 14175 | |
33ac3e89 | 14176 | #: builtin/tag.c:400 |
fb0e25bc | 14177 | msgid "replace the tag if exists" |
715fc761 | 14178 | msgstr "remplazar tag si existe" |
fb0e25bc | 14179 | |
33ac3e89 | 14180 | #: builtin/tag.c:401 builtin/update-ref.c:368 |
fb0e25bc CD |
14181 | msgid "create a reflog" |
14182 | msgstr "crear un reflog" | |
14183 | ||
33ac3e89 | 14184 | #: builtin/tag.c:403 |
fb0e25bc | 14185 | msgid "Tag listing options" |
715fc761 | 14186 | msgstr "Opciones de listado de tag" |
fb0e25bc | 14187 | |
33ac3e89 | 14188 | #: builtin/tag.c:404 |
fb0e25bc | 14189 | msgid "show tag list in columns" |
715fc761 | 14190 | msgstr "mostrar lista de tags en columnas" |
fb0e25bc | 14191 | |
33ac3e89 | 14192 | #: builtin/tag.c:405 builtin/tag.c:407 |
fb0e25bc CD |
14193 | msgid "print only tags that contain the commit" |
14194 | msgstr "mostrar solo tags que contienen el commit" | |
14195 | ||
33ac3e89 | 14196 | #: builtin/tag.c:406 builtin/tag.c:408 |
fb0e25bc CD |
14197 | msgid "print only tags that don't contain the commit" |
14198 | msgstr "mostrar solo tags que no contienen el commit" | |
14199 | ||
33ac3e89 | 14200 | #: builtin/tag.c:409 |
fb0e25bc | 14201 | msgid "print only tags that are merged" |
715fc761 | 14202 | msgstr "sólo imprimir las tags que están fusionadas" |
fb0e25bc | 14203 | |
33ac3e89 | 14204 | #: builtin/tag.c:410 |
fb0e25bc | 14205 | msgid "print only tags that are not merged" |
715fc761 | 14206 | msgstr "sólo imprimir las tags que no están fusionadas" |
fb0e25bc | 14207 | |
33ac3e89 | 14208 | #: builtin/tag.c:415 |
fb0e25bc | 14209 | msgid "print only tags of the object" |
715fc761 | 14210 | msgstr "sólo imprimir tags de el objeto" |
fb0e25bc | 14211 | |
33ac3e89 | 14212 | #: builtin/tag.c:459 |
fb0e25bc CD |
14213 | msgid "--column and -n are incompatible" |
14214 | msgstr "--column y -n son incompatibles" | |
14215 | ||
33ac3e89 | 14216 | #: builtin/tag.c:481 |
fb0e25bc CD |
14217 | msgid "-n option is only allowed in list mode" |
14218 | msgstr "opción -n solo es permitida en modo lista" | |
14219 | ||
33ac3e89 | 14220 | #: builtin/tag.c:483 |
fb0e25bc CD |
14221 | msgid "--contains option is only allowed in list mode" |
14222 | msgstr "opción --contains solo es permitido en modo lista" | |
14223 | ||
33ac3e89 | 14224 | #: builtin/tag.c:485 |
fb0e25bc | 14225 | msgid "--no-contains option is only allowed in list mode" |
715fc761 | 14226 | msgstr "opción --no-contains solo es permitida en modo lista" |
fb0e25bc | 14227 | |
33ac3e89 | 14228 | #: builtin/tag.c:487 |
fb0e25bc CD |
14229 | msgid "--points-at option is only allowed in list mode" |
14230 | msgstr "opción --points-at solo es permitida en modo lista" | |
14231 | ||
33ac3e89 | 14232 | #: builtin/tag.c:489 |
fb0e25bc CD |
14233 | msgid "--merged and --no-merged options are only allowed in list mode" |
14234 | msgstr "opciones --merged y --no-merged solo están permitidas en modo lista" | |
14235 | ||
33ac3e89 | 14236 | #: builtin/tag.c:500 |
fb0e25bc CD |
14237 | msgid "only one -F or -m option is allowed." |
14238 | msgstr "sólo se permite una de las opciones, -m ó -F." | |
14239 | ||
33ac3e89 | 14240 | #: builtin/tag.c:519 |
fb0e25bc CD |
14241 | msgid "too many params" |
14242 | msgstr "demasiados parámetros" | |
14243 | ||
33ac3e89 | 14244 | #: builtin/tag.c:525 |
fb0e25bc CD |
14245 | #, c-format |
14246 | msgid "'%s' is not a valid tag name." | |
715fc761 | 14247 | msgstr "'%s' no es un nombre de tag válido." |
fb0e25bc | 14248 | |
33ac3e89 | 14249 | #: builtin/tag.c:530 |
fb0e25bc CD |
14250 | #, c-format |
14251 | msgid "tag '%s' already exists" | |
715fc761 | 14252 | msgstr "el tag '%s' ya existe" |
fb0e25bc | 14253 | |
33ac3e89 | 14254 | #: builtin/tag.c:561 |
fb0e25bc CD |
14255 | #, c-format |
14256 | msgid "Updated tag '%s' (was %s)\n" | |
14257 | msgstr "Etiqueta '%s' actualizada (era %s)\n" | |
14258 | ||
33ac3e89 | 14259 | #: builtin/unpack-objects.c:498 |
fb0e25bc CD |
14260 | msgid "Unpacking objects" |
14261 | msgstr "Desempaquetando objetos" | |
14262 | ||
f8038f5b | 14263 | #: builtin/update-index.c:82 |
fb0e25bc CD |
14264 | #, c-format |
14265 | msgid "failed to create directory %s" | |
14266 | msgstr "fallo al crear directorio %s" | |
14267 | ||
f8038f5b | 14268 | #: builtin/update-index.c:88 |
fb0e25bc CD |
14269 | #, c-format |
14270 | msgid "failed to stat %s" | |
14271 | msgstr "fallo al iniciar %s" | |
14272 | ||
f8038f5b | 14273 | #: builtin/update-index.c:98 |
fb0e25bc CD |
14274 | #, c-format |
14275 | msgid "failed to create file %s" | |
14276 | msgstr "fallo al crear el archivo %s" | |
14277 | ||
f8038f5b | 14278 | #: builtin/update-index.c:106 |
fb0e25bc CD |
14279 | #, c-format |
14280 | msgid "failed to delete file %s" | |
14281 | msgstr "fallo al eliminar el archivo %s" | |
14282 | ||
f8038f5b | 14283 | #: builtin/update-index.c:113 builtin/update-index.c:219 |
fb0e25bc CD |
14284 | #, c-format |
14285 | msgid "failed to delete directory %s" | |
14286 | msgstr "fallo al eliminar directorio %s" | |
14287 | ||
f8038f5b | 14288 | #: builtin/update-index.c:138 |
fb0e25bc CD |
14289 | #, c-format |
14290 | msgid "Testing mtime in '%s' " | |
14291 | msgstr "Probando mtime en '%s' " | |
14292 | ||
f8038f5b | 14293 | #: builtin/update-index.c:152 |
fb0e25bc CD |
14294 | msgid "directory stat info does not change after adding a new file" |
14295 | msgstr "info de estado del directorio no cambia tras agregar un nuevo archivo" | |
14296 | ||
f8038f5b | 14297 | #: builtin/update-index.c:165 |
fb0e25bc | 14298 | msgid "directory stat info does not change after adding a new directory" |
4b15eb22 CD |
14299 | msgstr "" |
14300 | "info de estado del directorio no cambia tras agregar un nuevo directorio" | |
fb0e25bc | 14301 | |
f8038f5b | 14302 | #: builtin/update-index.c:178 |
fb0e25bc CD |
14303 | msgid "directory stat info changes after updating a file" |
14304 | msgstr "info de estado del directorio cambia tras actualizar un archivo" | |
14305 | ||
f8038f5b | 14306 | #: builtin/update-index.c:189 |
fb0e25bc | 14307 | msgid "directory stat info changes after adding a file inside subdirectory" |
4b15eb22 CD |
14308 | msgstr "" |
14309 | "info de estado del directorio cambia tras agregar un archivo dentro del " | |
14310 | "subdirectorio" | |
fb0e25bc | 14311 | |
f8038f5b | 14312 | #: builtin/update-index.c:200 |
fb0e25bc CD |
14313 | msgid "directory stat info does not change after deleting a file" |
14314 | msgstr "info de estado del directorio no cambia tras borrar un archivo" | |
14315 | ||
f8038f5b | 14316 | #: builtin/update-index.c:213 |
fb0e25bc CD |
14317 | msgid "directory stat info does not change after deleting a directory" |
14318 | msgstr "info de estado del directorio no cambia tras borrar un directorio" | |
14319 | ||
f8038f5b | 14320 | #: builtin/update-index.c:220 |
fb0e25bc CD |
14321 | msgid " OK" |
14322 | msgstr " OK" | |
14323 | ||
f8038f5b | 14324 | #: builtin/update-index.c:579 |
fb0e25bc CD |
14325 | msgid "git update-index [<options>] [--] [<file>...]" |
14326 | msgstr "git update-index [<opciones>] [--] [<archivo>...]" | |
14327 | ||
f8038f5b | 14328 | #: builtin/update-index.c:936 |
fb0e25bc | 14329 | msgid "continue refresh even when index needs update" |
715fc761 CDR |
14330 | msgstr "" |
14331 | "continuar refresh (Actualización) incluso cuando el índice necesita " | |
14332 | "actualización" | |
fb0e25bc | 14333 | |
f8038f5b | 14334 | #: builtin/update-index.c:939 |
fb0e25bc CD |
14335 | msgid "refresh: ignore submodules" |
14336 | msgstr "refresh: ignora submódulos" | |
14337 | ||
f8038f5b | 14338 | #: builtin/update-index.c:942 |
fb0e25bc CD |
14339 | msgid "do not ignore new files" |
14340 | msgstr "no ignorar archivos nuevos" | |
14341 | ||
f8038f5b | 14342 | #: builtin/update-index.c:944 |
fb0e25bc CD |
14343 | msgid "let files replace directories and vice-versa" |
14344 | msgstr "permitir que archivos remplacen directorios y vice-versa" | |
14345 | ||
f8038f5b | 14346 | #: builtin/update-index.c:946 |
fb0e25bc CD |
14347 | msgid "notice files missing from worktree" |
14348 | msgstr "avisar de archivos faltando en el árbol de trabajo" | |
14349 | ||
f8038f5b | 14350 | #: builtin/update-index.c:948 |
fb0e25bc CD |
14351 | msgid "refresh even if index contains unmerged entries" |
14352 | msgstr "ejecutar refresh incluso si el índice contiene entradas sin cambios" | |
14353 | ||
f8038f5b | 14354 | #: builtin/update-index.c:951 |
fb0e25bc CD |
14355 | msgid "refresh stat information" |
14356 | msgstr "refresh información de estado" | |
14357 | ||
f8038f5b | 14358 | #: builtin/update-index.c:955 |
fb0e25bc CD |
14359 | msgid "like --refresh, but ignore assume-unchanged setting" |
14360 | msgstr "como --refresh, pero ignora configuración assume-unchanged" | |
14361 | ||
f8038f5b | 14362 | #: builtin/update-index.c:959 |
fb0e25bc CD |
14363 | msgid "<mode>,<object>,<path>" |
14364 | msgstr "<modo>,<objeto>,<ruta>" | |
14365 | ||
f8038f5b | 14366 | #: builtin/update-index.c:960 |
fb0e25bc CD |
14367 | msgid "add the specified entry to the index" |
14368 | msgstr "agregar la entrada especificada al índice" | |
14369 | ||
f8038f5b | 14370 | #: builtin/update-index.c:969 |
fb0e25bc CD |
14371 | msgid "mark files as \"not changing\"" |
14372 | msgstr "marcar archivos como \"not changing\"" | |
14373 | ||
f8038f5b | 14374 | #: builtin/update-index.c:972 |
fb0e25bc CD |
14375 | msgid "clear assumed-unchanged bit" |
14376 | msgstr "limpiar bit assumed-unchanged" | |
14377 | ||
f8038f5b | 14378 | #: builtin/update-index.c:975 |
fb0e25bc CD |
14379 | msgid "mark files as \"index-only\"" |
14380 | msgstr "marcar archivos como \"index-only\"" | |
14381 | ||
f8038f5b | 14382 | #: builtin/update-index.c:978 |
fb0e25bc CD |
14383 | msgid "clear skip-worktree bit" |
14384 | msgstr "limpiar bit skip-worktree" | |
14385 | ||
f8038f5b | 14386 | #: builtin/update-index.c:981 |
fb0e25bc | 14387 | msgid "add to index only; do not add content to object database" |
4b15eb22 CD |
14388 | msgstr "" |
14389 | "agregar solo al índice; no agregar contenido a la base de datos de objetos" | |
fb0e25bc | 14390 | |
f8038f5b | 14391 | #: builtin/update-index.c:983 |
fb0e25bc | 14392 | msgid "remove named paths even if present in worktree" |
4b15eb22 CD |
14393 | msgstr "" |
14394 | "remover rutas nombradas incluso si están presentes en el árbol de trabajo" | |
fb0e25bc | 14395 | |
f8038f5b | 14396 | #: builtin/update-index.c:985 |
fb0e25bc | 14397 | msgid "with --stdin: input lines are terminated by null bytes" |
715fc761 | 14398 | msgstr "con --stdin: las lineas de entrada son terminadas con bytes nulos" |
fb0e25bc | 14399 | |
f8038f5b | 14400 | #: builtin/update-index.c:987 |
fb0e25bc CD |
14401 | msgid "read list of paths to be updated from standard input" |
14402 | msgstr "leer la lista de rutas para ser actualizada desde standard input" | |
14403 | ||
f8038f5b | 14404 | #: builtin/update-index.c:991 |
fb0e25bc CD |
14405 | msgid "add entries from standard input to the index" |
14406 | msgstr "agregar entradas de standard input al índice" | |
14407 | ||
f8038f5b | 14408 | #: builtin/update-index.c:995 |
fb0e25bc CD |
14409 | msgid "repopulate stages #2 and #3 for the listed paths" |
14410 | msgstr "repoblar stages #2 y #3 para las rutas listadas" | |
14411 | ||
f8038f5b | 14412 | #: builtin/update-index.c:999 |
fb0e25bc CD |
14413 | msgid "only update entries that differ from HEAD" |
14414 | msgstr "solo actualizar entradas que difieren de HEAD" | |
14415 | ||
f8038f5b | 14416 | #: builtin/update-index.c:1003 |
fb0e25bc CD |
14417 | msgid "ignore files missing from worktree" |
14418 | msgstr "ignorar archivos faltantes en el árbol de trabajo" | |
14419 | ||
f8038f5b | 14420 | #: builtin/update-index.c:1006 |
fb0e25bc CD |
14421 | msgid "report actions to standard output" |
14422 | msgstr "reportar acciones por standard output" | |
14423 | ||
f8038f5b | 14424 | #: builtin/update-index.c:1008 |
fb0e25bc CD |
14425 | msgid "(for porcelains) forget saved unresolved conflicts" |
14426 | msgstr "(para porcelanas) olvidar conflictos sin resolver guardados" | |
14427 | ||
f8038f5b | 14428 | #: builtin/update-index.c:1012 |
fb0e25bc CD |
14429 | msgid "write index in this format" |
14430 | msgstr "escribir índice en este formato" | |
14431 | ||
f8038f5b | 14432 | #: builtin/update-index.c:1014 |
fb0e25bc CD |
14433 | msgid "enable or disable split index" |
14434 | msgstr "activar o desactivar índice dividido" | |
14435 | ||
f8038f5b | 14436 | #: builtin/update-index.c:1016 |
fb0e25bc CD |
14437 | msgid "enable/disable untracked cache" |
14438 | msgstr "habilitar o deshabilitar caché no rastreado" | |
14439 | ||
f8038f5b | 14440 | #: builtin/update-index.c:1018 |
fb0e25bc CD |
14441 | msgid "test if the filesystem supports untracked cache" |
14442 | msgstr "probar si el filesystem soporta caché no rastreado" | |
14443 | ||
f8038f5b | 14444 | #: builtin/update-index.c:1020 |
fb0e25bc CD |
14445 | msgid "enable untracked cache without testing the filesystem" |
14446 | msgstr "habilitar caché no rastreado sin probar el filesystem" | |
14447 | ||
f8038f5b CDR |
14448 | #: builtin/update-index.c:1022 |
14449 | msgid "write out the index even if is not flagged as changed" | |
14450 | msgstr "escribir el índice incluso si no está marcado como cambiado" | |
14451 | ||
14452 | #: builtin/update-index.c:1024 | |
14453 | msgid "enable or disable file system monitor" | |
14454 | msgstr "activar o desactivar monitor de sistema de archivos" | |
14455 | ||
14456 | #: builtin/update-index.c:1026 | |
14457 | msgid "mark files as fsmonitor valid" | |
14458 | msgstr "marcar archivos como válidos para fsmonitor" | |
14459 | ||
14460 | #: builtin/update-index.c:1029 | |
14461 | msgid "clear fsmonitor valid bit" | |
14462 | msgstr "limpia el bit de validación fsmonitor" | |
14463 | ||
14464 | #: builtin/update-index.c:1127 | |
4b15eb22 CD |
14465 | msgid "" |
14466 | "core.splitIndex is set to false; remove or change it, if you really want to " | |
14467 | "enable split index" | |
14468 | msgstr "" | |
14469 | "core.splitIndex está configurado en false; remuévelo o cámbialo, si " | |
14470 | "realmente quieres habilitar el índice partido" | |
fb0e25bc | 14471 | |
f8038f5b | 14472 | #: builtin/update-index.c:1136 |
4b15eb22 CD |
14473 | msgid "" |
14474 | "core.splitIndex is set to true; remove or change it, if you really want to " | |
14475 | "disable split index" | |
14476 | msgstr "" | |
14477 | "core.splitIndex está configurado en true; remuévelo o cámbialo, si realmente " | |
14478 | "quieres deshabilitar el índice partido" | |
fb0e25bc | 14479 | |
f8038f5b | 14480 | #: builtin/update-index.c:1147 |
4b15eb22 CD |
14481 | msgid "" |
14482 | "core.untrackedCache is set to true; remove or change it, if you really want " | |
14483 | "to disable the untracked cache" | |
14484 | msgstr "" | |
14485 | "core.untrackedCache está configurado en true; remuévelo o cámbialo, si " | |
14486 | "realmente quieres deshabilitar el chaché no rastreado" | |
fb0e25bc | 14487 | |
f8038f5b | 14488 | #: builtin/update-index.c:1151 |
fb0e25bc CD |
14489 | msgid "Untracked cache disabled" |
14490 | msgstr "Caché no rastreado deshabilitado" | |
14491 | ||
f8038f5b | 14492 | #: builtin/update-index.c:1159 |
4b15eb22 CD |
14493 | msgid "" |
14494 | "core.untrackedCache is set to false; remove or change it, if you really want " | |
14495 | "to enable the untracked cache" | |
14496 | msgstr "" | |
14497 | "core.untrackedCache está configurado en false; remuévelo o cámbialo, si " | |
14498 | "realmente quieres habilitar el caché no rastreado" | |
fb0e25bc | 14499 | |
f8038f5b | 14500 | #: builtin/update-index.c:1163 |
fb0e25bc CD |
14501 | #, c-format |
14502 | msgid "Untracked cache enabled for '%s'" | |
14503 | msgstr "Caché no rastreado habilitado para '%s'" | |
14504 | ||
f8038f5b CDR |
14505 | #: builtin/update-index.c:1171 |
14506 | msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor" | |
14507 | msgstr "" | |
14508 | "core.fsmonitor no está configurado; actívalo si realmente quieres habilitar " | |
14509 | "fsmonitor" | |
14510 | ||
14511 | #: builtin/update-index.c:1175 | |
14512 | msgid "fsmonitor enabled" | |
14513 | msgstr "fsmonitor activado" | |
14514 | ||
14515 | #: builtin/update-index.c:1178 | |
14516 | msgid "" | |
14517 | "core.fsmonitor is set; remove it if you really want to disable fsmonitor" | |
14518 | msgstr "" | |
14519 | "core.fsmonitor está configurado; remuévelo si realmente quieres deshabilitar " | |
14520 | "el fsmonitor" | |
14521 | ||
14522 | #: builtin/update-index.c:1182 | |
14523 | msgid "fsmonitor disabled" | |
14524 | msgstr "fsmonitor desactivado" | |
14525 | ||
fb0e25bc CD |
14526 | #: builtin/update-ref.c:10 |
14527 | msgid "git update-ref [<options>] -d <refname> [<old-val>]" | |
14528 | msgstr "git update-ref [<opciones>] -d <nombre-referencia> [<valor-anterior>]" | |
14529 | ||
14530 | #: builtin/update-ref.c:11 | |
14531 | msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]" | |
4b15eb22 CD |
14532 | msgstr "" |
14533 | "git update-ref [<opciones>] <nombre-referencia> <valor-nuevo> [<valor-" | |
14534 | "anterior>]" | |
fb0e25bc CD |
14535 | |
14536 | #: builtin/update-ref.c:12 | |
14537 | msgid "git update-ref [<options>] --stdin [-z]" | |
14538 | msgstr "git update-ref [<opciones>] --stdin [-z]" | |
14539 | ||
4b15eb22 | 14540 | #: builtin/update-ref.c:363 |
fb0e25bc CD |
14541 | msgid "delete the reference" |
14542 | msgstr "eliminar la referencia" | |
14543 | ||
4b15eb22 | 14544 | #: builtin/update-ref.c:365 |
fb0e25bc CD |
14545 | msgid "update <refname> not the one it points to" |
14546 | msgstr "actualiza <refname> no a lo que apunta" | |
14547 | ||
4b15eb22 | 14548 | #: builtin/update-ref.c:366 |
fb0e25bc CD |
14549 | msgid "stdin has NUL-terminated arguments" |
14550 | msgstr "stdin tiene argumentos terminados en NUL" | |
14551 | ||
4b15eb22 | 14552 | #: builtin/update-ref.c:367 |
fb0e25bc CD |
14553 | msgid "read updates from stdin" |
14554 | msgstr "lee actualizaciones de stdin" | |
14555 | ||
14556 | #: builtin/update-server-info.c:7 | |
14557 | msgid "git update-server-info [--force]" | |
14558 | msgstr "git update-server-info [--force]" | |
14559 | ||
14560 | #: builtin/update-server-info.c:15 | |
14561 | msgid "update the info files from scratch" | |
715fc761 | 14562 | msgstr "actualiza los archivos info desde cero" |
fb0e25bc CD |
14563 | |
14564 | #: builtin/verify-commit.c:18 | |
14565 | msgid "git verify-commit [-v | --verbose] <commit>..." | |
715fc761 | 14566 | msgstr "git verify-commit [-v | --verbose] <commit>..." |
fb0e25bc CD |
14567 | |
14568 | #: builtin/verify-commit.c:73 | |
14569 | msgid "print commit contents" | |
715fc761 | 14570 | msgstr "imprimir contenido del commit" |
fb0e25bc CD |
14571 | |
14572 | #: builtin/verify-commit.c:74 builtin/verify-tag.c:38 | |
14573 | msgid "print raw gpg status output" | |
14574 | msgstr "muestra la salida de status gpg en formato raw" | |
14575 | ||
14576 | #: builtin/verify-pack.c:55 | |
14577 | msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..." | |
14578 | msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <paquete>..." | |
14579 | ||
14580 | #: builtin/verify-pack.c:65 | |
14581 | msgid "verbose" | |
14582 | msgstr "verboso" | |
14583 | ||
14584 | #: builtin/verify-pack.c:67 | |
14585 | msgid "show statistics only" | |
14586 | msgstr "solo mostrar estadísticas" | |
14587 | ||
14588 | #: builtin/verify-tag.c:19 | |
14589 | msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..." | |
14590 | msgstr "git verify-tag [-v | --verbose] [--format=<formato>] <tag>..." | |
14591 | ||
14592 | #: builtin/verify-tag.c:37 | |
14593 | msgid "print tag contents" | |
715fc761 | 14594 | msgstr "imprimir contenido del tag" |
fb0e25bc | 14595 | |
f8038f5b | 14596 | #: builtin/worktree.c:17 |
33ac3e89 CDR |
14597 | msgid "git worktree add [<options>] <path> [<commit-ish>]" |
14598 | msgstr "git worktree add [<opciones>] <ruta> [<commit-ish>]" | |
fb0e25bc | 14599 | |
f8038f5b | 14600 | #: builtin/worktree.c:18 |
fb0e25bc CD |
14601 | msgid "git worktree list [<options>]" |
14602 | msgstr "git worktree list [<opciones>]" | |
14603 | ||
f8038f5b | 14604 | #: builtin/worktree.c:19 |
fb0e25bc CD |
14605 | msgid "git worktree lock [<options>] <path>" |
14606 | msgstr "git worktree lock [<opciones>] <ruta>" | |
14607 | ||
f8038f5b | 14608 | #: builtin/worktree.c:20 |
33ac3e89 CDR |
14609 | msgid "git worktree move <worktree> <new-path>" |
14610 | msgstr "git worktree move <worktree> <nueva-ruta>" | |
14611 | ||
14612 | #: builtin/worktree.c:21 | |
fb0e25bc CD |
14613 | msgid "git worktree prune [<options>]" |
14614 | msgstr "git worktree prune [<opciones>]" | |
14615 | ||
33ac3e89 CDR |
14616 | #: builtin/worktree.c:22 |
14617 | msgid "git worktree remove [<options>] <worktree>" | |
14618 | msgstr "git worktree remove [<opciones>] <worktree>" | |
14619 | ||
14620 | #: builtin/worktree.c:23 | |
fb0e25bc CD |
14621 | msgid "git worktree unlock <path>" |
14622 | msgstr "git worktree unlock <ruta>" | |
14623 | ||
33ac3e89 | 14624 | #: builtin/worktree.c:60 |
fb0e25bc CD |
14625 | #, c-format |
14626 | msgid "Removing worktrees/%s: not a valid directory" | |
14627 | msgstr "Removiendo el worktrees/%s: no es un directorio válido" | |
14628 | ||
33ac3e89 | 14629 | #: builtin/worktree.c:66 |
fb0e25bc CD |
14630 | #, c-format |
14631 | msgid "Removing worktrees/%s: gitdir file does not exist" | |
14632 | msgstr "Removiendo worktrees/%s: archivo gitdir no existe" | |
14633 | ||
33ac3e89 | 14634 | #: builtin/worktree.c:71 builtin/worktree.c:80 |
fb0e25bc CD |
14635 | #, c-format |
14636 | msgid "Removing worktrees/%s: unable to read gitdir file (%s)" | |
14637 | msgstr "Removiendo worktrees/%s: no es posible leer el archivo gitdir (%s)" | |
14638 | ||
33ac3e89 | 14639 | #: builtin/worktree.c:90 |
4b15eb22 CD |
14640 | #, c-format |
14641 | msgid "" | |
14642 | "Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read " | |
14643 | "%<PRIuMAX>)" | |
14644 | msgstr "" | |
14645 | "Removiendo árboles de trabajo/%s: lectura corta (se esperan %<PRIuMAX> " | |
14646 | "bytes, %<PRIuMAX> leídos)" | |
14647 | ||
33ac3e89 | 14648 | #: builtin/worktree.c:98 |
fb0e25bc CD |
14649 | #, c-format |
14650 | msgid "Removing worktrees/%s: invalid gitdir file" | |
14651 | msgstr "Removiendo worktrees/%s: archivo gitdir inválido" | |
14652 | ||
33ac3e89 | 14653 | #: builtin/worktree.c:114 |
fb0e25bc CD |
14654 | #, c-format |
14655 | msgid "Removing worktrees/%s: gitdir file points to non-existent location" | |
4b15eb22 CD |
14656 | msgstr "" |
14657 | "Removiendo worktrees/%s: archivo gitdir apunta a una ubicación no existente" | |
fb0e25bc | 14658 | |
33ac3e89 | 14659 | #: builtin/worktree.c:161 |
fb0e25bc CD |
14660 | msgid "report pruned working trees" |
14661 | msgstr "reporta árboles de trabajo recortados" | |
14662 | ||
33ac3e89 | 14663 | #: builtin/worktree.c:163 |
fb0e25bc CD |
14664 | msgid "expire working trees older than <time>" |
14665 | msgstr "expirar árboles de trabajo más viejos a <tiempo>" | |
14666 | ||
33ac3e89 | 14667 | #: builtin/worktree.c:238 |
fb0e25bc CD |
14668 | #, c-format |
14669 | msgid "'%s' already exists" | |
14670 | msgstr "'%s' ya existe" | |
14671 | ||
33ac3e89 | 14672 | #: builtin/worktree.c:269 |
fb0e25bc CD |
14673 | #, c-format |
14674 | msgid "could not create directory of '%s'" | |
14675 | msgstr "no se pudo crear directorio de '%s'" | |
14676 | ||
33ac3e89 | 14677 | #: builtin/worktree.c:308 |
fb0e25bc CD |
14678 | #, c-format |
14679 | msgid "Preparing %s (identifier %s)" | |
14680 | msgstr "Preparando %s (identificador %s)" | |
14681 | ||
33ac3e89 | 14682 | #: builtin/worktree.c:385 |
fb0e25bc | 14683 | msgid "checkout <branch> even if already checked out in other worktree" |
4b15eb22 CD |
14684 | msgstr "" |
14685 | "hacer checkout a <rama> incluso si ya ha hecho checkout en otro árbol de " | |
14686 | "trabajo" | |
fb0e25bc | 14687 | |
33ac3e89 | 14688 | #: builtin/worktree.c:388 |
fb0e25bc CD |
14689 | msgid "create a new branch" |
14690 | msgstr "crear una nueva rama" | |
14691 | ||
33ac3e89 | 14692 | #: builtin/worktree.c:390 |
fb0e25bc CD |
14693 | msgid "create or reset a branch" |
14694 | msgstr "crear o restablecer una rama" | |
14695 | ||
33ac3e89 | 14696 | #: builtin/worktree.c:392 |
fb0e25bc CD |
14697 | msgid "populate the new working tree" |
14698 | msgstr "popular el nuevo árbol de trabajo" | |
14699 | ||
33ac3e89 | 14700 | #: builtin/worktree.c:393 |
fb0e25bc CD |
14701 | msgid "keep the new working tree locked" |
14702 | msgstr "mantener el nuevo árbol de trabajo bloqueado" | |
14703 | ||
33ac3e89 | 14704 | #: builtin/worktree.c:395 |
f8038f5b CDR |
14705 | msgid "set up tracking mode (see git-branch(1))" |
14706 | msgstr "configurando modo tracking (mirar git-branch(1))" | |
14707 | ||
33ac3e89 | 14708 | #: builtin/worktree.c:398 |
f8038f5b CDR |
14709 | msgid "try to match the new branch name with a remote-tracking branch" |
14710 | msgstr "" | |
14711 | "intentar emparejar el nuevo nombre de rama con una rama de rastreo remoto" | |
14712 | ||
33ac3e89 | 14713 | #: builtin/worktree.c:406 |
fb0e25bc CD |
14714 | msgid "-b, -B, and --detach are mutually exclusive" |
14715 | msgstr "-b, -B, y --detach son mutuamente exclusivas" | |
14716 | ||
33ac3e89 | 14717 | #: builtin/worktree.c:471 |
f8038f5b CDR |
14718 | msgid "--[no-]track can only be used if a new branch is created" |
14719 | msgstr "--[no-]track solo puede ser usado si una nueva rama es creada" | |
14720 | ||
33ac3e89 | 14721 | #: builtin/worktree.c:571 |
fb0e25bc CD |
14722 | msgid "reason for locking" |
14723 | msgstr "razón para bloquear" | |
14724 | ||
33ac3e89 CDR |
14725 | #: builtin/worktree.c:583 builtin/worktree.c:616 builtin/worktree.c:670 |
14726 | #: builtin/worktree.c:809 | |
fb0e25bc CD |
14727 | #, c-format |
14728 | msgid "'%s' is not a working tree" | |
14729 | msgstr "'%s' no es un árbol de trabajo" | |
14730 | ||
33ac3e89 | 14731 | #: builtin/worktree.c:585 builtin/worktree.c:618 |
fb0e25bc CD |
14732 | msgid "The main working tree cannot be locked or unlocked" |
14733 | msgstr "El árbol de trabajo principal no puede ser bloqueado ni desbloqueado" | |
14734 | ||
33ac3e89 | 14735 | #: builtin/worktree.c:590 |
fb0e25bc CD |
14736 | #, c-format |
14737 | msgid "'%s' is already locked, reason: %s" | |
14738 | msgstr "'%s' ya está bloqueado; razón: %s" | |
14739 | ||
33ac3e89 | 14740 | #: builtin/worktree.c:592 |
fb0e25bc CD |
14741 | #, c-format |
14742 | msgid "'%s' is already locked" | |
14743 | msgstr "'%s' ya está bloqueado" | |
14744 | ||
33ac3e89 | 14745 | #: builtin/worktree.c:620 |
fb0e25bc CD |
14746 | #, c-format |
14747 | msgid "'%s' is not locked" | |
14748 | msgstr "'%s' no está bloqueado" | |
14749 | ||
33ac3e89 CDR |
14750 | #: builtin/worktree.c:645 |
14751 | msgid "working trees containing submodules cannot be moved or removed" | |
14752 | msgstr "" | |
14753 | "árboles de trabajo conteniendo submódulos no puede ser movidos o removidos" | |
14754 | ||
14755 | #: builtin/worktree.c:672 builtin/worktree.c:811 | |
14756 | #, c-format | |
14757 | msgid "'%s' is a main working tree" | |
14758 | msgstr "'%s' es un árbol de trabajo principal" | |
14759 | ||
14760 | #: builtin/worktree.c:677 | |
14761 | #, c-format | |
14762 | msgid "could not figure out destination name from '%s'" | |
14763 | msgstr "no se pudo descubrir el nombre de destino de '%s'" | |
14764 | ||
14765 | #: builtin/worktree.c:683 | |
14766 | #, c-format | |
14767 | msgid "target '%s' already exists" | |
14768 | msgstr "el objetivo '%s' ya existe" | |
14769 | ||
14770 | #: builtin/worktree.c:690 | |
14771 | #, c-format | |
14772 | msgid "cannot move a locked working tree, lock reason: %s" | |
14773 | msgstr "" | |
14774 | "no se puede mover un árbol de trabajo encerrado, motivo del encierro: %s" | |
14775 | ||
14776 | #: builtin/worktree.c:692 | |
14777 | msgid "cannot move a locked working tree" | |
14778 | msgstr "no se puede mover un árbol de trabajo encerrado" | |
14779 | ||
14780 | #: builtin/worktree.c:695 | |
14781 | #, c-format | |
14782 | msgid "validation failed, cannot move working tree: %s" | |
14783 | msgstr "falló validación, no se puede mover el árbol de trabajo: %s" | |
14784 | ||
14785 | #: builtin/worktree.c:700 | |
14786 | #, c-format | |
14787 | msgid "failed to move '%s' to '%s'" | |
14788 | msgstr "fallo al mover '%s' a '%s'" | |
14789 | ||
14790 | #: builtin/worktree.c:748 | |
14791 | #, c-format | |
14792 | msgid "failed to run 'git status' on '%s'" | |
14793 | msgstr "falló al ejecutar 'git status' en '%s'" | |
14794 | ||
14795 | #: builtin/worktree.c:752 | |
14796 | #, c-format | |
14797 | msgid "'%s' is dirty, use --force to delete it" | |
14798 | msgstr "'%s' está sucio, use --force para borrarlo" | |
14799 | ||
14800 | #: builtin/worktree.c:757 | |
14801 | #, c-format | |
14802 | msgid "failed to run 'git status' on '%s', code %d" | |
14803 | msgstr "no se pudo ejecutar 'git status' en '%s', código %d" | |
14804 | ||
14805 | #: builtin/worktree.c:768 builtin/worktree.c:782 | |
14806 | #, c-format | |
14807 | msgid "failed to delete '%s'" | |
14808 | msgstr "fallo al borrar '%s'" | |
14809 | ||
14810 | #: builtin/worktree.c:794 | |
14811 | msgid "force removing even if the worktree is dirty" | |
14812 | msgstr "forzar remoción incluso si el árbol de trabajo está sucio" | |
14813 | ||
14814 | #: builtin/worktree.c:815 | |
14815 | #, c-format | |
14816 | msgid "cannot remove a locked working tree, lock reason: %s" | |
14817 | msgstr "" | |
14818 | "no se pueden remover árbol de trabajo encerrado, razón del encierro: %s" | |
14819 | ||
14820 | #: builtin/worktree.c:817 | |
14821 | msgid "cannot remove a locked working tree" | |
14822 | msgstr "no se puede remover árbol de trabajo encerrado" | |
14823 | ||
14824 | #: builtin/worktree.c:820 | |
14825 | #, c-format | |
14826 | msgid "validation failed, cannot remove working tree: %s" | |
14827 | msgstr "falló validación, no se puede remover árbol de trabajo: %s" | |
14828 | ||
fb0e25bc CD |
14829 | #: builtin/write-tree.c:14 |
14830 | msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]" | |
14831 | msgstr "git write-tree [--missing-ok] [--prefix=<prefijo>/]" | |
14832 | ||
14833 | #: builtin/write-tree.c:27 | |
14834 | msgid "<prefix>/" | |
14835 | msgstr "<prefijo>/" | |
14836 | ||
14837 | #: builtin/write-tree.c:28 | |
14838 | msgid "write tree object for a subdirectory <prefix>" | |
715fc761 | 14839 | msgstr "escribir objeto de árbol para un subdirectorio <prefijo>" |
fb0e25bc CD |
14840 | |
14841 | #: builtin/write-tree.c:31 | |
14842 | msgid "only useful for debugging" | |
14843 | msgstr "sólo útil para depurar" | |
14844 | ||
33ac3e89 | 14845 | #: upload-pack.c:27 |
fb0e25bc CD |
14846 | msgid "git upload-pack [<options>] <dir>" |
14847 | msgstr "git upload-pack [<opciones>] <directorio>" | |
14848 | ||
33ac3e89 | 14849 | #: upload-pack.c:1070 |
fb0e25bc CD |
14850 | msgid "quit after a single request/response exchange" |
14851 | msgstr "sale después de un intercambio petición/respuesta único" | |
14852 | ||
33ac3e89 | 14853 | #: upload-pack.c:1072 |
fb0e25bc CD |
14854 | msgid "exit immediately after initial ref advertisement" |
14855 | msgstr "salir inmediatamente tras el anuncio inicial de ref" | |
14856 | ||
33ac3e89 | 14857 | #: upload-pack.c:1074 |
fb0e25bc CD |
14858 | msgid "do not try <directory>/.git/ if <directory> is no Git directory" |
14859 | msgstr "no intente <directorio>/.git/ si <directorio> no es un directorio Git" | |
14860 | ||
33ac3e89 | 14861 | #: upload-pack.c:1076 |
fb0e25bc CD |
14862 | msgid "interrupt transfer after <n> seconds of inactivity" |
14863 | msgstr "interrumpir transferencia tras <n> segundos de inactividad" | |
14864 | ||
4b15eb22 | 14865 | #: credential-cache--daemon.c:222 |
fb0e25bc CD |
14866 | #, c-format |
14867 | msgid "" | |
14868 | "The permissions on your socket directory are too loose; other\n" | |
14869 | "users may be able to read your cached credentials. Consider running:\n" | |
14870 | "\n" | |
14871 | "\tchmod 0700 %s" | |
14872 | msgstr "" | |
14873 | "Los permisos en su directorio de socket son demasiado flojos; otros\n" | |
4b15eb22 CD |
14874 | "usuarios pueden leer sus credenciales almacenadas en caché. Considere " |
14875 | "ejecutar:\n" | |
fb0e25bc CD |
14876 | "\n" |
14877 | "\tchmod 0700 %s" | |
14878 | ||
4b15eb22 | 14879 | #: credential-cache--daemon.c:271 |
fb0e25bc CD |
14880 | msgid "print debugging messages to stderr" |
14881 | msgstr "mostrar mensajes de debug en stderr" | |
14882 | ||
33ac3e89 CDR |
14883 | #: git.c:8 |
14884 | msgid "" | |
14885 | "git [--version] [--help] [-C <path>] [-c <name>=<value>]\n" | |
14886 | " [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n" | |
14887 | " [-p | --paginate | --no-pager] [--no-replace-objects] [--bare]\n" | |
14888 | " [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n" | |
14889 | " <command> [<args>]" | |
14890 | msgstr "" | |
14891 | "git [--version] [--help] [-C <ruta>] [-c <nombre>=<valor>]\n" | |
14892 | " [--exec-path[=<ruta>]] [--html-path] [--man-path] [--info-path]\n" | |
14893 | " [-p | --paginate | --no-pager] [--no-replace-objects] [--bare]\n" | |
14894 | " [--git-dir=<ruta>] [--work-tree=<ruta>] [--namespace=<nombre>]\n" | |
14895 | " <comando> [<args>]" | |
14896 | ||
fb0e25bc CD |
14897 | #: git.c:15 |
14898 | msgid "" | |
14899 | "'git help -a' and 'git help -g' list available subcommands and some\n" | |
14900 | "concept guides. See 'git help <command>' or 'git help <concept>'\n" | |
14901 | "to read about a specific subcommand or concept." | |
14902 | msgstr "" | |
14903 | "'git help -a' y 'git help -g' listan los subcomandos disponibles y algunas\n" | |
14904 | "guías de concepto. Consulte 'git help <command>' o 'git help <concepto>'\n" | |
14905 | "para leer sobre un subcomando o concepto específico." | |
14906 | ||
33ac3e89 CDR |
14907 | #: git.c:95 |
14908 | #, c-format | |
14909 | msgid "no directory given for --git-dir\n" | |
14910 | msgstr "no se entregó directorio para --git-dir\n" | |
14911 | ||
14912 | #: git.c:109 | |
14913 | #, c-format | |
14914 | msgid "no namespace given for --namespace\n" | |
14915 | msgstr "no se entregó namespace para --namespace\n" | |
14916 | ||
14917 | #: git.c:123 | |
14918 | #, c-format | |
14919 | msgid "no directory given for --work-tree\n" | |
14920 | msgstr "no se entregó directorio para --work-tree\n" | |
14921 | ||
14922 | #: git.c:137 | |
14923 | #, c-format | |
14924 | msgid "no prefix given for --super-prefix\n" | |
14925 | msgstr "no se entregó prefijo para --super-prefix\n" | |
14926 | ||
14927 | #: git.c:159 | |
14928 | #, c-format | |
14929 | msgid "-c expects a configuration string\n" | |
14930 | msgstr "-c espera un string de configuración\n" | |
14931 | ||
14932 | #: git.c:197 | |
14933 | #, c-format | |
14934 | msgid "no directory given for -C\n" | |
14935 | msgstr "no se entregó directorio para -C\n" | |
14936 | ||
14937 | #: git.c:212 | |
14938 | #, c-format | |
14939 | msgid "unknown option: %s\n" | |
14940 | msgstr "opción %s desconocida\n" | |
14941 | ||
14942 | #: git.c:687 | |
14943 | #, c-format | |
14944 | msgid "expansion of alias '%s' failed; '%s' is not a git command\n" | |
14945 | msgstr "expansión del alias '%s' falló; '%s' no es un comando de git\n" | |
14946 | ||
14947 | #: git.c:699 | |
14948 | #, c-format | |
14949 | msgid "failed to run command '%s': %s\n" | |
14950 | msgstr "fallo al ejecutar comando '%s': %s\n" | |
14951 | ||
14952 | #: http.c:342 | |
fb0e25bc CD |
14953 | #, c-format |
14954 | msgid "negative value for http.postbuffer; defaulting to %d" | |
14955 | msgstr "valor negativo para http.postbuffer; poniendo el default a %d" | |
14956 | ||
33ac3e89 | 14957 | #: http.c:363 |
fb0e25bc CD |
14958 | msgid "Delegation control is not supported with cURL < 7.22.0" |
14959 | msgstr "Delegación de control no es soportada con cURL < 7.22.0" | |
14960 | ||
33ac3e89 | 14961 | #: http.c:372 |
fb0e25bc CD |
14962 | msgid "Public key pinning not supported with cURL < 7.44.0" |
14963 | msgstr "Fijación de llave pública no es soportada con cURL < 7.44.0" | |
14964 | ||
33ac3e89 | 14965 | #: http.c:1857 |
fb0e25bc CD |
14966 | #, c-format |
14967 | msgid "" | |
14968 | "unable to update url base from redirection:\n" | |
14969 | " asked for: %s\n" | |
14970 | " redirect: %s" | |
14971 | msgstr "" | |
14972 | "no puede actualizar la base de url de la redirección:\n" | |
14973 | " preguntaba por: %s\n" | |
14974 | " redireccionamiento: %s" | |
14975 | ||
33ac3e89 | 14976 | #: remote-curl.c:345 |
fb0e25bc CD |
14977 | #, c-format |
14978 | msgid "redirecting to %s" | |
14979 | msgstr "redirigiendo a %s" | |
14980 | ||
33ac3e89 | 14981 | #: list-objects-filter-options.h:59 |
f8038f5b CDR |
14982 | msgid "args" |
14983 | msgstr "args" | |
14984 | ||
33ac3e89 | 14985 | #: list-objects-filter-options.h:60 |
f8038f5b CDR |
14986 | msgid "object filtering" |
14987 | msgstr "filtrado de objeto" | |
14988 | ||
fb0e25bc CD |
14989 | #: common-cmds.h:9 |
14990 | msgid "start a working area (see also: git help tutorial)" | |
715fc761 | 14991 | msgstr "comienza un área de trabajo (ver también: git help tutorial)" |
fb0e25bc CD |
14992 | |
14993 | #: common-cmds.h:10 | |
14994 | msgid "work on the current change (see also: git help everyday)" | |
715fc761 | 14995 | msgstr "trabaja en los cambios actuales (ver también: git help everyday)" |
fb0e25bc CD |
14996 | |
14997 | #: common-cmds.h:11 | |
14998 | msgid "examine the history and state (see also: git help revisions)" | |
715fc761 | 14999 | msgstr "examina el historial y el estado (ver también: git help revisions)" |
fb0e25bc CD |
15000 | |
15001 | #: common-cmds.h:12 | |
15002 | msgid "grow, mark and tweak your common history" | |
9df63a4a | 15003 | msgstr "crece, marca y ajusta tu historial común" |
fb0e25bc CD |
15004 | |
15005 | #: common-cmds.h:13 | |
15006 | msgid "collaborate (see also: git help workflows)" | |
715fc761 | 15007 | msgstr "colabora (mira también: git help workflows)" |
fb0e25bc CD |
15008 | |
15009 | #: common-cmds.h:17 | |
15010 | msgid "Add file contents to the index" | |
9df63a4a | 15011 | msgstr "Agrega contenido de carpetas al índice" |
fb0e25bc CD |
15012 | |
15013 | #: common-cmds.h:18 | |
15014 | msgid "Use binary search to find the commit that introduced a bug" | |
33ac3e89 | 15015 | msgstr "Use la búsqueda binaria para encontrar el commit que introdujo el bug" |
fb0e25bc CD |
15016 | |
15017 | #: common-cmds.h:19 | |
15018 | msgid "List, create, or delete branches" | |
15019 | msgstr "Lista, crea, o borra ramas" | |
15020 | ||
15021 | #: common-cmds.h:20 | |
15022 | msgid "Switch branches or restore working tree files" | |
715fc761 | 15023 | msgstr "Cambia ramas o restaura los archivos de tu árbol de trabajo" |
fb0e25bc CD |
15024 | |
15025 | #: common-cmds.h:21 | |
15026 | msgid "Clone a repository into a new directory" | |
15027 | msgstr "Clona un repositorio dentro de un nuevo directorio" | |
15028 | ||
15029 | #: common-cmds.h:22 | |
15030 | msgid "Record changes to the repository" | |
15031 | msgstr "Graba los cambios en tu repositorio" | |
15032 | ||
15033 | #: common-cmds.h:23 | |
15034 | msgid "Show changes between commits, commit and working tree, etc" | |
715fc761 | 15035 | msgstr "Muestra los cambios entre commits, commit y árbol de trabajo, etc" |
fb0e25bc CD |
15036 | |
15037 | #: common-cmds.h:24 | |
15038 | msgid "Download objects and refs from another repository" | |
15039 | msgstr "Descarga objetos y referencias de otro repositorio" | |
15040 | ||
15041 | #: common-cmds.h:25 | |
15042 | msgid "Print lines matching a pattern" | |
715fc761 | 15043 | msgstr "Imprime las líneas que concuerdan con el patron" |
fb0e25bc CD |
15044 | |
15045 | #: common-cmds.h:26 | |
15046 | msgid "Create an empty Git repository or reinitialize an existing one" | |
715fc761 | 15047 | msgstr "Crea un repositorio de Git vacío o reinicia el que ya existe" |
fb0e25bc CD |
15048 | |
15049 | #: common-cmds.h:27 | |
15050 | msgid "Show commit logs" | |
715fc761 | 15051 | msgstr "Muestra los logs de los commits" |
fb0e25bc CD |
15052 | |
15053 | #: common-cmds.h:28 | |
15054 | msgid "Join two or more development histories together" | |
15055 | msgstr "Junta dos o mas historiales de desarrollo juntos" | |
15056 | ||
15057 | #: common-cmds.h:29 | |
15058 | msgid "Move or rename a file, a directory, or a symlink" | |
9df63a4a | 15059 | msgstr "Mueve o cambia el nombre a archivos, directorios o enlaces simbólicos" |
fb0e25bc CD |
15060 | |
15061 | #: common-cmds.h:30 | |
15062 | msgid "Fetch from and integrate with another repository or a local branch" | |
15063 | msgstr "Realiza un fetch e integra con otro repositorio o rama local" | |
15064 | ||
15065 | #: common-cmds.h:31 | |
15066 | msgid "Update remote refs along with associated objects" | |
15067 | msgstr "Actualiza referencias remotas junto con sus objetos asociados" | |
15068 | ||
15069 | #: common-cmds.h:32 | |
15070 | msgid "Reapply commits on top of another base tip" | |
15071 | msgstr "Vuelve a aplicar commits en la punta de otra rama" | |
15072 | ||
15073 | #: common-cmds.h:33 | |
15074 | msgid "Reset current HEAD to the specified state" | |
15075 | msgstr "Reinicia el HEAD actual a un estado especifico" | |
15076 | ||
15077 | #: common-cmds.h:34 | |
15078 | msgid "Remove files from the working tree and from the index" | |
9df63a4a | 15079 | msgstr "Borra archivos del árbol de trabajo y del índice" |
fb0e25bc CD |
15080 | |
15081 | #: common-cmds.h:35 | |
15082 | msgid "Show various types of objects" | |
15083 | msgstr "Muestra varios tipos de objetos" | |
15084 | ||
15085 | #: common-cmds.h:36 | |
15086 | msgid "Show the working tree status" | |
715fc761 | 15087 | msgstr "Muestra el estado del árbol de trabajo" |
fb0e25bc CD |
15088 | |
15089 | #: common-cmds.h:37 | |
15090 | msgid "Create, list, delete or verify a tag object signed with GPG" | |
15091 | msgstr "Crea, lista, borra o verifica un tag de objeto firmado con GPG" | |
15092 | ||
33ac3e89 | 15093 | #: parse-options.h:157 |
fb0e25bc | 15094 | msgid "expiry-date" |
715fc761 | 15095 | msgstr "fecha de expiración" |
fb0e25bc | 15096 | |
33ac3e89 | 15097 | #: parse-options.h:172 |
fb0e25bc CD |
15098 | msgid "no-op (backward compatibility)" |
15099 | msgstr "no-op (compatibilidad con versiones anteriores)" | |
15100 | ||
33ac3e89 | 15101 | #: parse-options.h:250 |
fb0e25bc CD |
15102 | msgid "be more verbose" |
15103 | msgstr "ser mas verboso" | |
15104 | ||
33ac3e89 | 15105 | #: parse-options.h:252 |
fb0e25bc CD |
15106 | msgid "be more quiet" |
15107 | msgstr "ser mas discreto" | |
15108 | ||
33ac3e89 | 15109 | #: parse-options.h:258 |
fb0e25bc | 15110 | msgid "use <n> digits to display SHA-1s" |
9df63a4a | 15111 | msgstr "usa <n> dígitos para mostrar SHA-1s" |
fb0e25bc CD |
15112 | |
15113 | #: rerere.h:40 | |
15114 | msgid "update the index with reused conflict resolution if possible" | |
4b15eb22 CD |
15115 | msgstr "" |
15116 | "actualizar el índice con la resolución de conflictos reutilizada si es " | |
15117 | "posible" | |
fb0e25bc CD |
15118 | |
15119 | #: git-bisect.sh:54 | |
15120 | msgid "You need to start by \"git bisect start\"" | |
15121 | msgstr "Debes iniciar con \"git bisect start\"" | |
15122 | ||
15123 | #. TRANSLATORS: Make sure to include [Y] and [n] in your | |
15124 | #. translation. The program will only accept English input | |
15125 | #. at this point. | |
15126 | #: git-bisect.sh:60 | |
15127 | msgid "Do you want me to do it for you [Y/n]? " | |
33ac3e89 | 15128 | msgstr "¿Quieres que lo haga por ti [Y/n]? " |
fb0e25bc CD |
15129 | |
15130 | #: git-bisect.sh:121 | |
15131 | #, sh-format | |
15132 | msgid "unrecognised option: '$arg'" | |
15133 | msgstr "opción no reconocida: '$arg'" | |
15134 | ||
15135 | #: git-bisect.sh:125 | |
15136 | #, sh-format | |
15137 | msgid "'$arg' does not appear to be a valid revision" | |
15138 | msgstr "'$arg' no parece ser una revisión válida" | |
15139 | ||
15140 | #: git-bisect.sh:154 | |
15141 | msgid "Bad HEAD - I need a HEAD" | |
15142 | msgstr "Mal HEAD - Necesito un HEAD" | |
15143 | ||
15144 | #: git-bisect.sh:167 | |
15145 | #, sh-format | |
4b15eb22 CD |
15146 | msgid "" |
15147 | "Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'." | |
15148 | msgstr "" | |
15149 | "Error al comprobar '$start_head'. Intente 'git bisect reset <rama-válida>'." | |
fb0e25bc CD |
15150 | |
15151 | #: git-bisect.sh:177 | |
15152 | msgid "won't bisect on cg-seek'ed tree" | |
9df63a4a | 15153 | msgstr "no se bisecará en un árbol con cg-seek" |
fb0e25bc CD |
15154 | |
15155 | #: git-bisect.sh:181 | |
15156 | msgid "Bad HEAD - strange symbolic ref" | |
15157 | msgstr "Mal HEAD - ref simbólico extraño" | |
15158 | ||
15159 | #: git-bisect.sh:233 | |
15160 | #, sh-format | |
15161 | msgid "Bad bisect_write argument: $state" | |
15162 | msgstr "Mal argumento bisect_write: $state" | |
15163 | ||
f8038f5b | 15164 | #: git-bisect.sh:246 |
fb0e25bc CD |
15165 | #, sh-format |
15166 | msgid "Bad rev input: $arg" | |
15167 | msgstr "Mala entrada rev: $arg" | |
15168 | ||
f8038f5b | 15169 | #: git-bisect.sh:265 |
fb0e25bc CD |
15170 | #, sh-format |
15171 | msgid "Bad rev input: $bisected_head" | |
15172 | msgstr "Mala entrada rev: $bisected_head" | |
15173 | ||
f8038f5b | 15174 | #: git-bisect.sh:274 |
fb0e25bc CD |
15175 | #, sh-format |
15176 | msgid "Bad rev input: $rev" | |
15177 | msgstr "Mala entrada rev: $rev" | |
15178 | ||
f8038f5b | 15179 | #: git-bisect.sh:283 |
fb0e25bc CD |
15180 | #, sh-format |
15181 | msgid "'git bisect $TERM_BAD' can take only one argument." | |
15182 | msgstr "'git bisect $TERM_BAD' solo puede tomar un argumento." | |
15183 | ||
f8038f5b | 15184 | #: git-bisect.sh:306 |
fb0e25bc CD |
15185 | #, sh-format |
15186 | msgid "Warning: bisecting only with a $TERM_BAD commit." | |
9df63a4a | 15187 | msgstr "Peligro: bisecando solo con un $TERM_BAD commit." |
fb0e25bc CD |
15188 | |
15189 | #. TRANSLATORS: Make sure to include [Y] and [n] in your | |
15190 | #. translation. The program will only accept English input | |
15191 | #. at this point. | |
f8038f5b | 15192 | #: git-bisect.sh:312 |
fb0e25bc | 15193 | msgid "Are you sure [Y/n]? " |
33ac3e89 | 15194 | msgstr "¿Estás seguro [Y/n]? " |
fb0e25bc | 15195 | |
f8038f5b | 15196 | #: git-bisect.sh:324 |
fb0e25bc CD |
15197 | #, sh-format |
15198 | msgid "" | |
15199 | "You need to give me at least one $bad_syn and one $good_syn revision.\n" | |
15200 | "(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)" | |
15201 | msgstr "" | |
15202 | "Tiene que dar al menos un $bad_syn y un $good_syn revision.\n" | |
15203 | "(Puede ver \"git bisect $bad_syn\" y \"git bisect $good_syn\" para eso.)" | |
15204 | ||
f8038f5b | 15205 | #: git-bisect.sh:327 |
fb0e25bc CD |
15206 | #, sh-format |
15207 | msgid "" | |
15208 | "You need to start by \"git bisect start\".\n" | |
15209 | "You then need to give me at least one $good_syn and one $bad_syn revision.\n" | |
15210 | "(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)" | |
15211 | msgstr "" | |
15212 | "Tiene que comenzar por \"git bisect start\".\n" | |
15213 | "Después tiene que entregar al menos un $good_syn y un $bad_syn revision.\n" | |
15214 | "(Puede usar \"git bisect $bad_syn\" y \"git bisect $good_syn\" para eso.)" | |
15215 | ||
f8038f5b | 15216 | #: git-bisect.sh:398 git-bisect.sh:512 |
fb0e25bc | 15217 | msgid "We are not bisecting." |
9df63a4a | 15218 | msgstr "No estamos bisecando." |
fb0e25bc | 15219 | |
f8038f5b | 15220 | #: git-bisect.sh:405 |
fb0e25bc CD |
15221 | #, sh-format |
15222 | msgid "'$invalid' is not a valid commit" | |
715fc761 | 15223 | msgstr "'$invalid' no es un commit válido" |
fb0e25bc | 15224 | |
f8038f5b | 15225 | #: git-bisect.sh:414 |
fb0e25bc CD |
15226 | #, sh-format |
15227 | msgid "" | |
15228 | "Could not check out original HEAD '$branch'.\n" | |
15229 | "Try 'git bisect reset <commit>'." | |
15230 | msgstr "" | |
15231 | "No se pudo revisar el HEAD original '$branch'.\n" | |
15232 | "Intente 'git bisect reset <commit>'." | |
15233 | ||
f8038f5b | 15234 | #: git-bisect.sh:422 |
fb0e25bc | 15235 | msgid "No logfile given" |
715fc761 | 15236 | msgstr "Ningún logfile proporcionado" |
fb0e25bc | 15237 | |
f8038f5b | 15238 | #: git-bisect.sh:423 |
fb0e25bc CD |
15239 | #, sh-format |
15240 | msgid "cannot read $file for replaying" | |
15241 | msgstr "no se puede leer $file para reproducir" | |
15242 | ||
f8038f5b | 15243 | #: git-bisect.sh:444 |
fb0e25bc CD |
15244 | msgid "?? what are you talking about?" |
15245 | msgstr "?? ¿De qué estás hablando?" | |
15246 | ||
f8038f5b CDR |
15247 | #: git-bisect.sh:453 |
15248 | msgid "bisect run failed: no command provided." | |
33ac3e89 | 15249 | msgstr "bisect falló: no se proveyó comando." |
f8038f5b CDR |
15250 | |
15251 | #: git-bisect.sh:458 | |
fb0e25bc CD |
15252 | #, sh-format |
15253 | msgid "running $command" | |
15254 | msgstr "ejecutando $command" | |
15255 | ||
f8038f5b | 15256 | #: git-bisect.sh:465 |
fb0e25bc CD |
15257 | #, sh-format |
15258 | msgid "" | |
15259 | "bisect run failed:\n" | |
15260 | "exit code $res from '$command' is < 0 or >= 128" | |
15261 | msgstr "" | |
15262 | "bisect falló:\n" | |
15263 | "código de salida $res de '$command' es <0 o >=128" | |
15264 | ||
f8038f5b | 15265 | #: git-bisect.sh:491 |
fb0e25bc CD |
15266 | msgid "bisect run cannot continue any more" |
15267 | msgstr "bisect no puede seguir continuando" | |
15268 | ||
f8038f5b | 15269 | #: git-bisect.sh:497 |
fb0e25bc CD |
15270 | #, sh-format |
15271 | msgid "" | |
15272 | "bisect run failed:\n" | |
15273 | "'bisect_state $state' exited with error code $res" | |
15274 | msgstr "" | |
15275 | "bisect falló:\n" | |
15276 | "'bisect_state $state' salió con código de error $res" | |
15277 | ||
f8038f5b | 15278 | #: git-bisect.sh:504 |
fb0e25bc CD |
15279 | msgid "bisect run success" |
15280 | msgstr "bisect exitoso" | |
15281 | ||
f8038f5b | 15282 | #: git-bisect.sh:533 |
fb0e25bc CD |
15283 | #, sh-format |
15284 | msgid "Invalid command: you're currently in a $TERM_BAD/$TERM_GOOD bisect." | |
4b15eb22 | 15285 | msgstr "" |
33ac3e89 | 15286 | "Comando inválido: actualmente se encuentra en un bisect $TERM_BAD/$TERM_GOOD." |
fb0e25bc | 15287 | |
f8038f5b | 15288 | #: git-bisect.sh:567 |
fb0e25bc CD |
15289 | msgid "no terms defined" |
15290 | msgstr "no hay términos definidos" | |
15291 | ||
f8038f5b | 15292 | #: git-bisect.sh:584 |
fb0e25bc CD |
15293 | #, sh-format |
15294 | msgid "" | |
15295 | "invalid argument $arg for 'git bisect terms'.\n" | |
15296 | "Supported options are: --term-good|--term-old and --term-bad|--term-new." | |
15297 | msgstr "" | |
15298 | "argumento inválido $arg para 'git bisect terms'.\n" | |
4b15eb22 CD |
15299 | "Las opciones soportadas son: --term-good|--term-old and --term-bad|--term-" |
15300 | "new." | |
fb0e25bc CD |
15301 | |
15302 | #: git-merge-octopus.sh:46 | |
4b15eb22 CD |
15303 | msgid "" |
15304 | "Error: Your local changes to the following files would be overwritten by " | |
15305 | "merge" | |
15306 | msgstr "" | |
15307 | "Error: Sus cambios locales de los siguientes archivos serán sobrescritos por " | |
15308 | "la fusión" | |
fb0e25bc CD |
15309 | |
15310 | #: git-merge-octopus.sh:61 | |
15311 | msgid "Automated merge did not work." | |
15312 | msgstr "Fusión automatizada no funcionó." | |
15313 | ||
15314 | #: git-merge-octopus.sh:62 | |
15315 | msgid "Should not be doing an octopus." | |
33ac3e89 | 15316 | msgstr "No debería hacer un pulpo." |
fb0e25bc CD |
15317 | |
15318 | #: git-merge-octopus.sh:73 | |
15319 | #, sh-format | |
15320 | msgid "Unable to find common commit with $pretty_name" | |
15321 | msgstr "No es posible encontrar commit común con $pretty_name" | |
15322 | ||
15323 | #: git-merge-octopus.sh:77 | |
15324 | #, sh-format | |
4b15eb22 | 15325 | msgid "Already up to date with $pretty_name" |
fb0e25bc CD |
15326 | msgstr "Ya actualizado con $pretty_name" |
15327 | ||
15328 | #: git-merge-octopus.sh:89 | |
15329 | #, sh-format | |
15330 | msgid "Fast-forwarding to: $pretty_name" | |
15331 | msgstr "Realizando fast-forward a: $pretty_name" | |
15332 | ||
15333 | #: git-merge-octopus.sh:97 | |
15334 | #, sh-format | |
15335 | msgid "Trying simple merge with $pretty_name" | |
15336 | msgstr "Intentando fusión simple con $pretty_name" | |
15337 | ||
15338 | #: git-merge-octopus.sh:102 | |
15339 | msgid "Simple merge did not work, trying automatic merge." | |
15340 | msgstr "Fusión simple no funcionó, intentando fusión automática." | |
15341 | ||
33ac3e89 | 15342 | #: git-rebase.sh:60 |
fb0e25bc | 15343 | msgid "" |
4b15eb22 CD |
15344 | "Resolve all conflicts manually, mark them as resolved with\n" |
15345 | "\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n" | |
15346 | "You can instead skip this commit: run \"git rebase --skip\".\n" | |
15347 | "To abort and get back to the state before \"git rebase\", run \"git rebase --" | |
15348 | "abort\"." | |
fb0e25bc | 15349 | msgstr "" |
4b15eb22 CD |
15350 | "Resuelva todos los conflictos manualmente ya sea con \n" |
15351 | "\"git add/rm <archivo_conflictivo>\", luego ejecute \"git rebase --continue" | |
15352 | "\".\n" | |
fb0e25bc | 15353 | "Si prefiere saltar este parche, ejecute \"git rebase --skip\" .\n" |
4b15eb22 CD |
15354 | "Para abortar y regresar al estado previo al \"git rebase\", ejecute \"git " |
15355 | "rebase --abort\"." | |
fb0e25bc | 15356 | |
33ac3e89 | 15357 | #: git-rebase.sh:163 git-rebase.sh:409 |
fb0e25bc CD |
15358 | #, sh-format |
15359 | msgid "Could not move back to $head_name" | |
15360 | msgstr "No se puede regresar a $head_name" | |
15361 | ||
33ac3e89 | 15362 | #: git-rebase.sh:174 |
fb0e25bc CD |
15363 | msgid "Applied autostash." |
15364 | msgstr "Autostash aplicado." | |
15365 | ||
33ac3e89 | 15366 | #: git-rebase.sh:177 |
fb0e25bc CD |
15367 | #, sh-format |
15368 | msgid "Cannot store $stash_sha1" | |
15369 | msgstr "No se puede almacenar $stash_sha1" | |
15370 | ||
33ac3e89 | 15371 | #: git-rebase.sh:218 |
fb0e25bc CD |
15372 | msgid "The pre-rebase hook refused to rebase." |
15373 | msgstr "El hook pre-rebase rechazó el rebase." | |
15374 | ||
33ac3e89 | 15375 | #: git-rebase.sh:223 |
f8038f5b CDR |
15376 | msgid "It looks like 'git am' is in progress. Cannot rebase." |
15377 | msgstr "Parece que 'git am' está en progreso. No se puede rebasar." | |
fb0e25bc | 15378 | |
33ac3e89 | 15379 | #: git-rebase.sh:370 |
fb0e25bc CD |
15380 | msgid "No rebase in progress?" |
15381 | msgstr "No hay rebase en progreso?" | |
15382 | ||
33ac3e89 | 15383 | #: git-rebase.sh:381 |
fb0e25bc | 15384 | msgid "The --edit-todo action can only be used during interactive rebase." |
4b15eb22 CD |
15385 | msgstr "" |
15386 | "La acción --edit-todo sólo puede ser usada al rebasar interactivamente." | |
fb0e25bc | 15387 | |
33ac3e89 | 15388 | #: git-rebase.sh:388 |
fb0e25bc CD |
15389 | msgid "Cannot read HEAD" |
15390 | msgstr "No se puede leer el HEAD" | |
15391 | ||
33ac3e89 | 15392 | #: git-rebase.sh:391 |
fb0e25bc CD |
15393 | msgid "" |
15394 | "You must edit all merge conflicts and then\n" | |
15395 | "mark them as resolved using git add" | |
15396 | msgstr "" | |
9df63a4a | 15397 | "Tienes que editar todos los conflictos de fusión y luego\n" |
fb0e25bc CD |
15398 | "marcarlos como resueltos usando git add" |
15399 | ||
33ac3e89 | 15400 | #: git-rebase.sh:435 |
fb0e25bc CD |
15401 | #, sh-format |
15402 | msgid "" | |
15403 | "It seems that there is already a $state_dir_base directory, and\n" | |
15404 | "I wonder if you are in the middle of another rebase. If that is the\n" | |
15405 | "case, please try\n" | |
15406 | "\t$cmd_live_rebase\n" | |
15407 | "If that is not the case, please\n" | |
15408 | "\t$cmd_clear_stale_rebase\n" | |
15409 | "and run me again. I am stopping in case you still have something\n" | |
15410 | "valuable there." | |
15411 | msgstr "" | |
15412 | "Parece que ya hay un directorio $state_dir_base, y\n" | |
15413 | "me pregunto si está en medio de otro rebase. Si ese es el \n" | |
15414 | "caso, por favor intente\n" | |
15415 | "\t$cmd_live_rebase\n" | |
15416 | "Si no es el caso, por favor\n" | |
15417 | "\t$cmd_clear_stale_rebase\n" | |
15418 | "y ejecúteme nuevamente. Me estoy deteniendo en caso de que tenga\n" | |
15419 | "algo de valor ahí." | |
15420 | ||
33ac3e89 | 15421 | #: git-rebase.sh:491 |
fb0e25bc | 15422 | #, sh-format |
f8038f5b CDR |
15423 | msgid "invalid upstream '$upstream_name'" |
15424 | msgstr "upstream inválido '$upstream_name'" | |
fb0e25bc | 15425 | |
33ac3e89 | 15426 | #: git-rebase.sh:515 |
fb0e25bc CD |
15427 | #, sh-format |
15428 | msgid "$onto_name: there are more than one merge bases" | |
15429 | msgstr "$onto_name: hay más de una base de fusión" | |
15430 | ||
33ac3e89 | 15431 | #: git-rebase.sh:518 git-rebase.sh:522 |
fb0e25bc CD |
15432 | #, sh-format |
15433 | msgid "$onto_name: there is no merge base" | |
15434 | msgstr "$onto_name: no hay base de fusión" | |
15435 | ||
33ac3e89 | 15436 | #: git-rebase.sh:527 |
fb0e25bc CD |
15437 | #, sh-format |
15438 | msgid "Does not point to a valid commit: $onto_name" | |
715fc761 | 15439 | msgstr "No apunta a un commit válido: $onto_name" |
fb0e25bc | 15440 | |
33ac3e89 | 15441 | #: git-rebase.sh:553 |
fb0e25bc | 15442 | #, sh-format |
f8038f5b CDR |
15443 | msgid "fatal: no such branch/commit '$branch_name'" |
15444 | msgstr "fatal: no existe la rama/commit: '$branch_name'" | |
fb0e25bc | 15445 | |
33ac3e89 | 15446 | #: git-rebase.sh:586 |
fb0e25bc CD |
15447 | msgid "Cannot autostash" |
15448 | msgstr "No se puede ejecutar autostash" | |
15449 | ||
33ac3e89 | 15450 | #: git-rebase.sh:591 |
fb0e25bc CD |
15451 | #, sh-format |
15452 | msgid "Created autostash: $stash_abbrev" | |
15453 | msgstr "Autostash creado: $stash_abbrev" | |
15454 | ||
33ac3e89 | 15455 | #: git-rebase.sh:595 |
fb0e25bc | 15456 | msgid "Please commit or stash them." |
9df63a4a | 15457 | msgstr "Por favor, confírmalos o guárdalos." |
fb0e25bc | 15458 | |
33ac3e89 | 15459 | #: git-rebase.sh:618 |
f8038f5b CDR |
15460 | #, sh-format |
15461 | msgid "HEAD is up to date." | |
33ac3e89 | 15462 | msgstr "HEAD está actualizado." |
f8038f5b | 15463 | |
33ac3e89 | 15464 | #: git-rebase.sh:620 |
fb0e25bc CD |
15465 | #, sh-format |
15466 | msgid "Current branch $branch_name is up to date." | |
15467 | msgstr "La rama actual $branch_name está actualizada." | |
15468 | ||
33ac3e89 | 15469 | #: git-rebase.sh:628 |
f8038f5b CDR |
15470 | #, sh-format |
15471 | msgid "HEAD is up to date, rebase forced." | |
15472 | msgstr "HEAD está actualizado, rebase forzado." | |
15473 | ||
33ac3e89 | 15474 | #: git-rebase.sh:630 |
fb0e25bc CD |
15475 | #, sh-format |
15476 | msgid "Current branch $branch_name is up to date, rebase forced." | |
15477 | msgstr "Rama actual $branch_name está actualizada, rebase forzado." | |
15478 | ||
33ac3e89 | 15479 | #: git-rebase.sh:642 |
fb0e25bc CD |
15480 | #, sh-format |
15481 | msgid "Changes from $mb to $onto:" | |
15482 | msgstr "Cambios desde $mb a $onto:" | |
15483 | ||
33ac3e89 | 15484 | #: git-rebase.sh:651 |
fb0e25bc | 15485 | msgid "First, rewinding head to replay your work on top of it..." |
4b15eb22 | 15486 | msgstr "" |
33ac3e89 CDR |
15487 | "En primer lugar, rebobinando HEAD para después reproducir tus cambios encima " |
15488 | "de ésta..." | |
fb0e25bc | 15489 | |
33ac3e89 | 15490 | #: git-rebase.sh:661 |
fb0e25bc CD |
15491 | #, sh-format |
15492 | msgid "Fast-forwarded $branch_name to $onto_name." | |
15493 | msgstr "Avance rápido de $branch_name a $onto_name." | |
15494 | ||
4b15eb22 | 15495 | #: git-stash.sh:61 |
fb0e25bc CD |
15496 | msgid "git stash clear with parameters is unimplemented" |
15497 | msgstr "git stash clear con parámetros no está implementado" | |
15498 | ||
f8038f5b | 15499 | #: git-stash.sh:108 |
fb0e25bc | 15500 | msgid "You do not have the initial commit yet" |
33ac3e89 | 15501 | msgstr "Aún no tienes un commit inicial" |
fb0e25bc | 15502 | |
f8038f5b | 15503 | #: git-stash.sh:123 |
fb0e25bc CD |
15504 | msgid "Cannot save the current index state" |
15505 | msgstr "No se puede guardar el estado actual del índice" | |
15506 | ||
f8038f5b | 15507 | #: git-stash.sh:138 |
fb0e25bc CD |
15508 | msgid "Cannot save the untracked files" |
15509 | msgstr "No se pueden guardar los archivos no rastreados" | |
15510 | ||
f8038f5b | 15511 | #: git-stash.sh:158 git-stash.sh:171 |
fb0e25bc CD |
15512 | msgid "Cannot save the current worktree state" |
15513 | msgstr "No se puede guardar el estado actual del árbol de trabajo" | |
15514 | ||
f8038f5b | 15515 | #: git-stash.sh:175 |
fb0e25bc CD |
15516 | msgid "No changes selected" |
15517 | msgstr "Sin cambios seleccionados" | |
15518 | ||
f8038f5b | 15519 | #: git-stash.sh:178 |
fb0e25bc CD |
15520 | msgid "Cannot remove temporary index (can't happen)" |
15521 | msgstr "No se puede remover el índice temporal (no puede suceder)" | |
15522 | ||
f8038f5b | 15523 | #: git-stash.sh:191 |
fb0e25bc CD |
15524 | msgid "Cannot record working tree state" |
15525 | msgstr "No se puede grabar el estado del árbol de trabajo" | |
15526 | ||
f8038f5b | 15527 | #: git-stash.sh:229 |
fb0e25bc CD |
15528 | #, sh-format |
15529 | msgid "Cannot update $ref_stash with $w_commit" | |
15530 | msgstr "No se puede actualizar $ref_stash con $w_commit" | |
15531 | ||
f8038f5b | 15532 | #: git-stash.sh:281 |
fb0e25bc | 15533 | #, sh-format |
f8038f5b CDR |
15534 | msgid "error: unknown option for 'stash push': $option" |
15535 | msgstr "error: opción desconocida para 'stash pus': $option" | |
fb0e25bc | 15536 | |
f8038f5b | 15537 | #: git-stash.sh:295 |
fb0e25bc CD |
15538 | msgid "Can't use --patch and --include-untracked or --all at the same time" |
15539 | msgstr "No se puede usar --patch y --include-untracked o --all al mismo tiempo" | |
15540 | ||
f8038f5b | 15541 | #: git-stash.sh:303 |
fb0e25bc CD |
15542 | msgid "No local changes to save" |
15543 | msgstr "No hay cambios locales para guardar" | |
15544 | ||
f8038f5b | 15545 | #: git-stash.sh:308 |
fb0e25bc CD |
15546 | msgid "Cannot initialize stash" |
15547 | msgstr "No se puede inicializar stash" | |
15548 | ||
f8038f5b | 15549 | #: git-stash.sh:312 |
fb0e25bc CD |
15550 | msgid "Cannot save the current status" |
15551 | msgstr "No se puede guardar el estado actual" | |
15552 | ||
f8038f5b | 15553 | #: git-stash.sh:313 |
fb0e25bc CD |
15554 | #, sh-format |
15555 | msgid "Saved working directory and index state $stash_msg" | |
15556 | msgstr "Directorio de trabajo guardado y estado de índice $stash_msg" | |
15557 | ||
33ac3e89 | 15558 | #: git-stash.sh:340 |
fb0e25bc CD |
15559 | msgid "Cannot remove worktree changes" |
15560 | msgstr "No se pueden remover cambios del árbol de trabajo" | |
15561 | ||
33ac3e89 | 15562 | #: git-stash.sh:488 |
fb0e25bc CD |
15563 | #, sh-format |
15564 | msgid "unknown option: $opt" | |
15565 | msgstr "opción desconocida: $opt" | |
15566 | ||
33ac3e89 | 15567 | #: git-stash.sh:501 |
fb0e25bc CD |
15568 | msgid "No stash entries found." |
15569 | msgstr "No se encontraron entradas de stash." | |
15570 | ||
33ac3e89 | 15571 | #: git-stash.sh:508 |
fb0e25bc CD |
15572 | #, sh-format |
15573 | msgid "Too many revisions specified: $REV" | |
15574 | msgstr "Se especificaron demasiadas revisiones: $REV" | |
15575 | ||
33ac3e89 | 15576 | #: git-stash.sh:523 |
fb0e25bc CD |
15577 | #, sh-format |
15578 | msgid "$reference is not a valid reference" | |
15579 | msgstr "$reference no es una referencia válida" | |
15580 | ||
33ac3e89 | 15581 | #: git-stash.sh:551 |
fb0e25bc CD |
15582 | #, sh-format |
15583 | msgid "'$args' is not a stash-like commit" | |
15584 | msgstr "'$args' no es un commit estilo stash" | |
15585 | ||
33ac3e89 | 15586 | #: git-stash.sh:562 |
fb0e25bc CD |
15587 | #, sh-format |
15588 | msgid "'$args' is not a stash reference" | |
15589 | msgstr "'$args' no es una referencia stash" | |
15590 | ||
33ac3e89 | 15591 | #: git-stash.sh:570 |
fb0e25bc CD |
15592 | msgid "unable to refresh index" |
15593 | msgstr "incapaz de refrescar el índice" | |
15594 | ||
33ac3e89 | 15595 | #: git-stash.sh:574 |
fb0e25bc CD |
15596 | msgid "Cannot apply a stash in the middle of a merge" |
15597 | msgstr "No se puede aplicar un stash en medio de una fusión" | |
15598 | ||
33ac3e89 | 15599 | #: git-stash.sh:582 |
fb0e25bc CD |
15600 | msgid "Conflicts in index. Try without --index." |
15601 | msgstr "Conflictos en índice. Intente sin --index." | |
15602 | ||
33ac3e89 | 15603 | #: git-stash.sh:584 |
fb0e25bc CD |
15604 | msgid "Could not save index tree" |
15605 | msgstr "No se puede guardar el índice del árbol" | |
15606 | ||
33ac3e89 | 15607 | #: git-stash.sh:593 |
fb0e25bc CD |
15608 | msgid "Could not restore untracked files from stash entry" |
15609 | msgstr "No se pueden restaurar archivos no rastreados de la entrada stash" | |
15610 | ||
33ac3e89 | 15611 | #: git-stash.sh:618 |
fb0e25bc CD |
15612 | msgid "Cannot unstage modified files" |
15613 | msgstr "No se puede sacar de stage archivos modificados" | |
15614 | ||
33ac3e89 | 15615 | #: git-stash.sh:633 |
fb0e25bc CD |
15616 | msgid "Index was not unstashed." |
15617 | msgstr "El índice no fue sacado de stash." | |
15618 | ||
33ac3e89 | 15619 | #: git-stash.sh:647 |
fb0e25bc CD |
15620 | msgid "The stash entry is kept in case you need it again." |
15621 | msgstr "La entrada de stash se guardó en caso de ser necesario nuevamente." | |
15622 | ||
33ac3e89 | 15623 | #: git-stash.sh:656 |
fb0e25bc CD |
15624 | #, sh-format |
15625 | msgid "Dropped ${REV} ($s)" | |
15626 | msgstr "Botado ${REV} ($s)" | |
15627 | ||
33ac3e89 | 15628 | #: git-stash.sh:657 |
fb0e25bc CD |
15629 | #, sh-format |
15630 | msgid "${REV}: Could not drop stash entry" | |
15631 | msgstr "${REV}: No se pudo borrar entrada stash" | |
15632 | ||
33ac3e89 | 15633 | #: git-stash.sh:665 |
fb0e25bc | 15634 | msgid "No branch name specified" |
33ac3e89 | 15635 | msgstr "No se especificó el nombre de la rama" |
fb0e25bc | 15636 | |
33ac3e89 | 15637 | #: git-stash.sh:744 |
fb0e25bc CD |
15638 | msgid "(To restore them type \"git stash apply\")" |
15639 | msgstr "(Para restaurarlos, escribe \"git stash apply\")" | |
15640 | ||
15641 | #: git-submodule.sh:181 | |
15642 | msgid "Relative path can only be used from the toplevel of the working tree" | |
4b15eb22 CD |
15643 | msgstr "" |
15644 | "La ruta relativa sólo se puede usar desde el nivel superior del árbol de " | |
15645 | "trabajo" | |
fb0e25bc CD |
15646 | |
15647 | #: git-submodule.sh:191 | |
15648 | #, sh-format | |
15649 | msgid "repo URL: '$repo' must be absolute or begin with ./|../" | |
33ac3e89 | 15650 | msgstr "repo URL: '$repo' debe ser absoluta o iniciar con ./|../" |
fb0e25bc CD |
15651 | |
15652 | #: git-submodule.sh:210 | |
15653 | #, sh-format | |
15654 | msgid "'$sm_path' already exists in the index" | |
15655 | msgstr "'$sm_path' ya existe en el índice" | |
15656 | ||
15657 | #: git-submodule.sh:213 | |
15658 | #, sh-format | |
15659 | msgid "'$sm_path' already exists in the index and is not a submodule" | |
15660 | msgstr "'$sm_path' ya existe en el índice y no es un submódulo" | |
15661 | ||
15662 | #: git-submodule.sh:219 | |
15663 | #, sh-format | |
15664 | msgid "" | |
15665 | "The following path is ignored by one of your .gitignore files:\n" | |
15666 | "$sm_path\n" | |
15667 | "Use -f if you really want to add it." | |
15668 | msgstr "" | |
15669 | "La siguiente ruta es ignorada por uno de tus archivos .gitignore:\n" | |
15670 | "$sm_path\n" | |
15671 | "Usa -f si en verdad quieres agregarlo." | |
15672 | ||
15673 | #: git-submodule.sh:237 | |
15674 | #, sh-format | |
15675 | msgid "Adding existing repo at '$sm_path' to the index" | |
33ac3e89 | 15676 | msgstr "Agregando el repositorio existente en '$sm_path' al índice" |
fb0e25bc CD |
15677 | |
15678 | #: git-submodule.sh:239 | |
15679 | #, sh-format | |
15680 | msgid "'$sm_path' already exists and is not a valid git repo" | |
15681 | msgstr "'$sm_path' ya existe y no es un repositorio git válido" | |
15682 | ||
15683 | #: git-submodule.sh:247 | |
15684 | #, sh-format | |
15685 | msgid "A git directory for '$sm_name' is found locally with remote(s):" | |
4b15eb22 CD |
15686 | msgstr "" |
15687 | "Se encontró localmente un directorio git para '$sm_name' con el(los) " | |
15688 | "remoto(s):" | |
fb0e25bc CD |
15689 | |
15690 | #: git-submodule.sh:249 | |
15691 | #, sh-format | |
15692 | msgid "" | |
15693 | "If you want to reuse this local git directory instead of cloning again from\n" | |
15694 | " $realrepo\n" | |
4b15eb22 CD |
15695 | "use the '--force' option. If the local git directory is not the correct " |
15696 | "repo\n" | |
15697 | "or you are unsure what this means choose another name with the '--name' " | |
15698 | "option." | |
fb0e25bc CD |
15699 | msgstr "" |
15700 | "Si quiere reusar este directorio git local en lugar de clonar nuevamente de\n" | |
15701 | " $realrepo\n" | |
4b15eb22 CD |
15702 | "use la opción '--force'. Si el directorio git local no es el repositorio " |
15703 | "correcto\n" | |
15704 | "o no está seguro de lo que esto significa, escoja otro nombre con la opción " | |
15705 | "'--name'." | |
fb0e25bc CD |
15706 | |
15707 | #: git-submodule.sh:255 | |
15708 | #, sh-format | |
15709 | msgid "Reactivating local git directory for submodule '$sm_name'." | |
15710 | msgstr "Reactivar directorio git local para el submódulo '$sm_name'." | |
15711 | ||
15712 | #: git-submodule.sh:267 | |
15713 | #, sh-format | |
15714 | msgid "Unable to checkout submodule '$sm_path'" | |
15715 | msgstr "No es posible hacer checkout al submódulo '$sm_path'" | |
15716 | ||
15717 | #: git-submodule.sh:272 | |
15718 | #, sh-format | |
15719 | msgid "Failed to add submodule '$sm_path'" | |
15720 | msgstr "Fallo al agregar el submódulo '$sm_path'" | |
15721 | ||
15722 | #: git-submodule.sh:281 | |
15723 | #, sh-format | |
15724 | msgid "Failed to register submodule '$sm_path'" | |
15725 | msgstr "Fallo al registrar el submódulo '$sm_path'" | |
15726 | ||
15727 | #: git-submodule.sh:342 | |
15728 | #, sh-format | |
15729 | msgid "Entering '$displaypath'" | |
15730 | msgstr "Entrando a '$displaypath'" | |
15731 | ||
15732 | #: git-submodule.sh:362 | |
15733 | #, sh-format | |
15734 | msgid "Stopping at '$displaypath'; script returned non-zero status." | |
4b15eb22 CD |
15735 | msgstr "" |
15736 | "Deteniendo en '$displaypath'; script retornó un status distinto de cero." | |
fb0e25bc | 15737 | |
33ac3e89 | 15738 | #: git-submodule.sh:584 |
fb0e25bc CD |
15739 | #, sh-format |
15740 | msgid "Unable to find current revision in submodule path '$displaypath'" | |
4b15eb22 CD |
15741 | msgstr "" |
15742 | "No se pudo encontrar la revisión actual en la ruta de submódulo " | |
15743 | "'$displaypath'" | |
fb0e25bc | 15744 | |
33ac3e89 | 15745 | #: git-submodule.sh:594 |
fb0e25bc CD |
15746 | #, sh-format |
15747 | msgid "Unable to fetch in submodule path '$sm_path'" | |
15748 | msgstr "No es posible realizar fetch en la ruta de submódulo '$sm_path'" | |
15749 | ||
33ac3e89 | 15750 | #: git-submodule.sh:599 |
fb0e25bc | 15751 | #, sh-format |
4b15eb22 CD |
15752 | msgid "" |
15753 | "Unable to find current ${remote_name}/${branch} revision in submodule path " | |
15754 | "'$sm_path'" | |
15755 | msgstr "" | |
15756 | "No es posible encontrar revisión actual ${remote_name}/${branch} en la ruta " | |
15757 | "de submódulo '$sm_path'" | |
fb0e25bc | 15758 | |
33ac3e89 | 15759 | #: git-submodule.sh:617 |
fb0e25bc CD |
15760 | #, sh-format |
15761 | msgid "Unable to fetch in submodule path '$displaypath'" | |
15762 | msgstr "No es posible realizar fetch en la ruta de submódulo '$displaypath'" | |
15763 | ||
33ac3e89 | 15764 | #: git-submodule.sh:623 |
fb0e25bc | 15765 | #, sh-format |
4b15eb22 CD |
15766 | msgid "" |
15767 | "Fetched in submodule path '$displaypath', but it did not contain $sha1. " | |
15768 | "Direct fetching of that commit failed." | |
15769 | msgstr "" | |
15770 | "Fetch realizado en ruta de submódulo '$displaypath', pero no contenía $sha1. " | |
15771 | "Fetch directo del commit falló." | |
fb0e25bc | 15772 | |
33ac3e89 | 15773 | #: git-submodule.sh:630 |
fb0e25bc CD |
15774 | #, sh-format |
15775 | msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" | |
15776 | msgstr "No es posible revisar '$sha1' en la ruta de submódulo '$displaypath'" | |
15777 | ||
33ac3e89 | 15778 | #: git-submodule.sh:631 |
fb0e25bc CD |
15779 | #, sh-format |
15780 | msgid "Submodule path '$displaypath': checked out '$sha1'" | |
15781 | msgstr "Ruta de submódulo '$displaypath': check out realizado a '$sha1'" | |
15782 | ||
33ac3e89 | 15783 | #: git-submodule.sh:635 |
fb0e25bc CD |
15784 | #, sh-format |
15785 | msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" | |
4b15eb22 CD |
15786 | msgstr "" |
15787 | "No se posible ejecutar rebase a '$sha1' en la ruta de submódulo " | |
15788 | "'$displaypath'" | |
fb0e25bc | 15789 | |
33ac3e89 | 15790 | #: git-submodule.sh:636 |
fb0e25bc CD |
15791 | #, sh-format |
15792 | msgid "Submodule path '$displaypath': rebased into '$sha1'" | |
15793 | msgstr "Ruta de submódulo '$displaypath': rebasada en '$sha1'" | |
15794 | ||
33ac3e89 | 15795 | #: git-submodule.sh:641 |
fb0e25bc CD |
15796 | #, sh-format |
15797 | msgid "Unable to merge '$sha1' in submodule path '$displaypath'" | |
33ac3e89 | 15798 | msgstr "Incapaz de fusionar '$sha1' en la ruta del submódulo '$displaypath'" |
fb0e25bc | 15799 | |
33ac3e89 | 15800 | #: git-submodule.sh:642 |
fb0e25bc CD |
15801 | #, sh-format |
15802 | msgid "Submodule path '$displaypath': merged in '$sha1'" | |
15803 | msgstr "Ruta de submódulo '$displaypath': fusionada en '$sha1'" | |
15804 | ||
33ac3e89 | 15805 | #: git-submodule.sh:647 |
fb0e25bc CD |
15806 | #, sh-format |
15807 | msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'" | |
4b15eb22 CD |
15808 | msgstr "" |
15809 | "Falló la ejecución de '$command $sha1' en la ruta de submódulo " | |
15810 | "'$displaypath'" | |
fb0e25bc | 15811 | |
33ac3e89 | 15812 | #: git-submodule.sh:648 |
fb0e25bc CD |
15813 | #, sh-format |
15814 | msgid "Submodule path '$displaypath': '$command $sha1'" | |
15815 | msgstr "Ruta de submódulo '$displaypath': '$command $sha1'" | |
15816 | ||
33ac3e89 | 15817 | #: git-submodule.sh:679 |
fb0e25bc CD |
15818 | #, sh-format |
15819 | msgid "Failed to recurse into submodule path '$displaypath'" | |
15820 | msgstr "Falló al recurrir en la ruta de submódulo '$displaypath'" | |
15821 | ||
33ac3e89 | 15822 | #: git-submodule.sh:775 |
fb0e25bc CD |
15823 | msgid "The --cached option cannot be used with the --files option" |
15824 | msgstr "La opción --cached no puede ser usada con la opción --files" | |
15825 | ||
33ac3e89 | 15826 | #: git-submodule.sh:827 |
fb0e25bc CD |
15827 | #, sh-format |
15828 | msgid "unexpected mode $mod_dst" | |
15829 | msgstr "modo $mod_dst inesperado" | |
15830 | ||
33ac3e89 | 15831 | #: git-submodule.sh:847 |
fb0e25bc CD |
15832 | #, sh-format |
15833 | msgid " Warn: $display_name doesn't contain commit $sha1_src" | |
715fc761 | 15834 | msgstr " Advertencia: $display_name no contiene el commit $sha1_src" |
fb0e25bc | 15835 | |
33ac3e89 | 15836 | #: git-submodule.sh:850 |
fb0e25bc CD |
15837 | #, sh-format |
15838 | msgid " Warn: $display_name doesn't contain commit $sha1_dst" | |
715fc761 | 15839 | msgstr " Advertencia: $display_name no contiene el commit $sha1_dst" |
fb0e25bc | 15840 | |
33ac3e89 | 15841 | #: git-submodule.sh:853 |
fb0e25bc CD |
15842 | #, sh-format |
15843 | msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst" | |
4b15eb22 | 15844 | msgstr "" |
33ac3e89 | 15845 | " Advertencia: $display_name no contiene los commits $sha1_src y $sha1_dst" |
fb0e25bc CD |
15846 | |
15847 | #: git-parse-remote.sh:89 | |
15848 | #, sh-format | |
15849 | msgid "See git-${cmd}(1) for details." | |
15850 | msgstr "Véase git-${cmd}(1) para más detalles." | |
15851 | ||
15852 | #: git-rebase--interactive.sh:140 | |
15853 | #, sh-format | |
15854 | msgid "Rebasing ($new_count/$total)" | |
15855 | msgstr "Rebasando ($new_count/$total)" | |
15856 | ||
15857 | #: git-rebase--interactive.sh:156 | |
15858 | msgid "" | |
15859 | "\n" | |
15860 | "Commands:\n" | |
4b15eb22 CD |
15861 | "p, pick = use commit\n" |
15862 | "r, reword = use commit, but edit the commit message\n" | |
15863 | "e, edit = use commit, but stop for amending\n" | |
15864 | "s, squash = use commit, but meld into previous commit\n" | |
15865 | "f, fixup = like \"squash\", but discard this commit's log message\n" | |
15866 | "x, exec = run command (the rest of the line) using shell\n" | |
15867 | "d, drop = remove commit\n" | |
fb0e25bc CD |
15868 | "\n" |
15869 | "These lines can be re-ordered; they are executed from top to bottom.\n" | |
15870 | msgstr "" | |
15871 | "\n" | |
15872 | "Comandos:\n" | |
15873 | " p, pick = usar commit\n" | |
15874 | " r, reword = usar commit, pero editar el mensaje\n" | |
15875 | " e, edit = usar commit, pero detener para enmendar\n" | |
15876 | " s, squash = usar commit, pero unirlo al commit previo\n" | |
15877 | " f, fixup = como \"squash\", pero descartar el mensaje del commit en el log\n" | |
15878 | " x, exec = ejecutar comando (el resto de la línea) usando un shell\n" | |
15879 | " d, drop = borrar commit\n" | |
15880 | "\n" | |
4b15eb22 CD |
15881 | "Estas líneas pueden ser re-ordenadas; son ejecutadas desde arriba hacia " |
15882 | "abajo.\n" | |
fb0e25bc CD |
15883 | |
15884 | #: git-rebase--interactive.sh:171 | |
15885 | msgid "" | |
15886 | "\n" | |
15887 | "Do not remove any line. Use 'drop' explicitly to remove a commit.\n" | |
15888 | msgstr "" | |
15889 | "\n" | |
f8038f5b | 15890 | "No eliminar ninguna línea. Usa 'drop' explícitamente para borrar un commit \n" |
fb0e25bc CD |
15891 | |
15892 | #: git-rebase--interactive.sh:175 | |
15893 | msgid "" | |
15894 | "\n" | |
15895 | "If you remove a line here THAT COMMIT WILL BE LOST.\n" | |
15896 | msgstr "" | |
15897 | "\n" | |
15898 | "Si remueves una línea aquí EL COMMIT SE PERDERÁ.\n" | |
15899 | ||
33ac3e89 | 15900 | #: git-rebase--interactive.sh:213 |
fb0e25bc CD |
15901 | #, sh-format |
15902 | msgid "" | |
15903 | "You can amend the commit now, with\n" | |
15904 | "\n" | |
15905 | "\tgit commit --amend $gpg_sign_opt_quoted\n" | |
15906 | "\n" | |
15907 | "Once you are satisfied with your changes, run\n" | |
15908 | "\n" | |
15909 | "\tgit rebase --continue" | |
15910 | msgstr "" | |
15911 | "Puede enmendar el commit ahora, con\n" | |
15912 | "\n" | |
15913 | "\tgit commit --amend $gpg_sign_opt_quoted\n" | |
15914 | "\n" | |
15915 | "Una vez que esté satisfecho con los cambios, ejecute\n" | |
15916 | "\n" | |
15917 | "\tgit rebase --continue" | |
15918 | ||
33ac3e89 | 15919 | #: git-rebase--interactive.sh:238 |
fb0e25bc CD |
15920 | #, sh-format |
15921 | msgid "$sha1: not a commit that can be picked" | |
15922 | msgstr "$sha1: no es un commit que pueda ser cogido" | |
15923 | ||
33ac3e89 | 15924 | #: git-rebase--interactive.sh:277 |
fb0e25bc CD |
15925 | #, sh-format |
15926 | msgid "Invalid commit name: $sha1" | |
715fc761 | 15927 | msgstr "Nombre de commit inválido: $sha1" |
fb0e25bc | 15928 | |
33ac3e89 | 15929 | #: git-rebase--interactive.sh:319 |
fb0e25bc CD |
15930 | msgid "Cannot write current commit's replacement sha1" |
15931 | msgstr "No se puede escribir el remplazo sha1 del commit actual" | |
15932 | ||
33ac3e89 | 15933 | #: git-rebase--interactive.sh:371 |
fb0e25bc CD |
15934 | #, sh-format |
15935 | msgid "Fast-forward to $sha1" | |
15936 | msgstr "Avance rápido a $sha1" | |
15937 | ||
33ac3e89 | 15938 | #: git-rebase--interactive.sh:373 |
fb0e25bc CD |
15939 | #, sh-format |
15940 | msgid "Cannot fast-forward to $sha1" | |
15941 | msgstr "No se puede realizar avance rápido a $sha1" | |
15942 | ||
33ac3e89 | 15943 | #: git-rebase--interactive.sh:382 |
fb0e25bc CD |
15944 | #, sh-format |
15945 | msgid "Cannot move HEAD to $first_parent" | |
15946 | msgstr "No se puede mover HEAD a $first_parent" | |
15947 | ||
33ac3e89 | 15948 | #: git-rebase--interactive.sh:387 |
fb0e25bc CD |
15949 | #, sh-format |
15950 | msgid "Refusing to squash a merge: $sha1" | |
15951 | msgstr "Rehusando a ejecutar squash en fusión: $sha1" | |
15952 | ||
33ac3e89 | 15953 | #: git-rebase--interactive.sh:405 |
fb0e25bc CD |
15954 | #, sh-format |
15955 | msgid "Error redoing merge $sha1" | |
15956 | msgstr "Error rehaciendo fusión $sha1" | |
15957 | ||
33ac3e89 | 15958 | #: git-rebase--interactive.sh:414 |
fb0e25bc CD |
15959 | #, sh-format |
15960 | msgid "Could not pick $sha1" | |
15961 | msgstr "No se pudo coger $sha1" | |
15962 | ||
33ac3e89 | 15963 | #: git-rebase--interactive.sh:423 |
fb0e25bc CD |
15964 | #, sh-format |
15965 | msgid "This is the commit message #${n}:" | |
715fc761 | 15966 | msgstr "Este es el mensaje del commit #${n}:" |
fb0e25bc | 15967 | |
33ac3e89 | 15968 | #: git-rebase--interactive.sh:428 |
fb0e25bc CD |
15969 | #, sh-format |
15970 | msgid "The commit message #${n} will be skipped:" | |
715fc761 | 15971 | msgstr "El mensaje del commit #${n} será ignorado:" |
fb0e25bc | 15972 | |
33ac3e89 | 15973 | #: git-rebase--interactive.sh:439 |
fb0e25bc CD |
15974 | #, sh-format |
15975 | msgid "This is a combination of $count commit." | |
15976 | msgid_plural "This is a combination of $count commits." | |
715fc761 CDR |
15977 | msgstr[0] "Esta es una combinación de $count commit." |
15978 | msgstr[1] "Esta es la combinación de $count commits." | |
fb0e25bc | 15979 | |
33ac3e89 | 15980 | #: git-rebase--interactive.sh:448 |
fb0e25bc CD |
15981 | #, sh-format |
15982 | msgid "Cannot write $fixup_msg" | |
15983 | msgstr "No se puede escribir $fixup_msg" | |
15984 | ||
33ac3e89 | 15985 | #: git-rebase--interactive.sh:451 |
fb0e25bc | 15986 | msgid "This is a combination of 2 commits." |
715fc761 | 15987 | msgstr "Esto es una combinación de 2 commits." |
fb0e25bc | 15988 | |
33ac3e89 CDR |
15989 | #: git-rebase--interactive.sh:492 git-rebase--interactive.sh:535 |
15990 | #: git-rebase--interactive.sh:538 | |
fb0e25bc CD |
15991 | #, sh-format |
15992 | msgid "Could not apply $sha1... $rest" | |
15993 | msgstr "No se puede aplicar $sha1... $rest" | |
15994 | ||
33ac3e89 | 15995 | #: git-rebase--interactive.sh:567 |
fb0e25bc CD |
15996 | #, sh-format |
15997 | msgid "" | |
15998 | "Could not amend commit after successfully picking $sha1... $rest\n" | |
15999 | "This is most likely due to an empty commit message, or the pre-commit hook\n" | |
4b15eb22 CD |
16000 | "failed. If the pre-commit hook failed, you may need to resolve the issue " |
16001 | "before\n" | |
fb0e25bc CD |
16002 | "you are able to reword the commit." |
16003 | msgstr "" | |
4b15eb22 CD |
16004 | "No se pudo corregir commit después de seleccionar exitosamente $sha1 ... " |
16005 | "$rest\n" | |
16006 | "Esto es probablemente debido a un mensaje de commit vacío, o el hook pre-" | |
16007 | "commit\n" | |
16008 | "ha fallado. Si el hook pre-commit falló, es posible que deba resolver el " | |
16009 | "problema antes\n" | |
fb0e25bc CD |
16010 | "de que sea capaz de reformular el commit." |
16011 | ||
33ac3e89 | 16012 | #: git-rebase--interactive.sh:582 |
fb0e25bc CD |
16013 | #, sh-format |
16014 | msgid "Stopped at $sha1_abbrev... $rest" | |
16015 | msgstr "Detenido en $sha1_abbrev... $rest" | |
16016 | ||
33ac3e89 | 16017 | #: git-rebase--interactive.sh:597 |
fb0e25bc CD |
16018 | #, sh-format |
16019 | msgid "Cannot '$squash_style' without a previous commit" | |
33ac3e89 | 16020 | msgstr "No se puede '$squash_style' sin un commit previo" |
fb0e25bc | 16021 | |
33ac3e89 | 16022 | #: git-rebase--interactive.sh:639 |
fb0e25bc CD |
16023 | #, sh-format |
16024 | msgid "Executing: $rest" | |
16025 | msgstr "Ejecutando: $rest" | |
16026 | ||
33ac3e89 | 16027 | #: git-rebase--interactive.sh:647 |
fb0e25bc CD |
16028 | #, sh-format |
16029 | msgid "Execution failed: $rest" | |
16030 | msgstr "Ejecución fallida: $rest" | |
16031 | ||
33ac3e89 | 16032 | #: git-rebase--interactive.sh:649 |
fb0e25bc CD |
16033 | msgid "and made changes to the index and/or the working tree" |
16034 | msgstr "y hizo cambios al índice y/o al árbol de trabajo" | |
16035 | ||
33ac3e89 | 16036 | #: git-rebase--interactive.sh:651 |
fb0e25bc CD |
16037 | msgid "" |
16038 | "You can fix the problem, and then run\n" | |
16039 | "\n" | |
16040 | "\tgit rebase --continue" | |
16041 | msgstr "" | |
16042 | "Puedes corregir el problema y entonces ejecutar\n" | |
16043 | "\n" | |
16044 | "\tgit rebase --continue" | |
16045 | ||
16046 | #. TRANSLATORS: after these lines is a command to be issued by the user | |
33ac3e89 | 16047 | #: git-rebase--interactive.sh:664 |
fb0e25bc CD |
16048 | #, sh-format |
16049 | msgid "" | |
16050 | "Execution succeeded: $rest\n" | |
16051 | "but left changes to the index and/or the working tree\n" | |
16052 | "Commit or stash your changes, and then run\n" | |
16053 | "\n" | |
16054 | "\tgit rebase --continue" | |
16055 | msgstr "" | |
16056 | "La ejecución tuvo éxito: $rest\n" | |
16057 | "Pero dejó cambios en el índice y/o en el árbol de trabajo\n" | |
16058 | "Realice un commit o stash con los cambios y, a continuación, ejecute\n" | |
16059 | "\n" | |
16060 | "\tgit rebase --continue" | |
16061 | ||
33ac3e89 | 16062 | #: git-rebase--interactive.sh:675 |
fb0e25bc CD |
16063 | #, sh-format |
16064 | msgid "Unknown command: $command $sha1 $rest" | |
16065 | msgstr "Comando desconocido: $command $sha1 $rest" | |
16066 | ||
33ac3e89 | 16067 | #: git-rebase--interactive.sh:676 |
fb0e25bc CD |
16068 | msgid "Please fix this using 'git rebase --edit-todo'." |
16069 | msgstr "Por favor, corrige esto usando 'git rebase --edit-todo'." | |
16070 | ||
33ac3e89 | 16071 | #: git-rebase--interactive.sh:711 |
fb0e25bc CD |
16072 | #, sh-format |
16073 | msgid "Successfully rebased and updated $head_name." | |
16074 | msgstr "$head_name rebasado y actualizado satisfactoriamente." | |
16075 | ||
33ac3e89 | 16076 | #: git-rebase--interactive.sh:735 |
fb0e25bc | 16077 | msgid "could not detach HEAD" |
33ac3e89 | 16078 | msgstr "no se puede desacoplar HEAD" |
fb0e25bc | 16079 | |
33ac3e89 | 16080 | #: git-rebase--interactive.sh:771 |
fb0e25bc CD |
16081 | msgid "Could not remove CHERRY_PICK_HEAD" |
16082 | msgstr "No se pudo remover CHERRY_PICK_HEAD" | |
16083 | ||
33ac3e89 | 16084 | #: git-rebase--interactive.sh:776 |
fb0e25bc CD |
16085 | #, sh-format |
16086 | msgid "" | |
16087 | "You have staged changes in your working tree.\n" | |
16088 | "If these changes are meant to be\n" | |
16089 | "squashed into the previous commit, run:\n" | |
16090 | "\n" | |
16091 | " git commit --amend $gpg_sign_opt_quoted\n" | |
16092 | "\n" | |
16093 | "If they are meant to go into a new commit, run:\n" | |
16094 | "\n" | |
16095 | " git commit $gpg_sign_opt_quoted\n" | |
16096 | "\n" | |
16097 | "In both cases, once you're done, continue with:\n" | |
16098 | "\n" | |
16099 | " git rebase --continue\n" | |
16100 | msgstr "" | |
715fc761 CDR |
16101 | "Tiene cambios en el área de stage de su árbol de trabajo.\n" |
16102 | "Si estos cambios están destinados a \n" | |
fb0e25bc CD |
16103 | "ser aplastados en el commit previo, ejecute:\n" |
16104 | "\n" | |
16105 | " git commit --amend $gpg_sign_opt_quoted\n" | |
16106 | "\n" | |
715fc761 | 16107 | "Si estos están destinados a ir en un nuevo commit, ejecute:\n" |
fb0e25bc CD |
16108 | "\n" |
16109 | " git commit $gpg_sign_opt_quoted\n" | |
16110 | "\n" | |
715fc761 | 16111 | "En ambos casos, cuando termine, continue con:\n" |
fb0e25bc CD |
16112 | "\n" |
16113 | " git rebase --continue\n" | |
16114 | ||
33ac3e89 | 16115 | #: git-rebase--interactive.sh:793 |
fb0e25bc | 16116 | msgid "Error trying to find the author identity to amend commit" |
4b15eb22 | 16117 | msgstr "" |
33ac3e89 | 16118 | "Error tratando de encontrar la identidad del autor para remediar el commit" |
fb0e25bc | 16119 | |
33ac3e89 | 16120 | #: git-rebase--interactive.sh:798 |
fb0e25bc CD |
16121 | msgid "" |
16122 | "You have uncommitted changes in your working tree. Please commit them\n" | |
16123 | "first and then run 'git rebase --continue' again." | |
16124 | msgstr "" | |
16125 | "Tienes cambios sin confirmar en tu árbol de trabajo. Por favor, confírmalos\n" | |
16126 | "primero y entonces ejecuta 'git rebase --continue' de nuevo." | |
16127 | ||
33ac3e89 | 16128 | #: git-rebase--interactive.sh:803 git-rebase--interactive.sh:807 |
fb0e25bc | 16129 | msgid "Could not commit staged changes." |
33ac3e89 | 16130 | msgstr "No se pudo realizar el commit con los cambios en el área de stage." |
fb0e25bc | 16131 | |
33ac3e89 | 16132 | #: git-rebase--interactive.sh:836 |
fb0e25bc CD |
16133 | msgid "" |
16134 | "\n" | |
16135 | "You are editing the todo file of an ongoing interactive rebase.\n" | |
16136 | "To continue rebase after editing, run:\n" | |
16137 | " git rebase --continue\n" | |
16138 | "\n" | |
16139 | msgstr "" | |
16140 | "\n" | |
16141 | "Esta editando el archivo TODO de un rebase interactivo.\n" | |
715fc761 | 16142 | "Para continuar el rebase después de editar, ejecute:\n" |
fb0e25bc CD |
16143 | " git rebase --continue\n" |
16144 | "\n" | |
16145 | ||
33ac3e89 | 16146 | #: git-rebase--interactive.sh:844 git-rebase--interactive.sh:1008 |
fb0e25bc CD |
16147 | msgid "Could not execute editor" |
16148 | msgstr "No se pudo ejecutar el editor" | |
16149 | ||
33ac3e89 | 16150 | #: git-rebase--interactive.sh:860 |
fb0e25bc CD |
16151 | #, sh-format |
16152 | msgid "Could not checkout $switch_to" | |
16153 | msgstr "No se pudo actualizar el árbol de trabajo a $switch_to" | |
16154 | ||
33ac3e89 | 16155 | #: git-rebase--interactive.sh:865 |
fb0e25bc CD |
16156 | msgid "No HEAD?" |
16157 | msgstr "¿Sin HEAD?" | |
16158 | ||
33ac3e89 | 16159 | #: git-rebase--interactive.sh:866 |
fb0e25bc CD |
16160 | #, sh-format |
16161 | msgid "Could not create temporary $state_dir" | |
16162 | msgstr "No se pudo crear $state_dir temporalmente" | |
16163 | ||
33ac3e89 | 16164 | #: git-rebase--interactive.sh:869 |
fb0e25bc CD |
16165 | msgid "Could not mark as interactive" |
16166 | msgstr "No se pudo marcar como interactivo" | |
16167 | ||
33ac3e89 | 16168 | #: git-rebase--interactive.sh:879 git-rebase--interactive.sh:884 |
fb0e25bc CD |
16169 | msgid "Could not init rewritten commits" |
16170 | msgstr "No se puede inicializar los commits reescritos" | |
16171 | ||
33ac3e89 | 16172 | #: git-rebase--interactive.sh:910 |
521437fe CDR |
16173 | msgid "Could not generate todo list" |
16174 | msgstr "No se pudo generar lista de pendientes" | |
16175 | ||
33ac3e89 | 16176 | #: git-rebase--interactive.sh:986 |
fb0e25bc CD |
16177 | #, sh-format |
16178 | msgid "Rebase $shortrevisions onto $shortonto ($todocount command)" | |
16179 | msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)" | |
16180 | msgstr[0] "Rebase $shortrevisions en $shortonto ($todocount comando)" | |
16181 | msgstr[1] "Rebase $shortrevisions en $shortonto ($todocount comandos)" | |
16182 | ||
33ac3e89 | 16183 | #: git-rebase--interactive.sh:991 |
fb0e25bc CD |
16184 | msgid "" |
16185 | "\n" | |
16186 | "However, if you remove everything, the rebase will be aborted.\n" | |
16187 | "\n" | |
16188 | msgstr "" | |
16189 | "\n" | |
16190 | "Como sea, si se remueve todo, el rebase sera abortado.\n" | |
16191 | "\n" | |
16192 | ||
33ac3e89 | 16193 | #: git-rebase--interactive.sh:998 |
fb0e25bc | 16194 | msgid "Note that empty commits are commented out" |
715fc761 | 16195 | msgstr "Tenga en cuenta que los commits vacíos están comentados" |
fb0e25bc CD |
16196 | |
16197 | #: git-sh-setup.sh:89 git-sh-setup.sh:94 | |
16198 | #, sh-format | |
16199 | msgid "usage: $dashless $USAGE" | |
16200 | msgstr "uso: $dashless $USAGE" | |
16201 | ||
16202 | #: git-sh-setup.sh:190 | |
16203 | #, sh-format | |
16204 | msgid "Cannot chdir to $cdup, the toplevel of the working tree" | |
4b15eb22 CD |
16205 | msgstr "" |
16206 | "No se puede aplicar chdir a $cdup, el nivel máximo del árbol de trabajo" | |
fb0e25bc CD |
16207 | |
16208 | #: git-sh-setup.sh:199 git-sh-setup.sh:206 | |
16209 | #, sh-format | |
16210 | msgid "fatal: $program_name cannot be used without a working tree." | |
715fc761 | 16211 | msgstr "fatal: $program_name no puede ser usado sin un árbol de trabajo." |
fb0e25bc CD |
16212 | |
16213 | #: git-sh-setup.sh:220 | |
16214 | msgid "Cannot rebase: You have unstaged changes." | |
4b15eb22 | 16215 | msgstr "" |
715fc761 | 16216 | "No se puede aplicar rebase: Tienes cambios que no están en el área de stage." |
fb0e25bc CD |
16217 | |
16218 | #: git-sh-setup.sh:223 | |
16219 | msgid "Cannot rewrite branches: You have unstaged changes." | |
4b15eb22 | 16220 | msgstr "" |
715fc761 | 16221 | "No se puede reescribir las ramas: Tienes cambios que no están en el área de " |
33ac3e89 | 16222 | "stage." |
fb0e25bc CD |
16223 | |
16224 | #: git-sh-setup.sh:226 | |
16225 | msgid "Cannot pull with rebase: You have unstaged changes." | |
4b15eb22 | 16226 | msgstr "" |
715fc761 | 16227 | "No se puede aplicar pull con rebase: Tienes cambios que no están en el área " |
4b15eb22 | 16228 | "de stage." |
fb0e25bc CD |
16229 | |
16230 | #: git-sh-setup.sh:229 | |
16231 | #, sh-format | |
16232 | msgid "Cannot $action: You have unstaged changes." | |
33ac3e89 | 16233 | msgstr "No se puede $action: Tienes cambios que no están en el área de stage." |
fb0e25bc CD |
16234 | |
16235 | #: git-sh-setup.sh:242 | |
16236 | msgid "Cannot rebase: Your index contains uncommitted changes." | |
4b15eb22 | 16237 | msgstr "" |
715fc761 | 16238 | "No se puede hacer rebase: Tu índice contiene cambios que no están en un " |
4b15eb22 | 16239 | "commit." |
fb0e25bc CD |
16240 | |
16241 | #: git-sh-setup.sh:245 | |
16242 | msgid "Cannot pull with rebase: Your index contains uncommitted changes." | |
4b15eb22 | 16243 | msgstr "" |
715fc761 | 16244 | "No se puede hacer pull con rebase: Tu índice contiene cambios que no están " |
4b15eb22 | 16245 | "en un commit." |
fb0e25bc CD |
16246 | |
16247 | #: git-sh-setup.sh:248 | |
16248 | #, sh-format | |
16249 | msgid "Cannot $action: Your index contains uncommitted changes." | |
16250 | msgstr "No se puede $action: El índice contiene cambios sin confirmar." | |
16251 | ||
16252 | #: git-sh-setup.sh:252 | |
16253 | msgid "Additionally, your index contains uncommitted changes." | |
715fc761 | 16254 | msgstr "Adicionalmente, tu índice contiene cambios que no están en un commit." |
fb0e25bc CD |
16255 | |
16256 | #: git-sh-setup.sh:372 | |
16257 | msgid "You need to run this command from the toplevel of the working tree." | |
4b15eb22 CD |
16258 | msgstr "" |
16259 | "Necesitas ejecutar este comando desde el nivel superior de tu árbol de " | |
16260 | "trabajo." | |
fb0e25bc CD |
16261 | |
16262 | #: git-sh-setup.sh:377 | |
16263 | msgid "Unable to determine absolute path of git directory" | |
16264 | msgstr "Incapaz de determinar la ruta absoluta del directorio git" | |
16265 | ||
16266 | #. TRANSLATORS: you can adjust this to align "git add -i" status menu | |
16267 | #: git-add--interactive.perl:196 | |
16268 | #, perl-format | |
16269 | msgid "%12s %12s %s" | |
16270 | msgstr "%12s %12s %s" | |
16271 | ||
16272 | #: git-add--interactive.perl:197 | |
16273 | msgid "staged" | |
16274 | msgstr "rastreado" | |
16275 | ||
16276 | #: git-add--interactive.perl:197 | |
16277 | msgid "unstaged" | |
16278 | msgstr "no rastreado" | |
16279 | ||
16280 | #: git-add--interactive.perl:246 git-add--interactive.perl:271 | |
16281 | msgid "binary" | |
16282 | msgstr "binario" | |
16283 | ||
16284 | #: git-add--interactive.perl:255 git-add--interactive.perl:309 | |
16285 | msgid "nothing" | |
16286 | msgstr "nada" | |
16287 | ||
16288 | #: git-add--interactive.perl:291 git-add--interactive.perl:306 | |
16289 | msgid "unchanged" | |
16290 | msgstr "sin cambios" | |
16291 | ||
16292 | #: git-add--interactive.perl:602 | |
16293 | #, perl-format | |
16294 | msgid "added %d path\n" | |
16295 | msgid_plural "added %d paths\n" | |
16296 | msgstr[0] "agregada %d ruta\n" | |
16297 | msgstr[1] "agregadas %d rutas\n" | |
16298 | ||
16299 | #: git-add--interactive.perl:605 | |
16300 | #, perl-format | |
16301 | msgid "updated %d path\n" | |
16302 | msgid_plural "updated %d paths\n" | |
16303 | msgstr[0] "actualizada %d ruta\n" | |
16304 | msgstr[1] "actualizadas %d rutas\n" | |
16305 | ||
16306 | #: git-add--interactive.perl:608 | |
16307 | #, perl-format | |
16308 | msgid "reverted %d path\n" | |
16309 | msgid_plural "reverted %d paths\n" | |
16310 | msgstr[0] "revertida %d ruta\n" | |
16311 | msgstr[1] "revertidas %d rutas\n" | |
16312 | ||
16313 | #: git-add--interactive.perl:611 | |
16314 | #, perl-format | |
16315 | msgid "touched %d path\n" | |
16316 | msgid_plural "touched %d paths\n" | |
16317 | msgstr[0] "touch hecho a %d ruta\n" | |
16318 | msgstr[1] "touch hecho a %d rutas\n" | |
16319 | ||
16320 | #: git-add--interactive.perl:620 | |
16321 | msgid "Update" | |
16322 | msgstr "Actualizar" | |
16323 | ||
16324 | #: git-add--interactive.perl:632 | |
16325 | msgid "Revert" | |
16326 | msgstr "Revertir" | |
16327 | ||
16328 | #: git-add--interactive.perl:655 | |
16329 | #, perl-format | |
16330 | msgid "note: %s is untracked now.\n" | |
16331 | msgstr "nota: %s no es rastreado ahora.\n" | |
16332 | ||
16333 | #: git-add--interactive.perl:666 | |
16334 | msgid "Add untracked" | |
16335 | msgstr "Agregar no rastreados" | |
16336 | ||
16337 | #: git-add--interactive.perl:672 | |
16338 | msgid "No untracked files.\n" | |
16339 | msgstr "No hay archivos sin rastrear.\n" | |
16340 | ||
33ac3e89 | 16341 | #: git-add--interactive.perl:1026 |
fb0e25bc CD |
16342 | msgid "" |
16343 | "If the patch applies cleanly, the edited hunk will immediately be\n" | |
16344 | "marked for staging." | |
16345 | msgstr "" | |
16346 | "Si el parche aplica limpiamente, el hunk editado sera marcado\n" | |
715fc761 | 16347 | "inmediatamente para el área de stage." |
fb0e25bc | 16348 | |
33ac3e89 | 16349 | #: git-add--interactive.perl:1029 |
fb0e25bc CD |
16350 | msgid "" |
16351 | "If the patch applies cleanly, the edited hunk will immediately be\n" | |
16352 | "marked for stashing." | |
16353 | msgstr "" | |
16354 | "Si el parche aplica limpiamente, el hunk editado sera marcado\n" | |
16355 | "inmediatamente para aplicar stash." | |
16356 | ||
33ac3e89 | 16357 | #: git-add--interactive.perl:1032 |
fb0e25bc CD |
16358 | msgid "" |
16359 | "If the patch applies cleanly, the edited hunk will immediately be\n" | |
16360 | "marked for unstaging." | |
16361 | msgstr "" | |
16362 | "Si el parche aplica limpiamente, el hunk editado sera marcado\n" | |
715fc761 | 16363 | "inmediatamente para sacar del área de stage." |
fb0e25bc | 16364 | |
33ac3e89 | 16365 | #: git-add--interactive.perl:1035 git-add--interactive.perl:1044 |
fb0e25bc CD |
16366 | msgid "" |
16367 | "If the patch applies cleanly, the edited hunk will immediately be\n" | |
16368 | "marked for applying." | |
16369 | msgstr "" | |
16370 | "Si el parche aplica de forma limpia, el hunk editado sera marcado \n" | |
16371 | "inmediatamente para aplicar." | |
16372 | ||
33ac3e89 | 16373 | #: git-add--interactive.perl:1038 git-add--interactive.perl:1041 |
fb0e25bc CD |
16374 | msgid "" |
16375 | "If the patch applies cleanly, the edited hunk will immediately be\n" | |
16376 | "marked for discarding." | |
16377 | msgstr "" | |
16378 | "Si el parche aplica de forma limpia, el hunk editado sera marcado\n" | |
16379 | "inmediatamente para descarte." | |
16380 | ||
33ac3e89 | 16381 | #: git-add--interactive.perl:1078 |
fb0e25bc CD |
16382 | #, perl-format |
16383 | msgid "failed to open hunk edit file for writing: %s" | |
715fc761 | 16384 | msgstr "fallo al abrir el archivo de adición del hunk para escritura: %s" |
fb0e25bc | 16385 | |
33ac3e89 | 16386 | #: git-add--interactive.perl:1079 |
fb0e25bc | 16387 | msgid "Manual hunk edit mode -- see bottom for a quick guide.\n" |
715fc761 | 16388 | msgstr "Modo de edición manual de hunk -- vea abajo para una guía rápida.\n" |
fb0e25bc | 16389 | |
33ac3e89 | 16390 | #: git-add--interactive.perl:1085 |
fb0e25bc CD |
16391 | #, perl-format |
16392 | msgid "" | |
16393 | "---\n" | |
16394 | "To remove '%s' lines, make them ' ' lines (context).\n" | |
16395 | "To remove '%s' lines, delete them.\n" | |
16396 | "Lines starting with %s will be removed.\n" | |
16397 | msgstr "" | |
16398 | "---\n" | |
715fc761 CDR |
16399 | "Para remover '%s' líneas, haga de ellas líneas ' ' (contexto).\n" |
16400 | "Para remover '%s' líneas, bórrelas.\n" | |
16401 | "Lineas comenzando con %s serán removidas.\n" | |
fb0e25bc CD |
16402 | |
16403 | #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages. | |
33ac3e89 | 16404 | #: git-add--interactive.perl:1093 |
fb0e25bc CD |
16405 | msgid "" |
16406 | "If it does not apply cleanly, you will be given an opportunity to\n" | |
16407 | "edit again. If all lines of the hunk are removed, then the edit is\n" | |
16408 | "aborted and the hunk is left unchanged.\n" | |
16409 | msgstr "" | |
16410 | "Si esto no aplica de manera limpia, se le da la oportunidad de \n" | |
715fc761 CDR |
16411 | "editar nuevamente. Si todas las líneas del hunk son removidas, entonces \n" |
16412 | "la edición es abortada y el hunk queda sin cambios.\n" | |
fb0e25bc | 16413 | |
33ac3e89 | 16414 | #: git-add--interactive.perl:1107 |
fb0e25bc CD |
16415 | #, perl-format |
16416 | msgid "failed to open hunk edit file for reading: %s" | |
715fc761 | 16417 | msgstr "fallo al abrir el archivo de edición del hunk para lectura: %s" |
fb0e25bc CD |
16418 | |
16419 | #. TRANSLATORS: do not translate [y/n] | |
16420 | #. The program will only accept that input | |
16421 | #. at this point. | |
16422 | #. Consider translating (saying "no" discards!) as | |
16423 | #. (saying "n" for "no" discards!) if the translation | |
16424 | #. of the word "no" does not start with n. | |
33ac3e89 | 16425 | #: git-add--interactive.perl:1206 |
4b15eb22 CD |
16426 | msgid "" |
16427 | "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " | |
16428 | msgstr "" | |
16429 | "Tu hunk editado no aplica. Editar nuevamente (decir \"no\" descarta!) [y/n]? " | |
fb0e25bc | 16430 | |
33ac3e89 | 16431 | #: git-add--interactive.perl:1215 |
fb0e25bc CD |
16432 | msgid "" |
16433 | "y - stage this hunk\n" | |
16434 | "n - do not stage this hunk\n" | |
16435 | "q - quit; do not stage this hunk or any of the remaining ones\n" | |
16436 | "a - stage this hunk and all later hunks in the file\n" | |
16437 | "d - do not stage this hunk or any of the later hunks in the file" | |
16438 | msgstr "" | |
16439 | "y - aplicar stage a este hunk\n" | |
16440 | "n - no aplicar stage a este hunk\n" | |
16441 | "q - quit; no aplicar stage a este hunk o ninguno de los restantes\n" | |
16442 | "a - aplicar stage a este hunk y a todos los posteriores en el archivo \n" | |
4b15eb22 CD |
16443 | "d - no aplicar stage a este hunk o a ninguno de los posteriores en este " |
16444 | "archivo" | |
fb0e25bc | 16445 | |
33ac3e89 | 16446 | #: git-add--interactive.perl:1221 |
fb0e25bc CD |
16447 | msgid "" |
16448 | "y - stash this hunk\n" | |
16449 | "n - do not stash this hunk\n" | |
16450 | "q - quit; do not stash this hunk or any of the remaining ones\n" | |
16451 | "a - stash this hunk and all later hunks in the file\n" | |
16452 | "d - do not stash this hunk or any of the later hunks in the file" | |
16453 | msgstr "" | |
16454 | "y - aplicar stash a este hunk\n" | |
16455 | "n - no aplicar stash a este hunk\n" | |
16456 | "q - quit; no aplicar stash a este hunk o a ninguno de los restantes\n" | |
16457 | "a - aplicar stash a este hunk y a todos los posteriores en el archivo\n" | |
16458 | "d - no aplicar stash a este hunk o ninguno de los posteriores en el archivo" | |
16459 | ||
33ac3e89 | 16460 | #: git-add--interactive.perl:1227 |
fb0e25bc CD |
16461 | msgid "" |
16462 | "y - unstage this hunk\n" | |
16463 | "n - do not unstage this hunk\n" | |
16464 | "q - quit; do not unstage this hunk or any of the remaining ones\n" | |
16465 | "a - unstage this hunk and all later hunks in the file\n" | |
16466 | "d - do not unstage this hunk or any of the later hunks in the file" | |
16467 | msgstr "" | |
715fc761 | 16468 | "y - sacar desde hunk del área de stage\n" |
fb0e25bc CD |
16469 | "n - no sacar este hunk del area de stage\n" |
16470 | "q - quit; no sacar del area de stage este hunk o ninguno de los restantes\n" | |
16471 | "a - sacar del area de stage este hunk y todos los posteriores en el archivo\n" | |
4b15eb22 CD |
16472 | "d - no sacar del area de stage este hunk o ninguno de los posteriores en el " |
16473 | "archivo" | |
fb0e25bc | 16474 | |
33ac3e89 | 16475 | #: git-add--interactive.perl:1233 |
fb0e25bc CD |
16476 | msgid "" |
16477 | "y - apply this hunk to index\n" | |
16478 | "n - do not apply this hunk to index\n" | |
16479 | "q - quit; do not apply this hunk or any of the remaining ones\n" | |
16480 | "a - apply this hunk and all later hunks in the file\n" | |
16481 | "d - do not apply this hunk or any of the later hunks in the file" | |
16482 | msgstr "" | |
9df63a4a CDR |
16483 | "y - aplicar este hunk al índice\n" |
16484 | "n - no aplicar este hunk al índice\n" | |
fb0e25bc CD |
16485 | "q - quit; no aplicar este hunk o ninguno de los restantes\n" |
16486 | "a - aplicar este hunk y todos los posteriores en el archivo\n" | |
16487 | "d - no aplicar este hunko ninguno de los posteriores en el archivo" | |
16488 | ||
33ac3e89 | 16489 | #: git-add--interactive.perl:1239 |
fb0e25bc CD |
16490 | msgid "" |
16491 | "y - discard this hunk from worktree\n" | |
16492 | "n - do not discard this hunk from worktree\n" | |
16493 | "q - quit; do not discard this hunk or any of the remaining ones\n" | |
16494 | "a - discard this hunk and all later hunks in the file\n" | |
16495 | "d - do not discard this hunk or any of the later hunks in the file" | |
16496 | msgstr "" | |
715fc761 CDR |
16497 | "y - descartar este hunk del árbol de trabajo\n" |
16498 | "n - no descartar este hunk del árbol de trabajo\n" | |
fb0e25bc CD |
16499 | "q - quit; no descartar este hunk o ninguno de los que restantes\n" |
16500 | "a - descartar este hunk y todos los posteriores en este archivo\n" | |
16501 | "d - no descartar este hunk o ninguno de los posteriores en el archivo" | |
16502 | ||
33ac3e89 | 16503 | #: git-add--interactive.perl:1245 |
fb0e25bc CD |
16504 | msgid "" |
16505 | "y - discard this hunk from index and worktree\n" | |
16506 | "n - do not discard this hunk from index and worktree\n" | |
16507 | "q - quit; do not discard this hunk or any of the remaining ones\n" | |
16508 | "a - discard this hunk and all later hunks in the file\n" | |
16509 | "d - do not discard this hunk or any of the later hunks in the file" | |
16510 | msgstr "" | |
715fc761 CDR |
16511 | "y - descartar este hunk del índice y el árbol de trabajo\n" |
16512 | "n - no descartar este hunk del índice ni el árbol de trabajo\n" | |
fb0e25bc CD |
16513 | "q - quit; no descartar este hunk o ninguno de los que quedan\n" |
16514 | "a - descartar este hunk y todos los posteriores en este archivo\n" | |
16515 | "d - no descartar este hunk o ninguno posterior en el archivo" | |
16516 | ||
33ac3e89 | 16517 | #: git-add--interactive.perl:1251 |
fb0e25bc CD |
16518 | msgid "" |
16519 | "y - apply this hunk to index and worktree\n" | |
16520 | "n - do not apply this hunk to index and worktree\n" | |
16521 | "q - quit; do not apply this hunk or any of the remaining ones\n" | |
16522 | "a - apply this hunk and all later hunks in the file\n" | |
16523 | "d - do not apply this hunk or any of the later hunks in the file" | |
16524 | msgstr "" | |
9df63a4a CDR |
16525 | "y - aplicar este hunk al índice y al árbol de trabajo\n" |
16526 | "n - no aplicar este hunk al índice y al árbol de trabajo\n" | |
fb0e25bc CD |
16527 | "q - quit; no aplicar este hunk o ninguno de los restantes\n" |
16528 | "a - aplicar este hunk y todos los posteriores en el archivo\n" | |
16529 | "d - no aplicar este hunk o ninguno de los siguientes en este archivo" | |
16530 | ||
33ac3e89 | 16531 | #: git-add--interactive.perl:1266 |
fb0e25bc CD |
16532 | msgid "" |
16533 | "g - select a hunk to go to\n" | |
16534 | "/ - search for a hunk matching the given regex\n" | |
16535 | "j - leave this hunk undecided, see next undecided hunk\n" | |
16536 | "J - leave this hunk undecided, see next hunk\n" | |
16537 | "k - leave this hunk undecided, see previous undecided hunk\n" | |
16538 | "K - leave this hunk undecided, see previous hunk\n" | |
16539 | "s - split the current hunk into smaller hunks\n" | |
16540 | "e - manually edit the current hunk\n" | |
16541 | "? - print help\n" | |
16542 | msgstr "" | |
16543 | "g - selecciona un hunk a donde ir\n" | |
16544 | "/ - buscar un hunk que concuerde el regex\n" | |
16545 | "j - dejar este hunk por definir, ver siguiente hunk por definir\n" | |
715fc761 | 16546 | "J - dejar este hunk por definir, ver siguiente hunk\n" |
fb0e25bc CD |
16547 | "k - dejar este hunk por definir, ver hunk previo por definir\n" |
16548 | "K - dejar este hunk por definir, ver hunk previo\n" | |
715fc761 | 16549 | "s - dividir el hunk actual en hunks mas pequeños\n" |
fb0e25bc CD |
16550 | "e - editar manualmente el hunk actual\n" |
16551 | "? - imprimir ayuda\n" | |
16552 | ||
33ac3e89 | 16553 | #: git-add--interactive.perl:1297 |
fb0e25bc | 16554 | msgid "The selected hunks do not apply to the index!\n" |
715fc761 | 16555 | msgstr "Los hunks seleccionados no aplican al índice!\n" |
fb0e25bc | 16556 | |
33ac3e89 | 16557 | #: git-add--interactive.perl:1298 |
fb0e25bc | 16558 | msgid "Apply them to the worktree anyway? " |
33ac3e89 | 16559 | msgstr "Aplicarlos al árbol de trabajo de todas maneras? " |
fb0e25bc | 16560 | |
33ac3e89 | 16561 | #: git-add--interactive.perl:1301 |
fb0e25bc CD |
16562 | msgid "Nothing was applied.\n" |
16563 | msgstr "Nada fue aplicado.\n" | |
16564 | ||
33ac3e89 | 16565 | #: git-add--interactive.perl:1312 |
fb0e25bc CD |
16566 | #, perl-format |
16567 | msgid "ignoring unmerged: %s\n" | |
16568 | msgstr "ignorando lo no fusionado: %s\n" | |
16569 | ||
33ac3e89 | 16570 | #: git-add--interactive.perl:1321 |
fb0e25bc CD |
16571 | msgid "Only binary files changed.\n" |
16572 | msgstr "Solo cambiaron archivos binarios.\n" | |
16573 | ||
33ac3e89 | 16574 | #: git-add--interactive.perl:1323 |
fb0e25bc CD |
16575 | msgid "No changes.\n" |
16576 | msgstr "Sin cambios.\n" | |
16577 | ||
33ac3e89 | 16578 | #: git-add--interactive.perl:1331 |
fb0e25bc | 16579 | msgid "Patch update" |
715fc761 | 16580 | msgstr "Actualización del parche" |
fb0e25bc | 16581 | |
33ac3e89 | 16582 | #: git-add--interactive.perl:1383 |
fb0e25bc | 16583 | #, perl-format |
33ac3e89 CDR |
16584 | msgid "Stage mode change [y,n,q,a,d%s,?]? " |
16585 | msgstr "Cambio de modo de stage [y,n,q,a,d%s,?]? " | |
fb0e25bc | 16586 | |
33ac3e89 | 16587 | #: git-add--interactive.perl:1384 |
fb0e25bc | 16588 | #, perl-format |
33ac3e89 CDR |
16589 | msgid "Stage deletion [y,n,q,a,d%s,?]? " |
16590 | msgstr "Aplicar stage al borrado [y,n,q,a,d%s,?]? " | |
fb0e25bc | 16591 | |
33ac3e89 | 16592 | #: git-add--interactive.perl:1385 |
fb0e25bc | 16593 | #, perl-format |
33ac3e89 CDR |
16594 | msgid "Stage this hunk [y,n,q,a,d%s,?]? " |
16595 | msgstr "Aplicar stage a este hunk [y,n,q,a,d%s,?]? " | |
fb0e25bc | 16596 | |
33ac3e89 | 16597 | #: git-add--interactive.perl:1388 |
fb0e25bc | 16598 | #, perl-format |
33ac3e89 CDR |
16599 | msgid "Stash mode change [y,n,q,a,d%s,?]? " |
16600 | msgstr "Aplicar stash al cambio de modo [y,n,q,a,d%s,?]? " | |
fb0e25bc | 16601 | |
33ac3e89 | 16602 | #: git-add--interactive.perl:1389 |
fb0e25bc | 16603 | #, perl-format |
33ac3e89 CDR |
16604 | msgid "Stash deletion [y,n,q,a,d%s,?]? " |
16605 | msgstr "Aplicar stash al borrado [y,n,q,a,d%s,?]? " | |
fb0e25bc | 16606 | |
33ac3e89 | 16607 | #: git-add--interactive.perl:1390 |
fb0e25bc | 16608 | #, perl-format |
33ac3e89 CDR |
16609 | msgid "Stash this hunk [y,n,q,a,d%s,?]? " |
16610 | msgstr "Aplicar stash a este hunk [y,n,q,a,d%s,?]? " | |
fb0e25bc | 16611 | |
33ac3e89 | 16612 | #: git-add--interactive.perl:1393 |
fb0e25bc | 16613 | #, perl-format |
33ac3e89 CDR |
16614 | msgid "Unstage mode change [y,n,q,a,d%s,?]? " |
16615 | msgstr "Sacar cambio de modo del stage [y,n,q,a,d%s,?]? " | |
fb0e25bc | 16616 | |
33ac3e89 | 16617 | #: git-add--interactive.perl:1394 |
fb0e25bc | 16618 | #, perl-format |
33ac3e89 CDR |
16619 | msgid "Unstage deletion [y,n,q,a,d%s,?]? " |
16620 | msgstr "Sacar borrado del stage [y,n,q,a,d%s,?]? " | |
fb0e25bc | 16621 | |
33ac3e89 | 16622 | #: git-add--interactive.perl:1395 |
fb0e25bc | 16623 | #, perl-format |
33ac3e89 CDR |
16624 | msgid "Unstage this hunk [y,n,q,a,d%s,?]? " |
16625 | msgstr "Sacar este hunk del stage [y,n,q,a,d%s,?]? " | |
fb0e25bc | 16626 | |
33ac3e89 | 16627 | #: git-add--interactive.perl:1398 |
fb0e25bc | 16628 | #, perl-format |
33ac3e89 CDR |
16629 | msgid "Apply mode change to index [y,n,q,a,d%s,?]? " |
16630 | msgstr "Aplicar cambio de modo al índice [y,n,q,a,d%s,?]? " | |
fb0e25bc | 16631 | |
33ac3e89 | 16632 | #: git-add--interactive.perl:1399 |
fb0e25bc | 16633 | #, perl-format |
33ac3e89 CDR |
16634 | msgid "Apply deletion to index [y,n,q,a,d%s,?]? " |
16635 | msgstr "Aplicar borrado al índice [y,n,q,a,d%s,?]? " | |
fb0e25bc | 16636 | |
33ac3e89 | 16637 | #: git-add--interactive.perl:1400 |
fb0e25bc | 16638 | #, perl-format |
33ac3e89 CDR |
16639 | msgid "Apply this hunk to index [y,n,q,a,d%s,?]? " |
16640 | msgstr "Aplicar este hunk al índice [y,n,q,a,d%s,?]? " | |
fb0e25bc | 16641 | |
33ac3e89 | 16642 | #: git-add--interactive.perl:1403 |
fb0e25bc | 16643 | #, perl-format |
33ac3e89 CDR |
16644 | msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? " |
16645 | msgstr "Descartar cambio de modo del árbol de trabajo [y,n,q,a,d%s,?]? " | |
fb0e25bc | 16646 | |
33ac3e89 | 16647 | #: git-add--interactive.perl:1404 |
fb0e25bc | 16648 | #, perl-format |
33ac3e89 CDR |
16649 | msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? " |
16650 | msgstr "Descartar borrado del árbol de trabajo [y,n,q,a,d%s,?]? " | |
fb0e25bc | 16651 | |
33ac3e89 | 16652 | #: git-add--interactive.perl:1405 |
fb0e25bc | 16653 | #, perl-format |
33ac3e89 CDR |
16654 | msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? " |
16655 | msgstr "Descartar este hunk del árbol de trabajo [y,n,q,a,d%s,?]? " | |
fb0e25bc | 16656 | |
33ac3e89 | 16657 | #: git-add--interactive.perl:1408 |
fb0e25bc | 16658 | #, perl-format |
33ac3e89 | 16659 | msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? " |
4b15eb22 | 16660 | msgstr "" |
33ac3e89 | 16661 | "Descartar cambio de modo del índice y el árbol de trabajo [y,n,q,a,d%s,?]? " |
fb0e25bc | 16662 | |
33ac3e89 | 16663 | #: git-add--interactive.perl:1409 |
fb0e25bc | 16664 | #, perl-format |
33ac3e89 CDR |
16665 | msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? " |
16666 | msgstr "Descartar borrado del índice y el árbol de trabajo [y,n,q,a,d%s,?]? " | |
fb0e25bc | 16667 | |
33ac3e89 | 16668 | #: git-add--interactive.perl:1410 |
fb0e25bc | 16669 | #, perl-format |
33ac3e89 CDR |
16670 | msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? " |
16671 | msgstr "Descartar este hunk del índice y el árbol de trabajo [y,n,q,a,d%s,?]? " | |
fb0e25bc | 16672 | |
33ac3e89 | 16673 | #: git-add--interactive.perl:1413 |
fb0e25bc | 16674 | #, perl-format |
33ac3e89 | 16675 | msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? " |
4b15eb22 | 16676 | msgstr "" |
33ac3e89 | 16677 | "Aplicar cambio de modo para el índice y el árbol de trabajo [y,n,q,a,d%s,?]? " |
fb0e25bc | 16678 | |
33ac3e89 | 16679 | #: git-add--interactive.perl:1414 |
fb0e25bc | 16680 | #, perl-format |
33ac3e89 CDR |
16681 | msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? " |
16682 | msgstr "Aplicar borrado al índice y al árbol de trabajo [y,n,q,a,d%s,?]? " | |
fb0e25bc | 16683 | |
33ac3e89 | 16684 | #: git-add--interactive.perl:1415 |
fb0e25bc | 16685 | #, perl-format |
33ac3e89 | 16686 | msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? " |
715fc761 | 16687 | msgstr "Aplicar este hunk al índice y árbol de trabajo [y,n,q,a,d,/%s,?]? " |
fb0e25bc | 16688 | |
33ac3e89 CDR |
16689 | #: git-add--interactive.perl:1515 |
16690 | msgid "No other hunks to goto\n" | |
16691 | msgstr "No hay más pedazos para el ir\n" | |
16692 | ||
16693 | #: git-add--interactive.perl:1522 | |
fb0e25bc | 16694 | msgid "go to which hunk (<ret> to see more)? " |
33ac3e89 | 16695 | msgstr "a que hunk ir (<enter> para ver mas)? " |
fb0e25bc | 16696 | |
33ac3e89 | 16697 | #: git-add--interactive.perl:1524 |
fb0e25bc | 16698 | msgid "go to which hunk? " |
33ac3e89 | 16699 | msgstr "a que hunk ir? " |
fb0e25bc | 16700 | |
33ac3e89 | 16701 | #: git-add--interactive.perl:1533 |
fb0e25bc CD |
16702 | #, perl-format |
16703 | msgid "Invalid number: '%s'\n" | |
16704 | msgstr "Numero invalido: '%s'\n" | |
16705 | ||
33ac3e89 | 16706 | #: git-add--interactive.perl:1538 |
fb0e25bc CD |
16707 | #, perl-format |
16708 | msgid "Sorry, only %d hunk available.\n" | |
16709 | msgid_plural "Sorry, only %d hunks available.\n" | |
16710 | msgstr[0] "Lo siento, solo %d hunk disponible.\n" | |
16711 | msgstr[1] "Lo siento, solo %d hunks disponibles.\n" | |
16712 | ||
33ac3e89 CDR |
16713 | #: git-add--interactive.perl:1564 |
16714 | msgid "No other hunks to search\n" | |
16715 | msgstr "No hay más pedazos para buscar\n" | |
16716 | ||
16717 | #: git-add--interactive.perl:1568 | |
fb0e25bc | 16718 | msgid "search for regex? " |
33ac3e89 | 16719 | msgstr "buscar para regexp? " |
fb0e25bc | 16720 | |
33ac3e89 | 16721 | #: git-add--interactive.perl:1581 |
fb0e25bc CD |
16722 | #, perl-format |
16723 | msgid "Malformed search regexp %s: %s\n" | |
33ac3e89 | 16724 | msgstr "Regexp para la búsqueda mal formado %s: %s\n" |
fb0e25bc | 16725 | |
33ac3e89 | 16726 | #: git-add--interactive.perl:1591 |
fb0e25bc | 16727 | msgid "No hunk matches the given pattern\n" |
715fc761 | 16728 | msgstr "No hay hunks que concuerden con el patrón entregado.\n" |
fb0e25bc | 16729 | |
33ac3e89 | 16730 | #: git-add--interactive.perl:1603 git-add--interactive.perl:1625 |
fb0e25bc CD |
16731 | msgid "No previous hunk\n" |
16732 | msgstr "No el anterior hunk\n" | |
16733 | ||
33ac3e89 | 16734 | #: git-add--interactive.perl:1612 git-add--interactive.perl:1631 |
fb0e25bc CD |
16735 | msgid "No next hunk\n" |
16736 | msgstr "No el siguiente hunk\n" | |
16737 | ||
33ac3e89 CDR |
16738 | #: git-add--interactive.perl:1637 |
16739 | msgid "Sorry, cannot split this hunk\n" | |
16740 | msgstr "Perdón, no se puede dividir este pedazo\n" | |
16741 | ||
16742 | #: git-add--interactive.perl:1643 | |
fb0e25bc CD |
16743 | #, perl-format |
16744 | msgid "Split into %d hunk.\n" | |
16745 | msgid_plural "Split into %d hunks.\n" | |
16746 | msgstr[0] "Cortar en %d hunk.\n" | |
16747 | msgstr[1] "Cortar en %d hunks.\n" | |
16748 | ||
33ac3e89 CDR |
16749 | #: git-add--interactive.perl:1653 |
16750 | msgid "Sorry, cannot edit this hunk\n" | |
16751 | msgstr "Perdón, no se puede editar este pedazo\n" | |
16752 | ||
16753 | #: git-add--interactive.perl:1699 | |
fb0e25bc | 16754 | msgid "Review diff" |
715fc761 | 16755 | msgstr "Revisión de diff" |
fb0e25bc CD |
16756 | |
16757 | #. TRANSLATORS: please do not translate the command names | |
16758 | #. 'status', 'update', 'revert', etc. | |
33ac3e89 | 16759 | #: git-add--interactive.perl:1718 |
fb0e25bc CD |
16760 | msgid "" |
16761 | "status - show paths with changes\n" | |
16762 | "update - add working tree state to the staged set of changes\n" | |
16763 | "revert - revert staged set of changes back to the HEAD version\n" | |
16764 | "patch - pick hunks and update selectively\n" | |
16765 | "diff - view diff between HEAD and index\n" | |
4b15eb22 CD |
16766 | "add untracked - add contents of untracked files to the staged set of " |
16767 | "changes\n" | |
fb0e25bc | 16768 | msgstr "" |
715fc761 CDR |
16769 | "status - muestra las rutas con cambios\n" |
16770 | "update - agrega el estado del árbol de trabajo al set de cambios en " | |
16771 | "el área de stage\n" | |
16772 | "revert - revierte los cambios en el área de stage de regreso a la " | |
16773 | "versión HEAD\n" | |
fb0e25bc | 16774 | "patch - selecciona los hunks y actualiza de forma selectiva\n" |
9df63a4a | 16775 | "diff - mirar la diff entre HEAD y el índice\n" |
4b15eb22 CD |
16776 | "add untracked - agrega contenidos de archivos no rastreados al grupo de " |
16777 | "cambios del area de stage\n" | |
fb0e25bc | 16778 | |
33ac3e89 CDR |
16779 | #: git-add--interactive.perl:1735 git-add--interactive.perl:1740 |
16780 | #: git-add--interactive.perl:1743 git-add--interactive.perl:1750 | |
16781 | #: git-add--interactive.perl:1754 git-add--interactive.perl:1760 | |
fb0e25bc CD |
16782 | msgid "missing --" |
16783 | msgstr "falta --" | |
16784 | ||
33ac3e89 | 16785 | #: git-add--interactive.perl:1756 |
fb0e25bc CD |
16786 | #, perl-format |
16787 | msgid "unknown --patch mode: %s" | |
16788 | msgstr "modo --patch desconocido: %s" | |
16789 | ||
33ac3e89 | 16790 | #: git-add--interactive.perl:1762 git-add--interactive.perl:1768 |
fb0e25bc CD |
16791 | #, perl-format |
16792 | msgid "invalid argument %s, expecting --" | |
16793 | msgstr "argumento invalido %s, se esperaba --" | |
16794 | ||
33ac3e89 | 16795 | #: git-send-email.perl:130 |
fb0e25bc CD |
16796 | msgid "local zone differs from GMT by a non-minute interval\n" |
16797 | msgstr "la zona local difiere de GMT por un intervalo de cero minutos\n" | |
16798 | ||
33ac3e89 | 16799 | #: git-send-email.perl:137 git-send-email.perl:143 |
fb0e25bc CD |
16800 | msgid "local time offset greater than or equal to 24 hours\n" |
16801 | msgstr "el offset del tiempo local es mayor o igual a 24 horas\n" | |
16802 | ||
33ac3e89 | 16803 | #: git-send-email.perl:211 git-send-email.perl:217 |
fb0e25bc CD |
16804 | msgid "the editor exited uncleanly, aborting everything" |
16805 | msgstr "el editor se cerro inapropiadamente, abortando todo" | |
16806 | ||
33ac3e89 | 16807 | #: git-send-email.perl:294 |
fb0e25bc | 16808 | #, perl-format |
4b15eb22 CD |
16809 | msgid "" |
16810 | "'%s' contains an intermediate version of the email you were composing.\n" | |
16811 | msgstr "" | |
715fc761 | 16812 | "'%s' contiene una versión intermedia del correo que se estaba generando.\n" |
fb0e25bc | 16813 | |
33ac3e89 | 16814 | #: git-send-email.perl:299 |
fb0e25bc CD |
16815 | #, perl-format |
16816 | msgid "'%s.final' contains the composed email.\n" | |
16817 | msgstr "'%s.final' contiene el email generado.\n" | |
16818 | ||
33ac3e89 | 16819 | #: git-send-email.perl:317 |
fb0e25bc CD |
16820 | msgid "--dump-aliases incompatible with other options\n" |
16821 | msgstr "--dump-aliases no es compatible con otras opciones.\n" | |
16822 | ||
33ac3e89 | 16823 | #: git-send-email.perl:383 git-send-email.perl:638 |
fb0e25bc CD |
16824 | msgid "Cannot run git format-patch from outside a repository\n" |
16825 | msgstr "No se puede ejecutar git format-patch desde fuera del repositorio.\n" | |
16826 | ||
33ac3e89 CDR |
16827 | #: git-send-email.perl:386 |
16828 | msgid "" | |
16829 | "`batch-size` and `relogin` must be specified together (via command-line or " | |
16830 | "configuration option)\n" | |
16831 | msgstr "" | |
16832 | "`batch-size` y `relogin` deben ser especificados juntos (via la línea de " | |
16833 | "comando o por opción de configuración)\n" | |
16834 | ||
16835 | #: git-send-email.perl:456 | |
fb0e25bc CD |
16836 | #, perl-format |
16837 | msgid "Unknown --suppress-cc field: '%s'\n" | |
33ac3e89 | 16838 | msgstr "Campo --suppress-cc desconocido: '%s'\n" |
fb0e25bc | 16839 | |
33ac3e89 | 16840 | #: git-send-email.perl:485 |
fb0e25bc CD |
16841 | #, perl-format |
16842 | msgid "Unknown --confirm setting: '%s'\n" | |
715fc761 | 16843 | msgstr "Configuración --confirm desconocida: '%s'\n" |
fb0e25bc | 16844 | |
33ac3e89 | 16845 | #: git-send-email.perl:513 |
fb0e25bc CD |
16846 | #, perl-format |
16847 | msgid "warning: sendmail alias with quotes is not supported: %s\n" | |
16848 | msgstr "peligro: alias de sendmail con comillas no es soportado: %s\n" | |
16849 | ||
33ac3e89 | 16850 | #: git-send-email.perl:515 |
fb0e25bc CD |
16851 | #, perl-format |
16852 | msgid "warning: `:include:` not supported: %s\n" | |
16853 | msgstr "peligro: `:include:` no soportado: %s\n" | |
16854 | ||
33ac3e89 | 16855 | #: git-send-email.perl:517 |
fb0e25bc CD |
16856 | #, perl-format |
16857 | msgid "warning: `/file` or `|pipe` redirection not supported: %s\n" | |
33ac3e89 | 16858 | msgstr "advertencia: redirección `/file` o `|pipe` no soportada : %s\n" |
fb0e25bc | 16859 | |
33ac3e89 | 16860 | #: git-send-email.perl:522 |
fb0e25bc CD |
16861 | #, perl-format |
16862 | msgid "warning: sendmail line is not recognized: %s\n" | |
33ac3e89 | 16863 | msgstr "advertencia: línea sendmail no reconocida: %s\n" |
fb0e25bc | 16864 | |
33ac3e89 | 16865 | #: git-send-email.perl:604 |
fb0e25bc CD |
16866 | #, perl-format |
16867 | msgid "" | |
16868 | "File '%s' exists but it could also be the range of commits\n" | |
16869 | "to produce patches for. Please disambiguate by...\n" | |
16870 | "\n" | |
16871 | " * Saying \"./%s\" if you mean a file; or\n" | |
16872 | " * Giving --format-patch option if you mean a range.\n" | |
16873 | msgstr "" | |
715fc761 CDR |
16874 | "Archivo '%s' existe pero podría ser el rango de commits \n" |
16875 | "para producir los parches. Por favor elimina la ambigüedad...\n" | |
fb0e25bc CD |
16876 | "\n" |
16877 | " * Diciendo \"./%s\" si se quiere decir un archivo; o\n" | |
715fc761 | 16878 | " * Agregando la opción --format-patch si se quiere decir un rango.\n" |
fb0e25bc | 16879 | |
33ac3e89 | 16880 | #: git-send-email.perl:625 |
fb0e25bc CD |
16881 | #, perl-format |
16882 | msgid "Failed to opendir %s: %s" | |
16883 | msgstr "Fallo al abrir directorio %s: %s" | |
16884 | ||
33ac3e89 | 16885 | #: git-send-email.perl:649 |
fb0e25bc CD |
16886 | #, perl-format |
16887 | msgid "" | |
16888 | "fatal: %s: %s\n" | |
16889 | "warning: no patches were sent\n" | |
16890 | msgstr "" | |
16891 | "fatal: %s: %s\n" | |
16892 | "peligro: no se mandaron parches\n" | |
16893 | ||
33ac3e89 | 16894 | #: git-send-email.perl:660 |
fb0e25bc CD |
16895 | msgid "" |
16896 | "\n" | |
16897 | "No patch files specified!\n" | |
16898 | "\n" | |
16899 | msgstr "" | |
16900 | "\n" | |
16901 | "No se especificaron parches!\n" | |
16902 | "\n" | |
16903 | ||
33ac3e89 | 16904 | #: git-send-email.perl:673 |
fb0e25bc CD |
16905 | #, perl-format |
16906 | msgid "No subject line in %s?" | |
715fc761 | 16907 | msgstr "No hay línea de subject en %s?" |
fb0e25bc | 16908 | |
33ac3e89 | 16909 | #: git-send-email.perl:683 |
fb0e25bc CD |
16910 | #, perl-format |
16911 | msgid "Failed to open for writing %s: %s" | |
715fc761 | 16912 | msgstr "Fallo al abrir para escritura %s: %s" |
fb0e25bc | 16913 | |
33ac3e89 | 16914 | #: git-send-email.perl:694 |
fb0e25bc CD |
16915 | msgid "" |
16916 | "Lines beginning in \"GIT:\" will be removed.\n" | |
16917 | "Consider including an overall diffstat or table of contents\n" | |
16918 | "for the patch you are writing.\n" | |
16919 | "\n" | |
16920 | "Clear the body content if you don't wish to send a summary.\n" | |
16921 | msgstr "" | |
9df63a4a | 16922 | "Lineas que comienzan en \"GIT:\" serán removidas.\n" |
fb0e25bc CD |
16923 | "Considere incluir un diffstat global o una tabla de contenidos\n" |
16924 | "para el parche que esta escribiendo.\n" | |
16925 | "\n" | |
16926 | "Limpiar el contenido de body si usted no desea mandar un resumen.\n" | |
16927 | ||
33ac3e89 | 16928 | #: git-send-email.perl:718 |
fb0e25bc CD |
16929 | #, perl-format |
16930 | msgid "Failed to open %s: %s" | |
16931 | msgstr "Fallo al abrir %s: %s" | |
16932 | ||
33ac3e89 CDR |
16933 | #: git-send-email.perl:735 |
16934 | #, perl-format | |
16935 | msgid "Failed to open %s.final: %s" | |
16936 | msgstr "Fallo al abrir %s.final: %s" | |
fb0e25bc | 16937 | |
33ac3e89 | 16938 | #: git-send-email.perl:778 |
fb0e25bc | 16939 | msgid "Summary email is empty, skipping it\n" |
715fc761 | 16940 | msgstr "Archivo de resumen esta vacío, saltando al siguiente\n" |
fb0e25bc CD |
16941 | |
16942 | #. TRANSLATORS: please keep [y/N] as is. | |
33ac3e89 | 16943 | #: git-send-email.perl:813 |
fb0e25bc CD |
16944 | #, perl-format |
16945 | msgid "Are you sure you want to use <%s> [y/N]? " | |
33ac3e89 | 16946 | msgstr "Esta seguro de que desea usar <%s> [y/N]? " |
fb0e25bc | 16947 | |
33ac3e89 | 16948 | #: git-send-email.perl:868 |
4b15eb22 CD |
16949 | msgid "" |
16950 | "The following files are 8bit, but do not declare a Content-Transfer-" | |
16951 | "Encoding.\n" | |
16952 | msgstr "" | |
16953 | "Los siguientes archivos son 8bit, pero no declaran un Content-Transfer-" | |
16954 | "Encoding.\n" | |
fb0e25bc | 16955 | |
33ac3e89 | 16956 | #: git-send-email.perl:873 |
fb0e25bc | 16957 | msgid "Which 8bit encoding should I declare [UTF-8]? " |
33ac3e89 | 16958 | msgstr "Que codificación de 8bit debería declarar [UTF-8]? " |
fb0e25bc | 16959 | |
33ac3e89 | 16960 | #: git-send-email.perl:881 |
fb0e25bc CD |
16961 | #, perl-format |
16962 | msgid "" | |
16963 | "Refusing to send because the patch\n" | |
16964 | "\t%s\n" | |
4b15eb22 CD |
16965 | "has the template subject '*** SUBJECT HERE ***'. Pass --force if you really " |
16966 | "want to send.\n" | |
fb0e25bc CD |
16967 | msgstr "" |
16968 | "Rehusando mandar el parche porque\n" | |
16969 | "\t%s\n" | |
4b15eb22 CD |
16970 | "tiene el template '*** SUBJECT HERE ***'. Agrega --force si realmente lo " |
16971 | "deseas mandar.\n" | |
fb0e25bc | 16972 | |
33ac3e89 | 16973 | #: git-send-email.perl:900 |
fb0e25bc CD |
16974 | msgid "To whom should the emails be sent (if anyone)?" |
16975 | msgstr "A quien se deben mandar los correos (si existe)?" | |
16976 | ||
33ac3e89 | 16977 | #: git-send-email.perl:918 |
fb0e25bc CD |
16978 | #, perl-format |
16979 | msgid "fatal: alias '%s' expands to itself\n" | |
16980 | msgstr "fatal: alias '%s' se expande a si mismo\n" | |
16981 | ||
33ac3e89 | 16982 | #: git-send-email.perl:930 |
fb0e25bc | 16983 | msgid "Message-ID to be used as In-Reply-To for the first email (if any)? " |
4b15eb22 | 16984 | msgstr "" |
33ac3e89 CDR |
16985 | "Qué id de mensaje será usado como En-Respuesta-Para en el primer email (si " |
16986 | "existe alguno)? " | |
fb0e25bc | 16987 | |
33ac3e89 | 16988 | #: git-send-email.perl:988 git-send-email.perl:996 |
fb0e25bc CD |
16989 | #, perl-format |
16990 | msgid "error: unable to extract a valid address from: %s\n" | |
715fc761 | 16991 | msgstr "error: no es posible extraer una dirección valida de %s\n" |
fb0e25bc CD |
16992 | |
16993 | #. TRANSLATORS: Make sure to include [q] [d] [e] in your | |
16994 | #. translation. The program will only accept English input | |
16995 | #. at this point. | |
33ac3e89 | 16996 | #: git-send-email.perl:1000 |
fb0e25bc | 16997 | msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): " |
33ac3e89 | 16998 | msgstr "Que hacer con esta dirección? ([q]salir|[d]botar|[e]ditar): " |
fb0e25bc | 16999 | |
33ac3e89 | 17000 | #: git-send-email.perl:1317 |
fb0e25bc CD |
17001 | #, perl-format |
17002 | msgid "CA path \"%s\" does not exist" | |
33ac3e89 | 17003 | msgstr "Ruta CA \"%s\" no existe" |
fb0e25bc | 17004 | |
33ac3e89 | 17005 | #: git-send-email.perl:1395 |
fb0e25bc CD |
17006 | msgid "" |
17007 | " The Cc list above has been expanded by additional\n" | |
17008 | " addresses found in the patch commit message. By default\n" | |
17009 | " send-email prompts before sending whenever this occurs.\n" | |
17010 | " This behavior is controlled by the sendemail.confirm\n" | |
17011 | " configuration setting.\n" | |
17012 | "\n" | |
17013 | " For additional information, run 'git send-email --help'.\n" | |
17014 | " To retain the current behavior, but squelch this message,\n" | |
17015 | " run 'git config --global sendemail.confirm auto'.\n" | |
17016 | "\n" | |
17017 | msgstr "" | |
33ac3e89 CDR |
17018 | " La lista Cc ha sido expandida por direcciones adicionales\n" |
17019 | " encontradas en el mensaje de commit parchado.. Por defecto\n" | |
17020 | " send-email se muestra antes de mandar cualquier cada vez que esto " | |
17021 | "sucede.\n" | |
17022 | " Este comportamiento is controlado por el valor de configuración " | |
17023 | "sendemail.confirm.\n" | |
fb0e25bc | 17024 | "\n" |
33ac3e89 CDR |
17025 | " Para mas información, ejecuta 'git send-email --help'.\n" |
17026 | " Para mantener el comportamiento actual, pero evitar este mensaje,\n" | |
17027 | " ejecuta 'git config --global sendemail.confirm auto'.\n" | |
fb0e25bc CD |
17028 | "\n" |
17029 | ||
17030 | #. TRANSLATORS: Make sure to include [y] [n] [q] [a] in your | |
17031 | #. translation. The program will only accept English input | |
17032 | #. at this point. | |
33ac3e89 | 17033 | #: git-send-email.perl:1410 |
fb0e25bc | 17034 | msgid "Send this email? ([y]es|[n]o|[q]uit|[a]ll): " |
33ac3e89 | 17035 | msgstr "Mandar este email? ([y]si||[n]o|[q]salir|[a]todo): " |
fb0e25bc | 17036 | |
33ac3e89 | 17037 | #: git-send-email.perl:1413 |
fb0e25bc CD |
17038 | msgid "Send this email reply required" |
17039 | msgstr "Necesitas mandar esta respuesta de email" | |
17040 | ||
33ac3e89 | 17041 | #: git-send-email.perl:1439 |
fb0e25bc CD |
17042 | msgid "The required SMTP server is not properly defined." |
17043 | msgstr "El servidor SMTP no esta definido adecuadamente." | |
17044 | ||
33ac3e89 | 17045 | #: git-send-email.perl:1486 |
fb0e25bc CD |
17046 | #, perl-format |
17047 | msgid "Server does not support STARTTLS! %s" | |
715fc761 | 17048 | msgstr "Servidor no soporta STARTTLS! %s" |
fb0e25bc | 17049 | |
33ac3e89 | 17050 | #: git-send-email.perl:1491 git-send-email.perl:1495 |
fb0e25bc CD |
17051 | #, perl-format |
17052 | msgid "STARTTLS failed! %s" | |
33ac3e89 | 17053 | msgstr "Falló STARTTLS! %s" |
fb0e25bc | 17054 | |
33ac3e89 | 17055 | #: git-send-email.perl:1505 |
fb0e25bc | 17056 | msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug." |
4b15eb22 CD |
17057 | msgstr "" |
17058 | "No es posible inicializar SMTP adecuadamente. Verificar config y usar ---" | |
17059 | "smtp-debug." | |
fb0e25bc | 17060 | |
33ac3e89 | 17061 | #: git-send-email.perl:1523 |
fb0e25bc CD |
17062 | #, perl-format |
17063 | msgid "Failed to send %s\n" | |
17064 | msgstr "Fallo al enviar %s\n" | |
17065 | ||
33ac3e89 | 17066 | #: git-send-email.perl:1526 |
fb0e25bc CD |
17067 | #, perl-format |
17068 | msgid "Dry-Sent %s\n" | |
17069 | msgstr "Dry-Sent %s\n" | |
17070 | ||
33ac3e89 | 17071 | #: git-send-email.perl:1526 |
fb0e25bc CD |
17072 | #, perl-format |
17073 | msgid "Sent %s\n" | |
17074 | msgstr "Enviado %s\n" | |
17075 | ||
33ac3e89 | 17076 | #: git-send-email.perl:1528 |
fb0e25bc CD |
17077 | msgid "Dry-OK. Log says:\n" |
17078 | msgstr "Dry-OK. Log dice:\n" | |
17079 | ||
33ac3e89 | 17080 | #: git-send-email.perl:1528 |
fb0e25bc CD |
17081 | msgid "OK. Log says:\n" |
17082 | msgstr "OK. Log dice:\n" | |
17083 | ||
33ac3e89 | 17084 | #: git-send-email.perl:1540 |
fb0e25bc | 17085 | msgid "Result: " |
33ac3e89 | 17086 | msgstr "Resultado: " |
fb0e25bc | 17087 | |
33ac3e89 | 17088 | #: git-send-email.perl:1543 |
fb0e25bc CD |
17089 | msgid "Result: OK\n" |
17090 | msgstr "Resultado: OK\n" | |
17091 | ||
33ac3e89 | 17092 | #: git-send-email.perl:1556 |
fb0e25bc CD |
17093 | #, perl-format |
17094 | msgid "can't open file %s" | |
17095 | msgstr "no se puede abrir el archivo %s" | |
17096 | ||
33ac3e89 | 17097 | #: git-send-email.perl:1603 git-send-email.perl:1623 |
fb0e25bc CD |
17098 | #, perl-format |
17099 | msgid "(mbox) Adding cc: %s from line '%s'\n" | |
715fc761 | 17100 | msgstr "(mbox) Agregando cc: %s de línea '%s'\n" |
fb0e25bc | 17101 | |
33ac3e89 | 17102 | #: git-send-email.perl:1609 |
fb0e25bc CD |
17103 | #, perl-format |
17104 | msgid "(mbox) Adding to: %s from line '%s'\n" | |
715fc761 | 17105 | msgstr "(mbox) Agregando para: %s de la línea '%s'\n" |
fb0e25bc | 17106 | |
33ac3e89 | 17107 | #: git-send-email.perl:1657 |
fb0e25bc CD |
17108 | #, perl-format |
17109 | msgid "(non-mbox) Adding cc: %s from line '%s'\n" | |
715fc761 | 17110 | msgstr "(non-mbox) Agregando cc: %s de la línea '%s'\n" |
fb0e25bc | 17111 | |
33ac3e89 | 17112 | #: git-send-email.perl:1682 |
fb0e25bc CD |
17113 | #, perl-format |
17114 | msgid "(body) Adding cc: %s from line '%s'\n" | |
715fc761 | 17115 | msgstr "(body) Agregando cc: %s de la línea '%s'\n" |
fb0e25bc | 17116 | |
33ac3e89 | 17117 | #: git-send-email.perl:1788 |
fb0e25bc CD |
17118 | #, perl-format |
17119 | msgid "(%s) Could not execute '%s'" | |
17120 | msgstr "(%s) no se pudo ejecutar '%s'" | |
17121 | ||
33ac3e89 | 17122 | #: git-send-email.perl:1795 |
fb0e25bc CD |
17123 | #, perl-format |
17124 | msgid "(%s) Adding %s: %s from: '%s'\n" | |
17125 | msgstr "(%s) Agregando %s: %s de: '%s'\n" | |
17126 | ||
33ac3e89 | 17127 | #: git-send-email.perl:1799 |
fb0e25bc CD |
17128 | #, perl-format |
17129 | msgid "(%s) failed to close pipe to '%s'" | |
17130 | msgstr "(%s) fallo al cerrar el pipe para '%s'" | |
17131 | ||
33ac3e89 | 17132 | #: git-send-email.perl:1826 |
fb0e25bc CD |
17133 | msgid "cannot send message as 7bit" |
17134 | msgstr "no se puede mandar mensaje como 7bit" | |
17135 | ||
33ac3e89 | 17136 | #: git-send-email.perl:1834 |
fb0e25bc | 17137 | msgid "invalid transfer encoding" |
715fc761 | 17138 | msgstr "codificación de transferencia invalida" |
fb0e25bc | 17139 | |
33ac3e89 | 17140 | #: git-send-email.perl:1872 git-send-email.perl:1923 git-send-email.perl:1933 |
fb0e25bc CD |
17141 | #, perl-format |
17142 | msgid "unable to open %s: %s\n" | |
17143 | msgstr "no es posible abrir %s: %s\n" | |
17144 | ||
33ac3e89 | 17145 | #: git-send-email.perl:1875 |
fb0e25bc CD |
17146 | #, perl-format |
17147 | msgid "%s: patch contains a line longer than 998 characters" | |
715fc761 | 17148 | msgstr "%s: el parche contiene una línea con mas de 998 caracteres" |
fb0e25bc | 17149 | |
33ac3e89 | 17150 | #: git-send-email.perl:1891 |
fb0e25bc CD |
17151 | #, perl-format |
17152 | msgid "Skipping %s with backup suffix '%s'.\n" | |
17153 | msgstr "Saltando %s con el sufijo de backup '%s'.\n" | |
17154 | ||
17155 | #. TRANSLATORS: please keep "[y|N]" as is. | |
33ac3e89 | 17156 | #: git-send-email.perl:1895 |
fb0e25bc CD |
17157 | #, perl-format |
17158 | msgid "Do you really want to send %s? [y|N]: " | |
33ac3e89 CDR |
17159 | msgstr "Realmente deseas mandar %s?[y|N]: " |
17160 | ||
17161 | #~ msgid "git fetch-pack: expected ACK/NAK, got EOF" | |
17162 | #~ msgstr "git getch-pack: se esperaba ACK/NAK, se obtuvo EOF" | |
17163 | ||
17164 | #~ msgid "invalid filter-spec expression '%s'" | |
17165 | #~ msgstr "expresión filter-spec inválida '%s'" | |
17166 | ||
17167 | #~ msgid "The copy of the patch that failed is found in: %s" | |
17168 | #~ msgstr "La copia del parche que fallido se encuentra en: %s" | |
17169 | ||
17170 | #~ msgid "pathspec and --all are incompatible" | |
17171 | #~ msgstr "pathspec y --all son incompatibles" | |
17172 | ||
17173 | #~ msgid "Submodule '$name' ($url) unregistered for path '$displaypath'" | |
17174 | #~ msgstr "" | |
17175 | #~ "Anulado el registro del submódulo '$name' ($url) para la ruta " | |
17176 | #~ "'$displaypath'" | |
17177 | ||
17178 | #~ msgid "To/Cc/Bcc fields are not interpreted yet, they have been ignored\n" | |
17179 | #~ msgstr "" | |
17180 | #~ "Campos Para/Cc/Bcc no han sido interpretados todavía, han sido ignorados\n" | |
4b15eb22 | 17181 | |
f8038f5b CDR |
17182 | #~ msgid "" |
17183 | #~ "empty strings as pathspecs will be made invalid in upcoming releases. " | |
17184 | #~ "please use . instead if you meant to match all paths" | |
17185 | #~ msgstr "" | |
17186 | #~ "los strings vacíos como pathspecs serán inválidas en las próximas " | |
17187 | #~ "versiones. por favor use . si quería hacer coincidir todas las rutas" | |
17188 | ||
17189 | #~ msgid "unable to open '%s' for writing" | |
17190 | #~ msgstr "No se pudo abrir '%s' para escritura" | |
17191 | ||
17192 | #~ msgid "could not truncate '%s'" | |
17193 | #~ msgstr "no se pudo truncar '%s'" | |
17194 | ||
17195 | #~ msgid "could not finish '%s'" | |
17196 | #~ msgstr "no se pudo finalizar '%s'" | |
17197 | ||
f8038f5b CDR |
17198 | #~ msgid "could not close %s" |
17199 | #~ msgstr "no se pudo cerrar %s" | |
17200 | ||
17201 | #~ msgid "Copied a misnamed branch '%s' away" | |
17202 | #~ msgstr "Copiada una rama mal llamada '%s' afuera" | |
17203 | ||
17204 | #~ msgid "it does not make sense to create 'HEAD' manually" | |
17205 | #~ msgstr "No tiene sentido crear 'HEAD' manualmente" | |
17206 | ||
17207 | #~ msgid "Don't know how to clone %s" | |
17208 | #~ msgstr "No se sabe como clonar %s" | |
17209 | ||
17210 | #~ msgid "show ignored files" | |
17211 | #~ msgstr "mostrar archivos ignorados" | |
17212 | ||
17213 | #~ msgid "%s is not a valid '%s' object" | |
17214 | #~ msgstr "%s no es un objeto '%s' válido" | |
17215 | ||
17216 | #~ msgid "Don't know how to fetch from %s" | |
17217 | #~ msgstr "No se sabe como extraer de %s" | |
17218 | ||
17219 | #~ msgid "'$term' is not a valid term" | |
17220 | #~ msgstr "'$term' no es un término válido" | |
17221 | ||
17222 | #~ msgid "" | |
17223 | #~ "error: unknown option for 'stash save': $option\n" | |
17224 | #~ " To provide a message, use git stash save -- '$option'" | |
17225 | #~ msgstr "" | |
17226 | #~ "error: opción desconocida para 'stash save': $option\n" | |
17227 | #~ " Esto provee un mensaje , use git stash save -- '$option'" | |
17228 | ||
17229 | #~ msgid "Failed to recurse into submodule path '$sm_path'" | |
17230 | #~ msgstr "Falló al recurrir en la ruta de submódulo '$sm_path'" | |
17231 | ||
6628a6e6 CDR |
17232 | #~ msgid "%%(trailers) does not take arguments" |
17233 | #~ msgstr "%%(trailers) no toma argumentos" | |
17234 | ||
4b15eb22 CD |
17235 | #~ msgid "submodule update strategy not supported for submodule '%s'" |
17236 | #~ msgstr "" | |
17237 | #~ "estrategia de actualización de submódulo no soportada para submódulo '%s'" | |
17238 | ||
17239 | #~ msgid "change upstream info" | |
17240 | #~ msgstr "cambie info de upstream" | |
17241 | ||
17242 | #~ msgid "" | |
17243 | #~ "\n" | |
17244 | #~ "If you wanted to make '%s' track '%s', do this:\n" | |
17245 | #~ "\n" | |
17246 | #~ msgstr "" | |
17247 | #~ "\n" | |
17248 | #~ "Si querías hacer que '%s' rastree '%s', haz esto:\n" | |
17249 | #~ "\n" | |
17250 | ||
17251 | #~ msgid "basename" | |
17252 | #~ msgstr "nombre base" | |
17253 | ||
17254 | #~ msgid "prepend parent project's basename to output" | |
17255 | #~ msgstr "anteponer el nombre base del proyecto padre a la salida" | |
17256 | ||
17257 | #~ msgid "" | |
17258 | #~ "Warning: the SHA-1 is missing or isn't a commit in the following line:\n" | |
17259 | #~ " - $line" | |
17260 | #~ msgstr "" | |
17261 | #~ "Peligro: falta el SHA-1 o no es un commit en la siguiente línea:\n" | |
17262 | #~ " - $line" | |
17263 | ||
17264 | #~ msgid "" | |
17265 | #~ "Warning: the command isn't recognized in the following line:\n" | |
17266 | #~ " - $line" | |
17267 | #~ msgstr "" | |
17268 | #~ "Peligro: el comando no es reconocido en la siguiente línea:\n" | |
17269 | #~ " - $line" | |
17270 | ||
17271 | #~ msgid "Or you can abort the rebase with 'git rebase --abort'." | |
17272 | #~ msgstr "O puedes abortar el rebasamiento con 'git rebase --abort'." |