Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
l10n: es: 2.22.0 round 2
author
Christopher Diaz Riveros
<chrisadr@gentoo.org>
Mon, 3 Jun 2019 14:34:50 +0000
(09:34 -0500)
committer
Christopher Diaz Riveros
<chrisadr@gentoo.org>
Mon, 3 Jun 2019 14:34:50 +0000
(09:34 -0500)
Signed-off-by: Christopher Diaz Riveros <chrisadr@gentoo.org>
po/es.po
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
cb56cf3
)
diff --git
a/po/es.po
b/po/es.po
index 0a3e456d635cf0e806c9f451cb6d5e2c3aea7ff9..2b16670b677ca9f8ab60ae6a771b8d1851259fa9 100644
(file)
--- a/
po/es.po
+++ b/
po/es.po
@@
-7,8
+7,8
@@
msgid ""
msgstr ""
"Project-Id-Version: Git\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
msgstr ""
"Project-Id-Version: Git\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2019-05-
14 17:09
+0800\n"
-"PO-Revision-Date: 2019-0
5-28 11:32
-0500\n"
+"POT-Creation-Date: 2019-05-
31 14:35
+0800\n"
+"PO-Revision-Date: 2019-0
6-03 09:33
-0500\n"
"Last-Translator: christopher.diaz.riv@gmail.com\n"
"Language-Team: CodeLabora <codelabora@gmail.com>\n"
"Language: es\n"
"Last-Translator: christopher.diaz.riv@gmail.com\n"
"Language-Team: CodeLabora <codelabora@gmail.com>\n"
"Language: es\n"
@@
-622,7
+622,7
@@
msgid "Unable to write new index file"
msgstr "No es posible escribir el archivo índice"
#: apply.c:4963 apply.c:4966 builtin/am.c:2210 builtin/am.c:2213
msgstr "No es posible escribir el archivo índice"
#: apply.c:4963 apply.c:4966 builtin/am.c:2210 builtin/am.c:2213
-#: builtin/clone.c:12
3
builtin/fetch.c:118 builtin/merge.c:271
+#: builtin/clone.c:12
0
builtin/fetch.c:118 builtin/merge.c:271
#: builtin/pull.c:207 builtin/submodule--helper.c:407
#: builtin/submodule--helper.c:1366 builtin/submodule--helper.c:1369
#: builtin/submodule--helper.c:1849 builtin/submodule--helper.c:1852
#: builtin/pull.c:207 builtin/submodule--helper.c:407
#: builtin/submodule--helper.c:1366 builtin/submodule--helper.c:1369
#: builtin/submodule--helper.c:1849 builtin/submodule--helper.c:1852
@@
-823,7
+823,7
@@
msgstr "anteponer prefijo a cada ruta en el archivo"
#: builtin/commit-tree.c:117 builtin/config.c:129 builtin/fast-export.c:1091
#: builtin/fast-export.c:1093 builtin/grep.c:895 builtin/hash-object.c:105
#: builtin/ls-files.c:560 builtin/ls-files.c:563 builtin/notes.c:412
#: builtin/commit-tree.c:117 builtin/config.c:129 builtin/fast-export.c:1091
#: builtin/fast-export.c:1093 builtin/grep.c:895 builtin/hash-object.c:105
#: builtin/ls-files.c:560 builtin/ls-files.c:563 builtin/notes.c:412
-#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:17
6
+#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:17
7
msgid "file"
msgstr "carpeta"
msgid "file"
msgstr "carpeta"
@@
-855,7
+855,7
@@
msgstr "comprimir mejor"
msgid "list supported archive formats"
msgstr "listar los formatos de carpeta soportados"
msgid "list supported archive formats"
msgstr "listar los formatos de carpeta soportados"
-#: archive.c:477 builtin/archive.c:91 builtin/clone.c:11
3 builtin/clone.c:116
+#: archive.c:477 builtin/archive.c:91 builtin/clone.c:11
0 builtin/clone.c:113
#: builtin/submodule--helper.c:1378 builtin/submodule--helper.c:1858
msgid "repo"
msgstr "repo"
#: builtin/submodule--helper.c:1378 builtin/submodule--helper.c:1858
msgid "repo"
msgstr "repo"
@@
-864,7
+864,7
@@
msgstr "repo"
msgid "retrieve the archive from remote repository <repo>"
msgstr "obtener la carpeta del repositorio remoto <repo>"
msgid "retrieve the archive from remote repository <repo>"
msgstr "obtener la carpeta del repositorio remoto <repo>"
-#: archive.c:479 builtin/archive.c:93 builtin/difftool.c:7
13
+#: archive.c:479 builtin/archive.c:93 builtin/difftool.c:7
07
#: builtin/notes.c:498
msgid "command"
msgstr "comando"
#: builtin/notes.c:498
msgid "command"
msgstr "comando"
@@
-1447,161
+1447,161
@@
msgstr "offset del chunk de commit-graph inapropiado %08x%08x"
msgid "commit-graph chunk id %08x appears multiple times"
msgstr "id de chunk de commit-graph %08x parece tener múltiples tiempos"
msgid "commit-graph chunk id %08x appears multiple times"
msgstr "id de chunk de commit-graph %08x parece tener múltiples tiempos"
-#: commit-graph.c:3
88
+#: commit-graph.c:3
90
#, c-format
msgid "could not find commit %s"
msgstr "no se pudo encontrar commit %s"
#, c-format
msgid "could not find commit %s"
msgstr "no se pudo encontrar commit %s"
-#: commit-graph.c:73
0
builtin/pack-objects.c:2649
+#: commit-graph.c:73
2
builtin/pack-objects.c:2649
#, c-format
msgid "unable to get type of object %s"
msgstr "incapaz de obtener el tipo de objeto: %s"
#, c-format
msgid "unable to get type of object %s"
msgstr "incapaz de obtener el tipo de objeto: %s"
-#: commit-graph.c:76
3
+#: commit-graph.c:76
5
msgid "Loading known commits in commit graph"
msgstr "Cargando commits conocidos en commit graph"
msgid "Loading known commits in commit graph"
msgstr "Cargando commits conocidos en commit graph"
-#: commit-graph.c:7
79
+#: commit-graph.c:7
81
msgid "Expanding reachable commits in commit graph"
msgstr "Expandiendo commits alcanzables en commit graph"
msgid "Expanding reachable commits in commit graph"
msgstr "Expandiendo commits alcanzables en commit graph"
-#: commit-graph.c:79
1
+#: commit-graph.c:79
3
msgid "Clearing commit marks in commit graph"
msgstr "Limpiando marcas de commits en commit graph"
msgid "Clearing commit marks in commit graph"
msgstr "Limpiando marcas de commits en commit graph"
-#: commit-graph.c:81
1
+#: commit-graph.c:81
3
msgid "Computing commit graph generation numbers"
msgstr "Calculando números de generación de commit graph"
msgid "Computing commit graph generation numbers"
msgstr "Calculando números de generación de commit graph"
-#: commit-graph.c:9
28
+#: commit-graph.c:9
30
#, c-format
msgid "Finding commits for commit graph in %d pack"
msgid_plural "Finding commits for commit graph in %d packs"
msgstr[0] "Encontrando commits para commit graph en %d pack"
msgstr[1] "Encontrando commits para commit graph en %d packs"
#, c-format
msgid "Finding commits for commit graph in %d pack"
msgid_plural "Finding commits for commit graph in %d packs"
msgstr[0] "Encontrando commits para commit graph en %d pack"
msgstr[1] "Encontrando commits para commit graph en %d packs"
-#: commit-graph.c:94
1
+#: commit-graph.c:94
3
#, c-format
msgid "error adding pack %s"
msgstr "error agregando pack %s"
#, c-format
msgid "error adding pack %s"
msgstr "error agregando pack %s"
-#: commit-graph.c:94
3
+#: commit-graph.c:94
5
#, c-format
msgid "error opening index for %s"
msgstr "error abriendo index para %s"
#, c-format
msgid "error opening index for %s"
msgstr "error abriendo index para %s"
-#: commit-graph.c:95
7
+#: commit-graph.c:95
9
#, c-format
msgid "Finding commits for commit graph from %d ref"
msgid_plural "Finding commits for commit graph from %d refs"
msgstr[0] "Encontrando commits para commit graph de %d ref"
msgstr[1] "Encontrando commits para commit graph de %d refs"
#, c-format
msgid "Finding commits for commit graph from %d ref"
msgid_plural "Finding commits for commit graph from %d refs"
msgstr[0] "Encontrando commits para commit graph de %d ref"
msgstr[1] "Encontrando commits para commit graph de %d refs"
-#: commit-graph.c:9
89
+#: commit-graph.c:9
91
msgid "Finding commits for commit graph among packed objects"
msgstr "Encontrando commits para commit graph entre los objetos empaquetados"
msgid "Finding commits for commit graph among packed objects"
msgstr "Encontrando commits para commit graph entre los objetos empaquetados"
-#: commit-graph.c:100
2
+#: commit-graph.c:100
4
msgid "Counting distinct commits in commit graph"
msgstr "Contando commits distintos en commit graph"
msgid "Counting distinct commits in commit graph"
msgstr "Contando commits distintos en commit graph"
-#: commit-graph.c:101
5
+#: commit-graph.c:101
7
#, c-format
msgid "the commit graph format cannot write %d commits"
msgstr "el formato de gráficos de commit no pudede escribir %d commits"
#, c-format
msgid "the commit graph format cannot write %d commits"
msgstr "el formato de gráficos de commit no pudede escribir %d commits"
-#: commit-graph.c:102
4
+#: commit-graph.c:102
6
msgid "Finding extra edges in commit graph"
msgstr "Encontrando esquinas extra en commit graph"
msgid "Finding extra edges in commit graph"
msgstr "Encontrando esquinas extra en commit graph"
-#: commit-graph.c:10
48
+#: commit-graph.c:10
50
msgid "too many commits to write graph"
msgstr "demasiados commits para escribir el gráfico"
msgid "too many commits to write graph"
msgstr "demasiados commits para escribir el gráfico"
-#: commit-graph.c:105
5 midx.c:805
+#: commit-graph.c:105
7 midx.c:819
#, c-format
msgid "unable to create leading directories of %s"
msgstr "no se pudo crear directorios principales para %s"
#, c-format
msgid "unable to create leading directories of %s"
msgstr "no se pudo crear directorios principales para %s"
-#: commit-graph.c:109
5
+#: commit-graph.c:109
7
#, c-format
msgid "Writing out commit graph in %d pass"
msgid_plural "Writing out commit graph in %d passes"
msgstr[0] "Escribiendo commit graph en %d paso"
msgstr[1] "Escribiendo commit graph en %d pasos"
#, c-format
msgid "Writing out commit graph in %d pass"
msgid_plural "Writing out commit graph in %d passes"
msgstr[0] "Escribiendo commit graph en %d paso"
msgstr[1] "Escribiendo commit graph en %d pasos"
-#: commit-graph.c:116
0
+#: commit-graph.c:116
2
msgid "the commit-graph file has incorrect checksum and is likely corrupt"
msgstr ""
"el archivo de commit-graph tiene checksums incorrectos y probablemente está "
"corrupto"
msgid "the commit-graph file has incorrect checksum and is likely corrupt"
msgstr ""
"el archivo de commit-graph tiene checksums incorrectos y probablemente está "
"corrupto"
-#: commit-graph.c:117
0
+#: commit-graph.c:117
2
#, c-format
msgid "commit-graph has incorrect OID order: %s then %s"
msgstr "commit-graph tiene un orden de OID incorrecto: %s luego %s"
#, c-format
msgid "commit-graph has incorrect OID order: %s then %s"
msgstr "commit-graph tiene un orden de OID incorrecto: %s luego %s"
-#: commit-graph.c:118
0 commit-graph.c:1195
+#: commit-graph.c:118
2 commit-graph.c:1197
#, c-format
msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
msgstr "commit-graph tiene un valor fanout incorrecto: fanout[%d] = %u != %u"
#, c-format
msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
msgstr "commit-graph tiene un valor fanout incorrecto: fanout[%d] = %u != %u"
-#: commit-graph.c:118
7
+#: commit-graph.c:118
9
#, c-format
msgid "failed to parse commit %s from commit-graph"
msgstr "falló al analizar commit %s para commit-graph"
#, c-format
msgid "failed to parse commit %s from commit-graph"
msgstr "falló al analizar commit %s para commit-graph"
-#: commit-graph.c:120
4
+#: commit-graph.c:120
6
msgid "Verifying commits in commit graph"
msgstr "Verificando commits en commit graph"
msgid "Verifying commits in commit graph"
msgstr "Verificando commits en commit graph"
-#: commit-graph.c:121
7
+#: commit-graph.c:121
9
#, c-format
msgid "failed to parse commit %s from object database for commit-graph"
msgstr ""
"falló al analizar el commit %s de la base de datos de objetos para commit-"
"graph"
#, c-format
msgid "failed to parse commit %s from object database for commit-graph"
msgstr ""
"falló al analizar el commit %s de la base de datos de objetos para commit-"
"graph"
-#: commit-graph.c:122
4
+#: commit-graph.c:122
6
#, c-format
msgid "root tree OID for commit %s in commit-graph is %s != %s"
msgstr "árbol raíz OID para commit %s en commit-graph es %s != %s"
#, c-format
msgid "root tree OID for commit %s in commit-graph is %s != %s"
msgstr "árbol raíz OID para commit %s en commit-graph es %s != %s"
-#: commit-graph.c:123
4
+#: commit-graph.c:123
6
#, c-format
msgid "commit-graph parent list for commit %s is too long"
msgstr "lista padre de commit-graph para commit %s es muy larga"
#, c-format
msgid "commit-graph parent list for commit %s is too long"
msgstr "lista padre de commit-graph para commit %s es muy larga"
-#: commit-graph.c:124
0
+#: commit-graph.c:124
2
#, c-format
msgid "commit-graph parent for %s is %s != %s"
msgstr "padre de commit-graph para %s es %s != %s"
#, c-format
msgid "commit-graph parent for %s is %s != %s"
msgstr "padre de commit-graph para %s es %s != %s"
-#: commit-graph.c:125
3
+#: commit-graph.c:125
5
#, c-format
msgid "commit-graph parent list for commit %s terminates early"
msgstr "lista padre de commit-graph para commit %s termina antes"
#, c-format
msgid "commit-graph parent list for commit %s terminates early"
msgstr "lista padre de commit-graph para commit %s termina antes"
-#: commit-graph.c:12
58
+#: commit-graph.c:12
60
#, c-format
msgid ""
"commit-graph has generation number zero for commit %s, but non-zero elsewhere"
msgstr ""
"commit-graph ha generado número cero para %s, pero no-cero para los demás"
#, c-format
msgid ""
"commit-graph has generation number zero for commit %s, but non-zero elsewhere"
msgstr ""
"commit-graph ha generado número cero para %s, pero no-cero para los demás"
-#: commit-graph.c:126
2
+#: commit-graph.c:126
4
#, c-format
msgid ""
"commit-graph has non-zero generation number for commit %s, but zero elsewhere"
msgstr ""
"commit-graph tiene generación no-cero para %s, pero cero para los demás"
#, c-format
msgid ""
"commit-graph has non-zero generation number for commit %s, but zero elsewhere"
msgstr ""
"commit-graph tiene generación no-cero para %s, pero cero para los demás"
-#: commit-graph.c:127
7
+#: commit-graph.c:127
9
#, c-format
msgid "commit-graph generation for commit %s is %u != %u"
msgstr "generación commit-graph para commit %s es %u != %u"
#, c-format
msgid "commit-graph generation for commit %s is %u != %u"
msgstr "generación commit-graph para commit %s es %u != %u"
-#: commit-graph.c:128
3
+#: commit-graph.c:128
5
#, c-format
msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
msgstr ""
#, c-format
msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
msgstr ""
@@
-2413,8
+2413,8
@@
msgstr "--follow requiere exactamente un pathspec"
msgid "invalid --stat value: %s"
msgstr "valor --stat inválido: %s"
msgid "invalid --stat value: %s"
msgstr "valor --stat inválido: %s"
-#: diff.c:4689 diff.c:4694 diff.c:4699 diff.c:4704 diff.c:521
6
-#: parse-options.c:
200
+#: diff.c:4689 diff.c:4694 diff.c:4699 diff.c:4704 diff.c:521
7
+#: parse-options.c:
199 parse-options.c:203
#, c-format
msgid "%s expects a numerical value"
msgstr "%s espera un valor numérico"
#, c-format
msgid "%s expects a numerical value"
msgstr "%s espera un valor numérico"
@@
-2481,144
+2481,144
@@
msgstr "argumento inválido para %s"
msgid "failed to parse --submodule option parameter: '%s'"
msgstr "falló al analizar parámetro de opción --submodule: '%s'"
msgid "failed to parse --submodule option parameter: '%s'"
msgstr "falló al analizar parámetro de opción --submodule: '%s'"
-#: diff.c:524
0
+#: diff.c:524
2
#, c-format
msgid "bad --word-diff argument: %s"
msgstr "mal argumento --word-diff: %s"
#, c-format
msgid "bad --word-diff argument: %s"
msgstr "mal argumento --word-diff: %s"
-#: diff.c:526
3
+#: diff.c:526
5
msgid "Diff output format options"
msgstr "Opciones de formato de salida para diff"
msgid "Diff output format options"
msgstr "Opciones de formato de salida para diff"
-#: diff.c:526
5 diff.c:5271
+#: diff.c:526
7 diff.c:5273
msgid "generate patch"
msgstr "generar parche"
msgid "generate patch"
msgstr "generar parche"
-#: diff.c:52
68
builtin/log.c:167
+#: diff.c:52
70
builtin/log.c:167
msgid "suppress diff output"
msgstr "suprimir salida de diff"
msgid "suppress diff output"
msgstr "suprimir salida de diff"
-#: diff.c:527
3 diff.c:5387 diff.c:5394
+#: diff.c:527
5 diff.c:5389 diff.c:5396
msgid "<n>"
msgstr "<n>"
msgid "<n>"
msgstr "<n>"
-#: diff.c:527
4 diff.c:5277
+#: diff.c:527
6 diff.c:5279
msgid "generate diffs with <n> lines context"
msgstr "genera diffs con <n> líneas de contexto"
msgid "generate diffs with <n> lines context"
msgstr "genera diffs con <n> líneas de contexto"
-#: diff.c:52
79
+#: diff.c:52
81
msgid "generate the diff in raw format"
msgstr "genera el diff en formato raw"
msgid "generate the diff in raw format"
msgstr "genera el diff en formato raw"
-#: diff.c:528
2
+#: diff.c:528
4
msgid "synonym for '-p --raw'"
msgstr "sinónimo para '-p --stat'"
msgid "synonym for '-p --raw'"
msgstr "sinónimo para '-p --stat'"
-#: diff.c:528
6
+#: diff.c:528
8
msgid "synonym for '-p --stat'"
msgstr "sinónimo para '-p --stat'"
msgid "synonym for '-p --stat'"
msgstr "sinónimo para '-p --stat'"
-#: diff.c:529
0
+#: diff.c:529
2
msgid "machine friendly --stat"
msgstr "--stat amigable para máquina"
msgid "machine friendly --stat"
msgstr "--stat amigable para máquina"
-#: diff.c:529
3
+#: diff.c:529
5
msgid "output only the last line of --stat"
msgstr "mostrar solo la última línea para --stat"
msgid "output only the last line of --stat"
msgstr "mostrar solo la última línea para --stat"
-#: diff.c:529
5 diff.c:5303
+#: diff.c:529
7 diff.c:5305
msgid "<param1,param2>..."
msgstr "<param1,param2>..."
msgid "<param1,param2>..."
msgstr "<param1,param2>..."
-#: diff.c:529
6
+#: diff.c:529
8
msgid ""
"output the distribution of relative amount of changes for each sub-directory"
msgstr ""
"muestra la distribución de cantidades de cambios relativa para cada "
"subdirectorio"
msgid ""
"output the distribution of relative amount of changes for each sub-directory"
msgstr ""
"muestra la distribución de cantidades de cambios relativa para cada "
"subdirectorio"
-#: diff.c:530
0
+#: diff.c:530
2
msgid "synonym for --dirstat=cumulative"
msgstr "sinónimo para --dirstat=cumulative"
msgid "synonym for --dirstat=cumulative"
msgstr "sinónimo para --dirstat=cumulative"
-#: diff.c:530
4
+#: diff.c:530
6
msgid "synonym for --dirstat=files,param1,param2..."
msgstr "sinonimo para --dirstat=archivos,param1,param2..."
msgid "synonym for --dirstat=files,param1,param2..."
msgstr "sinonimo para --dirstat=archivos,param1,param2..."
-#: diff.c:53
08
+#: diff.c:53
10
msgid "warn if changes introduce conflict markers or whitespace errors"
msgstr ""
"advierte si cambios introducen conflictos de markers o errores de espacios "
"en blanco"
msgid "warn if changes introduce conflict markers or whitespace errors"
msgstr ""
"advierte si cambios introducen conflictos de markers o errores de espacios "
"en blanco"
-#: diff.c:531
1
+#: diff.c:531
3
msgid "condensed summary such as creations, renames and mode changes"
msgstr ""
"resumen condensado de creaciones, cambios de nombres y cambios de modos"
msgid "condensed summary such as creations, renames and mode changes"
msgstr ""
"resumen condensado de creaciones, cambios de nombres y cambios de modos"
-#: diff.c:531
4
+#: diff.c:531
6
msgid "show only names of changed files"
msgstr "mostrar solo nombres de archivos cambiados"
msgid "show only names of changed files"
msgstr "mostrar solo nombres de archivos cambiados"
-#: diff.c:531
7
+#: diff.c:531
9
msgid "show only names and status of changed files"
msgstr "mostrar solo nombres y estados de archivos cambiados"
msgid "show only names and status of changed files"
msgstr "mostrar solo nombres y estados de archivos cambiados"
-#: diff.c:53
19
+#: diff.c:53
21
msgid "<width>[,<name-width>[,<count>]]"
msgstr "<ancho>[,<nombre-ancho>[,<cantidad>]]"
msgid "<width>[,<name-width>[,<count>]]"
msgstr "<ancho>[,<nombre-ancho>[,<cantidad>]]"
-#: diff.c:532
0
+#: diff.c:532
2
msgid "generate diffstat"
msgstr "generar diffstat"
msgid "generate diffstat"
msgstr "generar diffstat"
-#: diff.c:532
2 diff.c:5325 diff.c:5328
+#: diff.c:532
4 diff.c:5327 diff.c:5330
msgid "<width>"
msgstr "<ancho>"
msgid "<width>"
msgstr "<ancho>"
-#: diff.c:532
3
+#: diff.c:532
5
msgid "generate diffstat with a given width"
msgstr "genera diffstat con un ancho dado"
msgid "generate diffstat with a given width"
msgstr "genera diffstat con un ancho dado"
-#: diff.c:532
6
+#: diff.c:532
8
msgid "generate diffstat with a given name width"
msgstr "genera diffstat con un nombre de ancho dado"
msgid "generate diffstat with a given name width"
msgstr "genera diffstat con un nombre de ancho dado"
-#: diff.c:53
29
+#: diff.c:53
31
msgid "generate diffstat with a given graph width"
msgstr "genera diffstat con un ancho de graph dado"
msgid "generate diffstat with a given graph width"
msgstr "genera diffstat con un ancho de graph dado"
-#: diff.c:533
1
+#: diff.c:533
3
msgid "<count>"
msgstr "<cantidad>"
msgid "<count>"
msgstr "<cantidad>"
-#: diff.c:533
2
+#: diff.c:533
4
msgid "generate diffstat with limited lines"
msgstr "genera diffstat con líneas limitadas"
msgid "generate diffstat with limited lines"
msgstr "genera diffstat con líneas limitadas"
-#: diff.c:533
5
+#: diff.c:533
7
msgid "generate compact summary in diffstat"
msgstr "genera un resumen compacto de diffstat"
msgid "generate compact summary in diffstat"
msgstr "genera un resumen compacto de diffstat"
-#: diff.c:53
38
+#: diff.c:53
40
msgid "output a binary diff that can be applied"
msgstr "muestra un diff binario que puede ser aplicado"
msgid "output a binary diff that can be applied"
msgstr "muestra un diff binario que puede ser aplicado"
-#: diff.c:534
1
+#: diff.c:534
3
msgid "show full pre- and post-image object names on the \"index\" lines"
msgstr ""
"mostrar todo un pre- y post-image de nombres de objetos en las líneas \"index"
"\""
msgid "show full pre- and post-image object names on the \"index\" lines"
msgstr ""
"mostrar todo un pre- y post-image de nombres de objetos en las líneas \"index"
"\""
-#: diff.c:534
3
+#: diff.c:534
5
msgid "show colored diff"
msgstr "mostrar diff colorido"
msgid "show colored diff"
msgstr "mostrar diff colorido"
-#: diff.c:534
4
+#: diff.c:534
6
msgid "<kind>"
msgstr "<tipo>"
msgid "<kind>"
msgstr "<tipo>"
-#: diff.c:534
5
+#: diff.c:534
7
msgid ""
"highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
"diff"
msgid ""
"highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
"diff"
@@
-2626,7
+2626,7
@@
msgstr ""
"resaltar errores de espacios en blanco en las líneas 'context', 'old' o "
"'new' del diff"
"resaltar errores de espacios en blanco en las líneas 'context', 'old' o "
"'new' del diff"
-#: diff.c:53
48
+#: diff.c:53
50
msgid ""
"do not munge pathnames and use NULs as output field terminators in --raw or "
"--numstat"
msgid ""
"do not munge pathnames and use NULs as output field terminators in --raw or "
"--numstat"
@@
-2634,89
+2634,89
@@
msgstr ""
"no consolidar los pathnames y usar NULs como terminadores de campos en --raw "
"o --numstat"
"no consolidar los pathnames y usar NULs como terminadores de campos en --raw "
"o --numstat"
-#: diff.c:535
1 diff.c:5354 diff.c:5357 diff.c:5463
+#: diff.c:535
3 diff.c:5356 diff.c:5359 diff.c:5465
msgid "<prefix>"
msgstr "<prefijo>"
msgid "<prefix>"
msgstr "<prefijo>"
-#: diff.c:535
2
+#: diff.c:535
4
msgid "show the given source prefix instead of \"a/\""
msgstr "mostrar el prefijo de fuente dado en lugar de \"a/\""
msgid "show the given source prefix instead of \"a/\""
msgstr "mostrar el prefijo de fuente dado en lugar de \"a/\""
-#: diff.c:535
5
+#: diff.c:535
7
msgid "show the given source prefix instead of \"b/\""
msgstr "mostrar el prefijo de fuente dado en lugar de \"b/\""
msgid "show the given source prefix instead of \"b/\""
msgstr "mostrar el prefijo de fuente dado en lugar de \"b/\""
-#: diff.c:53
58
+#: diff.c:53
60
msgid "prepend an additional prefix to every line of output"
msgstr "anteponer un prefijo adicional a cada línea mostrada"
msgid "prepend an additional prefix to every line of output"
msgstr "anteponer un prefijo adicional a cada línea mostrada"
-#: diff.c:536
1
+#: diff.c:536
3
msgid "do not show any source or destination prefix"
msgstr "no mostrar ningún prefijo de fuente o destino"
msgid "do not show any source or destination prefix"
msgstr "no mostrar ningún prefijo de fuente o destino"
-#: diff.c:536
4
+#: diff.c:536
6
msgid "show context between diff hunks up to the specified number of lines"
msgstr ""
"muestra el contexto entre hunks de diff hasta el número especificado de "
"líneas"
msgid "show context between diff hunks up to the specified number of lines"
msgstr ""
"muestra el contexto entre hunks de diff hasta el número especificado de "
"líneas"
-#: diff.c:53
68 diff.c:5373 diff.c:5378
+#: diff.c:53
70 diff.c:5375 diff.c:5380
msgid "<char>"
msgstr "<char>"
msgid "<char>"
msgstr "<char>"
-#: diff.c:53
69
+#: diff.c:53
71
msgid "specify the character to indicate a new line instead of '+'"
msgstr "especifica el char para indicar una nueva línea en lugar de '+'"
msgid "specify the character to indicate a new line instead of '+'"
msgstr "especifica el char para indicar una nueva línea en lugar de '+'"
-#: diff.c:537
4
+#: diff.c:537
6
msgid "specify the character to indicate an old line instead of '-'"
msgstr "especifica el char para indicar una línea vieja en lugar de '-'"
msgid "specify the character to indicate an old line instead of '-'"
msgstr "especifica el char para indicar una línea vieja en lugar de '-'"
-#: diff.c:53
79
+#: diff.c:53
81
msgid "specify the character to indicate a context instead of ' '"
msgstr "especifica el char para indicar un contexto en lugar de ' '"
msgid "specify the character to indicate a context instead of ' '"
msgstr "especifica el char para indicar un contexto en lugar de ' '"
-#: diff.c:538
2
+#: diff.c:538
4
msgid "Diff rename options"
msgstr "Opciones de diff rename"
msgid "Diff rename options"
msgstr "Opciones de diff rename"
-#: diff.c:538
3
+#: diff.c:538
5
msgid "<n>[/<m>]"
msgstr "<n>[/<m>]"
msgid "<n>[/<m>]"
msgstr "<n>[/<m>]"
-#: diff.c:538
4
+#: diff.c:538
6
msgid "break complete rewrite changes into pairs of delete and create"
msgstr "descomponer los cambios de reescritura en pares de borrar y crear"
msgid "break complete rewrite changes into pairs of delete and create"
msgstr "descomponer los cambios de reescritura en pares de borrar y crear"
-#: diff.c:53
88
+#: diff.c:53
90
msgid "detect renames"
msgstr "detectar renombrados"
msgid "detect renames"
msgstr "detectar renombrados"
-#: diff.c:539
2
+#: diff.c:539
4
msgid "omit the preimage for deletes"
msgstr "omite la preimage para borrados"
msgid "omit the preimage for deletes"
msgstr "omite la preimage para borrados"
-#: diff.c:539
5
+#: diff.c:539
7
msgid "detect copies"
msgstr "detectar copias"
msgid "detect copies"
msgstr "detectar copias"
-#: diff.c:5
399
+#: diff.c:5
401
msgid "use unmodified files as source to find copies"
msgstr "usa archivos no modificados como fuente para encontrar copias"
msgid "use unmodified files as source to find copies"
msgstr "usa archivos no modificados como fuente para encontrar copias"
-#: diff.c:540
1
+#: diff.c:540
3
msgid "disable rename detection"
msgstr "deshabilita detección de renombres"
msgid "disable rename detection"
msgstr "deshabilita detección de renombres"
-#: diff.c:540
4
+#: diff.c:540
6
msgid "use empty blobs as rename source"
msgstr "usa blobs vacíos como fuente de renombre"
msgid "use empty blobs as rename source"
msgstr "usa blobs vacíos como fuente de renombre"
-#: diff.c:540
6
+#: diff.c:540
8
msgid "continue listing the history of a file beyond renames"
msgstr "continua listando el historial de un archivo más allá de renombres"
msgid "continue listing the history of a file beyond renames"
msgstr "continua listando el historial de un archivo más allá de renombres"
-#: diff.c:54
09
+#: diff.c:54
11
msgid ""
"prevent rename/copy detection if the number of rename/copy targets exceeds "
"given limit"
msgid ""
"prevent rename/copy detection if the number of rename/copy targets exceeds "
"given limit"
@@
-2724,155
+2724,155
@@
msgstr ""
"previene detección de renombre/copias si el número de objetivos para "
"renombres/copias excede el límite dado"
"previene detección de renombre/copias si el número de objetivos para "
"renombres/copias excede el límite dado"
-#: diff.c:541
1
+#: diff.c:541
3
msgid "Diff algorithm options"
msgstr "Opciones de algoritmos de diff"
msgid "Diff algorithm options"
msgstr "Opciones de algoritmos de diff"
-#: diff.c:541
3
+#: diff.c:541
5
msgid "produce the smallest possible diff"
msgstr "produce el diff más pequeño posible"
msgid "produce the smallest possible diff"
msgstr "produce el diff más pequeño posible"
-#: diff.c:541
6
+#: diff.c:541
8
msgid "ignore whitespace when comparing lines"
msgstr "ignorar espacios en blanco cuando comparando líneas"
msgid "ignore whitespace when comparing lines"
msgstr "ignorar espacios en blanco cuando comparando líneas"
-#: diff.c:54
19
+#: diff.c:54
21
msgid "ignore changes in amount of whitespace"
msgstr "ignorar cambios en la cantidad de líneas en blanco"
msgid "ignore changes in amount of whitespace"
msgstr "ignorar cambios en la cantidad de líneas en blanco"
-#: diff.c:542
2
+#: diff.c:542
4
msgid "ignore changes in whitespace at EOL"
msgstr "ignorar cambios en espacios en blanco en EOL"
msgid "ignore changes in whitespace at EOL"
msgstr "ignorar cambios en espacios en blanco en EOL"
-#: diff.c:542
5
+#: diff.c:542
7
msgid "ignore carrier-return at the end of line"
msgstr "ignora carrier-return al final de la línea"
msgid "ignore carrier-return at the end of line"
msgstr "ignora carrier-return al final de la línea"
-#: diff.c:54
28
+#: diff.c:54
30
msgid "ignore changes whose lines are all blank"
msgstr "ignora cambios cuyas líneas son todas en blanco"
msgid "ignore changes whose lines are all blank"
msgstr "ignora cambios cuyas líneas son todas en blanco"
-#: diff.c:543
1
+#: diff.c:543
3
msgid "heuristic to shift diff hunk boundaries for easy reading"
msgstr "heurística para cambiar los límites de hunk para una fácil lectura"
msgid "heuristic to shift diff hunk boundaries for easy reading"
msgstr "heurística para cambiar los límites de hunk para una fácil lectura"
-#: diff.c:543
4
+#: diff.c:543
6
msgid "generate diff using the \"patience diff\" algorithm"
msgstr "genera un diff usando algoritmo \"patience diff\""
msgid "generate diff using the \"patience diff\" algorithm"
msgstr "genera un diff usando algoritmo \"patience diff\""
-#: diff.c:54
38
+#: diff.c:54
40
msgid "generate diff using the \"histogram diff\" algorithm"
msgstr "genera un diff usando algoritmo \"histogram diff\""
msgid "generate diff using the \"histogram diff\" algorithm"
msgstr "genera un diff usando algoritmo \"histogram diff\""
-#: diff.c:544
0
+#: diff.c:544
2
msgid "<algorithm>"
msgstr "<algoritmo>"
msgid "<algorithm>"
msgstr "<algoritmo>"
-#: diff.c:544
1
+#: diff.c:544
3
msgid "choose a diff algorithm"
msgstr "escoge un algoritmo para diff"
msgid "choose a diff algorithm"
msgstr "escoge un algoritmo para diff"
-#: diff.c:544
3
+#: diff.c:544
5
msgid "<text>"
msgstr "<texto>"
msgid "<text>"
msgstr "<texto>"
-#: diff.c:544
4
+#: diff.c:544
6
msgid "generate diff using the \"anchored diff\" algorithm"
msgstr "genera un diff usando algoritmo \"anchored diff\""
msgid "generate diff using the \"anchored diff\" algorithm"
msgstr "genera un diff usando algoritmo \"anchored diff\""
-#: diff.c:544
6 diff.c:5455 diff.c:5458
+#: diff.c:544
8 diff.c:5457 diff.c:5460
msgid "<mode>"
msgstr "<modo>"
msgid "<mode>"
msgstr "<modo>"
-#: diff.c:544
7
+#: diff.c:544
9
msgid "show word diff, using <mode> to delimit changed words"
msgstr ""
"muestra diff por palabras usando <modo> para delimitar las palabras cambiadas"
msgid "show word diff, using <mode> to delimit changed words"
msgstr ""
"muestra diff por palabras usando <modo> para delimitar las palabras cambiadas"
-#: diff.c:54
49 diff.c:5452 diff.c:5497
+#: diff.c:54
51 diff.c:5454 diff.c:5499
msgid "<regex>"
msgstr "<regex>"
msgid "<regex>"
msgstr "<regex>"
-#: diff.c:545
0
+#: diff.c:545
2
msgid "use <regex> to decide what a word is"
msgstr "usa <regex> para decidir que palabra es"
msgid "use <regex> to decide what a word is"
msgstr "usa <regex> para decidir que palabra es"
-#: diff.c:545
3
+#: diff.c:545
5
msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
msgstr "equivalente a --word-diff=color --word-diff-regex=<regex>"
msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
msgstr "equivalente a --word-diff=color --word-diff-regex=<regex>"
-#: diff.c:545
6
-msgid "move lines of code are colored differently"
-msgstr "líneas movidas de código
so
n coloreadas diferente"
+#: diff.c:545
8
+msgid "move
d
lines of code are colored differently"
+msgstr "líneas movidas de código
está
n coloreadas diferente"
-#: diff.c:54
59
+#: diff.c:54
61
msgid "how white spaces are ignored in --color-moved"
msgstr "como espacios en blanco son ignorados en --color-moved"
msgid "how white spaces are ignored in --color-moved"
msgstr "como espacios en blanco son ignorados en --color-moved"
-#: diff.c:546
2
-msgid "
Diff other
options"
+#: diff.c:546
4
+msgid "
Other diff
options"
msgstr "Otras opciones de diff"
msgstr "Otras opciones de diff"
-#: diff.c:546
4
+#: diff.c:546
6
msgid "when run from subdir, exclude changes outside and show relative paths"
msgstr ""
"cuando ejecutado desde un subdir, excluye cambios del exterior y muestra "
"paths relativos"
msgid "when run from subdir, exclude changes outside and show relative paths"
msgstr ""
"cuando ejecutado desde un subdir, excluye cambios del exterior y muestra "
"paths relativos"
-#: diff.c:54
68
+#: diff.c:54
70
msgid "treat all files as text"
msgstr "tratar todos los archivos como texto"
msgid "treat all files as text"
msgstr "tratar todos los archivos como texto"
-#: diff.c:547
0
+#: diff.c:547
2
msgid "swap two inputs, reverse the diff"
msgstr "cambia dos inputs, invierte el diff"
msgid "swap two inputs, reverse the diff"
msgstr "cambia dos inputs, invierte el diff"
-#: diff.c:547
2
+#: diff.c:547
4
msgid "exit with 1 if there were differences, 0 otherwise"
msgstr "termina con 1 si hubieron diferencias, de lo contrario con 0"
msgid "exit with 1 if there were differences, 0 otherwise"
msgstr "termina con 1 si hubieron diferencias, de lo contrario con 0"
-#: diff.c:547
4
+#: diff.c:547
6
msgid "disable all output of the program"
msgstr "deshabilita todo el output del programa"
msgid "disable all output of the program"
msgstr "deshabilita todo el output del programa"
-#: diff.c:547
6
+#: diff.c:547
8
msgid "allow an external diff helper to be executed"
msgstr "permite la ejecución de un diff helper externo"
msgid "allow an external diff helper to be executed"
msgstr "permite la ejecución de un diff helper externo"
-#: diff.c:54
78
+#: diff.c:54
80
msgid "run external text conversion filters when comparing binary files"
msgstr ""
"ejecuta filtros de conversión de texto externos cuando comparando binarios"
msgid "run external text conversion filters when comparing binary files"
msgstr ""
"ejecuta filtros de conversión de texto externos cuando comparando binarios"
-#: diff.c:548
0
+#: diff.c:548
2
msgid "<when>"
msgstr "<cuando>"
msgid "<when>"
msgstr "<cuando>"
-#: diff.c:548
1
+#: diff.c:548
3
msgid "ignore changes to submodules in the diff generation"
msgstr "ignorar cambios a submódulos en la generación de diff"
msgid "ignore changes to submodules in the diff generation"
msgstr "ignorar cambios a submódulos en la generación de diff"
-#: diff.c:548
4
+#: diff.c:548
6
msgid "<format>"
msgstr "<formato>"
msgid "<format>"
msgstr "<formato>"
-#: diff.c:548
5
+#: diff.c:548
7
msgid "specify how differences in submodules are shown"
msgstr "especifica como son mostradas las diferencias en submódulos"
msgid "specify how differences in submodules are shown"
msgstr "especifica como son mostradas las diferencias en submódulos"
-#: diff.c:54
89
+#: diff.c:54
91
msgid "hide 'git add -N' entries from the index"
msgstr "ocultar entradas 'git add -N' del index"
msgid "hide 'git add -N' entries from the index"
msgstr "ocultar entradas 'git add -N' del index"
-#: diff.c:549
2
+#: diff.c:549
4
msgid "treat 'git add -N' entries as real in the index"
msgstr "trata entradas 'git add -N' como reales en el index"
msgid "treat 'git add -N' entries as real in the index"
msgstr "trata entradas 'git add -N' como reales en el index"
-#: diff.c:549
4
+#: diff.c:549
6
msgid "<string>"
msgstr "<string>"
msgid "<string>"
msgstr "<string>"
-#: diff.c:549
5
+#: diff.c:549
7
msgid ""
"look for differences that change the number of occurrences of the specified "
"string"
msgid ""
"look for differences that change the number of occurrences of the specified "
"string"
@@
-2880,7
+2880,7
@@
msgstr ""
"busca por diferencias que cambien el número de ocurrencias para el string "
"especificado"
"busca por diferencias que cambien el número de ocurrencias para el string "
"especificado"
-#: diff.c:5
498
+#: diff.c:5
500
msgid ""
"look for differences that change the number of occurrences of the specified "
"regex"
msgid ""
"look for differences that change the number of occurrences of the specified "
"regex"
@@
-2888,23
+2888,23
@@
msgstr ""
"busca por diferencias que cambien el número de ocurrencias para el regex "
"especificado"
"busca por diferencias que cambien el número de ocurrencias para el regex "
"especificado"
-#: diff.c:550
1
+#: diff.c:550
3
msgid "show all changes in the changeset with -S or -G"
msgstr "mostrar todos los cambios en el changeset con -S o -G"
msgid "show all changes in the changeset with -S or -G"
msgstr "mostrar todos los cambios en el changeset con -S o -G"
-#: diff.c:550
4
+#: diff.c:550
6
msgid "treat <string> in -S as extended POSIX regular expression"
msgstr "tratar <string> en -S como una expresión regular extendida de POSIX"
msgid "treat <string> in -S as extended POSIX regular expression"
msgstr "tratar <string> en -S como una expresión regular extendida de POSIX"
-#: diff.c:550
7
+#: diff.c:550
9
msgid "control the order in which files appear in the output"
msgstr "controlar el orden en el que los archivos aparecen en la salida"
msgid "control the order in which files appear in the output"
msgstr "controlar el orden en el que los archivos aparecen en la salida"
-#: diff.c:55
08
+#: diff.c:55
10
msgid "<object-id>"
msgstr "<id-objeto>"
msgid "<object-id>"
msgstr "<id-objeto>"
-#: diff.c:55
09
+#: diff.c:55
11
msgid ""
"look for differences that change the number of occurrences of the specified "
"object"
msgid ""
"look for differences that change the number of occurrences of the specified "
"object"
@@
-2912,33
+2912,33
@@
msgstr ""
"busca por diferencias que cambien el número de ocurrencias para el objeto "
"especificado"
"busca por diferencias que cambien el número de ocurrencias para el objeto "
"especificado"
-#: diff.c:551
1
+#: diff.c:551
3
msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"
msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"
-#: diff.c:551
2
+#: diff.c:551
4
msgid "select files by diff type"
msgstr "selecciona archivos por tipo de diff"
msgid "select files by diff type"
msgstr "selecciona archivos por tipo de diff"
-#: diff.c:551
4
+#: diff.c:551
6
msgid "<file>"
msgstr "<archivo>"
msgid "<file>"
msgstr "<archivo>"
-#: diff.c:551
5
+#: diff.c:551
7
msgid "Output to a specific file"
msgstr "Output a un archivo específico"
msgid "Output to a specific file"
msgstr "Output a un archivo específico"
-#: diff.c:61
48
+#: diff.c:61
50
msgid "inexact rename detection was skipped due to too many files."
msgstr ""
"detección de cambio de nombre inexacta fue saltada por haber muchos archivos."
msgid "inexact rename detection was skipped due to too many files."
msgstr ""
"detección de cambio de nombre inexacta fue saltada por haber muchos archivos."
-#: diff.c:615
1
+#: diff.c:615
3
msgid "only found copies from modified paths due to too many files."
msgstr ""
"solo se encontraron copias de rutas modificadas por haber muchos archivos."
msgid "only found copies from modified paths due to too many files."
msgstr ""
"solo se encontraron copias de rutas modificadas por haber muchos archivos."
-#: diff.c:615
4
+#: diff.c:615
6
#, c-format
msgid ""
"you may want to set your %s variable to at least %d and retry the command."
#, c-format
msgid ""
"you may want to set your %s variable to at least %d and retry the command."
@@
-3254,7
+3254,7
@@
msgstr "error procesando refs deseadas: %d"
msgid "no matching remote head"
msgstr "no concuerda el head remoto"
msgid "no matching remote head"
msgstr "no concuerda el head remoto"
-#: fetch-pack.c:1699 builtin/clone.c:67
6
+#: fetch-pack.c:1699 builtin/clone.c:67
3
msgid "remote did not send all necessary objects"
msgstr "remoto no mando todos los objetos necesarios"
msgid "remote did not send all necessary objects"
msgstr "remoto no mando todos los objetos necesarios"
@@
-3291,7
+3291,7
@@
msgstr "ignora color inválido '%.*s' en log.graphColors"
msgid "'%s': unable to read %s"
msgstr "'%s': no es posible leer %s"
msgid "'%s': unable to read %s"
msgstr "'%s': no es posible leer %s"
-#: grep.c:2130 setup.c:164 builtin/clone.c:41
4
builtin/diff.c:82
+#: grep.c:2130 setup.c:164 builtin/clone.c:41
1
builtin/diff.c:82
#: builtin/rm.c:135
#, c-format
msgid "failed to stat '%s'"
#: builtin/rm.c:135
#, c-format
msgid "failed to stat '%s'"
@@
-3574,7
+3574,7
@@
msgid "failed to read the cache"
msgstr "falló al leer la cache"
#: merge.c:107 rerere.c:720 builtin/am.c:1887 builtin/am.c:1921
msgstr "falló al leer la cache"
#: merge.c:107 rerere.c:720 builtin/am.c:1887 builtin/am.c:1921
-#: builtin/checkout.c:461 builtin/checkout.c:811 builtin/clone.c:77
6
+#: builtin/checkout.c:461 builtin/checkout.c:811 builtin/clone.c:77
3
#: builtin/stash.c:264
msgid "unable to write new index file"
msgstr "no es posible escribir el archivo índice"
#: builtin/stash.c:264
msgid "unable to write new index file"
msgstr "no es posible escribir el archivo índice"
@@
-4071,78
+4071,78
@@
msgstr "multi-pack-index le falta el conjunto de offset del objeto requerido"
msgid "multi-pack-index pack names out of order: '%s' before '%s'"
msgstr "multi-pack-index nombres de paquete fuera de orden:'%s' antes '%s'"
msgid "multi-pack-index pack names out of order: '%s' before '%s'"
msgstr "multi-pack-index nombres de paquete fuera de orden:'%s' antes '%s'"
-#: midx.c:20
9
+#: midx.c:20
8
#, c-format
msgid "bad pack-int-id: %u (%u total packs)"
msgstr "mal pack-int-id: %u (%u paquetes totales)"
#, c-format
msgid "bad pack-int-id: %u (%u total packs)"
msgstr "mal pack-int-id: %u (%u paquetes totales)"
-#: midx.c:25
0
+#: midx.c:25
8
msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
msgstr "multi-pack-index guarda un offset de 64-bit, pero off_t es muy pequeño"
msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
msgstr "multi-pack-index guarda un offset de 64-bit, pero off_t es muy pequeño"
-#: midx.c:2
75
+#: midx.c:2
86
msgid "error preparing packfile from multi-pack-index"
msgstr "error preparando packfile de multi-pack-index"
msgid "error preparing packfile from multi-pack-index"
msgstr "error preparando packfile de multi-pack-index"
-#: midx.c:4
43
+#: midx.c:4
57
#, c-format
msgid "failed to add packfile '%s'"
msgstr "falló al agregar packfile '%s'"
#, c-format
msgid "failed to add packfile '%s'"
msgstr "falló al agregar packfile '%s'"
-#: midx.c:4
49
+#: midx.c:4
63
#, c-format
msgid "failed to open pack-index '%s'"
msgstr "falló al abrir pack-index '%s'"
#, c-format
msgid "failed to open pack-index '%s'"
msgstr "falló al abrir pack-index '%s'"
-#: midx.c:5
43
+#: midx.c:5
57
#, c-format
msgid "failed to locate object %d in packfile"
msgstr "falló al ubicar objeto %d en packfile"
#, c-format
msgid "failed to locate object %d in packfile"
msgstr "falló al ubicar objeto %d en packfile"
-#: midx.c:9
79
+#: midx.c:9
93
#, c-format
msgid "failed to clear multi-pack-index at %s"
msgstr "falló al limpiar multi-pack-index en %s"
#, c-format
msgid "failed to clear multi-pack-index at %s"
msgstr "falló al limpiar multi-pack-index en %s"
-#: midx.c:10
34
+#: midx.c:10
48
msgid "Looking for referenced packfiles"
msgstr "Buscando por packfiles referidos"
msgid "Looking for referenced packfiles"
msgstr "Buscando por packfiles referidos"
-#: midx.c:10
49
+#: midx.c:10
63
#, c-format
msgid ""
"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
msgstr ""
"oid fanout fuera de orden: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
#, c-format
msgid ""
"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
msgstr ""
"oid fanout fuera de orden: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
-#: midx.c:10
53
+#: midx.c:10
67
msgid "Verifying OID order in MIDX"
msgstr "Verificando orden de OID en MIDX"
msgid "Verifying OID order in MIDX"
msgstr "Verificando orden de OID en MIDX"
-#: midx.c:10
62
+#: midx.c:10
76
#, c-format
msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
msgstr "oid lookup fuera de orden: oid[%d] = %s >= %s = oid[%d]"
#, c-format
msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
msgstr "oid lookup fuera de orden: oid[%d] = %s >= %s = oid[%d]"
-#: midx.c:10
81
+#: midx.c:10
95
msgid "Sorting objects by packfile"
msgstr "Ordenando objetos por packfile"
msgid "Sorting objects by packfile"
msgstr "Ordenando objetos por packfile"
-#: midx.c:1
087
+#: midx.c:1
101
msgid "Verifying object offsets"
msgstr "Verificando offsets de objetos"
msgid "Verifying object offsets"
msgstr "Verificando offsets de objetos"
-#: midx.c:11
03
+#: midx.c:11
17
#, c-format
msgid "failed to load pack entry for oid[%d] = %s"
msgstr "fallo al cargar entrada pack para oid[%d] = %s"
#, c-format
msgid "failed to load pack entry for oid[%d] = %s"
msgstr "fallo al cargar entrada pack para oid[%d] = %s"
-#: midx.c:11
09
+#: midx.c:11
23
#, c-format
msgid "failed to load pack-index for packfile %s"
msgstr "falló al cargar el pack-index para packfile %s"
#, c-format
msgid "failed to load pack-index for packfile %s"
msgstr "falló al cargar el pack-index para packfile %s"
-#: midx.c:11
18
+#: midx.c:11
32
#, c-format
msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
msgstr "offset para objeto incorrecto oid[%d] = %s: %<PRIx64> != %<PRIx64>"
#, c-format
msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
msgstr "offset para objeto incorrecto oid[%d] = %s: %<PRIx64> != %<PRIx64>"
@@
-4233,13
+4233,13
@@
msgstr "hash no concuerda %s"
msgid "offset before end of packfile (broken .idx?)"
msgstr "offset antes del final del paquete (broken .idx?)"
msgid "offset before end of packfile (broken .idx?)"
msgstr "offset antes del final del paquete (broken .idx?)"
-#: packfile.c:18
80
+#: packfile.c:18
68
#, c-format
msgid "offset before start of pack index for %s (corrupt index?)"
msgstr ""
"offset antes del comienzo del índice del paquete para %s (índice corrupto?)"
#, c-format
msgid "offset before start of pack index for %s (corrupt index?)"
msgstr ""
"offset antes del comienzo del índice del paquete para %s (índice corrupto?)"
-#: packfile.c:18
84
+#: packfile.c:18
72
#, c-format
msgid "offset beyond end of pack index for %s (truncated index?)"
msgstr ""
#, c-format
msgid "offset beyond end of pack index for %s (truncated index?)"
msgstr ""
@@
-4260,7
+4260,7
@@
msgstr "%s es incompatible con %s"
msgid "%s : incompatible with something else"
msgstr "%s : incompatible con otra cosa"
msgid "%s : incompatible with something else"
msgstr "%s : incompatible con otra cosa"
-#: parse-options.c:92 parse-options.c:96 parse-options.c:
287
+#: parse-options.c:92 parse-options.c:96 parse-options.c:
319
#, c-format
msgid "%s takes no value"
msgstr "%s no toma valores"
#, c-format
msgid "%s takes no value"
msgstr "%s no toma valores"
@@
-4270,41
+4270,41
@@
msgstr "%s no toma valores"
msgid "%s isn't available"
msgstr "%s no está disponible"
msgid "%s isn't available"
msgstr "%s no está disponible"
-#: parse-options.c:21
6
+#: parse-options.c:21
9
#, c-format
msgid "%s expects a non-negative integer value with an optional k/m/g suffix"
msgstr "%s espera un valor entero no negativo con un sufijo opcional k/m/g"
#, c-format
msgid "%s expects a non-negative integer value with an optional k/m/g suffix"
msgstr "%s espera un valor entero no negativo con un sufijo opcional k/m/g"
-#: parse-options.c:3
56
+#: parse-options.c:3
89
#, c-format
msgid "ambiguous option: %s (could be --%s%s or --%s%s)"
msgstr "opción ambigua: %s (puede ser --%s%s o --%s%s)"
#, c-format
msgid "ambiguous option: %s (could be --%s%s or --%s%s)"
msgstr "opción ambigua: %s (puede ser --%s%s o --%s%s)"
-#: parse-options.c:
390 parse-options.c:398
+#: parse-options.c:
423 parse-options.c:431
#, c-format
msgid "did you mean `--%s` (with two dashes ?)"
msgstr "¿quisiste decir `--%s` (con dos guiones)?"
#, c-format
msgid "did you mean `--%s` (with two dashes ?)"
msgstr "¿quisiste decir `--%s` (con dos guiones)?"
-#: parse-options.c:
733
+#: parse-options.c:
859
#, c-format
msgid "unknown option `%s'"
msgstr "opción `%s' desconocida"
#, c-format
msgid "unknown option `%s'"
msgstr "opción `%s' desconocida"
-#: parse-options.c:
735
+#: parse-options.c:
861
#, c-format
msgid "unknown switch `%c'"
msgstr "switch desconocido `%c'"
#, c-format
msgid "unknown switch `%c'"
msgstr "switch desconocido `%c'"
-#: parse-options.c:
737
+#: parse-options.c:
863
#, c-format
msgid "unknown non-ascii option in string: `%s'"
msgstr "opcion desconocida en string no ascii: `%s'"
#, c-format
msgid "unknown non-ascii option in string: `%s'"
msgstr "opcion desconocida en string no ascii: `%s'"
-#: parse-options.c:
759
+#: parse-options.c:
887
msgid "..."
msgstr "..."
msgid "..."
msgstr "..."
-#: parse-options.c:
778
+#: parse-options.c:
906
#, c-format
msgid "usage: %s"
msgstr "uso: %s"
#, c-format
msgid "usage: %s"
msgstr "uso: %s"
@@
-4312,36
+4312,41
@@
msgstr "uso: %s"
#. TRANSLATORS: the colon here should align with the
#. one in "usage: %s" translation.
#.
#. TRANSLATORS: the colon here should align with the
#. one in "usage: %s" translation.
#.
-#: parse-options.c:
784
+#: parse-options.c:
912
#, c-format
msgid " or: %s"
msgstr " o: %s"
#, c-format
msgid " or: %s"
msgstr " o: %s"
-#: parse-options.c:
787
+#: parse-options.c:
915
#, c-format
msgid " %s"
msgstr " %s"
#, c-format
msgid " %s"
msgstr " %s"
-#: parse-options.c:
826
+#: parse-options.c:
954
msgid "-NUM"
msgstr "-NUM"
msgid "-NUM"
msgstr "-NUM"
-#: parse-options-cb.c:21
+#: parse-options.c:968
+#, c-format
+msgid "alias of --%s"
+msgstr "alias de --%s"
+
+#: parse-options-cb.c:20 parse-options-cb.c:24
#, c-format
msgid "option `%s' expects a numerical value"
msgstr "opción `%s' espera un valor numérico"
#, c-format
msgid "option `%s' expects a numerical value"
msgstr "opción `%s' espera un valor numérico"
-#: parse-options-cb.c:
38
+#: parse-options-cb.c:
41
#, c-format
msgid "malformed expiration date '%s'"
msgstr "fecha de expiración mal formada: '%s'"
#, c-format
msgid "malformed expiration date '%s'"
msgstr "fecha de expiración mal formada: '%s'"
-#: parse-options-cb.c:5
1
+#: parse-options-cb.c:5
4
#, c-format
msgid "option `%s' expects \"always\", \"auto\", or \"never\""
msgstr "opción `%s' puede usar \"always\", \"auto\", o \"never\""
#, c-format
msgid "option `%s' expects \"always\", \"auto\", or \"never\""
msgstr "opción `%s' puede usar \"always\", \"auto\", o \"never\""
-#: parse-options-cb.c:1
27 parse-options-cb.c:144
+#: parse-options-cb.c:1
30 parse-options-cb.c:147
#, c-format
msgid "malformed object name '%s'"
msgstr "nombre de objeto mal formado '%s'"
#, c-format
msgid "malformed object name '%s'"
msgstr "nombre de objeto mal formado '%s'"
@@
-4681,32
+4686,32
@@
msgstr "no se pudo refrescar el index compartido '%s'"
msgid "broken index, expect %s in %s, got %s"
msgstr "index roto, se esperaba %s en %s, se obtuvo %s"
msgid "broken index, expect %s in %s, got %s"
msgstr "index roto, se esperaba %s en %s, se obtuvo %s"
-#: read-cache.c:298
8
wrapper.c:658 builtin/merge.c:1117
+#: read-cache.c:298
9
wrapper.c:658 builtin/merge.c:1117
#, c-format
msgid "could not close '%s'"
msgstr "no se pudo cerrar '%s'"
#, c-format
msgid "could not close '%s'"
msgstr "no se pudo cerrar '%s'"
-#: read-cache.c:309
1
sequencer.c:2354 sequencer.c:3807
+#: read-cache.c:309
2
sequencer.c:2354 sequencer.c:3807
#, c-format
msgid "could not stat '%s'"
msgstr "no se pudo definir '%s'"
#, c-format
msgid "could not stat '%s'"
msgstr "no se pudo definir '%s'"
-#: read-cache.c:310
4
+#: read-cache.c:310
5
#, c-format
msgid "unable to open git dir: %s"
msgstr "no es posible abrir el directorio de git: %s"
#, c-format
msgid "unable to open git dir: %s"
msgstr "no es posible abrir el directorio de git: %s"
-#: read-cache.c:311
6
+#: read-cache.c:311
7
#, c-format
msgid "unable to unlink: %s"
msgstr "no es posible eliminar el vinculo: %s"
#, c-format
msgid "unable to unlink: %s"
msgstr "no es posible eliminar el vinculo: %s"
-#: read-cache.c:314
1
+#: read-cache.c:314
2
#, c-format
msgid "cannot fix permission bits on '%s'"
msgstr "no se pudo arreglar bits de permisos en '%s'"
#, c-format
msgid "cannot fix permission bits on '%s'"
msgstr "no se pudo arreglar bits de permisos en '%s'"
-#: read-cache.c:329
0
+#: read-cache.c:329
1
#, c-format
msgid "%s: cannot drop to stage #0"
msgstr "%s: no se puede eliminar a stage #0"
#, c-format
msgid "%s: cannot drop to stage #0"
msgstr "%s: no se puede eliminar a stage #0"
@@
-4965,7
+4970,7
@@
msgstr "no se pudo eliminar la referencia: %s"
msgid "invalid refspec '%s'"
msgstr "refspec inválido: '%s'"
msgid "invalid refspec '%s'"
msgstr "refspec inválido: '%s'"
-#: ref-filter.c:39 wt-status.c:190
7
+#: ref-filter.c:39 wt-status.c:190
9
msgid "gone"
msgstr "desaparecido"
msgid "gone"
msgstr "desaparecido"
@@
-6249,7
+6254,7
@@
msgstr "No se pudo aplicar %s... %.*s"
msgid "Could not merge %.*s"
msgstr "No se pudo fusionar %.*s"
msgid "Could not merge %.*s"
msgstr "No se pudo fusionar %.*s"
-#: sequencer.c:2997 sequencer.c:3001 builtin/difftool.c:63
9
+#: sequencer.c:2997 sequencer.c:3001 builtin/difftool.c:63
3
#, c-format
msgid "could not copy '%s' to '%s'"
msgstr "no se pudo copiar '%s' a '%s'"
#, c-format
msgid "could not copy '%s' to '%s'"
msgstr "no se pudo copiar '%s' a '%s'"
@@
-6945,16
+6950,16
@@
msgstr "incapaz de analizar header de %s"
msgid "unable to unpack contents of %s"
msgstr "no es posible desempaquetar contenidos de %s"
msgid "unable to unpack contents of %s"
msgstr "no es posible desempaquetar contenidos de %s"
-#: sha1-name.c:4
87
+#: sha1-name.c:4
90
#, c-format
msgid "short SHA1 %s is ambiguous"
msgstr "SHA1 %s corto es ambiguo"
#, c-format
msgid "short SHA1 %s is ambiguous"
msgstr "SHA1 %s corto es ambiguo"
-#: sha1-name.c:
498
+#: sha1-name.c:
501
msgid "The candidates are:"
msgstr "Los candidatos son:"
msgid "The candidates are:"
msgstr "Los candidatos son:"
-#: sha1-name.c:
794
+#: sha1-name.c:
800
msgid ""
"Git normally never creates a ref that ends with 40 hex characters\n"
"because it will be ignored when you just specify 40-hex. These refs\n"
msgid ""
"Git normally never creates a ref that ends with 40 hex characters\n"
"because it will be ignored when you just specify 40-hex. These refs\n"
@@
-7981,67
+7986,67
@@
msgstr " (usa \"git am --skip\" para saltar este parche)"
msgid " (use \"git am --abort\" to restore the original branch)"
msgstr " (usa \"git am --abort\" para restaurar la rama original)"
msgid " (use \"git am --abort\" to restore the original branch)"
msgstr " (usa \"git am --abort\" para restaurar la rama original)"
-#: wt-status.c:128
2
+#: wt-status.c:128
4
msgid "git-rebase-todo is missing."
msgstr "git-rebase-todo no está presente."
msgid "git-rebase-todo is missing."
msgstr "git-rebase-todo no está presente."
-#: wt-status.c:128
4
+#: wt-status.c:128
6
msgid "No commands done."
msgstr "No se realizaron los comandos."
msgid "No commands done."
msgstr "No se realizaron los comandos."
-#: wt-status.c:128
7
+#: wt-status.c:128
9
#, c-format
msgid "Last command done (%d command done):"
msgid_plural "Last commands done (%d commands done):"
msgstr[0] "El último comando realizado (%d comando realizado):"
msgstr[1] "Los últimos comandos realizados (%d comandos realizados):"
#, c-format
msgid "Last command done (%d command done):"
msgid_plural "Last commands done (%d commands done):"
msgstr[0] "El último comando realizado (%d comando realizado):"
msgstr[1] "Los últimos comandos realizados (%d comandos realizados):"
-#: wt-status.c:1
298
+#: wt-status.c:1
300
#, c-format
msgid " (see more in file %s)"
msgstr " (ver mas en el archivo %s)"
#, c-format
msgid " (see more in file %s)"
msgstr " (ver mas en el archivo %s)"
-#: wt-status.c:130
3
+#: wt-status.c:130
5
msgid "No commands remaining."
msgstr "No quedan mas comandos."
msgid "No commands remaining."
msgstr "No quedan mas comandos."
-#: wt-status.c:130
6
+#: wt-status.c:130
8
#, c-format
msgid "Next command to do (%d remaining command):"
msgid_plural "Next commands to do (%d remaining commands):"
msgstr[0] "Siguiente comando a realizar (%d comando restante):"
msgstr[1] "Siguiente comandos a realizar (%d comandos faltantes):"
#, c-format
msgid "Next command to do (%d remaining command):"
msgid_plural "Next commands to do (%d remaining commands):"
msgstr[0] "Siguiente comando a realizar (%d comando restante):"
msgstr[1] "Siguiente comandos a realizar (%d comandos faltantes):"
-#: wt-status.c:131
4
+#: wt-status.c:131
6
msgid " (use \"git rebase --edit-todo\" to view and edit)"
msgstr " (usa \"git rebase --edit-todo\" para ver y editar)"
msgid " (use \"git rebase --edit-todo\" to view and edit)"
msgstr " (usa \"git rebase --edit-todo\" para ver y editar)"
-#: wt-status.c:132
6
+#: wt-status.c:132
8
#, c-format
msgid "You are currently rebasing branch '%s' on '%s'."
msgstr "Estás aplicando un rebase de la rama '%s' en '%s."
#, c-format
msgid "You are currently rebasing branch '%s' on '%s'."
msgstr "Estás aplicando un rebase de la rama '%s' en '%s."
-#: wt-status.c:133
1
+#: wt-status.c:133
3
msgid "You are currently rebasing."
msgstr "Estás aplicando un rebase."
msgid "You are currently rebasing."
msgstr "Estás aplicando un rebase."
-#: wt-status.c:134
4
+#: wt-status.c:134
6
msgid " (fix conflicts and then run \"git rebase --continue\")"
msgstr " (corrige los conflictos y ejecuta \"git rebase --continue\")"
msgid " (fix conflicts and then run \"git rebase --continue\")"
msgstr " (corrige los conflictos y ejecuta \"git rebase --continue\")"
-#: wt-status.c:134
6
+#: wt-status.c:134
8
msgid " (use \"git rebase --skip\" to skip this patch)"
msgstr " (usa \"git rebase --skip\" para omitir este parche)"
msgid " (use \"git rebase --skip\" to skip this patch)"
msgstr " (usa \"git rebase --skip\" para omitir este parche)"
-#: wt-status.c:13
48
+#: wt-status.c:13
50
msgid " (use \"git rebase --abort\" to check out the original branch)"
msgstr " (usa \"git rebase --abort\" para volver a tu rama original)"
msgid " (use \"git rebase --abort\" to check out the original branch)"
msgstr " (usa \"git rebase --abort\" para volver a tu rama original)"
-#: wt-status.c:135
5
+#: wt-status.c:135
7
msgid " (all conflicts fixed: run \"git rebase --continue\")"
msgstr " (todos los conflictos corregidos: ejecuta \"git rebase --continue\")"
msgid " (all conflicts fixed: run \"git rebase --continue\")"
msgstr " (todos los conflictos corregidos: ejecuta \"git rebase --continue\")"
-#: wt-status.c:13
59
+#: wt-status.c:13
61
#, c-format
msgid ""
"You are currently splitting a commit while rebasing branch '%s' on '%s'."
#, c-format
msgid ""
"You are currently splitting a commit while rebasing branch '%s' on '%s'."
@@
-8049,144
+8054,144
@@
msgstr ""
"Estás dividiendo un commit mientras aplicas un rebase de la rama '%s' en "
"'%s'."
"Estás dividiendo un commit mientras aplicas un rebase de la rama '%s' en "
"'%s'."
-#: wt-status.c:136
4
+#: wt-status.c:136
6
msgid "You are currently splitting a commit during a rebase."
msgstr "Estás dividiendo un commit durante un rebase."
msgid "You are currently splitting a commit during a rebase."
msgstr "Estás dividiendo un commit durante un rebase."
-#: wt-status.c:136
7
+#: wt-status.c:136
9
msgid " (Once your working directory is clean, run \"git rebase --continue\")"
msgstr ""
" (Una vez que tu directorio de trabajo esté limpio, ejecuta \"git rebase --"
"continue\")"
msgid " (Once your working directory is clean, run \"git rebase --continue\")"
msgstr ""
" (Una vez que tu directorio de trabajo esté limpio, ejecuta \"git rebase --"
"continue\")"
-#: wt-status.c:137
1
+#: wt-status.c:137
3
#, c-format
msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
msgstr ""
"Estás editando un commit mientras se aplica un rebase de la rama '%s' en "
"'%s'."
#, c-format
msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
msgstr ""
"Estás editando un commit mientras se aplica un rebase de la rama '%s' en "
"'%s'."
-#: wt-status.c:137
6
+#: wt-status.c:137
8
msgid "You are currently editing a commit during a rebase."
msgstr "Estás editando un commit durante un rebase."
msgid "You are currently editing a commit during a rebase."
msgstr "Estás editando un commit durante un rebase."
-#: wt-status.c:13
79
+#: wt-status.c:13
81
msgid " (use \"git commit --amend\" to amend the current commit)"
msgstr " (usa \"git commit --amend\" para enmendar el commit actual)"
msgid " (use \"git commit --amend\" to amend the current commit)"
msgstr " (usa \"git commit --amend\" para enmendar el commit actual)"
-#: wt-status.c:138
1
+#: wt-status.c:138
3
msgid ""
" (use \"git rebase --continue\" once you are satisfied with your changes)"
msgstr ""
" (usa \"git rebase --continue\" una vez que estés satisfecho con tus "
"cambios)"
msgid ""
" (use \"git rebase --continue\" once you are satisfied with your changes)"
msgstr ""
" (usa \"git rebase --continue\" una vez que estés satisfecho con tus "
"cambios)"
-#: wt-status.c:139
2
+#: wt-status.c:139
4
msgid "Cherry-pick currently in progress."
msgstr "Cherry-pick en progreso actualmente"
msgid "Cherry-pick currently in progress."
msgstr "Cherry-pick en progreso actualmente"
-#: wt-status.c:139
5
+#: wt-status.c:139
7
#, c-format
msgid "You are currently cherry-picking commit %s."
msgstr "Estás realizando un cherry-picking en el commit %s."
#, c-format
msgid "You are currently cherry-picking commit %s."
msgstr "Estás realizando un cherry-picking en el commit %s."
-#: wt-status.c:140
2
+#: wt-status.c:140
4
msgid " (fix conflicts and run \"git cherry-pick --continue\")"
msgstr " (corrige los conflictos y ejecuta \"git cherry-pick --continue\")"
msgid " (fix conflicts and run \"git cherry-pick --continue\")"
msgstr " (corrige los conflictos y ejecuta \"git cherry-pick --continue\")"
-#: wt-status.c:140
5
+#: wt-status.c:140
7
msgid " (run \"git cherry-pick --continue\" to continue)"
msgstr " (ejecuta \"git cherry-pick --continue\" para continuar)"
msgid " (run \"git cherry-pick --continue\" to continue)"
msgstr " (ejecuta \"git cherry-pick --continue\" para continuar)"
-#: wt-status.c:14
08
+#: wt-status.c:14
10
msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
msgstr ""
" (todos los conflictos corregidos: ejecuta \"git cherry-pick --continue\")"
msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
msgstr ""
" (todos los conflictos corregidos: ejecuta \"git cherry-pick --continue\")"
-#: wt-status.c:141
0
+#: wt-status.c:141
2
msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
msgstr ""
" (use \"git cherry-pick --abort\" para cancelar la operación cherry-pick)"
msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
msgstr ""
" (use \"git cherry-pick --abort\" para cancelar la operación cherry-pick)"
-#: wt-status.c:142
0
+#: wt-status.c:142
2
msgid "Revert currently in progress."
msgstr "Revierte el estado en progreso actual"
msgid "Revert currently in progress."
msgstr "Revierte el estado en progreso actual"
-#: wt-status.c:142
3
+#: wt-status.c:142
5
#, c-format
msgid "You are currently reverting commit %s."
msgstr "Estás revirtiendo el commit %s."
#, c-format
msgid "You are currently reverting commit %s."
msgstr "Estás revirtiendo el commit %s."
-#: wt-status.c:14
29
+#: wt-status.c:14
31
msgid " (fix conflicts and run \"git revert --continue\")"
msgstr " (corrige los conflictos y ejecuta \"git revert --continue\")"
msgid " (fix conflicts and run \"git revert --continue\")"
msgstr " (corrige los conflictos y ejecuta \"git revert --continue\")"
-#: wt-status.c:143
2
+#: wt-status.c:143
4
msgid " (run \"git revert --continue\" to continue)"
msgstr " (ejecuta \"git revert --continue\" para continuar)"
msgid " (run \"git revert --continue\" to continue)"
msgstr " (ejecuta \"git revert --continue\" para continuar)"
-#: wt-status.c:143
5
+#: wt-status.c:143
7
msgid " (all conflicts fixed: run \"git revert --continue\")"
msgstr " (todos los conflictos corregidos: ejecuta \"git revert --continue\")"
msgid " (all conflicts fixed: run \"git revert --continue\")"
msgstr " (todos los conflictos corregidos: ejecuta \"git revert --continue\")"
-#: wt-status.c:143
7
+#: wt-status.c:143
9
msgid " (use \"git revert --abort\" to cancel the revert operation)"
msgstr " (usa \"git revert --abort\" para cancelar la operación de revertir)"
msgid " (use \"git revert --abort\" to cancel the revert operation)"
msgstr " (usa \"git revert --abort\" para cancelar la operación de revertir)"
-#: wt-status.c:144
7
+#: wt-status.c:144
9
#, c-format
msgid "You are currently bisecting, started from branch '%s'."
msgstr "Estás aplicando un bisect, comenzando en la rama '%s'."
#, c-format
msgid "You are currently bisecting, started from branch '%s'."
msgstr "Estás aplicando un bisect, comenzando en la rama '%s'."
-#: wt-status.c:145
1
+#: wt-status.c:145
3
msgid "You are currently bisecting."
msgstr "Estás aplicando un bisect."
msgid "You are currently bisecting."
msgstr "Estás aplicando un bisect."
-#: wt-status.c:145
4
+#: wt-status.c:145
6
msgid " (use \"git bisect reset\" to get back to the original branch)"
msgstr " (usa \"git bisect reset\" para volver a la rama original)"
msgid " (use \"git bisect reset\" to get back to the original branch)"
msgstr " (usa \"git bisect reset\" para volver a la rama original)"
-#: wt-status.c:166
3
+#: wt-status.c:166
5
msgid "On branch "
msgstr "En la rama "
msgid "On branch "
msgstr "En la rama "
-#: wt-status.c:167
0
+#: wt-status.c:167
2
msgid "interactive rebase in progress; onto "
msgstr "rebase interactivo en progreso; en "
msgid "interactive rebase in progress; onto "
msgstr "rebase interactivo en progreso; en "
-#: wt-status.c:167
2
+#: wt-status.c:167
4
msgid "rebase in progress; onto "
msgstr "rebase en progreso; en "
msgid "rebase in progress; onto "
msgstr "rebase en progreso; en "
-#: wt-status.c:167
7
+#: wt-status.c:167
9
msgid "HEAD detached at "
msgstr "HEAD desacoplada en "
msgid "HEAD detached at "
msgstr "HEAD desacoplada en "
-#: wt-status.c:16
79
+#: wt-status.c:16
81
msgid "HEAD detached from "
msgstr "HEAD desacoplada de "
msgid "HEAD detached from "
msgstr "HEAD desacoplada de "
-#: wt-status.c:168
2
+#: wt-status.c:168
4
msgid "Not currently on any branch."
msgstr "Actualmente no estás en ninguna rama."
msgid "Not currently on any branch."
msgstr "Actualmente no estás en ninguna rama."
-#: wt-status.c:1
699
+#: wt-status.c:1
701
msgid "Initial commit"
msgstr "Confirmación inicial"
msgid "Initial commit"
msgstr "Confirmación inicial"
-#: wt-status.c:170
0
+#: wt-status.c:170
2
msgid "No commits yet"
msgstr "No hay commits todavía"
msgid "No commits yet"
msgstr "No hay commits todavía"
-#: wt-status.c:171
4
+#: wt-status.c:171
6
msgid "Untracked files"
msgstr "Archivos sin seguimiento"
msgid "Untracked files"
msgstr "Archivos sin seguimiento"
-#: wt-status.c:171
6
+#: wt-status.c:171
8
msgid "Ignored files"
msgstr "Archivos ignorados"
msgid "Ignored files"
msgstr "Archivos ignorados"
-#: wt-status.c:172
0
+#: wt-status.c:172
2
#, c-format
msgid ""
"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
#, c-format
msgid ""
"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@
-8197,31
+8202,31
@@
msgstr ""
"puede acelerarlo, pero tiene que ser cuidadoso de no olvidar agregar\n"
"nuevos archivos usted mismo (vea 'git help status')."
"puede acelerarlo, pero tiene que ser cuidadoso de no olvidar agregar\n"
"nuevos archivos usted mismo (vea 'git help status')."
-#: wt-status.c:172
6
+#: wt-status.c:172
8
#, c-format
msgid "Untracked files not listed%s"
msgstr "Archivos no rastreados no son mostrados %s"
#, c-format
msgid "Untracked files not listed%s"
msgstr "Archivos no rastreados no son mostrados %s"
-#: wt-status.c:17
28
+#: wt-status.c:17
30
msgid " (use -u option to show untracked files)"
msgstr " (usa la opción -u para mostrar los archivos sin seguimiento)"
msgid " (use -u option to show untracked files)"
msgstr " (usa la opción -u para mostrar los archivos sin seguimiento)"
-#: wt-status.c:173
4
+#: wt-status.c:173
6
msgid "No changes"
msgstr "Sin cambios"
msgid "No changes"
msgstr "Sin cambios"
-#: wt-status.c:17
39
+#: wt-status.c:17
41
#, c-format
msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
msgstr ""
"sin cambios agregados al commit (usa \"git add\" y/o \"git commit -a\")\n"
#, c-format
msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
msgstr ""
"sin cambios agregados al commit (usa \"git add\" y/o \"git commit -a\")\n"
-#: wt-status.c:174
2
+#: wt-status.c:174
4
#, c-format
msgid "no changes added to commit\n"
msgstr "no se agregaron cambios al commit\n"
#, c-format
msgid "no changes added to commit\n"
msgstr "no se agregaron cambios al commit\n"
-#: wt-status.c:174
5
+#: wt-status.c:174
7
#, c-format
msgid ""
"nothing added to commit but untracked files present (use \"git add\" to "
#, c-format
msgid ""
"nothing added to commit but untracked files present (use \"git add\" to "
@@
-8230,67
+8235,67
@@
msgstr ""
"no hay nada agregado al commit pero hay archivos sin seguimiento presentes "
"(usa \"git add\" para hacerles seguimiento)\n"
"no hay nada agregado al commit pero hay archivos sin seguimiento presentes "
"(usa \"git add\" para hacerles seguimiento)\n"
-#: wt-status.c:17
48
+#: wt-status.c:17
50
#, c-format
msgid "nothing added to commit but untracked files present\n"
msgstr ""
"no hay nada agregado para confirmar, pero hay archivos sin seguimiento "
"presentes\n"
#, c-format
msgid "nothing added to commit but untracked files present\n"
msgstr ""
"no hay nada agregado para confirmar, pero hay archivos sin seguimiento "
"presentes\n"
-#: wt-status.c:175
1
+#: wt-status.c:175
3
#, c-format
msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
msgstr ""
"no hay nada para confirmar (crea/copia archivos y usa \"git add\" para "
"hacerles seguimiento)\n"
#, c-format
msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
msgstr ""
"no hay nada para confirmar (crea/copia archivos y usa \"git add\" para "
"hacerles seguimiento)\n"
-#: wt-status.c:175
4 wt-status.c:1759
+#: wt-status.c:175
6 wt-status.c:1761
#, c-format
msgid "nothing to commit\n"
msgstr "nada para hacer commit\n"
#, c-format
msgid "nothing to commit\n"
msgstr "nada para hacer commit\n"
-#: wt-status.c:175
7
+#: wt-status.c:175
9
#, c-format
msgid "nothing to commit (use -u to show untracked files)\n"
msgstr ""
"nada para hacer commit (usa -u para mostrar los archivos no rastreados)\n"
#, c-format
msgid "nothing to commit (use -u to show untracked files)\n"
msgstr ""
"nada para hacer commit (usa -u para mostrar los archivos no rastreados)\n"
-#: wt-status.c:176
1
+#: wt-status.c:176
3
#, c-format
msgid "nothing to commit, working tree clean\n"
msgstr "nada para hacer commit, el árbol de trabajo está limpio\n"
#, c-format
msgid "nothing to commit, working tree clean\n"
msgstr "nada para hacer commit, el árbol de trabajo está limpio\n"
-#: wt-status.c:187
4
+#: wt-status.c:187
6
msgid "No commits yet on "
msgstr "No hay commits todavía en "
msgid "No commits yet on "
msgstr "No hay commits todavía en "
-#: wt-status.c:18
78
+#: wt-status.c:18
80
msgid "HEAD (no branch)"
msgstr "HEAD (sin rama)"
msgid "HEAD (no branch)"
msgstr "HEAD (sin rama)"
-#: wt-status.c:19
09
+#: wt-status.c:19
11
msgid "different"
msgstr "diferente"
msgid "different"
msgstr "diferente"
-#: wt-status.c:191
1 wt-status.c:1919
+#: wt-status.c:191
3 wt-status.c:1921
msgid "behind "
msgstr "detrás "
msgid "behind "
msgstr "detrás "
-#: wt-status.c:191
4 wt-status.c:1917
+#: wt-status.c:191
6 wt-status.c:1919
msgid "ahead "
msgstr "adelante "
#. TRANSLATORS: the action is e.g. "pull with rebase"
msgid "ahead "
msgstr "adelante "
#. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:244
1
+#: wt-status.c:244
3
#, c-format
msgid "cannot %s: You have unstaged changes."
msgstr "no se puede %s: Tienes cambios sin marcar."
#, c-format
msgid "cannot %s: You have unstaged changes."
msgstr "no se puede %s: Tienes cambios sin marcar."
-#: wt-status.c:244
7
+#: wt-status.c:244
9
msgid "additionally, your index contains uncommitted changes."
msgstr "adicionalmente, tu índice contiene cambios que no están en un commit."
msgid "additionally, your index contains uncommitted changes."
msgstr "adicionalmente, tu índice contiene cambios que no están en un commit."
-#: wt-status.c:24
49
+#: wt-status.c:24
51
#, c-format
msgid "cannot %s: Your index contains uncommitted changes."
msgstr "no se puede %s: Tu índice contiene cambios que no están en un commit."
#, c-format
msgid "cannot %s: Your index contains uncommitted changes."
msgstr "no se puede %s: Tu índice contiene cambios que no están en un commit."
@@
-8531,7
+8536,7
@@
msgstr "offset de zona horaria inválido"
msgid "Patch format detection failed."
msgstr "Falló al detectar el formato del parche."
msgid "Patch format detection failed."
msgstr "Falló al detectar el formato del parche."
-#: builtin/am.c:949 builtin/clone.c:4
12
+#: builtin/am.c:949 builtin/clone.c:4
09
#, c-format
msgid "failed to create directory '%s'"
msgstr "falló al crear el directorio '%s'"
#, c-format
msgid "failed to create directory '%s'"
msgstr "falló al crear el directorio '%s'"
@@
-8769,8
+8774,8
@@
msgstr "pasarlo a través de git-apply"
#: builtin/fmt-merge-msg.c:674 builtin/grep.c:879 builtin/merge.c:247
#: builtin/pull.c:158 builtin/pull.c:217 builtin/rebase.c:1412
#: builtin/repack.c:317 builtin/repack.c:321 builtin/repack.c:323
#: builtin/fmt-merge-msg.c:674 builtin/grep.c:879 builtin/merge.c:247
#: builtin/pull.c:158 builtin/pull.c:217 builtin/rebase.c:1412
#: builtin/repack.c:317 builtin/repack.c:321 builtin/repack.c:323
-#: builtin/show-branch.c:651 builtin/show-ref.c:17
1
builtin/tag.c:397
-#: parse-options.h:14
0 parse-options.h:161 parse-options.h:303
+#: builtin/show-branch.c:651 builtin/show-ref.c:17
2
builtin/tag.c:397
+#: parse-options.h:14
1 parse-options.h:162 parse-options.h:311
msgid "n"
msgstr "n"
msgid "n"
msgstr "n"
@@
-9650,7
+9655,7
@@
msgstr "ordenamiento y filtrado son case-insensitive"
msgid "format to use for the output"
msgstr "formato para usar para el output"
msgid "format to use for the output"
msgstr "formato para usar para el output"
-#: builtin/branch.c:676 builtin/clone.c:7
51
+#: builtin/branch.c:676 builtin/clone.c:7
48
msgid "HEAD not found below refs/heads!"
msgstr "HEAD no encontrado abajo de refs/heads!"
msgid "HEAD not found below refs/heads!"
msgstr "HEAD no encontrado abajo de refs/heads!"
@@
-10075,7
+10080,7
@@
msgstr "No se puede hacer reflog para '%s': %s\n"
msgid "HEAD is now at"
msgstr "HEAD está ahora en"
msgid "HEAD is now at"
msgstr "HEAD está ahora en"
-#: builtin/checkout.c:894 builtin/clone.c:70
4
+#: builtin/checkout.c:894 builtin/clone.c:70
1
msgid "unable to update HEAD"
msgstr "no es posible actualizar HEAD"
msgid "unable to update HEAD"
msgstr "no es posible actualizar HEAD"
@@
-10215,7
+10220,7
@@
msgstr "'%s' no puede ser usado con '%s'"
msgid "Cannot switch branch to a non-commit '%s'"
msgstr "No se puede cambiar rama a un '%s' sin commits"
msgid "Cannot switch branch to a non-commit '%s'"
msgstr "No se puede cambiar rama a un '%s' sin commits"
-#: builtin/checkout.c:1356 builtin/checkout.c:1358 builtin/clone.c:1
21
+#: builtin/checkout.c:1356 builtin/checkout.c:1358 builtin/clone.c:1
18
#: builtin/remote.c:169 builtin/remote.c:171 builtin/worktree.c:492
#: builtin/worktree.c:494
msgid "branch"
#: builtin/remote.c:169 builtin/remote.c:171 builtin/worktree.c:492
#: builtin/worktree.c:494
msgid "branch"
@@
-10269,7
+10274,7
@@
msgstr "realizar una fusión de tres vías con la rama nueva"
msgid "update ignored files (default)"
msgstr "actualizar archivos ignorados (default)"
msgid "update ignored files (default)"
msgstr "actualizar archivos ignorados (default)"
-#: builtin/checkout.c:1377 builtin/log.c:1594 parse-options.h:3
09
+#: builtin/checkout.c:1377 builtin/log.c:1594 parse-options.h:3
17
msgid "style"
msgstr "estilo"
msgid "style"
msgstr "estilo"
@@
-10518,7
+10523,7
@@
msgstr "borrar directorios completos"
#: builtin/clean.c:913 builtin/describe.c:546 builtin/describe.c:548
#: builtin/grep.c:897 builtin/log.c:171 builtin/log.c:173
#: builtin/ls-files.c:557 builtin/name-rev.c:417 builtin/name-rev.c:419
#: builtin/clean.c:913 builtin/describe.c:546 builtin/describe.c:548
#: builtin/grep.c:897 builtin/log.c:171 builtin/log.c:173
#: builtin/ls-files.c:557 builtin/name-rev.c:417 builtin/name-rev.c:419
-#: builtin/show-ref.c:17
8
+#: builtin/show-ref.c:17
9
msgid "pattern"
msgstr "patrón"
msgid "pattern"
msgstr "patrón"
@@
-10582,128
+10587,128
@@
msgstr "no usar hardlinks, siempre copiar"
msgid "setup as shared repository"
msgstr "configurar como repositorio compartido"
msgid "setup as shared repository"
msgstr "configurar como repositorio compartido"
-#: builtin/clone.c:10
3 builtin/clone.c:107
+#: builtin/clone.c:10
4
msgid "pathspec"
msgstr "pathspec"
msgid "pathspec"
msgstr "pathspec"
-#: builtin/clone.c:10
3 builtin/clone.c:107
+#: builtin/clone.c:10
4
msgid "initialize submodules in the clone"
msgstr "inicializar submódulos en el clonado"
msgid "initialize submodules in the clone"
msgstr "inicializar submódulos en el clonado"
-#: builtin/clone.c:1
10
+#: builtin/clone.c:1
07
msgid "number of submodules cloned in parallel"
msgstr "numero de submódulos clonados en paralelo"
msgid "number of submodules cloned in parallel"
msgstr "numero de submódulos clonados en paralelo"
-#: builtin/clone.c:1
11
builtin/init-db.c:486
+#: builtin/clone.c:1
08
builtin/init-db.c:486
msgid "template-directory"
msgstr "directorio-template"
msgid "template-directory"
msgstr "directorio-template"
-#: builtin/clone.c:1
12
builtin/init-db.c:487
+#: builtin/clone.c:1
09
builtin/init-db.c:487
msgid "directory from which templates will be used"
msgstr "directorio del cual los templates serán usados"
msgid "directory from which templates will be used"
msgstr "directorio del cual los templates serán usados"
-#: builtin/clone.c:11
4 builtin/clone.c:116
builtin/submodule--helper.c:1379
+#: builtin/clone.c:11
1 builtin/clone.c:113
builtin/submodule--helper.c:1379
#: builtin/submodule--helper.c:1859
msgid "reference repository"
msgstr "repositorio de referencia"
#: builtin/submodule--helper.c:1859
msgid "reference repository"
msgstr "repositorio de referencia"
-#: builtin/clone.c:11
8
builtin/submodule--helper.c:1381
+#: builtin/clone.c:11
5
builtin/submodule--helper.c:1381
#: builtin/submodule--helper.c:1861
msgid "use --reference only while cloning"
msgstr "usa--reference solamente si estás clonado"
#: builtin/submodule--helper.c:1861
msgid "use --reference only while cloning"
msgstr "usa--reference solamente si estás clonado"
-#: builtin/clone.c:11
9
builtin/column.c:27 builtin/merge-file.c:46
+#: builtin/clone.c:11
6
builtin/column.c:27 builtin/merge-file.c:46
#: builtin/pack-objects.c:3306 builtin/repack.c:329
msgid "name"
msgstr "nombre"
#: builtin/pack-objects.c:3306 builtin/repack.c:329
msgid "name"
msgstr "nombre"
-#: builtin/clone.c:1
20
+#: builtin/clone.c:1
17
msgid "use <name> instead of 'origin' to track upstream"
msgstr "use <nombre> en lugar de 'origin' para rastrear upstream"
msgid "use <name> instead of 'origin' to track upstream"
msgstr "use <nombre> en lugar de 'origin' para rastrear upstream"
-#: builtin/clone.c:1
22
+#: builtin/clone.c:1
19
msgid "checkout <branch> instead of the remote's HEAD"
msgstr "checkout <rama> en lugar de HEAD remota"
msgid "checkout <branch> instead of the remote's HEAD"
msgstr "checkout <rama> en lugar de HEAD remota"
-#: builtin/clone.c:12
4
+#: builtin/clone.c:12
1
msgid "path to git-upload-pack on the remote"
msgstr "ruta para git-upload-pack en el remoto"
msgid "path to git-upload-pack on the remote"
msgstr "ruta para git-upload-pack en el remoto"
-#: builtin/clone.c:12
5
builtin/fetch.c:142 builtin/grep.c:836
+#: builtin/clone.c:12
2
builtin/fetch.c:142 builtin/grep.c:836
#: builtin/pull.c:225
msgid "depth"
msgstr "profundidad"
#: builtin/pull.c:225
msgid "depth"
msgstr "profundidad"
-#: builtin/clone.c:12
6
+#: builtin/clone.c:12
3
msgid "create a shallow clone of that depth"
msgstr "crear un clon superficial para esa profundidad"
msgid "create a shallow clone of that depth"
msgstr "crear un clon superficial para esa profundidad"
-#: builtin/clone.c:12
7
builtin/fetch.c:144 builtin/pack-objects.c:3295
+#: builtin/clone.c:12
4
builtin/fetch.c:144 builtin/pack-objects.c:3295
msgid "time"
msgstr "tiempo"
msgid "time"
msgstr "tiempo"
-#: builtin/clone.c:12
8
+#: builtin/clone.c:12
5
msgid "create a shallow clone since a specific time"
msgstr "crear un clon superficial desde el tiempo específico"
msgid "create a shallow clone since a specific time"
msgstr "crear un clon superficial desde el tiempo específico"
-#: builtin/clone.c:12
9
builtin/fetch.c:146 builtin/fetch.c:169
+#: builtin/clone.c:12
6
builtin/fetch.c:146 builtin/fetch.c:169
#: builtin/rebase.c:1389
msgid "revision"
msgstr "revision"
#: builtin/rebase.c:1389
msgid "revision"
msgstr "revision"
-#: builtin/clone.c:1
30
builtin/fetch.c:147
+#: builtin/clone.c:1
27
builtin/fetch.c:147
msgid "deepen history of shallow clone, excluding rev"
msgstr "ahondando historia de clon superficial, excluyendo rev"
msgid "deepen history of shallow clone, excluding rev"
msgstr "ahondando historia de clon superficial, excluyendo rev"
-#: builtin/clone.c:1
32
+#: builtin/clone.c:1
29
msgid "clone only one branch, HEAD or --branch"
msgstr "clonar solo una rama,HEAD o --branch"
msgid "clone only one branch, HEAD or --branch"
msgstr "clonar solo una rama,HEAD o --branch"
-#: builtin/clone.c:13
4
+#: builtin/clone.c:13
1
msgid "don't clone any tags, and make later fetches not to follow them"
msgstr "no clonar ningún tag, y hacer que los subsiguientes fetch no los sigan"
msgid "don't clone any tags, and make later fetches not to follow them"
msgstr "no clonar ningún tag, y hacer que los subsiguientes fetch no los sigan"
-#: builtin/clone.c:13
6
+#: builtin/clone.c:13
3
msgid "any cloned submodules will be shallow"
msgstr "cualquier submódulo clonado será superficial"
msgid "any cloned submodules will be shallow"
msgstr "cualquier submódulo clonado será superficial"
-#: builtin/clone.c:13
7
builtin/init-db.c:495
+#: builtin/clone.c:13
4
builtin/init-db.c:495
msgid "gitdir"
msgstr "gitdir"
msgid "gitdir"
msgstr "gitdir"
-#: builtin/clone.c:13
8
builtin/init-db.c:496
+#: builtin/clone.c:13
5
builtin/init-db.c:496
msgid "separate git dir from working tree"
msgstr "separa git dir del árbol de trabajo"
msgid "separate git dir from working tree"
msgstr "separa git dir del árbol de trabajo"
-#: builtin/clone.c:13
9
+#: builtin/clone.c:13
6
msgid "key=value"
msgstr "llave=valor"
msgid "key=value"
msgstr "llave=valor"
-#: builtin/clone.c:1
40
+#: builtin/clone.c:1
37
msgid "set config inside the new repository"
msgstr "configurar config dentro del nuevo repositorio"
msgid "set config inside the new repository"
msgstr "configurar config dentro del nuevo repositorio"
-#: builtin/clone.c:1
42
builtin/fetch.c:164 builtin/ls-remote.c:76
+#: builtin/clone.c:1
39
builtin/fetch.c:164 builtin/ls-remote.c:76
#: builtin/push.c:585 builtin/send-pack.c:172
msgid "server-specific"
msgstr "especifico-de-servidor"
#: builtin/push.c:585 builtin/send-pack.c:172
msgid "server-specific"
msgstr "especifico-de-servidor"
-#: builtin/clone.c:1
42
builtin/fetch.c:164 builtin/ls-remote.c:76
+#: builtin/clone.c:1
39
builtin/fetch.c:164 builtin/ls-remote.c:76
#: builtin/push.c:585 builtin/send-pack.c:173
msgid "option to transmit"
msgstr "opción para trasmitir"
#: builtin/push.c:585 builtin/send-pack.c:173
msgid "option to transmit"
msgstr "opción para trasmitir"
-#: builtin/clone.c:14
3
builtin/fetch.c:165 builtin/pull.c:238
+#: builtin/clone.c:14
0
builtin/fetch.c:165 builtin/pull.c:238
#: builtin/push.c:586
msgid "use IPv4 addresses only"
msgstr "solo usar direcciones IPv4"
#: builtin/push.c:586
msgid "use IPv4 addresses only"
msgstr "solo usar direcciones IPv4"
-#: builtin/clone.c:14
5
builtin/fetch.c:167 builtin/pull.c:241
+#: builtin/clone.c:14
2
builtin/fetch.c:167 builtin/pull.c:241
#: builtin/push.c:588
msgid "use IPv6 addresses only"
msgstr "solo usar direcciones IPv6"
#: builtin/push.c:588
msgid "use IPv6 addresses only"
msgstr "solo usar direcciones IPv6"
-#: builtin/clone.c:28
3
+#: builtin/clone.c:28
0
msgid ""
"No directory name could be guessed.\n"
"Please specify a directory on the command line"
msgid ""
"No directory name could be guessed.\n"
"Please specify a directory on the command line"
@@
-10711,47
+10716,47
@@
msgstr ""
"No se pudo adivinar ningún nombre de directorio.\n"
"Por favor especifique un directorio en la línea de comando"
"No se pudo adivinar ningún nombre de directorio.\n"
"Por favor especifique un directorio en la línea de comando"
-#: builtin/clone.c:33
6
+#: builtin/clone.c:33
3
#, c-format
msgid "info: Could not add alternate for '%s': %s\n"
msgstr "info: No se pudo agregar un alterno para '%s': %s\n"
#, c-format
msgid "info: Could not add alternate for '%s': %s\n"
msgstr "info: No se pudo agregar un alterno para '%s': %s\n"
-#: builtin/clone.c:40
8
+#: builtin/clone.c:40
5
#, c-format
msgid "failed to open '%s'"
msgstr "falló al abrir '%s'"
#, c-format
msgid "failed to open '%s'"
msgstr "falló al abrir '%s'"
-#: builtin/clone.c:41
6
+#: builtin/clone.c:41
3
#, c-format
msgid "%s exists and is not a directory"
msgstr "%s existe pero no es un directorio"
#, c-format
msgid "%s exists and is not a directory"
msgstr "%s existe pero no es un directorio"
-#: builtin/clone.c:4
30
+#: builtin/clone.c:4
27
#, c-format
msgid "failed to stat %s\n"
msgstr "falló al analizar %s\n"
#, c-format
msgid "failed to stat %s\n"
msgstr "falló al analizar %s\n"
-#: builtin/clone.c:44
7
+#: builtin/clone.c:44
4
#, c-format
msgid "failed to unlink '%s'"
msgstr "falló al desvincular '%s'"
#, c-format
msgid "failed to unlink '%s'"
msgstr "falló al desvincular '%s'"
-#: builtin/clone.c:4
52
+#: builtin/clone.c:4
49
#, c-format
msgid "failed to create link '%s'"
msgstr "falló al crear link '%s'"
#, c-format
msgid "failed to create link '%s'"
msgstr "falló al crear link '%s'"
-#: builtin/clone.c:45
6
+#: builtin/clone.c:45
3
#, c-format
msgid "failed to copy file to '%s'"
msgstr "falló al copiar archivo a '%s'"
#, c-format
msgid "failed to copy file to '%s'"
msgstr "falló al copiar archivo a '%s'"
-#: builtin/clone.c:4
82
+#: builtin/clone.c:4
79
#, c-format
msgid "done.\n"
msgstr "hecho.\n"
#, c-format
msgid "done.\n"
msgstr "hecho.\n"
-#: builtin/clone.c:49
6
+#: builtin/clone.c:49
3
msgid ""
"Clone succeeded, but checkout failed.\n"
"You can inspect what was checked out with 'git status'\n"
msgid ""
"Clone succeeded, but checkout failed.\n"
"You can inspect what was checked out with 'git status'\n"
@@
-10761,96
+10766,96
@@
msgstr ""
"Puede inspeccionar a qué se hizo checkout con 'git status'\n"
"y volver a intentarlo con 'git checkout -f HEAD'\n"
"Puede inspeccionar a qué se hizo checkout con 'git status'\n"
"y volver a intentarlo con 'git checkout -f HEAD'\n"
-#: builtin/clone.c:57
3
+#: builtin/clone.c:57
0
#, c-format
msgid "Could not find remote branch %s to clone."
msgstr "No se pudo encontrar la rama remota %s para clonar."
#, c-format
msgid "Could not find remote branch %s to clone."
msgstr "No se pudo encontrar la rama remota %s para clonar."
-#: builtin/clone.c:6
92
+#: builtin/clone.c:6
89
#, c-format
msgid "unable to update %s"
msgstr "incapaz de actualizar %s"
#, c-format
msgid "unable to update %s"
msgstr "incapaz de actualizar %s"
-#: builtin/clone.c:7
42
+#: builtin/clone.c:7
39
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
msgstr ""
"remoto HEAD refiere a un ref inexistente, no se puede hacer checkout.\n"
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
msgstr ""
"remoto HEAD refiere a un ref inexistente, no se puede hacer checkout.\n"
-#: builtin/clone.c:77
3
+#: builtin/clone.c:77
0
msgid "unable to checkout working tree"
msgstr "no es posible realizar checkout en el árbol de trabajo"
msgid "unable to checkout working tree"
msgstr "no es posible realizar checkout en el árbol de trabajo"
-#: builtin/clone.c:81
8
+#: builtin/clone.c:81
5
msgid "unable to write parameters to config file"
msgstr "no es posible escribir parámetros al archivo config"
msgid "unable to write parameters to config file"
msgstr "no es posible escribir parámetros al archivo config"
-#: builtin/clone.c:8
81
+#: builtin/clone.c:8
78
msgid "cannot repack to clean up"
msgstr "no se puede reempaquetar para limpiar"
msgid "cannot repack to clean up"
msgstr "no se puede reempaquetar para limpiar"
-#: builtin/clone.c:88
3
+#: builtin/clone.c:88
0
msgid "cannot unlink temporary alternates file"
msgstr "no se puede desvincular archivos alternos temporales"
msgid "cannot unlink temporary alternates file"
msgstr "no se puede desvincular archivos alternos temporales"
-#: builtin/clone.c:92
3
builtin/receive-pack.c:1952
+#: builtin/clone.c:92
0
builtin/receive-pack.c:1952
msgid "Too many arguments."
msgstr "Muchos argumentos."
msgid "Too many arguments."
msgstr "Muchos argumentos."
-#: builtin/clone.c:92
7
+#: builtin/clone.c:92
4
msgid "You must specify a repository to clone."
msgstr "Tienes que especificar un repositorio para clonar."
msgid "You must specify a repository to clone."
msgstr "Tienes que especificar un repositorio para clonar."
-#: builtin/clone.c:9
40
+#: builtin/clone.c:9
37
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr "Las opciones --bare y --origin %s son incompatibles."
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr "Las opciones --bare y --origin %s son incompatibles."
-#: builtin/clone.c:94
3
+#: builtin/clone.c:94
0
msgid "--bare and --separate-git-dir are incompatible."
msgstr "--bare y --separate-git-dir son incompatibles."
msgid "--bare and --separate-git-dir are incompatible."
msgstr "--bare y --separate-git-dir son incompatibles."
-#: builtin/clone.c:95
6
+#: builtin/clone.c:95
3
#, c-format
msgid "repository '%s' does not exist"
msgstr "repositorio '%s' no existe"
#, c-format
msgid "repository '%s' does not exist"
msgstr "repositorio '%s' no existe"
-#: builtin/clone.c:9
62
builtin/fetch.c:1610
+#: builtin/clone.c:9
59
builtin/fetch.c:1610
#, c-format
msgid "depth %s is not a positive number"
msgstr "profundidad %s no es un numero positivo"
#, c-format
msgid "depth %s is not a positive number"
msgstr "profundidad %s no es un numero positivo"
-#: builtin/clone.c:9
72
+#: builtin/clone.c:9
69
#, c-format
msgid "destination path '%s' already exists and is not an empty directory."
msgstr "la ruta de destino '%s' ya existe y no es un directorio vacío."
#, c-format
msgid "destination path '%s' already exists and is not an empty directory."
msgstr "la ruta de destino '%s' ya existe y no es un directorio vacío."
-#: builtin/clone.c:9
82
+#: builtin/clone.c:9
79
#, c-format
msgid "working tree '%s' already exists."
msgstr "directorio de trabajo '%s' ya existe."
#, c-format
msgid "working tree '%s' already exists."
msgstr "directorio de trabajo '%s' ya existe."
-#: builtin/clone.c:99
7 builtin/clone.c:1018 builtin/difftool.c:270
+#: builtin/clone.c:99
4 builtin/clone.c:1015 builtin/difftool.c:264
#: builtin/worktree.c:296 builtin/worktree.c:328
#, c-format
msgid "could not create leading directories of '%s'"
msgstr "no se pudo crear directorios principales de '%s'"
#: builtin/worktree.c:296 builtin/worktree.c:328
#, c-format
msgid "could not create leading directories of '%s'"
msgstr "no se pudo crear directorios principales de '%s'"
-#: builtin/clone.c:
1002
+#: builtin/clone.c:
999
#, c-format
msgid "could not create work tree dir '%s'"
msgstr "no se pudo crear un árbol de trabajo '%s'"
#, c-format
msgid "could not create work tree dir '%s'"
msgstr "no se pudo crear un árbol de trabajo '%s'"
-#: builtin/clone.c:10
22
+#: builtin/clone.c:10
19
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr "Clonando en un repositorio vacío '%s'...\n"
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr "Clonando en un repositorio vacío '%s'...\n"
-#: builtin/clone.c:102
4
+#: builtin/clone.c:102
1
#, c-format
msgid "Cloning into '%s'...\n"
msgstr "Clonando en '%s'...\n"
#, c-format
msgid "Cloning into '%s'...\n"
msgstr "Clonando en '%s'...\n"
-#: builtin/clone.c:104
8
+#: builtin/clone.c:104
5
msgid ""
"clone --recursive is not compatible with both --reference and --reference-if-"
"able"
msgid ""
"clone --recursive is not compatible with both --reference and --reference-if-"
"able"
@@
-10858,36
+10863,36
@@
msgstr ""
"clone --recursive no es compatible con --reference y --reference-if-able al "
"mismo tiempo"
"clone --recursive no es compatible con --reference y --reference-if-able al "
"mismo tiempo"
-#: builtin/clone.c:110
9
+#: builtin/clone.c:110
6
msgid "--depth is ignored in local clones; use file:// instead."
msgstr "--depth es ignorada en clonaciones locales; usa file:// más bien."
msgid "--depth is ignored in local clones; use file:// instead."
msgstr "--depth es ignorada en clonaciones locales; usa file:// más bien."
-#: builtin/clone.c:11
11
+#: builtin/clone.c:11
08
msgid "--shallow-since is ignored in local clones; use file:// instead."
msgstr "--shallow-since es ignorado en el clon local; use file:// ."
msgid "--shallow-since is ignored in local clones; use file:// instead."
msgstr "--shallow-since es ignorado en el clon local; use file:// ."
-#: builtin/clone.c:111
3
+#: builtin/clone.c:111
0
msgid "--shallow-exclude is ignored in local clones; use file:// instead."
msgstr "--shallow-exclude es ignorado en clones locales; use file://."
msgid "--shallow-exclude is ignored in local clones; use file:// instead."
msgstr "--shallow-exclude es ignorado en clones locales; use file://."
-#: builtin/clone.c:111
5
+#: builtin/clone.c:111
2
msgid "--filter is ignored in local clones; use file:// instead."
msgstr "--filter es ignorado en clones locales; usa file:// en su lugar."
msgid "--filter is ignored in local clones; use file:// instead."
msgstr "--filter es ignorado en clones locales; usa file:// en su lugar."
-#: builtin/clone.c:111
8
+#: builtin/clone.c:111
5
msgid "source repository is shallow, ignoring --local"
msgstr "repositorio fuente es superficial, ignorando --local"
msgid "source repository is shallow, ignoring --local"
msgstr "repositorio fuente es superficial, ignorando --local"
-#: builtin/clone.c:112
3
+#: builtin/clone.c:112
0
msgid "--local is ignored"
msgstr "--local es ignorado"
msgid "--local is ignored"
msgstr "--local es ignorado"
-#: builtin/clone.c:1
200 builtin/clone.c:1208
+#: builtin/clone.c:1
197 builtin/clone.c:1205
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr "Rama remota %s no encontrada en upstream %s"
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr "Rama remota %s no encontrada en upstream %s"
-#: builtin/clone.c:12
11
+#: builtin/clone.c:12
08
msgid "You appear to have cloned an empty repository."
msgstr "Pareces haber clonado un repositorio sin contenido."
msgid "You appear to have cloned an empty repository."
msgstr "Pareces haber clonado un repositorio sin contenido."
@@
-11319,7
+11324,7
@@
msgstr "terminar entradas con NUL"
#: builtin/commit.c:1335 builtin/commit.c:1339 builtin/commit.c:1517
#: builtin/fast-export.c:1085 builtin/fast-export.c:1088 builtin/rebase.c:1465
#: builtin/commit.c:1335 builtin/commit.c:1339 builtin/commit.c:1517
#: builtin/fast-export.c:1085 builtin/fast-export.c:1088 builtin/rebase.c:1465
-#: parse-options.h:3
23
+#: parse-options.h:3
31
msgid "mode"
msgstr "modo"
msgid "mode"
msgstr "modo"
@@
-11337,7
+11342,7
@@
msgstr ""
"mostrar archivos ignorados, modos opcionales: traditional, matching, no. "
"(Predeterminado: traditional)"
"mostrar archivos ignorados, modos opcionales: traditional, matching, no. "
"(Predeterminado: traditional)"
-#: builtin/commit.c:1342 parse-options.h:17
8
+#: builtin/commit.c:1342 parse-options.h:17
9
msgid "when"
msgstr "cuando"
msgid "when"
msgstr "cuando"
@@
-11399,7
+11404,7
@@
msgid "override date for commit"
msgstr "sobrescribe la fecha del commit"
#: builtin/commit.c:1481 builtin/commit.c:1482 builtin/commit.c:1483
msgstr "sobrescribe la fecha del commit"
#: builtin/commit.c:1481 builtin/commit.c:1482 builtin/commit.c:1483
-#: builtin/commit.c:1484 parse-options.h:3
15
ref-filter.h:92
+#: builtin/commit.c:1484 parse-options.h:3
23
ref-filter.h:92
msgid "commit"
msgstr "confirmar"
msgid "commit"
msgstr "confirmar"
@@
-12092,31
+12097,31
@@
msgstr "más de dos blobs entregados: '%s'"
msgid "unhandled object '%s' given."
msgstr "objeto no manejado '%s' entregado."
msgid "unhandled object '%s' given."
msgstr "objeto no manejado '%s' entregado."
-#: builtin/difftool.c:3
1
+#: builtin/difftool.c:3
0
msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
msgstr "git difftool [<opciones>] [<commit> [<commit>]] [--] [<ruta>...]"
msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
msgstr "git difftool [<opciones>] [<commit> [<commit>]] [--] [<ruta>...]"
-#: builtin/difftool.c:25
9
+#: builtin/difftool.c:25
3
#, c-format
msgid "failed: %d"
msgstr "falló: %d"
#, c-format
msgid "failed: %d"
msgstr "falló: %d"
-#: builtin/difftool.c:
301
+#: builtin/difftool.c:
295
#, c-format
msgid "could not read symlink %s"
msgstr "no se pudo leer el symlink %s"
#, c-format
msgid "could not read symlink %s"
msgstr "no se pudo leer el symlink %s"
-#: builtin/difftool.c:
303
+#: builtin/difftool.c:
297
#, c-format
msgid "could not read symlink file %s"
msgstr "no se pudo leer el archivo symlink %s"
#, c-format
msgid "could not read symlink file %s"
msgstr "no se pudo leer el archivo symlink %s"
-#: builtin/difftool.c:3
11
+#: builtin/difftool.c:3
05
#, c-format
msgid "could not read object %s for symlink %s"
msgstr "no se pudo leer el objeto %s para el symlink %s"
#, c-format
msgid "could not read object %s for symlink %s"
msgstr "no se pudo leer el objeto %s para el symlink %s"
-#: builtin/difftool.c:4
12
+#: builtin/difftool.c:4
06
msgid ""
"combined diff formats('-c' and '--cc') are not supported in\n"
"directory diff mode('-d' and '--dir-diff')."
msgid ""
"combined diff formats('-c' and '--cc') are not supported in\n"
"directory diff mode('-d' and '--dir-diff')."
@@
-12124,54
+12129,54
@@
msgstr ""
"formatos combinados de diff ('-c' y '--cc') no soportados en\n"
"modo diff para directorio('-d' y '--dir-diff')."
"formatos combinados de diff ('-c' y '--cc') no soportados en\n"
"modo diff para directorio('-d' y '--dir-diff')."
-#: builtin/difftool.c:6
32
+#: builtin/difftool.c:6
26
#, c-format
msgid "both files modified: '%s' and '%s'."
msgstr "ambos archivos modificados: '%s' y '%s'."
#, c-format
msgid "both files modified: '%s' and '%s'."
msgstr "ambos archivos modificados: '%s' y '%s'."
-#: builtin/difftool.c:6
34
+#: builtin/difftool.c:6
28
msgid "working tree file has been left."
msgstr "archivo del árbol de trabajo ha sido dejado."
msgid "working tree file has been left."
msgstr "archivo del árbol de trabajo ha sido dejado."
-#: builtin/difftool.c:6
45
+#: builtin/difftool.c:6
39
#, c-format
msgid "temporary files exist in '%s'."
msgstr "archivo temporal existe en '%s'."
#, c-format
msgid "temporary files exist in '%s'."
msgstr "archivo temporal existe en '%s'."
-#: builtin/difftool.c:64
6
+#: builtin/difftool.c:64
0
msgid "you may want to cleanup or recover these."
msgstr "tal vez desee limpiar o recuperar estos."
msgid "you may want to cleanup or recover these."
msgstr "tal vez desee limpiar o recuperar estos."
-#: builtin/difftool.c:6
95
+#: builtin/difftool.c:6
89
msgid "use `diff.guitool` instead of `diff.tool`"
msgstr "use `diff.guitool` en lugar de `diff.tool`"
msgid "use `diff.guitool` instead of `diff.tool`"
msgstr "use `diff.guitool` en lugar de `diff.tool`"
-#: builtin/difftool.c:69
7
+#: builtin/difftool.c:69
1
msgid "perform a full-directory diff"
msgstr "realizar un diff de todo el directorio"
msgid "perform a full-directory diff"
msgstr "realizar un diff de todo el directorio"
-#: builtin/difftool.c:69
9
+#: builtin/difftool.c:69
3
msgid "do not prompt before launching a diff tool"
msgstr "no mostrar antes de lanzar una herramienta de diff"
msgid "do not prompt before launching a diff tool"
msgstr "no mostrar antes de lanzar una herramienta de diff"
-#: builtin/difftool.c:
704
+#: builtin/difftool.c:
698
msgid "use symlinks in dir-diff mode"
msgstr "usar enlaces simbólicos en modo dir-diff"
msgid "use symlinks in dir-diff mode"
msgstr "usar enlaces simbólicos en modo dir-diff"
-#: builtin/difftool.c:
705
+#: builtin/difftool.c:
699
msgid "tool"
msgstr "herramienta"
msgid "tool"
msgstr "herramienta"
-#: builtin/difftool.c:70
6
+#: builtin/difftool.c:70
0
msgid "use the specified diff tool"
msgstr "usar la herramienta de diff especificada"
msgid "use the specified diff tool"
msgstr "usar la herramienta de diff especificada"
-#: builtin/difftool.c:70
8
+#: builtin/difftool.c:70
2
msgid "print a list of diff tools that may be used with `--tool`"
msgstr ""
"mostrar una lista de herramientas de diff que pueden ser usadas con `--tool`"
msgid "print a list of diff tools that may be used with `--tool`"
msgstr ""
"mostrar una lista de herramientas de diff que pueden ser usadas con `--tool`"
-#: builtin/difftool.c:7
11
+#: builtin/difftool.c:7
05
msgid ""
"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
"code"
msgid ""
"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
"code"
@@
-12179,23
+12184,31
@@
msgstr ""
"hacer que 'git-difftool' salga cuando una herramienta de diff retorne un "
"código de salida distinto de cero"
"hacer que 'git-difftool' salga cuando una herramienta de diff retorne un "
"código de salida distinto de cero"
-#: builtin/difftool.c:7
14
+#: builtin/difftool.c:7
08
msgid "specify a custom command for viewing diffs"
msgstr "especificar un comando personalizado para ver diffs"
msgid "specify a custom command for viewing diffs"
msgstr "especificar un comando personalizado para ver diffs"
-#: builtin/difftool.c:7
15
+#: builtin/difftool.c:7
09
msgid "passed to `diff`"
msgstr "pasado a `diff`"
msgid "passed to `diff`"
msgstr "pasado a `diff`"
-#: builtin/difftool.c:7
30
+#: builtin/difftool.c:7
24
msgid "difftool requires worktree or --no-index"
msgstr "difftool requiere un árbol de trabajo o --no-index"
msgid "difftool requires worktree or --no-index"
msgstr "difftool requiere un árbol de trabajo o --no-index"
-#: builtin/difftool.c:744
+#: builtin/difftool.c:731
+msgid "--dir-diff is incompatible with --no-index"
+msgstr "--dirty-diff es incompatible con --no-index"
+
+#: builtin/difftool.c:734
+msgid "--gui, --tool and --extcmd are mutually exclusive"
+msgstr "--gui, --tool y --extcmd son mutuamente exclusivas"
+
+#: builtin/difftool.c:742
msgid "no <tool> given for --tool=<tool>"
msgstr "no se ha proporcionado <herramienta> para --tool=<herramienta>"
msgid "no <tool> given for --tool=<tool>"
msgstr "no se ha proporcionado <herramienta> para --tool=<herramienta>"
-#: builtin/difftool.c:7
51
+#: builtin/difftool.c:7
49
msgid "no <cmd> given for --extcmd=<cmd>"
msgstr "no se ha entregado <comando> para --extcmd=<comando>"
msgid "no <cmd> given for --extcmd=<cmd>"
msgstr "no se ha entregado <comando> para --extcmd=<comando>"
@@
-15956,15
+15969,15
@@
msgstr "Enumerando objetos"
msgid "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>)"
msgstr "Total %<PRIu32> (delta %<PRIu32>), reusado %<PRIu32> (delta %<PRIu32>)"
msgid "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>)"
msgstr "Total %<PRIu32> (delta %<PRIu32>), reusado %<PRIu32> (delta %<PRIu32>)"
-#: builtin/pack-refs.c:
7
+#: builtin/pack-refs.c:
8
msgid "git pack-refs [<options>]"
msgstr "git pack-refs [<opciones>]"
msgid "git pack-refs [<options>]"
msgstr "git pack-refs [<opciones>]"
-#: builtin/pack-refs.c:1
5
+#: builtin/pack-refs.c:1
6
msgid "pack everything"
msgstr "empaquetar todo"
msgid "pack everything"
msgstr "empaquetar todo"
-#: builtin/pack-refs.c:1
6
+#: builtin/pack-refs.c:1
7
msgid "prune loose refs (default)"
msgstr "recortar refs perdidos (default)"
msgid "prune loose refs (default)"
msgstr "recortar refs perdidos (default)"
@@
-18835,7
+18848,7
@@
msgstr "'%s' no es una ref válida."
msgid "cannot find commit %s (%s)"
msgstr "no se puede encontrar el commit %s (%s)"
msgid "cannot find commit %s (%s)"
msgstr "no se puede encontrar el commit %s (%s)"
-#: builtin/show-ref.c:1
1
+#: builtin/show-ref.c:1
2
msgid ""
"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]"
msgid ""
"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]"
@@
-18843,39
+18856,39
@@
msgstr ""
"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<patrón>...]"
"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<patrón>...]"
-#: builtin/show-ref.c:1
2
+#: builtin/show-ref.c:1
3
msgid "git show-ref --exclude-existing[=<pattern>]"
msgstr "git show-ref --exclude-existing[=<patrón>]"
msgid "git show-ref --exclude-existing[=<pattern>]"
msgstr "git show-ref --exclude-existing[=<patrón>]"
-#: builtin/show-ref.c:16
1
+#: builtin/show-ref.c:16
2
msgid "only show tags (can be combined with heads)"
msgstr "solo mostrar tags (puede ser combinado con heads)"
msgid "only show tags (can be combined with heads)"
msgstr "solo mostrar tags (puede ser combinado con heads)"
-#: builtin/show-ref.c:16
2
+#: builtin/show-ref.c:16
3
msgid "only show heads (can be combined with tags)"
msgstr "solo mostrar heads (puede ser combinado con tags)"
msgid "only show heads (can be combined with tags)"
msgstr "solo mostrar heads (puede ser combinado con tags)"
-#: builtin/show-ref.c:16
3
+#: builtin/show-ref.c:16
4
msgid "stricter reference checking, requires exact ref path"
msgstr "revisar referencias más estrictamente, requiere ruta de ref exacta"
msgid "stricter reference checking, requires exact ref path"
msgstr "revisar referencias más estrictamente, requiere ruta de ref exacta"
-#: builtin/show-ref.c:16
6 builtin/show-ref.c:168
+#: builtin/show-ref.c:16
7 builtin/show-ref.c:169
msgid "show the HEAD reference, even if it would be filtered out"
msgstr "mostrar la referencia de HEAD, incluso si se filtrara"
msgid "show the HEAD reference, even if it would be filtered out"
msgstr "mostrar la referencia de HEAD, incluso si se filtrara"
-#: builtin/show-ref.c:17
0
+#: builtin/show-ref.c:17
1
msgid "dereference tags into object IDs"
msgstr "tags de deferencia en IDs de objeto"
msgid "dereference tags into object IDs"
msgstr "tags de deferencia en IDs de objeto"
-#: builtin/show-ref.c:17
2
+#: builtin/show-ref.c:17
3
msgid "only show SHA1 hash using <n> digits"
msgstr "solo mostrar hash SHA1 usando <n> dígitos"
msgid "only show SHA1 hash using <n> digits"
msgstr "solo mostrar hash SHA1 usando <n> dígitos"
-#: builtin/show-ref.c:17
6
+#: builtin/show-ref.c:17
7
msgid "do not print results to stdout (useful with --verify)"
msgstr "no mostrar resultados en stdout (útil con --verify)"
msgid "do not print results to stdout (useful with --verify)"
msgstr "no mostrar resultados en stdout (útil con --verify)"
-#: builtin/show-ref.c:17
8
+#: builtin/show-ref.c:17
9
msgid "show refs from stdin that aren't in local repository"
msgstr "mostrar refs de stdin que no están en el repositorio local"
msgid "show refs from stdin that aren't in local repository"
msgstr "mostrar refs de stdin que no están en el repositorio local"
@@
-19643,12
+19656,12
@@
msgstr "incapaz de escribir el archivo de tag"
#: builtin/tag.c:210
#, c-format
msgid ""
#: builtin/tag.c:210
#, c-format
msgid ""
-"You have created a nested tag. The object referred to by your new is\n"
+"You have created a nested tag. The object referred to by your new
tag
is\n"
"already a tag. If you meant to tag the object that it points to, use:\n"
"\n"
"\tgit tag -f %s %s^{}"
msgstr ""
"already a tag. If you meant to tag the object that it points to, use:\n"
"\n"
"\tgit tag -f %s %s^{}"
msgstr ""
-"Has creado un tag anidado. El objeto referido por el nuevo ya\n"
+"Has creado un tag anidado. El objeto referido por el nuevo
tag
ya\n"
"es un tag. Si quisiste hacer el tag al objeto que apunta, usa:\n"
"\n"
"\tgit tag -f %s %s^{}"
"es un tag. Si quisiste hacer el tag al objeto que apunta, usa:\n"
"\n"
"\tgit tag -f %s %s^{}"
@@
-20779,27
+20792,27
@@
msgstr "args"
msgid "object filtering"
msgstr "filtrado de objeto"
msgid "object filtering"
msgstr "filtrado de objeto"
-#: parse-options.h:1
69
+#: parse-options.h:1
70
msgid "expiry-date"
msgstr "fecha de expiración"
msgid "expiry-date"
msgstr "fecha de expiración"
-#: parse-options.h:18
3
+#: parse-options.h:18
4
msgid "no-op (backward compatibility)"
msgstr "no-op (compatibilidad con versiones anteriores)"
msgid "no-op (backward compatibility)"
msgstr "no-op (compatibilidad con versiones anteriores)"
-#: parse-options.h:
296
+#: parse-options.h:
304
msgid "be more verbose"
msgstr "ser mas verboso"
msgid "be more verbose"
msgstr "ser mas verboso"
-#: parse-options.h:
298
+#: parse-options.h:
306
msgid "be more quiet"
msgstr "ser mas discreto"
msgid "be more quiet"
msgstr "ser mas discreto"
-#: parse-options.h:3
04
+#: parse-options.h:3
12
msgid "use <n> digits to display SHA-1s"
msgstr "usa <n> dígitos para mostrar SHA-1s"
msgid "use <n> digits to display SHA-1s"
msgstr "usa <n> dígitos para mostrar SHA-1s"
-#: parse-options.h:3
23
+#: parse-options.h:3
31
msgid "how to strip spaces and #comments from message"
msgstr "cómo quitar espacios y #comentarios de mensajes"
msgid "how to strip spaces and #comments from message"
msgstr "cómo quitar espacios y #comentarios de mensajes"