diff --git a/po/documentation.es.po b/po/documentation.es.po
index 47ca7cd209cc7b814d55d70a44ff8d59dedb9ff3..7110ac6df512d72eafe09814e722962daabdc4f1 100644
--- a/po/documentation.es.po
+++ b/po/documentation.es.po
@@ -4,19 +4,7 @@
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: jn.avila@free.fr\n"
-"POT-Creation-Date: 2023-11-04 20:14+0100\n"
-"PO-Revision-Date: 2023-10-30 22:03+0000\n"
-"Last-Translator: Salvador Pe챰a <salvadorp74@hotmail.com>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: es\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 5.2-dev\n"
+msgstr "Project-Id-Version: PACKAGE VERSION\nReport-Msgid-Bugs-To: jn.avila@free.fr\nPOT-Creation-Date: 2023-11-04 20:14+0100\nPO-Revision-Date: 2023-11-07 03:28+0000\nLast-Translator: Salvador Pe챰a <salvadorp74@hotmail.com>\nLanguage-Team: LANGUAGE <LL@li.org>\nLanguage: es\nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit\nPlural-Forms: nplurals=2; plural=n != 1;\nX-Generator: Weblate 5.2-dev\n"
 
 #. type: Labeled list
 #: en/blame-options.txt:1 en/diff-options.txt:780 en/git-instaweb.txt:45 en/git-mailinfo.txt:49 en/git-mailsplit.txt:35 en/git-repack.txt:180 en/git-status.txt:31
@@ -3630,10 +3618,9 @@ msgstr "Lo que produce la opci처n -p es ligeramente diferente del formato tradic
 
 #. type: Plain text
 #: en/diff-generate-patch.txt:21
-#, fuzzy, priority:280
-#| msgid "It is preceded with a \"git diff\" header that looks like this:"
+#, priority:280
 msgid "It is preceded by a \"git diff\" header that looks like this:"
-msgstr "Es precedido con un encabezado \"git diff\" que se ve as챠:"
+msgstr "Es precedido por un encabezado \"git diff\" que se ve as챠:"
 
 #. type: Plain text
 #: en/diff-generate-patch.txt:23
@@ -3649,10 +3636,9 @@ msgstr "Los nombres de fichero `a/` y `b/` son iguales a menos que involucre ren
 
 #. type: Plain text
 #: en/diff-generate-patch.txt:31
-#, fuzzy, priority:280
-#| msgid "When rename/copy is involved, `file1` and `file2` show the name of the source file of the rename/copy and the name of the file that rename/copy produces, respectively."
+#, priority:280
 msgid "When a rename/copy is involved, `file1` and `file2` show the name of the source file of the rename/copy and the name of the file that the rename/copy produces, respectively."
-msgstr "Cuando involucra renombre/copia, `fichero1` y `fichero2` muestra el nombre del fichero fuente del renombre/copia y el nombre del fichero que produce el renombre/copia, respectivamente."
+msgstr "Cuando se involucra un renombre/copia, `fichero1` y `fichero2` muestra el nombre del fichero fuente del renombre/copia y el nombre del fichero que produce el renombre/copia, respectivamente."
 
 #. type: Plain text
 #: en/diff-generate-patch.txt:33
@@ -3744,8 +3730,7 @@ msgstr ""
 
 #. type: Plain text
 #: en/diff-generate-patch.txt:82
-#, fuzzy, priority:280
-#| msgid "Hunk headers mention the name of the function to which the hunk applies.  See \"Defining a custom hunk-header\" in linkgit:gitattributes[5] for details of how to tailor to this to specific languages."
+#, priority:280
 msgid "Hunk headers mention the name of the function to which the hunk applies.  See \"Defining a custom hunk-header\" in linkgit:gitattributes[5] for details of how to tailor this to specific languages."
 msgstr "Encabezados de fragmento mencionan el nombre de la funci처n a la cual se aplica el fragmento. Ver \"Definiendo un encabezado de fragmento personalizado\" en linkgit:gitattributes[5] para detalles de c처mo ajustar 챕ste a lenguajes espec챠ficos."
 
@@ -3757,8 +3742,7 @@ msgstr "Formato de diff combinado"
 
 #. type: Plain text
 #: en/diff-generate-patch.txt:93
-#, fuzzy, priority:280
-#| msgid "Any diff-generating command can take the `-c` or `--cc` option to produce a 'combined diff' when showing a merge. This is the default format when showing merges with linkgit:git-diff[1] or linkgit:git-show[1]. Note also that you can give suitable `--diff-merges` option to any of these commands to force generation of diffs in specific format."
+#, priority:280
 msgid "Any diff-generating command can take the `-c` or `--cc` option to produce a 'combined diff' when showing a merge. This is the default format when showing merges with linkgit:git-diff[1] or linkgit:git-show[1]. Note also that you can give suitable `--diff-merges` option to any of these commands to force generation of diffs in a specific format."
 msgstr "Cualquier comando que genere un diff puede tomar las opciones `-c` o `--cc` para producir una 'diff combinada' cuando se muestra la fusi처n. Este es el formato predeterminado cuando se muestran fusiones con linkgit:git-diff[1] o linkgit:git-show[1]. Note que tambi챕n puede ser adecuado dar la opci처n `--diff-merges` a cualquiera de esos comandos para forzar la generaci처n de diffs en un formato espec챠fico."
 
@@ -3838,10 +3822,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/diff-generate-patch.txt:128
-#, fuzzy, priority:280
-#| msgid "It is preceded with a \"git diff\" header, that looks like this (when the `-c` option is used):"
+#, priority:280
 msgid "It is preceded by a \"git diff\" header, that looks like this (when the `-c` option is used):"
-msgstr "Es precedido con un encabezado \"git diff\", que se ve as챠 (cuando se usa la opci처n `-c`):"
+msgstr "Es precedido por un encabezado \"git diff\", que se ve as챠 (cuando se usa la opci처n `-c`):"
 
 #. type: Plain text
 #: en/diff-generate-patch.txt:130
@@ -3883,17 +3866,15 @@ msgstr ""
 
 #. type: Plain text
 #: en/diff-generate-patch.txt:148
-#, fuzzy, priority:280
-#| msgid "The `mode <mode>,<mode>..<mode>` line appears only if at least one of the <mode> is different from the rest. Extended headers with information about detected contents movement (renames and copying detection) are designed to work with diff of two <tree-ish> and are not used by combined diff format."
+#, priority:280
 msgid "The `mode <mode>,<mode>..<mode>` line appears only if at least one of the <mode> is different from the rest. Extended headers with information about detected content movement (renames and copying detection) are designed to work with the diff of two <tree-ish> and are not used by combined diff format."
-msgstr "La l챠nea `mode <modo>,<modo>..<modo>` s처lo aparece si por lo menos uno de los <modo> es diferente del resto. Los encabezados extendidos con informaci처n sobre movimientos de contenido detectados (detecci처n de renombrados y copia) est찼n dise챰ados para trabajar con diff o dos <arbol-ismos> y no se usan en el formato diff combinado."
+msgstr "La l챠nea `mode <modo>,<modo>..<modo>` s처lo aparece si por lo menos uno de los <modo> es diferente del resto. Los encabezados extendidos con informaci처n sobre movimientos de contenido detectados (detecci처n de renombrados y copia) est찼n dise챰ados para trabajar con el diff de dos <arbol-ismos> y no se usan en el formato diff combinado."
 
 #. type: Plain text
 #: en/diff-generate-patch.txt:150
-#, fuzzy, priority:280
-#| msgid "It is followed by two-line from-file/to-file header"
+#, priority:280
 msgid "It is followed by a two-line from-file/to-file header:"
-msgstr "Es seguido por el encabezado de dos l챠neas del-fichero/al-fichero"
+msgstr "Es seguido por un encabezado de dos l챠neas del-fichero/al-fichero:"
 
 #. type: Plain text
 #: en/diff-generate-patch.txt:152 en/diff-generate-patch.txt:163 en/diff-generate-patch.txt:164 en/diff-generate-patch.txt:165
@@ -3909,17 +3890,15 @@ msgstr "b/fichero"
 
 #. type: Plain text
 #: en/diff-generate-patch.txt:157
-#, fuzzy, priority:280
-#| msgid "Similar to two-line header for traditional 'unified' diff format, `/dev/null` is used to signal created or deleted files."
+#, priority:280
 msgid "Similar to the two-line header for the traditional 'unified' diff format, `/dev/null` is used to signal created or deleted files."
 msgstr "Similar al encabezado de dos l챠neas del formato diff tradicional 'unificado', se usa `/dev/null` para indicar ficheros creados o borrados."
 
 #. type: Plain text
 #: en/diff-generate-patch.txt:161
-#, fuzzy, priority:280
-#| msgid "However, if the --combined-all-paths option is provided, instead of a two-line from-file/to-file you get a N+1 line from-file/to-file header, where N is the number of parents in the merge commit"
+#, priority:280
 msgid "However, if the --combined-all-paths option is provided, instead of a two-line from-file/to-file, you get an N+1 line from-file/to-file header, where N is the number of parents in the merge commit:"
-msgstr "Sin embargo, si se da la opci처n --combines-all-paths, en lugar de dos l챠neas con de-fichero/a-fichero obtendr찼 un encabezado en l챠nea N+1 de-fichero/a-fichero, donde N es el n첬mero de padres en el commit de fusi처n"
+msgstr "Sin embargo, si se da la opci처n --combines-all-paths, en lugar de dos l챠neas con de-fichero/a-fichero obtendr찼 un encabezado de-fichero/a-fichero de N+1 l챠neas, donde N es el n첬mero de padres en la confirmaci처n de fusi처n:"
 
 #. type: Plain text
 #: en/diff-generate-patch.txt:170
@@ -3959,8 +3938,7 @@ msgstr "Un caracter `-` en la columna N significa que la l챠nea aparece en fiche
 
 #. type: Plain text
 #: en/diff-generate-patch.txt:202
-#, fuzzy, priority:280
-#| msgid "In the above example output, the function signature was changed from both files (hence two `-` removals from both file1 and file2, plus `++` to mean one line that was added does not appear in either file1 or file2).  Also eight other lines are the same from file1 but do not appear in file2 (hence prefixed with `+`)."
+#, priority:280
 msgid "In the above example output, the function signature was changed from both files (hence two `-` removals from both file1 and file2, plus `++` to mean one line that was added does not appear in either file1 or file2).  Also, eight other lines are the same from file1 but do not appear in file2 (hence prefixed with `+`)."
 msgstr "En el ejemplo de salida de arriba, la firma de la funci처n cambi처 en ambos ficheros (por eso los dos `-` eliminaciones de ambos ficheros fichero1 y fichero2, adem찼s `++` que significa que una l챠nea agregada no aparece en ning첬n fichero de fichero1 o fichero2). Adem찼s, otras ocho l챠neas iguales del fichero1 que no aparecen en fichero2 (por eso prefijadas con `+`)."
 
@@ -3996,10 +3974,9 @@ msgstr "--patch"
 
 #. type: Plain text
 #: en/diff-options.txt:26
-#, fuzzy, priority:280
-#| msgid "<<generate_patch_text_with_p, \"Generating patch text with -p\">>)."
+#, priority:280
 msgid "Generate patch (see <<generate_patch_text_with_p>>)."
-msgstr "<<generate_patch_text_with_p, \"Generando texto de parche con -p\">>)."
+msgstr "Genera parche (ver <<generate_patch_text_with_p>>)."
 
 #. type: Plain text
 #: en/diff-options.txt:28 en/diff-options.txt:146
@@ -4035,7 +4012,7 @@ msgstr "-m"
 #: en/diff-options.txt:44
 #, priority:280
 msgid "Show diffs for merge commits in the default format. This is similar to '--diff-merges=on', except `-m` will produce no output unless `-p` is given as well."
-msgstr ""
+msgstr "Muestra diffs para confirmaciones de fusi처n en el formato predeterminado. Es similar a '--diff-merges=on', excepto `-m` no producir찼 salida a menos que se d챕 tambi챕n `-p`."
 
 #. type: Labeled list
 #: en/diff-options.txt:45 en/git-am.txt:57 en/git-blame.txt:53 en/git-branch.txt:138 en/git-cvsexportcommit.txt:37 en/git-diff-files.txt:37 en/git-diff-tree.txt:93 en/git-grep.txt:188 en/git-help.txt:65 en/git-ls-files.txt:38 en/git-shortlog.txt:87 en/git-stripspace.txt:42
@@ -4047,7 +4024,7 @@ msgstr "-c"
 #: en/diff-options.txt:48
 #, priority:280
 msgid "Produce combined diff output for merge commits.  Shortcut for '--diff-merges=combined -p'."
-msgstr ""
+msgstr "Produce salida de diff combinada para confirmaciones de fusi처n.  Atajo para '--diff-merges=combined -p'."
 
 #. type: Labeled list
 #: en/diff-options.txt:49 en/git-diff-files.txt:38 en/git-diff-tree.txt:103
@@ -4059,7 +4036,7 @@ msgstr "--cc"
 #: en/diff-options.txt:52
 #, priority:280
 msgid "Produce dense combined diff output for merge commits.  Shortcut for '--diff-merges=dense-combined -p'."
-msgstr ""
+msgstr "Produce salida de diff densa combinada para confirmaciones de fusi처n.  Atajo para '--diff-merges=dense-combined -p'."
 
 #. type: Labeled list
 #: en/diff-options.txt:53
@@ -4071,7 +4048,7 @@ msgstr "--dd"
 #: en/diff-options.txt:57
 #, priority:280
 msgid "Produce diff with respect to first parent for both merge and regular commits.  Shortcut for '--diff-merges=first-parent -p'."
-msgstr ""
+msgstr "Produce diff con respecto al primer padre tanto para confirmaciones normales como de fusi처n. Atajo para '--diff-merges=first-parent -p'."
 
 #. type: Labeled list
 #: en/diff-options.txt:58
@@ -4083,7 +4060,7 @@ msgstr "--remerge-diff"
 #: en/diff-options.txt:61
 #, priority:280
 msgid "Produce remerge-diff output for merge commits.  Shortcut for '--diff-merges=remerge -p'."
-msgstr ""
+msgstr "Produce salida de diff de re-fusi처n para confirmaciones de fusi처n.  Atajo para '--diff-merges=remerge -p'."
 
 #. type: Labeled list
 #: en/diff-options.txt:62
@@ -4093,17 +4070,15 @@ msgstr "--no-diff-merges"
 
 #. type: Plain text
 #: en/diff-options.txt:64
-#, fuzzy, priority:280
-#| msgid "--diff-merges=on"
+#, priority:280
 msgid "Synonym for '--diff-merges=off'."
-msgstr "--diff-merges=on"
+msgstr "Sin처nimo de '--diff-merges=off'."
 
 #. type: Labeled list
 #: en/diff-options.txt:65
-#, fuzzy, no-wrap, priority:280
-#| msgid "--diff-merges=m"
+#, no-wrap, priority:280
 msgid "--diff-merges=<format>"
-msgstr "--diff-merges=m"
+msgstr "--diff-merges=<formato>"
 
 #. type: Plain text
 #: en/diff-options.txt:69
@@ -4115,14 +4090,13 @@ msgstr "Especifica el formato de diff a usar para commits de fusi처n. El predete
 #: en/diff-options.txt:71
 #, priority:280
 msgid "The following formats are supported:"
-msgstr ""
+msgstr "Los siguientes formatos est찼n soportados:"
 
 #. type: Labeled list
 #: en/diff-options.txt:73
-#, fuzzy, no-wrap, priority:280
-#| msgid "none"
+#, no-wrap, priority:280
 msgid "off, none"
-msgstr "none"
+msgstr "off, none"
 
 #. type: Plain text
 #: en/diff-options.txt:76
@@ -4134,81 +4108,73 @@ msgstr "Deshabilita la salida de diff para commits de fusi처n. 횣til para sobree
 #: en/diff-options.txt:77
 #, no-wrap, priority:280
 msgid "on, m"
-msgstr ""
+msgstr "on, m"
 
 #. type: Plain text
 #: en/diff-options.txt:82
-#, fuzzy, priority:280
-#| msgid "This option makes diff output for merge commits to be shown in the default format. `-m` will produce the output only if `-p` is given as well. The default format could be changed using `log.diffMerges` configuration parameter, which default value is `separate`."
+#, priority:280
 msgid "Make diff output for merge commits to be shown in the default format. The default format can be changed using `log.diffMerges` configuration variable, whose default value is `separate`."
-msgstr "Esta opci처n hace que se muestre la salida de diff para commits de fusi처n en el formato predeterminado. `-m` producir찼 la salida s처lo si tambi챕n de proporciona `-p`. Se puede cambiar el formato predeterminado usando el par찼metro de configuraci처n `log.diffMerges`, cuyo valor predeterminado es `separate`."
+msgstr "Hace que se muestre la salida de diff en el formato predeterminado para confirmaciones de fusi처n. Se puede cambiar el formato predeterminado usando la variable de configuraci처n `log.diffMerges`, cuyo valor predeterminado es `separate`."
 
 #. type: Labeled list
 #: en/diff-options.txt:83
-#, fuzzy, no-wrap, priority:280
-#| msgid "--first-parent"
+#, no-wrap, priority:280
 msgid "first-parent, 1"
-msgstr "--first-parent"
+msgstr "first-parent, 1"
 
 #. type: Plain text
 #: en/diff-options.txt:86
 #, priority:280
 msgid "Show full diff with respect to first parent. This is the same format as `--patch` produces for non-merge commits."
-msgstr ""
+msgstr "Mostrar diff completo con respecto a su primer padre. Es el mismo formato que produce `--patch` para confirmaciones de no-fusi처n."
 
 #. type: Labeled list
 #: en/diff-options.txt:87
 #, no-wrap, priority:280
 msgid "separate"
-msgstr ""
+msgstr "separate"
 
 #. type: Plain text
 #: en/diff-options.txt:90
-#, fuzzy, priority:280
-#| msgid "This makes merge commits show the full diff with respect to each of the parents. Separate log entry and diff is generated for each parent."
+#, priority:280
 msgid "Show full diff with respect to each of parents.  Separate log entry and diff is generated for each parent."
-msgstr "Este hace que los commits de fusi처n muestren el diff completo con respecto a cada uno de los padres. Para cada padre por separado se generan entrada en la bit찼cora y diff."
+msgstr "Muestra el diff completo con respecto a cada uno de los padres.  Para cada padre por separado se generan entrada en la bit찼cora y diff."
 
 #. type: Labeled list
 #: en/diff-options.txt:91
 #, no-wrap, priority:280
 msgid "combined, c"
-msgstr ""
+msgstr "combined, c"
 
 #. type: Plain text
 #: en/diff-options.txt:96
-#, fuzzy, priority:280
-#| msgid "With this option, diff output for a merge commit shows the differences from each of the parents to the merge result simultaneously instead of showing pairwise diff between a parent and the result one at a time. Furthermore, it lists only files which were modified from all parents. `-c` implies `-p`."
+#, priority:280
 msgid "Show differences from each of the parents to the merge result simultaneously instead of showing pairwise diff between a parent and the result one at a time. Furthermore, it lists only files which were modified from all parents."
-msgstr "Con esta opci처n, la salida del diff para un commit de fusi처n muestra las diferencias entre cada uno de los padres al resultado de la fusi처n simult찼neamente en lugar de mostrar por pares la diferencia entre un padre y el resultado uno a la vez. Mas all찼, lista s처lo los ficheros que fueron modificados de todos los padres. `-c` implica `-p`."
+msgstr "Muestra simult찼neamente las diferencias entre todos -y cada uno de- los padres y el resultado de la fusi처n, en lugar de mostrar diferencias por pares entre un padre y el resultado, uno a la vez. Mas all찼, lista s처lo los ficheros que fueron modificados de todos los padres."
 
 #. type: Labeled list
 #: en/diff-options.txt:97
-#, fuzzy, no-wrap, priority:280
-#| msgid "--diff-merges=dense-combined"
+#, no-wrap, priority:280
 msgid "dense-combined, cc"
-msgstr "--diff-merges=dense-combined"
+msgstr "dense-combined, cc"
 
 #. type: Plain text
 #: en/diff-options.txt:102
-#, fuzzy, priority:280
-#| msgid "With this option the output produced by `--diff-merges=combined` is further compressed by omitting uninteresting hunks whose contents in the parents have only two variants and the merge result picks one of them without modification.  `--cc` implies `-p`."
+#, priority:280
 msgid "Further compress output produced by `--diff-merges=combined` by omitting uninteresting hunks whose contents in the parents have only two variants and the merge result picks one of them without modification."
-msgstr "Con esta opci처n la salida producida por `--diff-merges=combined` es adem찼s comprimida al omitir fragmentos no-interesantes cuyo contenido en los padres s처lo tienen dos variantes y la fusi처n resulta elegir una de ellas sin modificaci처n. `--cc` implica `-p`."
+msgstr "Compresi처n posterior de salida producida por `--diff-merges=combined` al omitir fragmentos no-interesantes cuyo contenido en los padres s처lo tienen dos variantes y la fusi처n resulta elegir una de ellas sin modificaci처n."
 
 #. type: Labeled list
 #: en/diff-options.txt:103
-#, fuzzy, no-wrap, priority:280
-#| msgid "emerge"
+#, no-wrap, priority:280
 msgid "remerge, r"
-msgstr "emerge"
+msgstr "remerge, r"
 
 #. type: Plain text
 #: en/diff-options.txt:108
-#, fuzzy, priority:280
-#| msgid "With this option, two-parent merge commits are remerged to create a temporary tree object -- potentially containing files with conflict markers and such.  A diff is then shown between that temporary tree and the actual merge commit."
+#, priority:280
 msgid "Remerge two-parent merge commits to create a temporary tree object--potentially containing files with conflict markers and such.  A diff is then shown between that temporary tree and the actual merge commit."
-msgstr "Con esta opci처n, commits de fusi처n de dos padres son re-fusionados para crear un objeto 찼rbol temporal -- potencialmente conteniendo ficheros con marcadores de conflicto y similares. Entonces se muestra un diff entre ese 찼rbol temporal y el commit de fusi처n actual."
+msgstr "Refusiona confirmaciones de fusi처n de dos padres para crear un objeto 찼rbol temporal --potencialmente conteniendo ficheros con marcadores de conflicto y similares. Entonces se muestra un diff entre ese 찼rbol temporal y la confirmaci처n de fusi처n actual."
 
 #. type: Plain text
 #: en/diff-options.txt:112
@@ -4672,10 +4638,9 @@ msgstr "-z"
 
 #. type: Plain text
 #: en/diff-options.txt:318
-#, fuzzy, no-wrap, priority:280
-#| msgid "\tSeparate the commits with NULs instead of with new newlines.\n"
+#, no-wrap, priority:280
 msgid "\tSeparate the commits with NULs instead of newlines.\n"
-msgstr "\tSepara los commits con NULs en lugar de saltos de l챠nea.\n"
+msgstr "\tSepara las confirmaciones con NULs en lugar de saltos de l챠nea.\n"
 
 #. type: Plain text
 #: en/diff-options.txt:321
@@ -5337,7 +5302,7 @@ msgstr "Tambi챕n, estas letras en may첬sculas pueden ser en min첬scula para excl
 #: en/diff-options.txt:650
 #, priority:280
 msgid "Note that not all diffs can feature all types. For instance, copied and renamed entries cannot appear if detection for those types is disabled."
-msgstr ""
+msgstr "Nota que no todos los diffs pueden presentar todos los tipos. Por lo tanto, entradas copiadas y renombradas no pueden aparecer si la detecci처n para esos tipos est찼 deshabilitada."
 
 #. type: Labeled list
 #: en/diff-options.txt:651
@@ -5515,10 +5480,9 @@ msgstr "--rotate-to=<fichero>"
 
 #. type: Plain text
 #: en/diff-options.txt:752
-#, fuzzy, priority:280
-#| msgid "Discard the files before the named <file> from the output (i.e. 'skip to'), or move them to the end of the output (i.e. 'rotate to').  These were invented primarily for use of the `git difftool` command, and may not be very useful otherwise."
+#, priority:280
 msgid "Discard the files before the named <file> from the output (i.e. 'skip to'), or move them to the end of the output (i.e. 'rotate to').  These options were invented primarily for the use of the `git difftool` command, and may not be very useful otherwise."
-msgstr "Descarta de la salida los ficheros que est찼n antes que el <fichero> nombrado (ej. 'saltar hasta'), o los mueve al final de la salida (ej. 'rotar hasta'). Estos se inventaron primordialmente para uso del comando `git difftool`, y pueden no ser 첬tiles de otra forma."
+msgstr "Descarta de la salida los ficheros que est찼n antes que el <fichero> nombrado (ej. 'skipt to'), o los mueve al final de la salida (ej. 'rotate to'). Estas opciones se inventaron primordialmente para uso del comando `git difftool`, y pueden no ser 첬tiles de otra forma."
 
 #. type: Labeled list
 #: en/diff-options.txt:754 en/git-apply.txt:105 en/git-cvsimport.txt:168
@@ -7664,8 +7628,7 @@ msgstr "--abort"
 
 #. type: Plain text
 #: en/git-am.txt:197
-#, fuzzy, priority:100
-#| msgid "Restore the original branch and abort the patching operation.  Revert contents of files involved in the am operation to their pre-am state."
+#, priority:100
 msgid "Restore the original branch and abort the patching operation.  Revert the contents of files involved in the am operation to their pre-am state."
 msgstr "Restaurar la rama original y abortar la operaci처n de parchado. Revierte el contenido de los ficheros involucrados en la operaci처n am a su estado pre-am."
 
@@ -7907,10 +7870,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/git-apply.txt:57
-#, fuzzy, priority:100
-#| msgid "Output a condensed summary of extended header information such as creations, renames and mode changes."
+#, priority:100
 msgid "Instead of applying the patch, output a condensed summary of information obtained from git diff extended headers, such as creations, renames, and mode changes.  Turns off \"apply\"."
-msgstr "Muestra un resumen condensado de informaci처n de encabezado extendido como creaciones, renombrados y cambios de modo."
+msgstr "En lugar de aplicar el parche, da salida a un resumen condensado de informaci처n obtenida de los encabezados extendidos de git diff, como creaciones, renombrados y cambios de modo.  Apaga \"apply\"."
 
 #. type: Plain text
 #: en/git-apply.txt:62
@@ -8568,7 +8530,7 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-archive.txt:94
-#, fuzzy, no-wrap, priority:100
+#, no-wrap, priority:100
 msgid "<extra>"
 msgstr "<extra>"
 
@@ -8670,7 +8632,7 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-archive.txt:139
-#, fuzzy, no-wrap, priority:100
+#, no-wrap, priority:100
 msgid "tar.umask"
 msgstr "tar.umask"
 
@@ -11431,10 +11393,9 @@ msgstr "git-cat-file(1)"
 
 #. type: Plain text
 #: en/git-cat-file.txt:7
-#, fuzzy, priority:80
-#| msgid "git-cat-file - Provide content or type and size information for repository objects"
+#, priority:80
 msgid "git-cat-file - Provide contents or details of repository objects"
-msgstr "git-cat-file - Proveer contenido o tipo y tama챰o de informaci처n para objetos de repositorio"
+msgstr "git-cat-file - Proveer contenido o detalles de objetos de repositorio"
 
 #. type: Plain text
 #: en/git-cat-file.txt:19
@@ -12664,10 +12625,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/git-checkout-index.txt:23
-#, fuzzy, priority:80
-#| msgid "Copy files from the index to the working tree."
+#, priority:80
 msgid "Copies all listed files from the index to the working directory (not overwriting existing files)."
-msgstr "Copiar ficheros del 챠ndice al 찼rbol de trabajo."
+msgstr "Copiar todos lo ficheros listados del 챠ndice al directorio de trabajo (sin sobreescribir ficheros existentes)."
 
 #. type: Plain text
 #: en/git-checkout-index.txt:30
@@ -16133,7 +16093,7 @@ msgstr "Esta opci처n determina como deber챠a ser limpiado el mensaje de confirma
 
 #. type: Labeled list
 #: en/git-commit.txt:238
-#, fuzzy, no-wrap, priority:280
+#, no-wrap, priority:280
 msgid "strip"
 msgstr "strip"
 
@@ -16181,7 +16141,7 @@ msgstr "Lo mismo que `whitespace` excepto que todo desde (incluyendo) la l챠nea
 
 #. type: Plain text
 #: en/git-commit.txt:251
-#, fuzzy, no-wrap, priority:280
+#, no-wrap, priority:280
 msgid "# ------------------------ >8 ------------------------\n"
 msgstr "# ------------------------ >8 ------------------------\n"
 
@@ -16297,13 +16257,13 @@ msgstr ""
 #: en/git-commit.txt:335 en/git-status.txt:58
 #, no-wrap, priority:280
 msgid "-u[<mode>]"
-msgstr ""
+msgstr "-u[<modo>]"
 
 #. type: Labeled list
 #: en/git-commit.txt:336 en/git-status.txt:59
 #, no-wrap, priority:280
 msgid "--untracked-files[=<mode>]"
-msgstr ""
+msgstr "--untracked-files[=<modo>]"
 
 #. type: Plain text
 #: en/git-commit.txt:338 en/git-status.txt:61
@@ -16315,13 +16275,13 @@ msgstr "Muestra los ficheros sin seguimiento."
 #: en/git-commit.txt:343
 #, priority:280
 msgid "The mode parameter is optional (defaults to 'all'), and is used to specify the handling of untracked files; when -u is not used, the default is 'normal', i.e. show untracked files and directories."
-msgstr ""
+msgstr "El par찼metro de modo es opcional (predeterminado a 'all'), y es usado para especificar el manejo de ficheros sin seguimiento; cuando no se usa -u, el predeterminado es 'normal', ej. muestra ficheros sin seguimiento y directorios."
 
 #. type: Plain text
 #: en/git-commit.txt:345 en/git-status.txt:68 en/git-status.txt:110
 #, priority:280
 msgid "The possible options are:"
-msgstr ""
+msgstr "Las opciones posibles son:"
 
 #. type: Plain text
 #: en/git-commit.txt:347
@@ -16333,19 +16293,19 @@ msgstr ""
 #: en/git-commit.txt:348
 #, no-wrap, priority:280
 msgid "'normal' - Shows untracked files and directories\n"
-msgstr ""
+msgstr "'normal' - Muestra ficheros sin seguimiento y directorios\n"
 
 #. type: Plain text
 #: en/git-commit.txt:349 en/git-status.txt:72
 #, no-wrap, priority:280
 msgid "'all'    - Also shows individual files in untracked directories.\n"
-msgstr ""
+msgstr "'all'    - Adem찼s muestra ficheros individuales en directorios sin seguimiento.\n"
 
 #. type: Plain text
 #: en/git-commit.txt:352 en/git-status.txt:85
 #, priority:280
 msgid "The default can be changed using the status.showUntrackedFiles configuration variable documented in linkgit:git-config[1]."
-msgstr ""
+msgstr "El predeterminado puede cambiarse usando la variable de configuraci처n status.showUntrackedFiles documentada en linkgit:git-config[1]."
 
 #. type: Plain text
 #: en/git-commit.txt:364
@@ -16363,13 +16323,13 @@ msgstr ""
 #: en/git-commit.txt:372
 #, priority:280
 msgid "Suppress commit summary message."
-msgstr ""
+msgstr "Suprime mensaje de resumen de confirmaci처n."
 
 #. type: Plain text
 #: en/git-commit.txt:377
 #, priority:280
 msgid "Do not create a commit, but show a list of paths that are to be committed, paths with local changes that will be left uncommitted and paths that are untracked."
-msgstr ""
+msgstr "No crea una confirmaci처n, pero muestra una lista de rutas que no ser찼n confirmadas, rutas con cambios locales que se dejar찼n sin confirmar y rutas que est찼n sin seguimiento."
 
 #. type: Labeled list
 #: en/git-commit.txt:378
@@ -16381,7 +16341,7 @@ msgstr "--status"
 #: en/git-commit.txt:383
 #, priority:280
 msgid "Include the output of linkgit:git-status[1] in the commit message template when using an editor to prepare the commit message.  Defaults to on, but can be used to override configuration variable commit.status."
-msgstr ""
+msgstr "Incluye la salida de linkgit:git-status[1] en la plantilla de mensaje de confirmaci처n cuando se usa un editor para preparar el mensaje de confirmaci처n.  Predeterminado a on, pero puede usarse para anular la variable de configuraci처n commit.status."
 
 #. type: Labeled list
 #: en/git-commit.txt:384
@@ -16393,13 +16353,13 @@ msgstr "--no-status"
 #: en/git-commit.txt:388
 #, priority:280
 msgid "Do not include the output of linkgit:git-status[1] in the commit message template when using an editor to prepare the default commit message."
-msgstr ""
+msgstr "No incluye la salida de linkgit:git-status[1] en la plantilla de mensaje de confirmaci처n cuando se usa un editor para preparar el mensaje de confirmaci처n predeterminado."
 
 #. type: Plain text
 #: en/git-commit.txt:406
 #, priority:280
 msgid "When pathspec is given on the command line, commit the contents of the files that match the pathspec without recording the changes already added to the index. The contents of these files are also staged for the next commit on top of what have been staged before."
-msgstr ""
+msgstr "Cuando se da especificaci처n de ruta en la l챠nea de comandos, confirma el contenido de los ficheros que coinciden con la especificaci처n de ruta sin registrar los cambios ya agregados al 챠ndice. El contenido de esos ficheros tambi챕n es presentado para la siguiente confirmaci처n por encima de lo que se ha presentado antes."
 
 #. type: Plain text
 #: en/git-commit.txt:422
@@ -16415,13 +16375,13 @@ msgid ""
 "$ git rm goodbye.c\n"
 "$ git add hello.c\n"
 "$ git commit\n"
-msgstr ""
+msgstr "$ edit hola.c\n$ git rm adios.c\n$ git add hola.c\n$ git commit\n"
 
 #. type: Plain text
 #: en/git-commit.txt:436
 #, priority:280
 msgid "Instead of staging files after each individual change, you can tell `git commit` to notice the changes to the files whose contents are tracked in your working tree and do corresponding `git add` and `git rm` for you.  That is, this example does the same as the earlier example if there is no other change in your working tree:"
-msgstr ""
+msgstr "En lugar de presentar ficheros despu챕s de cada cambio individual, puedes decirle a `git commit` que note los cambios en los ficheros cuyo contenido tiene seguimiento en tu 찼rbol de trabajo y haga los `git add` y `git rm` correspondientes por ti. Esto es, este ejemplo hace lo mismo que el ejemplo anterior si no hay otro cambio en tu 찼rbol de trabajo:"
 
 #. type: delimited block -
 #: en/git-commit.txt:441
@@ -16430,19 +16390,19 @@ msgid ""
 "$ edit hello.c\n"
 "$ rm goodbye.c\n"
 "$ git commit -a\n"
-msgstr ""
+msgstr "$ edit hola.c\n$ rm adios.c\n$ git commit -a\n"
 
 #. type: Plain text
 #: en/git-commit.txt:446
 #, priority:280
 msgid "The command `git commit -a` first looks at your working tree, notices that you have modified hello.c and removed goodbye.c, and performs necessary `git add` and `git rm` for you."
-msgstr ""
+msgstr "El comando `git commit -a` mira primero en tu 찼rbol de trabajo, nota que has modificado hola.c y removido adios.c, y realiza los `gitt add` y `git rm` por t챠."
 
 #. type: Plain text
 #: en/git-commit.txt:451
 #, priority:280
 msgid "After staging changes to many files, you can alter the order the changes are recorded in, by giving pathnames to `git commit`.  When pathnames are given, the command makes a commit that only records the changes made to the named paths:"
-msgstr ""
+msgstr "Despu챕s de presentar cambios a varios ficheros, puedes alterar el orden en que se registran los cambios, proporcionando nombres de rutas a `git commit`. Cuando se dan nombres de rutas, el comando hace una confirmaci처n que s처lo registra los cambios hechos a las rutas nombradas:"
 
 #. type: delimited block -
 #: en/git-commit.txt:457
@@ -16452,25 +16412,25 @@ msgid ""
 "$ git add hello.c hello.h\n"
 "$ edit Makefile\n"
 "$ git commit Makefile\n"
-msgstr ""
+msgstr "$ edit hola.c hola.h\n$ git add hola.c hola.h\n$ edit HazFichero\n$ git commit HazFichero\n"
 
 #. type: Plain text
 #: en/git-commit.txt:464
 #, priority:280
 msgid "This makes a commit that records the modification to `Makefile`.  The changes staged for `hello.c` and `hello.h` are not included in the resulting commit.  However, their changes are not lost -- they are still staged and merely held back.  After the above sequence, if you do:"
-msgstr ""
+msgstr "Esto hace una confirmaci처n que registra la modificaci처n a `HazFichero`.  Los cambios presentado para `hola.c` y `hola.h` no se incluyen en la confirmaci처n resultante.  Sin embargo, sus cambios no se pierden -- a첬n est찼n presentados y meramente retenidos.  Despu챕s de la secuencia anterior, si haces:"
 
 #. type: delimited block -
 #: en/git-commit.txt:467 en/git-commit.txt:493
 #, no-wrap, priority:280
 msgid "$ git commit\n"
-msgstr ""
+msgstr "$ git commit\n"
 
 #. type: Plain text
 #: en/git-commit.txt:471
 #, priority:280
 msgid "this second commit would record the changes to `hello.c` and `hello.h` as expected."
-msgstr ""
+msgstr "la segunda confirmaci처n registrar찼 los cambios a `hola.c` y `hola.h` como es de esperarse."
 
 #. type: Plain text
 #: en/git-commit.txt:479
@@ -21112,8 +21072,7 @@ msgstr ""
 
 #. type: Plain text
 #: en/git-diff-tree.txt:19
-#, fuzzy, priority:80
-#| msgid "Compares the content and mode of blobs found via two tree objects."
+#, priority:80
 msgid "Compare the content and mode of blobs found via two tree objects."
 msgstr "Compara el contenido y el modo de blobs encontrados a trav챕s de dos objetos del 찼rbol."
 
@@ -22231,7 +22190,7 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-fast-import.txt:152
-#, fuzzy, no-wrap, priority:90
+#, no-wrap, priority:90
 msgid "--big-file-threshold=<n>"
 msgstr "--big-file-threshold=<n>"
 
@@ -22267,7 +22226,7 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-fast-import.txt:171 en/git-pack-objects.txt:152 en/git-repack.txt:147
-#, fuzzy, no-wrap, priority:100
+#, no-wrap, priority:100
 msgid "--max-pack-size=<n>"
 msgstr "--max-pack-size=<n>"
 
@@ -22453,7 +22412,7 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-fast-import.txt:305
-#, fuzzy, no-wrap, priority:90
+#, no-wrap, priority:90
 msgid "`rfc2822`"
 msgstr "`rfc2822`"
 
@@ -27243,10 +27202,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-format-patch.txt:218
-#, fuzzy, no-wrap, priority:100
-#| msgid "--pid-file=<file>"
+#, no-wrap, priority:100
 msgid "--description-file=<file>"
-msgstr "--pid-file=<fichero>"
+msgstr "--description-file=<fichero>"
 
 #. type: Plain text
 #: en/git-format-patch.txt:221
@@ -28566,9 +28524,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-gc.txt:62 en/git-repack.txt:77
-#, fuzzy, no-wrap, priority:100
+#, no-wrap, priority:100
 msgid "--max-cruft-size=<n>"
-msgstr "--max-pack-size=<n>"
+msgstr "--max-cruft-size=<n>"
 
 #. type: Plain text
 #: en/git-gc.txt:68
@@ -29904,10 +29862,9 @@ msgstr "--developer-interfaces"
 
 #. type: Plain text
 #: en/git-help.txt:90
-#, fuzzy, priority:100
-#| msgid "File formats, protocols and other developer interfaces"
+#, priority:100
 msgid "Print a list of file formats, protocols and other developer interfaces documentation on the standard output."
-msgstr "Formatos de fichero, protocolos y otras interfaces para el desarrollador"
+msgstr "Imprime una lista de formatos de fichero, protocolos y otra documentaci처n de interfaces para el desarrollador en la salida est찼ndar."
 
 #. type: Labeled list
 #: en/git-help.txt:92
@@ -31374,8 +31331,7 @@ msgstr "Si la variable de ambiente `$GIT_DIR` se configura, entonces especifica
 
 #. type: Plain text
 #: en/git-init.txt:34
-#, fuzzy, priority:300
-#| msgid "If the object storage directory is specified via the `$GIT_OBJECT_DIRECTORY` environment variable then the sha1 directories are created underneath - otherwise the default `$GIT_DIR/objects` directory is used."
+#, priority:300
 msgid "If the object storage directory is specified via the `$GIT_OBJECT_DIRECTORY` environment variable then the sha1 directories are created underneath; otherwise, the default `$GIT_DIR/objects` directory is used."
 msgstr "Si el directorio de almacenamiento de objetos se especifica con la variable de ambiente `$GIT_OBJECT_DITECTORY`, entonces los directorios sha1 se crean bajo 챕l, de lo contrario se usa el directorio predeterminado `$GIT_DIR/objects`."
 
@@ -31417,17 +31373,15 @@ msgstr "Especifica el directorio de d처nde usar plantillas. (Ver la secci처n \"D
 
 #. type: Plain text
 #: en/git-init.txt:71
-#, fuzzy, priority:300
-#| msgid "Instead of initializing the repository as a directory to either `$GIT_DIR` or `./.git/`, create a text file there containing the path to the actual repository.  This file acts as filesystem-agnostic Git symbolic link to the repository."
+#, priority:300
 msgid "Instead of initializing the repository as a directory to either `$GIT_DIR` or `./.git/`, create a text file there containing the path to the actual repository.  This file acts as a filesystem-agnostic Git symbolic link to the repository."
 msgstr "En lugar de inicializar el repositorio como un directorio ya sea de `$GIT_DIR` o `./.git`, crea un fichero de texto conteniendo la ruta al repositorio actual. Este fichero act첬a como una liga simb처lica de Git agn처stica de sistema de ficheros hacia el repositorio."
 
 #. type: Plain text
 #: en/git-init.txt:73
-#, fuzzy, priority:300
-#| msgid "If this is reinitialization, the repository will be moved to the specified path."
+#, priority:300
 msgid "If this is a reinitialization, the repository will be moved to the specified path."
-msgstr "Si es re-inicializaci처n, el repositorio se mover찼 a la ruta especificada."
+msgstr "Si es una re-inicializaci처n, el repositorio se mover찼 a la ruta especificada."
 
 #. type: Labeled list
 #: en/git-init.txt:74
@@ -31485,8 +31439,7 @@ msgstr "'group' (o 'true')"
 
 #. type: Plain text
 #: en/git-init.txt:108
-#, fuzzy, priority:300
-#| msgid "Make the repository group-writable, (and g+sx, since the git group may be not the primary group of all users). This is used to loosen the permissions of an otherwise safe umask(2) value. Note that the umask still applies to the other permission bits (e.g. if umask is '0022', using 'group' will not remove read privileges from other (non-group) users). See '0xxx' for how to exactly specify the repository permissions."
+#, priority:300
 msgid "Make the repository group-writable, (and g+sx, since the git group may not be the primary group of all users). This is used to loosen the permissions of an otherwise safe umask(2) value. Note that the umask still applies to the other permission bits (e.g. if umask is '0022', using 'group' will not remove read privileges from other (non-group) users). See '0xxx' for how to exactly specify the repository permissions."
 msgstr "Hace al repositorio escribible para el grupo, (y g+sx, ya que el grupo git podr챠a no ser el grupo primario de todos los usuarios). Esto se usa para relajar los permisos de un valor -por el contrario- seguro de umask(2). Note que la umask a첬n aplica a los otros bits de permisos (ej. si umask es '0022', usando 'group' no quitar찼 privilegios de lectura de otros usuarios (no del grupo) ). Ver '0xxx' para c처mo especificar exactamente los permisos del repositorio."
 
@@ -31510,8 +31463,7 @@ msgstr "'<permisos>'"
 
 #. type: Plain text
 #: en/git-init.txt:123
-#, fuzzy, priority:300
-#| msgid "'<perm>' is a 3-digit octal number prefixed with `0` and each file will have mode '<perm>'. '<perm>' will override users' umask(2)  value (and not only loosen permissions as 'group' and 'all' does). '0640' will create a repository which is group-readable, but not group-writable or accessible to others. '0660' will create a repo that is readable and writable to the current user and group, but inaccessible to others (directories and executable files get their `x` bit from the `r` bit for corresponding classes of users)."
+#, priority:300
 msgid "'<perm>' is a 3-digit octal number prefixed with `0` and each file will have mode '<perm>'. '<perm>' will override users' umask(2)  value (and not only loosen permissions as 'group' and 'all' do). '0640' will create a repository which is group-readable, but not group-writable or accessible to others. '0660' will create a repo that is readable and writable to the current user and group, but inaccessible to others (directories and executable files get their `x` bit from the `r` bit for corresponding classes of users)."
 msgstr "'<permisos>' es un n첬mero octal de tres d챠gitos prefijado con `0` y cada fichero tendr찼 el modo '<permisos>'. '<permisos>' sobre-escribir찼 el valor umask(2) del usuario (y no solo permisos mas holgados como lo hacen 'group' y 'all'). '0640' crear찼 un repositorio legible por el grupo, pero no escribible o accesible para otros. '0660' crear찼 un repositorio que es legible y escribible por el usuario actual y grupo, pero inaccesible para otros (directorios y ejecutables obtienen su bit `x` del bit `r` para sus clases de usuarios correspondientes)."
 
@@ -31955,10 +31907,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-interpret-trailers.txt:122
-#, fuzzy, no-wrap, priority:100
-#| msgid "--trailer <token>[(=|:)<value>]"
+#, no-wrap, priority:100
 msgid "--trailer <key>[(=|:)<value>]"
-msgstr "--trailer <token>[(=|:)<valor>]"
+msgstr "--trailer <clave>[(=|:)<valor>]"
 
 #. type: Plain text
 #: en/git-interpret-trailers.txt:126
@@ -32286,10 +32237,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-interpret-trailers.txt:292
-#, fuzzy, no-wrap, priority:100
-#| msgid "tar.<format>.command"
+#, no-wrap, priority:100
 msgid "trailer.<keyAlias>.command"
-msgstr "tar.<formato>.command"
+msgstr "trailer.<alias-de-clave>.command"
 
 #. type: Plain text
 #: en/git-interpret-trailers.txt:298
@@ -36412,8 +36362,7 @@ msgstr "'git mv' [<opciones>] <origen>... <destino>\n"
 
 #. type: Plain text
 #: en/git-mv.txt:17
-#, fuzzy, priority:280
-#| msgid "Move or rename a file, directory or symlink."
+#, priority:280
 msgid "Move or rename a file, directory, or symlink."
 msgstr "Mueve o renombra un fichero, directorio o enlace simb처lico."
 
@@ -45584,10 +45533,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-repack.txt:169
-#, fuzzy, no-wrap, priority:100
-#| msgid "--expire-to=<dir>"
+#, no-wrap, priority:100
 msgid "--filter-to=<dir>"
-msgstr "--expire-to=<directorio>"
+msgstr "--filter-to=<directorio>"
 
 #. type: Plain text
 #: en/git-repack.txt:179
@@ -45651,10 +45599,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-repack.txt:223
-#, fuzzy, no-wrap, priority:100
-#| msgid "-o<directory>"
+#, no-wrap, priority:100
 msgid "-g<factor>"
-msgstr "-o <directorio>"
+msgstr "-g<factor>"
 
 #. type: Labeled list
 #: en/git-repack.txt:224
@@ -52426,10 +52373,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/git-status.txt:252
-#, fuzzy, priority:280
-#| msgid "Show untracked files."
+#, priority:280
 msgid "'?' = the submodule has untracked files"
-msgstr "Muestra los ficheros sin seguimiento."
+msgstr "'?'= el subm처dulo tiene ficheros sin seguimiento"
 
 #. type: Plain text
 #: en/git-status.txt:255
@@ -52886,8 +52832,7 @@ msgstr "--strip-comments"
 
 #. type: Plain text
 #: en/git-stripspace.txt:41
-#, fuzzy, priority:100
-#| msgid "Skip and remove all lines starting with comment character (default '#')."
+#, priority:100
 msgid "Skip and remove all lines starting with a comment character (default '#')."
 msgstr "Saltar y borrar todas las l챠neas que comienzan con un car찼cter de comentario (predeterminado '#')."
 
@@ -56576,13 +56521,11 @@ msgstr "Esta opci처n afecta opciones que esperan una ruta (como `--git-dir` y `-
 
 #. type: Plain text
 #: en/git.txt:75
-#, fuzzy, no-wrap, priority:100
+#, no-wrap, priority:100
 msgid ""
 "    git --git-dir=a.git --work-tree=b -C c status\n"
 "    git --git-dir=c/a.git --work-tree=c/b status\n"
-msgstr ""
-"    git --git-dir=a.git --work-tree=b -C c status\n"
-"    git --git-dir=c/a.git --work-tree=c/b status\n"
+msgstr "    git --git-dir=a.git --work-tree=b -C c status\n    git --git-dir=c/a.git --work-tree=c/b status\n"
 
 #. type: Labeled list
 #: en/git.txt:76
@@ -56616,10 +56559,9 @@ msgstr "Como `-c <nombre>=<valor>`, da a la variable de configuraci처n '<nombre>
 
 #. type: Plain text
 #: en/git.txt:104
-#, fuzzy, priority:100
-#| msgid "This is useful for cases where you want to pass transitory configuration options to git, but are doing so on OS's where other processes might be able to read your cmdline (e.g. `/proc/self/cmdline`), but not your environ (e.g. `/proc/self/environ`). That behavior is the default on Linux, but may not be on your system."
+#, priority:100
 msgid "This is useful for cases where you want to pass transitory configuration options to git, but are doing so on operating systems where other processes might be able to read your command line (e.g. `/proc/self/cmdline`), but not your environment (e.g. `/proc/self/environ`). That behavior is the default on Linux, but may not be on your system."
-msgstr "Esto es 첬til en casos donde quieres pasar a git opciones de configuraci처n transitorias, pero se hacen tan en el SO donde otros procesos pueden ser capaces de leer tu l챠nea de comandos (ej. `/proc/self/cmdline`), pero no tu ambiente (ej. `/proc/self/environ`). Ese es el comportamiento predeterminado en Linux, pero pudiera no serlo en tu sistema."
+msgstr "Esto es 첬til en casos donde quieres pasar a git opciones de configuraci처n transitorias, pero se hacen tan en el sistema oprativo donde otros procesos pueden ser capaces de leer tu l챠nea de comandos (ej. `/proc/self/cmdline`), pero no tu ambiente (ej. `/proc/self/environ`). Ese es el comportamiento predeterminado en Linux, pero pudiera no serlo en tu sistema."
 
 #. type: Plain text
 #: en/git.txt:109
@@ -57105,7 +57047,7 @@ msgstr "Indica el nombre del objeto para cualquier tipo de objeto."
 
 #. type: Labeled list
 #: en/git.txt:393 en/git-unpack-file.txt:23
-#, fuzzy, no-wrap, priority:100
+#, no-wrap, priority:100
 msgid "<blob>"
 msgstr "<blob>"
 
@@ -57393,10 +57335,9 @@ msgstr "`GIT_DEFAULT_HASH`"
 
 #. type: Plain text
 #: en/git.txt:558
-#, fuzzy, priority:100
-#| msgid "If this variable is set, the default hash algorithm for new repositories will be set to this value. This value is ignored when cloning and the setting of the remote repository is always used. The default is \"sha1\". THIS VARIABLE IS EXPERIMENTAL! See `--object-format` in linkgit:git-init[1]."
+#, priority:100
 msgid "If this variable is set, the default hash algorithm for new repositories will be set to this value. This value is ignored when cloning and the setting of the remote repository is always used. The default is \"sha1\".  See `--object-format` in linkgit:git-init[1]."
-msgstr "Si se configura esta variable, el algoritmo predeterminado de hash para repositorios nuevos ser찼 asignado con 챕ste valor. Al clonar se ignora este valor y siempre se usa la configuraci처n del repositorio remoto. El predeterminado es \"sha1\". ESTA VARIABLE ES EXPERIMENTAL! Ver `--object-format` en linkgit:git-init[1]."
+msgstr "Si se configura esta variable, el algoritmo predeterminado de hash para repositorios nuevos ser찼 asignado con 챕ste valor. Al clonar se ignora este valor y siempre se usa la configuraci처n del repositorio remoto. El predeterminado es \"sha1\".  Ver `--object-format` en linkgit:git-init[1]."
 
 #. type: Title ~
 #: en/git.txt:560
@@ -58742,10 +58683,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/git-update-index.txt:160
-#, fuzzy, priority:80
-#| msgid "Remove files from the working tree and from the index."
+#, priority:80
 msgid "Report what is being added and removed from the index."
-msgstr "Elimina ficheros del 찼rbol de trabajo y del 챠ndice."
+msgstr "Reporta lo que se agrega y quita del 챠ndice."
 
 #. type: Labeled list
 #: en/git-update-index.txt:161
@@ -59830,8 +59770,7 @@ msgstr "--[no-]strict"
 
 #. type: Plain text
 #: en/git-upload-pack.txt:30
-#, fuzzy, priority:100
-#| msgid "Do not try <directory>/.git/ if <directory> is no Git directory."
+#, priority:100
 msgid "Do not try <directory>/.git/ if <directory> is not a Git directory."
 msgstr "No intente <directorio>/.git/ si <directorio> no es un directorio Git."
 
@@ -60521,10 +60460,9 @@ msgstr "git-whatchanged(1)"
 
 #. type: Plain text
 #: en/git-whatchanged.txt:7
-#, fuzzy, priority:100
-#| msgid "Show logs with difference each commit introduces."
+#, priority:100
 msgid "git-whatchanged - Show logs with differences each commit introduces"
-msgstr "Mostrar logs con las diferencias que cada confirmaci처n introduce."
+msgstr "git-whatchanged - Mostrar logs con las diferencias que introduce cada confirmaci처n"
 
 #. type: Plain text
 #: en/git-whatchanged.txt:13
@@ -61681,8 +61619,7 @@ msgstr "[[def_grafts]]injertos"
 
 #. type: Plain text
 #: en/glossary-content.txt:194
-#, fuzzy, priority:310
-#| msgid "Grafts enables two otherwise different lines of development to be joined together by recording fake ancestry information for commits. This way you can make Git pretend the set of <<def_parent,parents>> a <<def_commit,commit>> has is different from what was recorded when the commit was created. Configured via the `.git/info/grafts` file."
+#, priority:310
 msgid "Grafts enable two otherwise different lines of development to be joined together by recording fake ancestry information for commits. This way you can make Git pretend the set of <<def_parent,parents>> a <<def_commit,commit>> has is different from what was recorded when the commit was created. Configured via the `.git/info/grafts` file."
 msgstr "Injertos permiten juntar dos lineas distintas de desarrollo al guardar informaci처n falsa de antecesor para confirmaciones. De esta manera se puede hacer que Git asuma que el conjunto de <<def_parent,padres>> de una <<def_commit,confirmaci처n>> sea diferente de lo que realmente fue guardado cuando la confirmaci처n fue creada. Configurar mediante el fichero `.git/info/grafts`."
 
@@ -63644,13 +63581,13 @@ msgstr ""
 #: en/object-format-disclaimer.txt:3
 #, priority:300
 msgid "Note: At present, there is no interoperability between SHA-256 repositories and SHA-1 repositories."
-msgstr ""
+msgstr "Nota: En el presente, no hay interoperabilidad entre repositorios SHA-256 y SHA-1."
 
 #. type: Plain text
 #: en/object-format-disclaimer.txt:9
 #, priority:300
 msgid "Historically, we warned that SHA-256 repositories may later need backward incompatible changes when we introduce such interoperability features. Today, we only expect compatible changes. Furthermore, if such changes prove to be necessary, it can be expected that SHA-256 repositories created with today's Git will be usable by future versions of Git without data loss."
-msgstr ""
+msgstr "Hist처ricamente, hemos advertido que repositorios SHA-256 puedan necesitar despu챕s cambios incompatibles hacia atr찼s cuando introduzcamos tales caracter챠sticas de interoperabilidad. Hoy, s처lo esperamos cambios compatibles. Adem찼s, si tales cambios prueban ser necesarios, se puede esperar que repositorios SHA-256 creados con el Git de hoy sean usables por versiones futuras de Git sin p챕rdida de datos."
 
 #. type: Title -
 #: en/pretty-formats.txt:2
@@ -64477,10 +64414,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/pretty-formats.txt:227
-#, fuzzy, no-wrap, priority:260
-#| msgid "describe[:options]"
+#, no-wrap, priority:260
 msgid "'%(decorate[:<options>])'"
-msgstr "describe[:options]"
+msgstr "'%(decorate[:<opciones>])'"
 
 #. type: Plain text
 #: en/pretty-formats.txt:232
@@ -64538,10 +64474,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/pretty-formats.txt:246
-#, fuzzy, no-wrap, priority:260
-#| msgid "describe[:options]"
+#, no-wrap, priority:260
 msgid "'%(describe[:<options>])'"
-msgstr "describe[:options]"
+msgstr "'%(describe[:<opciones>])'"
 
 #. type: Plain text
 #: en/pretty-formats.txt:251
@@ -64815,10 +64750,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/pretty-formats.txt:303
-#, fuzzy, no-wrap, priority:260
-#| msgid "describe[:options]"
+#, no-wrap, priority:260
 msgid "'%(trailers[:<options>])'"
-msgstr "describe[:options]"
+msgstr "'%(trailers[:<opciones>])'"
 
 #. type: Plain text
 #: en/pretty-formats.txt:308
@@ -68254,8 +68188,7 @@ msgstr "En general, URLs contienen informaci처n del protocolo de transporte, la
 
 #. type: Plain text
 #: en/urls.txt:12
-#, fuzzy, priority:300
-#| msgid "Git supports ssh, git, http, and https protocols (in addition, ftp, and ftps can be used for fetching, but this is inefficient and deprecated; do not use it)."
+#, priority:300
 msgid "Git supports ssh, git, http, and https protocols (in addition, ftp and ftps can be used for fetching, but this is inefficient and deprecated; do not use them)."
 msgstr "Git soporta los protocolos ssh, git, http y https (adem찼s, se puede usar ftp y ftps para fetch, pero es ineficiente y obsoleto; no los use)."