@matheusbsbs / matheus-bagliano / commits / 521437fe7c

l10n: es.po: Spanish translation 2.16.0 round 2

Signed-off-by: Christopher Díaz Riveros <chrisadr@gentoo.org>

Christopher Díaz Riveros committed Jan 7, 2018 at 12:15 UTC 521437fe7c2e9ac6bb643ec8acfa9b3519453339
1 file changed +197 -181
po/es.po
+197 -181
@@ -7,8 +7,8 @@ msgid ""
7 msgstr ""
8 "Project-Id-Version: Git\n"
9 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
10 -"POT-Creation-Date: 2017-12-31 10:45+0800\n"
11 -"PO-Revision-Date: 2018-01-04 15:57-0500\n"
10 +"POT-Creation-Date: 2018-01-07 07:50+0800\n"
11 +"PO-Revision-Date: 2018-01-07 12:14-0500\n"
12 "Last-Translator: christopher.diaz.riv@gmail.com\n"
13 "Language-Team: CodeLabora <codelabora@gmail.com>\n"
14 "Language: es\n"
@@ -612,7 +612,7 @@ msgstr[1] ""
612 msgid "Unable to write new index file"
613 msgstr "No es posible escribir el archivo indice"
614
615 -#: apply.c:4921 apply.c:4924 builtin/am.c:2257 builtin/am.c:2260
615 +#: apply.c:4921 apply.c:4924 builtin/am.c:2220 builtin/am.c:2223
616 #: builtin/clone.c:116 builtin/fetch.c:116 builtin/pull.c:193
617 #: builtin/submodule--helper.c:369 builtin/submodule--helper.c:860
618 #: builtin/submodule--helper.c:863 builtin/submodule--helper.c:1230
@@ -629,7 +629,7 @@ msgstr "no aplicar cambios que concuerden con la ruta suministrada"
629 msgid "apply changes matching the given path"
630 msgstr "aplicar cambios que concuerden con la ruta suministrada"
631
632 -#: apply.c:4927 builtin/am.c:2266
632 +#: apply.c:4927 builtin/am.c:2229
633 msgid "num"
634 msgstr "num"
635
@@ -690,7 +690,7 @@ msgstr "rutas están separadas con un carácter NULL "
690 msgid "ensure at least <n> lines of context match"
691 msgstr "asegure que por lo menos <n> líneas del contexto concuerden"
692
693 -#: apply.c:4959 builtin/am.c:2245 builtin/interpret-trailers.c:95
693 +#: apply.c:4959 builtin/am.c:2208 builtin/interpret-trailers.c:95
694 #: builtin/interpret-trailers.c:97 builtin/interpret-trailers.c:99
695 #: builtin/pack-objects.c:3009
696 msgid "action"
@@ -739,7 +739,7 @@ msgstr ""
739 msgid "do not trust the line counts in the hunk headers"
740 msgstr "no confiar en el conteo de líneas en los headers del hunk"
741
742 -#: apply.c:4983 builtin/am.c:2254
742 +#: apply.c:4983 builtin/am.c:2217
743 msgid "root"
744 msgstr "raiz"
745
@@ -1007,8 +1007,8 @@ msgid "--reverse and --first-parent together require specified latest commit"
1007 msgstr ""
1008 "--reverse y --first-parent juntos requieren especificar el ultimo commit"
1009
1010 -#: blame.c:1797 bundle.c:169 ref-filter.c:1981 sequencer.c:1179
1011 -#: sequencer.c:2367 builtin/commit.c:1066 builtin/log.c:364 builtin/log.c:918
1010 +#: blame.c:1797 bundle.c:169 ref-filter.c:1981 sequencer.c:1177
1011 +#: sequencer.c:2370 builtin/commit.c:1066 builtin/log.c:364 builtin/log.c:918
1012 #: builtin/log.c:1368 builtin/log.c:1697 builtin/log.c:1945 builtin/merge.c:369
1013 #: builtin/shortlog.c:191
1014 msgid "revision walk setup failed"
@@ -1190,8 +1190,8 @@ msgstr "'%s' no se ve como un archivo bundle v2"
1190 msgid "unrecognized header: %s%s (%d)"
1191 msgstr "header no reconocido %s%s (%d)"
1192
1193 -#: bundle.c:88 sequencer.c:1357 sequencer.c:1804 sequencer.c:2631
1194 -#: sequencer.c:2657 sequencer.c:2748 sequencer.c:2850 builtin/commit.c:782
1193 +#: bundle.c:88 sequencer.c:1360 sequencer.c:1807 sequencer.c:2637
1194 +#: sequencer.c:2663 sequencer.c:2754 sequencer.c:2856 builtin/commit.c:782
1195 #, c-format
1196 msgid "could not open '%s'"
1197 msgstr "no se pudo abrir '%s'"
@@ -1258,8 +1258,8 @@ msgstr "index-pack murio"
1258 msgid "invalid color value: %.*s"
1259 msgstr "color inválido: %.*s"
1260
1261 -#: commit.c:41 sequencer.c:1611 builtin/am.c:421 builtin/am.c:465
1262 -#: builtin/am.c:1471 builtin/am.c:2106
1261 +#: commit.c:41 sequencer.c:1614 builtin/am.c:421 builtin/am.c:465
1262 +#: builtin/am.c:1434 builtin/am.c:2069
1263 #, c-format
1264 msgid "could not parse %s"
1265 msgstr "no se puede analizar %s"
@@ -2088,11 +2088,11 @@ msgstr ""
2088 msgid "Unable to create '%s.lock': %s"
2089 msgstr "No se pudo crear '%s.lock': %s"
2090
2091 -#: merge.c:41
2091 +#: merge.c:74
2092 msgid "failed to read the cache"
2093 msgstr "fallo al leer la cache"
2094
2095 -#: merge.c:95 builtin/am.c:1980 builtin/am.c:2014 builtin/checkout.c:379
2095 +#: merge.c:128 builtin/am.c:1943 builtin/am.c:1977 builtin/checkout.c:379
2096 #: builtin/checkout.c:600 builtin/clone.c:754
2097 msgid "unable to write new index file"
2098 msgstr "no es posible escribir el archivo indice"
@@ -2323,36 +2323,41 @@ msgstr ""
2323 msgid "Adding %s"
2324 msgstr "Agregando %s"
2325
2326 -#: merge-recursive.c:1955
2326 +#: merge-recursive.c:1958
2327 +#, c-format
2328 +msgid "Dirty index: cannot merge (dirty: %s)"
2329 +msgstr "Índice sucio: no se puede fusionar (sucio: %s)"
2330 +
2331 +#: merge-recursive.c:1962
2332 msgid "Already up to date!"
2333 msgstr "¡Ya está actualizado!"
2334
2330 -#: merge-recursive.c:1964
2335 +#: merge-recursive.c:1971
2336 #, c-format
2337 msgid "merging of trees %s and %s failed"
2338 msgstr "falló la fusión de los árboles %s y %s"
2339
2335 -#: merge-recursive.c:2061
2340 +#: merge-recursive.c:2068
2341 msgid "Merging:"
2342 msgstr "Fusionando:"
2343
2339 -#: merge-recursive.c:2074
2344 +#: merge-recursive.c:2081
2345 #, c-format
2346 msgid "found %u common ancestor:"
2347 msgid_plural "found %u common ancestors:"
2348 msgstr[0] "se encontró %u ancestro común:"
2349 msgstr[1] "se encontraron %u ancestros comunes:"
2350
2346 -#: merge-recursive.c:2113
2351 +#: merge-recursive.c:2120
2352 msgid "merge returned no commit"
2353 msgstr "la fusión no devolvió ningun commit"
2354
2350 -#: merge-recursive.c:2176
2355 +#: merge-recursive.c:2183
2356 #, c-format
2357 msgid "Could not parse object '%s'"
2358 msgstr "No se pudo analizar el objeto '%s'"
2359
2355 -#: merge-recursive.c:2190 builtin/merge.c:656 builtin/merge.c:815
2360 +#: merge-recursive.c:2197 builtin/merge.c:656 builtin/merge.c:815
2361 msgid "Unable to write index."
2362 msgstr "Incapaz de escribir el índice."
2363
@@ -2552,12 +2557,12 @@ msgstr ""
2557 "GIT_INDEX_VERSION configurado, pero el valor no es válido.\n"
2558 "Usando versión %i"
2559
2555 -#: read-cache.c:2370 sequencer.c:2725 wrapper.c:658 builtin/merge.c:1048
2560 +#: read-cache.c:2370 sequencer.c:2731 wrapper.c:658 builtin/merge.c:1048
2561 #, c-format
2562 msgid "could not close '%s'"
2563 msgstr "no se pudo cerrar '%s'"
2564
2560 -#: read-cache.c:2442 sequencer.c:1366 sequencer.c:2093
2565 +#: read-cache.c:2442 sequencer.c:1369 sequencer.c:2096
2566 #, c-format
2567 msgid "could not stat '%s'"
2568 msgstr "no se pudo definir '%s'"
@@ -2973,25 +2978,25 @@ msgstr ""
2978 "Puedes desactivar esta advertencias con `git config advice.ignoredHook "
2979 "false`."
2980
2976 -#: send-pack.c:151
2981 +#: send-pack.c:141
2982 #, c-format
2983 msgid "unable to parse remote unpack status: %s"
2984 msgstr "no es posible analizar el estado de desempaquetado remoto: %s"
2985
2981 -#: send-pack.c:153
2986 +#: send-pack.c:143
2987 #, c-format
2988 msgid "remote unpack failed: %s"
2989 msgstr "desempaquetado remoto falló: %s"
2990
2986 -#: send-pack.c:316
2991 +#: send-pack.c:306
2992 msgid "failed to sign the push certificate"
2993 msgstr "falló al firmar el certificado de push"
2994
2990 -#: send-pack.c:429
2995 +#: send-pack.c:419
2996 msgid "the receiving end does not support --signed push"
2997 msgstr "el final receptor no soporta --signed push"
2998
2994 -#: send-pack.c:431
2999 +#: send-pack.c:421
3000 msgid ""
3001 "not sending a push certificate since the receiving end does not support --"
3002 "signed push"
@@ -2999,11 +3004,11 @@ msgstr ""
3004 "no se manda un certificado de push ya que el destino no soporta push firmado "
3005 "(--signed )"
3006
3002 -#: send-pack.c:443
3007 +#: send-pack.c:433
3008 msgid "the receiving end does not support --atomic push"
3009 msgstr "el destino no soporta push atómicos (--atomic)"
3010
3006 -#: send-pack.c:448
3011 +#: send-pack.c:438
3012 msgid "the receiving end does not support push options"
3013 msgstr "el destino no soporta opciones de push"
3014
@@ -3042,13 +3047,13 @@ msgstr ""
3047 "con 'git add <rutas>' o 'git rm <rutas>'\n"
3048 "y haz un commit del resultado con 'git commit'"
3049
3045 -#: sequencer.c:297 sequencer.c:1715
3050 +#: sequencer.c:297 sequencer.c:1718
3051 #, c-format
3052 msgid "could not lock '%s'"
3053 msgstr "No se pudo bloquear '%s'"
3054
3050 -#: sequencer.c:300 sequencer.c:1592 sequencer.c:1720 sequencer.c:1734
3051 -#: sequencer.c:2723 sequencer.c:2794 wrapper.c:656
3055 +#: sequencer.c:300 sequencer.c:1595 sequencer.c:1723 sequencer.c:1737
3056 +#: sequencer.c:2729 sequencer.c:2800 wrapper.c:656
3057 #, c-format
3058 msgid "could not write to '%s'"
3059 msgstr "No se pudo escribir en '%s'"
@@ -3058,12 +3063,12 @@ msgstr "No se pudo escribir en '%s'"
3063 msgid "could not write eol to '%s'"
3064 msgstr "No se pudo escribir EOL en '%s'"
3065
3061 -#: sequencer.c:308 sequencer.c:1597 sequencer.c:1722
3066 +#: sequencer.c:308 sequencer.c:1600 sequencer.c:1725
3067 #, c-format
3068 msgid "failed to finalize '%s'."
3069 msgstr "Fallo al finalizar '%s'."
3070
3066 -#: sequencer.c:332 sequencer.c:829 sequencer.c:1618 builtin/am.c:259
3071 +#: sequencer.c:332 sequencer.c:829 sequencer.c:1621 builtin/am.c:259
3072 #: builtin/commit.c:754 builtin/merge.c:1046
3073 #, c-format
3074 msgid "could not read '%s'"
@@ -3092,12 +3097,12 @@ msgid "%s: Unable to write new index file"
3097 msgstr "%s: Incapaz de escribir el nuevo archivo índice"
3098
3099 #: sequencer.c:496
3095 -msgid "could not resolve HEAD commit\n"
3096 -msgstr "No se pudo resolver el commit de HEAD\n"
3100 +msgid "could not resolve HEAD commit"
3101 +msgstr "No se pudo resolver el commit de HEAD"
3102
3103 #: sequencer.c:516
3099 -msgid "unable to update cache tree\n"
3100 -msgstr "no es posible actualizar el árbol de la caché\n"
3104 +msgid "unable to update cache tree"
3105 +msgstr "no es posible actualizar el árbol de la caché"
3106
3107 #: sequencer.c:600
3108 #, c-format
@@ -3131,13 +3136,13 @@ msgstr ""
3136
3137 #: sequencer.c:702
3138 #, c-format
3134 -msgid "could not parse commit %s\n"
3135 -msgstr "No se pudo analizar commit %s.\n"
3139 +msgid "could not parse commit %s"
3140 +msgstr "No se pudo analizar commit %s"
3141
3142 #: sequencer.c:707
3143 #, c-format
3139 -msgid "could not parse parent commit %s\n"
3140 -msgstr "No se pudo analizar el commit padre %s\n"
3144 +msgid "could not parse parent commit %s"
3145 +msgstr "No se pudo analizar el commit padre %s"
3146
3147 #: sequencer.c:836
3148 #, c-format
@@ -3166,7 +3171,7 @@ msgstr ""
3171 msgid "This is a combination of %d commits."
3172 msgstr "Esta es una combinación de %d commits."
3173
3169 -#: sequencer.c:857 sequencer.c:2742
3174 +#: sequencer.c:857 sequencer.c:2748
3175 msgid "need a HEAD to fixup"
3176 msgstr "se necesita un HEAD para arreglar"
3177
@@ -3233,158 +3238,168 @@ msgstr "no se puede obtener el mensaje de commit para %s"
3238
3239 #. TRANSLATORS: The first %s will be a "todo" command like
3240 #. "revert" or "pick", the second %s a SHA1.
3236 -#: sequencer.c:1025
3241 +#: sequencer.c:1023
3242 #, c-format
3243 msgid "%s: cannot parse parent commit %s"
3244 msgstr "%s: no se puede analizar el commit padre %s"
3245
3241 -#: sequencer.c:1088 sequencer.c:1864
3246 +#: sequencer.c:1086 sequencer.c:1867
3247 #, c-format
3248 msgid "could not rename '%s' to '%s'"
3249 msgstr "No se puede renombrar '%s' a '%s'"
3250
3246 -#: sequencer.c:1139
3251 +#: sequencer.c:1137
3252 #, c-format
3253 msgid "could not revert %s... %s"
3254 msgstr "no se pudo revertir %s... %s"
3255
3251 -#: sequencer.c:1140
3256 +#: sequencer.c:1138
3257 #, c-format
3258 msgid "could not apply %s... %s"
3259 msgstr "no se pudo aplicar %s... %s"
3260
3256 -#: sequencer.c:1182
3261 +#: sequencer.c:1180
3262 msgid "empty commit set passed"
3263 msgstr "conjunto de commits vacío entregado"
3264
3260 -#: sequencer.c:1192
3265 +#: sequencer.c:1190
3266 #, c-format
3267 msgid "git %s: failed to read the index"
3268 msgstr "git %s: fallo al leer el índice"
3269
3265 -#: sequencer.c:1198
3270 +#: sequencer.c:1196
3271 #, c-format
3272 msgid "git %s: failed to refresh the index"
3273 msgstr "git %s: fallo al refrescar el índice"
3274
3270 -#: sequencer.c:1319
3275 +#: sequencer.c:1270
3276 +#, c-format
3277 +msgid "%s does not accept arguments: '%s'"
3278 +msgstr "%s no acepta los argumentos: '%s'"
3279 +
3280 +#: sequencer.c:1279
3281 +#, c-format
3282 +msgid "missing arguments for %s"
3283 +msgstr "faltan argumentos para para %s"
3284 +
3285 +#: sequencer.c:1322
3286 #, c-format
3287 msgid "invalid line %d: %.*s"
3288 msgstr "línea inválida %d: %.*s"
3289
3275 -#: sequencer.c:1327
3290 +#: sequencer.c:1330
3291 #, c-format
3292 msgid "cannot '%s' without a previous commit"
3293 msgstr "no se puede '%s' sin un commit previo"
3294
3280 -#: sequencer.c:1360 sequencer.c:2522 sequencer.c:2557 sequencer.c:2636
3281 -#: sequencer.c:2662 sequencer.c:2752 sequencer.c:2853
3295 +#: sequencer.c:1363 sequencer.c:2525 sequencer.c:2560 sequencer.c:2642
3296 +#: sequencer.c:2668 sequencer.c:2758 sequencer.c:2859
3297 #, c-format
3298 msgid "could not read '%s'."
3299 msgstr "no se puede leer '%s'."
3300
3286 -#: sequencer.c:1372
3301 +#: sequencer.c:1375
3302 msgid "please fix this using 'git rebase --edit-todo'."
3303 msgstr "por favor arregle esto usando 'git rebase --edit-todo'."
3304
3290 -#: sequencer.c:1374
3305 +#: sequencer.c:1377
3306 #, c-format
3307 msgid "unusable instruction sheet: '%s'"
3308 msgstr "hoja de instrucciones inutilízale: '%s'"
3309
3295 -#: sequencer.c:1379
3310 +#: sequencer.c:1382
3311 msgid "no commits parsed."
3312 msgstr "ningún commit analizado."
3313
3299 -#: sequencer.c:1390
3314 +#: sequencer.c:1393
3315 msgid "cannot cherry-pick during a revert."
3316 msgstr "no se puede realizar cherry-pick durante un revert."
3317
3303 -#: sequencer.c:1392
3318 +#: sequencer.c:1395
3319 msgid "cannot revert during a cherry-pick."
3320 msgstr "no se puede realizar un revert durante un cherry-pick"
3321
3307 -#: sequencer.c:1459
3322 +#: sequencer.c:1462
3323 #, c-format
3324 msgid "invalid key: %s"
3325 msgstr "llave invalida: %s"
3326
3312 -#: sequencer.c:1462
3327 +#: sequencer.c:1465
3328 #, c-format
3329 msgid "invalid value for %s: %s"
3330 msgstr "valor invalido para %s: %s"
3331
3317 -#: sequencer.c:1528
3332 +#: sequencer.c:1531
3333 #, c-format
3334 msgid "malformed options sheet: '%s'"
3335 msgstr "hoja de opciones mal formada: '%s'"
3336
3322 -#: sequencer.c:1566
3337 +#: sequencer.c:1569
3338 msgid "a cherry-pick or revert is already in progress"
3339 msgstr "un cherry-pick o rever ya esta en progreso"
3340
3326 -#: sequencer.c:1567
3341 +#: sequencer.c:1570
3342 msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
3343 msgstr "intenta \"git cherry-pick (--continue | --quit | --abort)\""
3344
3330 -#: sequencer.c:1570
3345 +#: sequencer.c:1573
3346 #, c-format
3347 msgid "could not create sequencer directory '%s'"
3348 msgstr "no se pudo crear un directorio secuenciador '%s' "
3349
3335 -#: sequencer.c:1585
3350 +#: sequencer.c:1588
3351 msgid "could not lock HEAD"
3352 msgstr "no se pudo bloquear HEAD"
3353
3339 -#: sequencer.c:1643 sequencer.c:2227
3354 +#: sequencer.c:1646 sequencer.c:2230
3355 msgid "no cherry-pick or revert in progress"
3356 msgstr "ningún cherry-pick o revert en progreso"
3357
3343 -#: sequencer.c:1645
3358 +#: sequencer.c:1648
3359 msgid "cannot resolve HEAD"
3360 msgstr "no se puede resolver HEAD"
3361
3347 -#: sequencer.c:1647 sequencer.c:1682
3362 +#: sequencer.c:1650 sequencer.c:1685
3363 msgid "cannot abort from a branch yet to be born"
3364 msgstr "no se puede abortar de una rama por nacer"
3365
3351 -#: sequencer.c:1668 builtin/grep.c:713
3366 +#: sequencer.c:1671 builtin/grep.c:713
3367 #, c-format
3368 msgid "cannot open '%s'"
3369 msgstr "no se puede abrir '%s'"
3370
3356 -#: sequencer.c:1670
3371 +#: sequencer.c:1673
3372 #, c-format
3373 msgid "cannot read '%s': %s"
3374 msgstr "no se puede leer '%s': %s"
3375
3361 -#: sequencer.c:1671
3376 +#: sequencer.c:1674
3377 msgid "unexpected end of file"
3378 msgstr "final de archivo inesperado"
3379
3365 -#: sequencer.c:1677
3380 +#: sequencer.c:1680
3381 #, c-format
3382 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
3383 msgstr "archivo HEAD de pre-cherry-pick guardado '%s' esta corrupto"
3384
3370 -#: sequencer.c:1688
3385 +#: sequencer.c:1691
3386 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
3387 msgstr "Parece que se ha movido HEAD. No se hace rebobinado, revise su HEAD!"
3388
3374 -#: sequencer.c:1829 sequencer.c:2125
3389 +#: sequencer.c:1832 sequencer.c:2128
3390 msgid "cannot read HEAD"
3391 msgstr "no se puede leer HEAD"
3392
3378 -#: sequencer.c:1869 builtin/difftool.c:639
3393 +#: sequencer.c:1872 builtin/difftool.c:639
3394 #, c-format
3395 msgid "could not copy '%s' to '%s'"
3396 msgstr "no se pudo copiar '%s' a '%s'"
3397
3383 -#: sequencer.c:1888
3398 +#: sequencer.c:1891
3399 msgid "could not read index"
3400 msgstr "no se pudo leer indice"
3401
3387 -#: sequencer.c:1893
3402 +#: sequencer.c:1896
3403 #, c-format
3404 msgid ""
3405 "execution failed: %s\n"
@@ -3399,11 +3414,11 @@ msgstr ""
3414 " git rebase --continue\n"
3415 "\n"
3416
3402 -#: sequencer.c:1899
3417 +#: sequencer.c:1902
3418 msgid "and made changes to the index and/or the working tree\n"
3419 msgstr "y se hicieron cambios al índice y/o árbol de trabajo\n"
3420
3406 -#: sequencer.c:1905
3421 +#: sequencer.c:1908
3422 #, c-format
3423 msgid ""
3424 "execution succeeded: %s\n"
@@ -3420,17 +3435,17 @@ msgstr ""
3435 " git rebase --continue\n"
3436 "\n"
3437
3423 -#: sequencer.c:1964
3438 +#: sequencer.c:1967
3439 #, c-format
3440 msgid "Applied autostash.\n"
3441 msgstr "Autostash aplicado.\n"
3442
3428 -#: sequencer.c:1976
3443 +#: sequencer.c:1979
3444 #, c-format
3445 msgid "cannot store %s"
3446 msgstr "no se puede guardar %s"
3447
3433 -#: sequencer.c:1979 git-rebase.sh:175
3448 +#: sequencer.c:1982 git-rebase.sh:175
3449 #, c-format
3450 msgid ""
3451 "Applying autostash resulted in conflicts.\n"
@@ -3442,57 +3457,57 @@ msgstr ""
3457 "Puedes ejecutar \"git stash pop\" o \"git stash drop\" en cualquier "
3458 "momento.\n"
3459
3445 -#: sequencer.c:2061
3460 +#: sequencer.c:2064
3461 #, c-format
3462 msgid "Stopped at %s... %.*s\n"
3463 msgstr "Detenido en %s... %.*s\n"
3464
3450 -#: sequencer.c:2103
3465 +#: sequencer.c:2106
3466 #, c-format
3467 msgid "unknown command %d"
3468 msgstr "comando desconocido %d"
3469
3455 -#: sequencer.c:2133
3470 +#: sequencer.c:2136
3471 msgid "could not read orig-head"
3472 msgstr "no se puede leer orig-head"
3473
3459 -#: sequencer.c:2138 sequencer.c:2739
3474 +#: sequencer.c:2141 sequencer.c:2745
3475 msgid "could not read 'onto'"
3476 msgstr "no se puede leer 'onto'"
3477
3463 -#: sequencer.c:2145
3478 +#: sequencer.c:2148
3479 #, c-format
3480 msgid "could not update %s"
3481 msgstr "no se puede actualizar %s"
3482
3468 -#: sequencer.c:2152
3483 +#: sequencer.c:2155
3484 #, c-format
3485 msgid "could not update HEAD to %s"
3486 msgstr "no se puede actualizar HEAD a %s"
3487
3473 -#: sequencer.c:2236
3488 +#: sequencer.c:2239
3489 msgid "cannot rebase: You have unstaged changes."
3490 msgstr "no se puede realizar rebase: Tienes cambios fuera del área de stage."
3491
3477 -#: sequencer.c:2241
3492 +#: sequencer.c:2244
3493 msgid "could not remove CHERRY_PICK_HEAD"
3494 msgstr "no se puede remover CHERRY_PICK_HEAD"
3495
3481 -#: sequencer.c:2250
3496 +#: sequencer.c:2253
3497 msgid "cannot amend non-existing commit"
3498 msgstr "no se puede arreglar un commit no existente"
3499
3485 -#: sequencer.c:2252
3500 +#: sequencer.c:2255
3501 #, c-format
3502 msgid "invalid file: '%s'"
3503 msgstr "archivo invalido: '%s'"
3504
3490 -#: sequencer.c:2254
3505 +#: sequencer.c:2257
3506 #, c-format
3507 msgid "invalid contents: '%s'"
3508 msgstr "contenido inválido: '%s'"
3509
3495 -#: sequencer.c:2257
3510 +#: sequencer.c:2260
3511 msgid ""
3512 "\n"
3513 "You have uncommitted changes in your working tree. Please, commit them\n"
@@ -3503,45 +3518,45 @@ msgstr ""
3518 "un commit con estos\n"
3519 "primero y luego ejecuta 'git rebase --continue' de nuevo."
3520
3506 -#: sequencer.c:2267
3521 +#: sequencer.c:2270
3522 msgid "could not commit staged changes."
3523 msgstr "no se pudo realizar el commit con los cambios en el área de stage."
3524
3510 -#: sequencer.c:2347
3525 +#: sequencer.c:2350
3526 #, c-format
3527 msgid "%s: can't cherry-pick a %s"
3528 msgstr "%s: no se puede aplicar cherry-pick a un %s"
3529
3515 -#: sequencer.c:2351
3530 +#: sequencer.c:2354
3531 #, c-format
3532 msgid "%s: bad revision"
3533 msgstr "%s: mala revision"
3534
3520 -#: sequencer.c:2384
3535 +#: sequencer.c:2387
3536 msgid "can't revert as initial commit"
3537 msgstr "no se puede revertir como commit inicial"
3538
3524 -#: sequencer.c:2489
3539 +#: sequencer.c:2492
3540 msgid "make_script: unhandled options"
3541 msgstr "make_script: opciones desconocidas"
3542
3528 -#: sequencer.c:2492
3543 +#: sequencer.c:2495
3544 msgid "make_script: error preparing revisions"
3545 msgstr "make_script: error preparando revisiones"
3546
3532 -#: sequencer.c:2526 sequencer.c:2561
3547 +#: sequencer.c:2529 sequencer.c:2564
3548 #, c-format
3549 msgid "unusable todo list: '%s'"
3550 msgstr "lista de pendientes inutilízale: '%s'"
3551
3537 -#: sequencer.c:2609
3552 +#: sequencer.c:2615
3553 #, c-format
3554 msgid ""
3555 "unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
3556 msgstr ""
3557 "Opción %s no reconocida para la opción rebase.missingCommitsCheck. Ignorando."
3558
3544 -#: sequencer.c:2689
3559 +#: sequencer.c:2695
3560 #, c-format
3561 msgid ""
3562 "Warning: some commits may have been dropped accidentally.\n"
@@ -3550,7 +3565,7 @@ msgstr ""
3565 "Peligro: algunos commits pueden haber sido botados de forma accidental.\n"
3566 "Commits botados (empezando con el mas nuevo):\n"
3567
3553 -#: sequencer.c:2696
3568 +#: sequencer.c:2702
3569 #, c-format
3570 msgid ""
3571 "To avoid this message, use \"drop\" to explicitly remove a commit.\n"
@@ -3568,7 +3583,7 @@ msgstr ""
3583 "Los posibles comportamientos son: ignore,warn,error.\n"
3584 "\n"
3585
3571 -#: sequencer.c:2708
3586 +#: sequencer.c:2714
3587 #, c-format
3588 msgid ""
3589 "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
@@ -3579,18 +3594,18 @@ msgstr ""
3594 "rebase --continue'.\n"
3595 "O se puede abortar el rebase con 'git rebase --abort'.\n"
3596
3582 -#: sequencer.c:2721 sequencer.c:2788 wrapper.c:225 wrapper.c:395
3597 +#: sequencer.c:2727 sequencer.c:2794 wrapper.c:225 wrapper.c:395
3598 #: builtin/am.c:779
3599 #, c-format
3600 msgid "could not open '%s' for writing"
3601 msgstr "no se pudo abrir '%s' para escritura"
3602
3588 -#: sequencer.c:2769
3603 +#: sequencer.c:2775
3604 #, c-format
3605 msgid "could not parse commit '%s'"
3606 msgstr "No se pudo analizar commit '%s'"
3607
3593 -#: sequencer.c:2891
3608 +#: sequencer.c:2897
3609 msgid "the script was already rearranged."
3610 msgstr "este script ya fue reorganizado."
3611
@@ -5037,48 +5052,48 @@ msgstr "Fallo al dividir parches"
5052 msgid "unable to write index file"
5053 msgstr "no es posible escribir en el archivo indice"
5054
5040 -#: builtin/am.c:1197
5055 +#: builtin/am.c:1160
5056 #, c-format
5057 msgid "When you have resolved this problem, run \"%s --continue\"."
5058 msgstr "Cuando haya resuelto este problema, ejecute \"%s --continue\"."
5059
5045 -#: builtin/am.c:1198
5060 +#: builtin/am.c:1161
5061 #, c-format
5062 msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
5063 msgstr "Si prefieres saltar este parche, ejecuta \"%s --skip\"."
5064
5050 -#: builtin/am.c:1199
5065 +#: builtin/am.c:1162
5066 #, c-format
5067 msgid "To restore the original branch and stop patching, run \"%s --abort\"."
5068 msgstr ""
5069 "Para restaurar la rama original y detener el parchado, ejecutar \"%s --abort"
5070 "\"."
5071
5057 -#: builtin/am.c:1306
5072 +#: builtin/am.c:1269
5073 msgid "Patch is empty."
5074 msgstr "El parche esta vacío."
5075
5061 -#: builtin/am.c:1372
5076 +#: builtin/am.c:1335
5077 #, c-format
5078 msgid "invalid ident line: %.*s"
5079 msgstr "sangría no válida: %.*s"
5080
5066 -#: builtin/am.c:1394
5081 +#: builtin/am.c:1357
5082 #, c-format
5083 msgid "unable to parse commit %s"
5084 msgstr "no es posible analizar el commit %s"
5085
5071 -#: builtin/am.c:1587
5086 +#: builtin/am.c:1550
5087 msgid "Repository lacks necessary blobs to fall back on 3-way merge."
5088 msgstr ""
5089 "Repositorio carece de los blobs necesarios para retroceder en una fusión de "
5090 "3-vías"
5091
5077 -#: builtin/am.c:1589
5092 +#: builtin/am.c:1552
5093 msgid "Using index info to reconstruct a base tree..."
5094 msgstr "Usando la información del índice para reconstruir un árbol base..."
5095
5081 -#: builtin/am.c:1608
5096 +#: builtin/am.c:1571
5097 msgid ""
5098 "Did you hand edit your patch?\n"
5099 "It does not apply to blobs recorded in its index."
@@ -5086,37 +5101,37 @@ msgstr ""
5101 "Editaste el parche a mano?\n"
5102 "No aplica a blobs guardados en su índice."
5103
5089 -#: builtin/am.c:1614
5104 +#: builtin/am.c:1577
5105 msgid "Falling back to patching base and 3-way merge..."
5106 msgstr "Retrocediento para parchar base y fusión de 3-vías..."
5107
5093 -#: builtin/am.c:1639
5108 +#: builtin/am.c:1602
5109 msgid "Failed to merge in the changes."
5110 msgstr "Falló al fusionar en los cambios."
5111
5097 -#: builtin/am.c:1663 builtin/merge.c:642
5112 +#: builtin/am.c:1626 builtin/merge.c:642
5113 msgid "git write-tree failed to write a tree"
5114 msgstr "git write-tree falló al escribir el árbol"
5115
5101 -#: builtin/am.c:1670
5116 +#: builtin/am.c:1633
5117 msgid "applying to an empty history"
5118 msgstr "aplicando a un historial vacio"
5119
5105 -#: builtin/am.c:1683 builtin/commit.c:1798 builtin/merge.c:825
5120 +#: builtin/am.c:1646 builtin/commit.c:1798 builtin/merge.c:825
5121 #: builtin/merge.c:850
5122 msgid "failed to write commit object"
5123 msgstr "fallo al escribir el objeto commit"
5124
5110 -#: builtin/am.c:1716 builtin/am.c:1720
5125 +#: builtin/am.c:1679 builtin/am.c:1683
5126 #, c-format
5127 msgid "cannot resume: %s does not exist."
5128 msgstr "no se puede continuar: %s no existe"
5129
5115 -#: builtin/am.c:1736
5130 +#: builtin/am.c:1699
5131 msgid "cannot be interactive without stdin connected to a terminal."
5132 msgstr "no se puede ser interactivo sin stdin conectado a un terminal"
5133
5119 -#: builtin/am.c:1741
5134 +#: builtin/am.c:1704
5135 msgid "Commit Body is:"
5136 msgstr "Cuerpo de commit es:"
5137
@@ -5124,35 +5139,35 @@ msgstr "Cuerpo de commit es:"
5139 #. in your translation. The program will only accept English
5140 #. input at this point.
5141 #.
5127 -#: builtin/am.c:1751
5142 +#: builtin/am.c:1714
5143 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
5144 msgstr "Aplicar? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
5145
5131 -#: builtin/am.c:1801
5146 +#: builtin/am.c:1764
5147 #, c-format
5148 msgid "Dirty index: cannot apply patches (dirty: %s)"
5149 msgstr "Índice sucio: no se puede aplicar parches (sucio: %s)"
5150
5136 -#: builtin/am.c:1841 builtin/am.c:1913
5151 +#: builtin/am.c:1804 builtin/am.c:1876
5152 #, c-format
5153 msgid "Applying: %.*s"
5154 msgstr "Aplicando: %.*s"
5155
5141 -#: builtin/am.c:1857
5156 +#: builtin/am.c:1820
5157 msgid "No changes -- Patch already applied."
5158 msgstr "Sin cambios -- parche ya aplicado."
5159
5145 -#: builtin/am.c:1865
5160 +#: builtin/am.c:1828
5161 #, c-format
5162 msgid "Patch failed at %s %.*s"
5163 msgstr "El parche fallo en %s %.*s"
5164
5150 -#: builtin/am.c:1871
5165 +#: builtin/am.c:1834
5166 #, c-format
5167 msgid "The copy of the patch that failed is found in: %s"
5168 msgstr "La copia del parche que fallido se encuentra en: %s"
5169
5155 -#: builtin/am.c:1916
5170 +#: builtin/am.c:1879
5171 msgid ""
5172 "No changes - did you forget to use 'git add'?\n"
5173 "If there is nothing left to stage, chances are that something else\n"
@@ -5162,7 +5177,7 @@ msgstr ""
5177 "Si no hay nada en el área de stage, las posibilidad es que algo mas\n"
5178 "ya haya introducido el mismo cambio; tal vez quieras omitir este parche."
5179
5165 -#: builtin/am.c:1923
5180 +#: builtin/am.c:1886
5181 msgid ""
5182 "You still have unmerged paths in your index.\n"
5183 "You should 'git add' each file with resolved conflicts to mark them as "
@@ -5175,17 +5190,17 @@ msgstr ""
5190 "Tal vez ejecute `git rm` en el archivo para aceptar \"borrado por ellos\" en "
5191 "él."
5192
5178 -#: builtin/am.c:2030 builtin/am.c:2034 builtin/am.c:2046 builtin/reset.c:332
5193 +#: builtin/am.c:1993 builtin/am.c:1997 builtin/am.c:2009 builtin/reset.c:332
5194 #: builtin/reset.c:340
5195 #, c-format
5196 msgid "Could not parse object '%s'."
5197 msgstr "No se pudo analizar el objeto '%s'."
5198
5184 -#: builtin/am.c:2082
5199 +#: builtin/am.c:2045
5200 msgid "failed to clean index"
5201 msgstr "fallo al limpiar el indice"
5202
5188 -#: builtin/am.c:2117
5203 +#: builtin/am.c:2080
5204 msgid ""
5205 "You seem to have moved HEAD since the last 'am' failure.\n"
5206 "Not rewinding to ORIG_HEAD"
@@ -5193,76 +5208,76 @@ msgstr ""
5208 "Parece haber movido HEAD desde el último fallo 'am'.\n"
5209 "No rebobinando a ORIG_HEAD "
5210
5196 -#: builtin/am.c:2180
5211 +#: builtin/am.c:2143
5212 #, c-format
5213 msgid "Invalid value for --patch-format: %s"
5214 msgstr "valor invalido para --patch-format: %s"
5215
5201 -#: builtin/am.c:2213
5216 +#: builtin/am.c:2176
5217 msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
5218 msgstr "git am [<opciones>] [(<mbox> | <Directorio-de-correo>)...]"
5219
5205 -#: builtin/am.c:2214
5220 +#: builtin/am.c:2177
5221 msgid "git am [<options>] (--continue | --skip | --abort)"
5222 msgstr "git am [<opciones>] (--continue | --skip | --abort)"
5223
5209 -#: builtin/am.c:2220
5224 +#: builtin/am.c:2183
5225 msgid "run interactively"
5226 msgstr "ejecutar de manera interactiva"
5227
5213 -#: builtin/am.c:2222
5228 +#: builtin/am.c:2185
5229 msgid "historical option -- no-op"
5230 msgstr "opción histórica -- no-op"
5231
5217 -#: builtin/am.c:2224
5232 +#: builtin/am.c:2187
5233 msgid "allow fall back on 3way merging if needed"
5234 msgstr "permitir retroceso en fusión de 3-vías si es necesario"
5235
5221 -#: builtin/am.c:2225 builtin/init-db.c:484 builtin/prune-packed.c:57
5236 +#: builtin/am.c:2188 builtin/init-db.c:484 builtin/prune-packed.c:57
5237 #: builtin/repack.c:180
5238 msgid "be quiet"
5239 msgstr "ser silencioso"
5240
5226 -#: builtin/am.c:2227
5241 +#: builtin/am.c:2190
5242 msgid "add a Signed-off-by line to the commit message"
5243 msgstr "agregar una línea \"Firmado-por\" al mensaje del commit"
5244
5230 -#: builtin/am.c:2230
5245 +#: builtin/am.c:2193
5246 msgid "recode into utf8 (default)"
5247 msgstr "recodificar en utf8 (default)"
5248
5234 -#: builtin/am.c:2232
5249 +#: builtin/am.c:2195
5250 msgid "pass -k flag to git-mailinfo"
5251 msgstr "pasar flag -k a git-mailinfo"
5252
5238 -#: builtin/am.c:2234
5253 +#: builtin/am.c:2197
5254 msgid "pass -b flag to git-mailinfo"
5255 msgstr "pasar flag -b a git-mailinfo"
5256
5242 -#: builtin/am.c:2236
5257 +#: builtin/am.c:2199
5258 msgid "pass -m flag to git-mailinfo"
5259 msgstr "pasar flag -m a git-mailinfo"
5260
5246 -#: builtin/am.c:2238
5261 +#: builtin/am.c:2201
5262 msgid "pass --keep-cr flag to git-mailsplit for mbox format"
5263 msgstr "pasar flag --keep-cr a git-mailsplit para formato mbox"
5264
5250 -#: builtin/am.c:2241
5265 +#: builtin/am.c:2204
5266 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
5267 msgstr ""
5268 "no pasar flag --keep-cr a git-mailsplit independientemente de am.keepcr"
5269
5255 -#: builtin/am.c:2244
5270 +#: builtin/am.c:2207
5271 msgid "strip everything before a scissors line"
5272 msgstr "descubrir todo antes de una línea de tijeras"
5273
5259 -#: builtin/am.c:2246 builtin/am.c:2249 builtin/am.c:2252 builtin/am.c:2255
5260 -#: builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264 builtin/am.c:2267
5261 -#: builtin/am.c:2273
5274 +#: builtin/am.c:2209 builtin/am.c:2212 builtin/am.c:2215 builtin/am.c:2218
5275 +#: builtin/am.c:2221 builtin/am.c:2224 builtin/am.c:2227 builtin/am.c:2230
5276 +#: builtin/am.c:2236
5277 msgid "pass it through git-apply"
5278 msgstr "pasarlo a través de git-apply"
5279
5265 -#: builtin/am.c:2263 builtin/fmt-merge-msg.c:665 builtin/fmt-merge-msg.c:668
5280 +#: builtin/am.c:2226 builtin/fmt-merge-msg.c:665 builtin/fmt-merge-msg.c:668
5281 #: builtin/grep.c:845 builtin/merge.c:205 builtin/pull.c:145 builtin/pull.c:203
5282 #: builtin/repack.c:189 builtin/repack.c:193 builtin/repack.c:195
5283 #: builtin/show-branch.c:631 builtin/show-ref.c:169 builtin/tag.c:377
@@ -5270,57 +5285,57 @@ msgstr "pasarlo a través de git-apply"
5285 msgid "n"
5286 msgstr "n"
5287
5273 -#: builtin/am.c:2269 builtin/branch.c:629 builtin/for-each-ref.c:38
5288 +#: builtin/am.c:2232 builtin/branch.c:629 builtin/for-each-ref.c:38
5289 #: builtin/replace.c:444 builtin/tag.c:412 builtin/verify-tag.c:39
5290 msgid "format"
5291 msgstr "formato"
5292
5278 -#: builtin/am.c:2270
5293 +#: builtin/am.c:2233
5294 msgid "format the patch(es) are in"
5295 msgstr "formatear el parche(s)"
5296
5282 -#: builtin/am.c:2276
5297 +#: builtin/am.c:2239
5298 msgid "override error message when patch failure occurs"
5299 msgstr "sobrescribir mensajes de error cuando fallos de parchado ocurran"
5300
5286 -#: builtin/am.c:2278
5301 +#: builtin/am.c:2241
5302 msgid "continue applying patches after resolving a conflict"
5303 msgstr "continuar aplicando los parches tras resolver conflictos"
5304
5290 -#: builtin/am.c:2281
5305 +#: builtin/am.c:2244
5306 msgid "synonyms for --continue"
5307 msgstr "sinónimos para --continue"
5308
5294 -#: builtin/am.c:2284
5309 +#: builtin/am.c:2247
5310 msgid "skip the current patch"
5311 msgstr "saltar el parche actual"
5312
5298 -#: builtin/am.c:2287
5313 +#: builtin/am.c:2250
5314 msgid "restore the original branch and abort the patching operation."
5315 msgstr "restaurar la rama original y abortar la operación de parchado."
5316
5302 -#: builtin/am.c:2291
5317 +#: builtin/am.c:2254
5318 msgid "lie about committer date"
5319 msgstr "mentir sobre la fecha del committer"
5320
5306 -#: builtin/am.c:2293
5321 +#: builtin/am.c:2256
5322 msgid "use current timestamp for author date"
5323 msgstr "usar el timestamp actual para la fecha del autor"
5324
5310 -#: builtin/am.c:2295 builtin/commit.c:1636 builtin/merge.c:236
5325 +#: builtin/am.c:2258 builtin/commit.c:1636 builtin/merge.c:236
5326 #: builtin/pull.c:178 builtin/revert.c:112 builtin/tag.c:392
5327 msgid "key-id"
5328 msgstr "key-id"
5329
5315 -#: builtin/am.c:2296
5330 +#: builtin/am.c:2259
5331 msgid "GPG-sign commits"
5332 msgstr "commits con firma GPG"
5333
5319 -#: builtin/am.c:2299
5334 +#: builtin/am.c:2262
5335 msgid "(internal use for git-rebase)"
5336 msgstr "(uso interno para git-rebase)"
5337
5323 -#: builtin/am.c:2317
5338 +#: builtin/am.c:2280
5339 msgid ""
5340 "The -b/--binary option has been a no-op for long time, and\n"
5341 "it will be removed. Please do not use it anymore."
@@ -5328,16 +5343,16 @@ msgstr ""
5343 "La opción -b/--binary ha estado deshabilitada por mucho tiempo, y\n"
5344 "será removida. Por favor no la use más."
5345
5331 -#: builtin/am.c:2324
5346 +#: builtin/am.c:2287
5347 msgid "failed to read the index"
5348 msgstr "fallo al leer el indice"
5349
5335 -#: builtin/am.c:2339
5350 +#: builtin/am.c:2302
5351 #, c-format
5352 msgid "previous rebase directory %s still exists but mbox given."
5353 msgstr "directorio de rebase previo %s todavía existe en el mbox dado."
5354
5340 -#: builtin/am.c:2363
5355 +#: builtin/am.c:2326
5356 #, c-format
5357 msgid ""
5358 "Stray %s directory found.\n"
@@ -5346,7 +5361,7 @@ msgstr ""
5361 "Directorio extraviado %s encontrado.\n"
5362 "Use \"git am --abort\" para borrarlo."
5363
5349 -#: builtin/am.c:2369
5364 +#: builtin/am.c:2332
5365 msgid "Resolve operation not in progress, we are not resuming."
5366 msgstr "Operación de resolución no está en progreso, no vamos a continuar."
5367
@@ -15722,7 +15737,7 @@ msgstr ""
15737 " git rebase --continue\n"
15738 "\n"
15739
15725 -#: git-rebase--interactive.sh:835 git-rebase--interactive.sh:994
15740 +#: git-rebase--interactive.sh:835 git-rebase--interactive.sh:995
15741 msgid "Could not execute editor"
15742 msgstr "No se pudo ejecutar el editor"
15743
@@ -15748,14 +15763,18 @@ msgstr "No se pudo marcar como interactivo"
15763 msgid "Could not init rewritten commits"
15764 msgstr "No se puede inicializar los commits reescritos"
15765
15751 -#: git-rebase--interactive.sh:972
15766 +#: git-rebase--interactive.sh:897
15767 +msgid "Could not generate todo list"
15768 +msgstr "No se pudo generar lista de pendientes"
15769 +
15770 +#: git-rebase--interactive.sh:973
15771 #, sh-format
15772 msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
15773 msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
15774 msgstr[0] "Rebase $shortrevisions en $shortonto ($todocount comando)"
15775 msgstr[1] "Rebase $shortrevisions en $shortonto ($todocount comandos)"
15776
15758 -#: git-rebase--interactive.sh:977
15777 +#: git-rebase--interactive.sh:978
15778 msgid ""
15779 "\n"
15780 "However, if you remove everything, the rebase will be aborted.\n"
@@ -15765,7 +15784,7 @@ msgstr ""
15784 "Como sea, si se remueve todo, el rebase sera abortado.\n"
15785 "\n"
15786
15768 -#: git-rebase--interactive.sh:984
15787 +#: git-rebase--interactive.sh:985
15788 msgid "Note that empty commits are commented out"
15789 msgstr "Tenga en cuenta que los commits vacíos están comentados"
15790
@@ -16731,9 +16750,6 @@ msgstr "Realmente deseas mandar %s?[y|N]"
16750 #~ msgid "could not finish '%s'"
16751 #~ msgstr "no se pudo finalizar '%s'"
16752
16734 -#~ msgid "could not write to %s"
16735 -#~ msgstr "no se pudo escribir en %s"
16736 -
16753 #~ msgid "could not close %s"
16754 #~ msgstr "no se pudo cerrar %s"
16755