diff --git a/po/documentation.es.po b/po/documentation.es.po index 6899ac894a218b72c6baaabafb31621dec8d323a..581b99b5d347320b384aa29a6914596433264acb 100644 --- a/po/documentation.es.po +++ b/po/documentation.es.po @@ -4,7 +4,7 @@ # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. # msgid "" -msgstr "Project-Id-Version: PACKAGE VERSION\nReport-Msgid-Bugs-To: jn.avila@free.fr\nPOT-Creation-Date: 2023-05-18 19:52+0200\nPO-Revision-Date: 2023-06-20 03:52+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 4.18.1\n" +msgstr "Project-Id-Version: PACKAGE VERSION\nReport-Msgid-Bugs-To: jn.avila@free.fr\nPOT-Creation-Date: 2023-05-18 19:52+0200\nPO-Revision-Date: 2023-06-21 19:50+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 4.18.1\n" #. type: Labeled list #: en/blame-options.txt:1 en/diff-options.txt:769 en/git-instaweb.txt:45 en/git-mailinfo.txt:49 en/git-mailsplit.txt:35 en/git-repack.txt:146 en/git-status.txt:31 @@ -3669,7 +3669,7 @@ msgstr "El 챠ndice de similaridad es el porcentaje de l챠neas sin cambios, y el #: en/diff-generate-patch.txt:61 #, priority:280 msgid "The index line includes the blob object names before and after the change. The <mode> is included if the file mode does not change; otherwise, separate lines indicate the old and the new mode." -msgstr "" +msgstr "La l챠nea de 챠ndice incluye los nombres de objeto blob antes y despu챕s del cambio. El <modo> se incluye si el modo del fichero no cambia; de lo contrario, l챠neas separadas indican los modos anterior y nuevo." #. type: Plain text #: en/diff-generate-patch.txt:65 @@ -3699,7 +3699,7 @@ msgstr "diff --git a/a b/b\nrename from a\nrename to b\ndiff --git a/b b/a\nrena #: en/diff-generate-patch.txt:82 #, 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." -msgstr "" +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." #. type: Title - #: en/diff-generate-patch.txt:85 @@ -4034,7 +4034,7 @@ msgstr "--diff-merges=separate" #: en/diff-options.txt:72 #, 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." -msgstr "" +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." #. type: Labeled list #: en/diff-options.txt:73 @@ -4058,7 +4058,7 @@ msgstr "--remerge-diff" #: en/diff-options.txt:80 #, 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." -msgstr "" +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." #. type: Plain text #: en/diff-options.txt:84 @@ -4088,7 +4088,7 @@ msgstr "-c" #: en/diff-options.txt:94 #, 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`." -msgstr "" +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`." #. type: Labeled list #: en/diff-options.txt:95 @@ -4112,7 +4112,7 @@ msgstr "--cc" #: en/diff-options.txt:103 #, 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`." -msgstr "" +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`." #. type: Labeled list #: en/diff-options.txt:104 en/git-diff-tree.txt:113 @@ -4351,7 +4351,7 @@ msgstr "`patience`" #: en/diff-options.txt:195 #, priority:280 msgid "Use \"patience diff\" algorithm when generating patches." -msgstr "" +msgstr "Usa el algoritmo \"diff paciente\" al generar parches." #. type: Labeled list #: en/diff-options.txt:195 @@ -67362,7 +67362,7 @@ msgstr "una URL como \"trabajo:repo.git\" o como \"host.xz:/ruta/a/repo.git\" se #: en/urls.txt:93 #, priority:300 msgid "If you want to rewrite URLs for push only, you can create a configuration section of the form:" -msgstr "" +msgstr "Si quieres reescribir URLs s처lo para push, puedes crear una secci처n de configuraci처n de la forma:" #. type: delimited block - #: en/urls.txt:97 @@ -67370,7 +67370,7 @@ msgstr "" msgid "" "\t[url \"<actual url base>\"]\n" "\t\tpushInsteadOf = <other url base>\n" -msgstr "" +msgstr "\t[url \"<url-base-actual>\"]\n\t\tpushInsteadOf = <otra-url-base>\n" #. type: delimited block - #: en/urls.txt:104