-
Notifications
You must be signed in to change notification settings - Fork 206
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'origin/master' into Weblate.
- Loading branch information
Showing
6 changed files
with
186 additions
and
228 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -4,7 +4,7 @@ | |
| # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. | ||
| # | ||
| msgid "" | ||
| msgstr "Project-Id-Version: PACKAGE VERSION\nReport-Msgid-Bugs-To: [email protected]\nPOT-Creation-Date: 2024-02-10 18:59+0100\nPO-Revision-Date: 2024-03-26 02:01+0000\nLast-Translator: Salvador Peña <[email protected]>\nLanguage-Team: LANGUAGE <[email protected]>\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.5-dev\n" | ||
| msgstr "Project-Id-Version: PACKAGE VERSION\nReport-Msgid-Bugs-To: [email protected]\nPOT-Creation-Date: 2024-02-10 18:59+0100\nPO-Revision-Date: 2024-03-31 17:02+0000\nLast-Translator: Salvador Peña <[email protected]>\nLanguage-Team: LANGUAGE <[email protected]>\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.5-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 | ||
|
|
@@ -3139,7 +3139,7 @@ msgstr "commit.gpgSign" | |
| #: en/config/commit.txt:17 | ||
| #, priority:280 | ||
| msgid "A boolean to specify whether all commits should be GPG signed. Use of this option when doing operations such as rebase can result in a large number of commits being signed. It may be convenient to use an agent to avoid typing your GPG passphrase several times." | ||
| msgstr "" | ||
| msgstr "Un booleano para especificar si todas las confirmaciones deben ser firmadas con GPG. Usar esta opción cuando se hagan operaciones como rebase que puedan resultar en un número elevado de confirmaciones a firmar. Puede ser conveniente usar un agente para evitar teclear tu contraseña GPG varias veces." | ||
|
|
||
| #. type: Labeled list | ||
| #: en/config/commit.txt:18 | ||
|
|
@@ -3277,7 +3277,7 @@ msgstr "diff.statNameWidth" | |
| #: en/config/diff.txt:58 | ||
| #, placeholders:'--stat':'--stat', priority:280 | ||
| msgid "Limit the width of the filename part in --stat output. If set, applies to all commands generating --stat output except format-patch." | ||
| msgstr "" | ||
| msgstr "Limita el ancho de la parte del nombre de fichero en la salida de --stat. Si se asigna, aplica a todos los comandos que generan salida --stat exceptuando format-patch." | ||
|
|
||
| #. type: Labeled list | ||
| #: en/config/diff.txt:59 | ||
|
|
@@ -3289,7 +3289,7 @@ msgstr "diff.statGraphWidth" | |
| #: en/config/diff.txt:62 | ||
| #, placeholders:'--stat':'--stat', priority:280 | ||
| msgid "Limit the width of the graph part in --stat output. If set, applies to all commands generating --stat output except format-patch." | ||
| msgstr "" | ||
| msgstr "Limita el ancho de la parte del grafo en la salida de --stat. Si se asigna, aplica a todos los comandos que generan salida de --stat exceptuando format-patch." | ||
|
|
||
| #. type: Labeled list | ||
| #: en/config/diff.txt:63 | ||
|
|
@@ -14276,7 +14276,7 @@ msgstr "" | |
| #: en/git-checkout.txt:225 | ||
| #, priority:240 | ||
| msgid "Create a new unborn branch, named `<new-branch>`, started from `<start-point>` and switch to it. The first commit made on this new branch will have no parents and it will be the root of a new history totally disconnected from all the other branches and commits." | ||
| msgstr "" | ||
| msgstr "Crea una nueva rama nonata, nombrada `<nueva-rama>`, a partir de `<punto-inicial>` y cambia a él. La primer confirmación hecha en esta nueva rama no tendrá padres y será la raíz de un nuevo historial totalmente desconectado de todas las otras ramas y confirmaciones." | ||
|
|
||
| #. type: Plain text | ||
| #: en/git-checkout.txt:230 | ||
|
|
@@ -27342,7 +27342,7 @@ msgstr "" | |
| #: en/git-for-each-ref.txt:183 en/git.txt:427 | ||
| #, no-wrap, placeholders:'HEAD', priority:100 | ||
| msgid "HEAD" | ||
| msgstr "" | ||
| msgstr "CABEZA" | ||
|
|
||
| #. type: Plain text | ||
| #: en/git-for-each-ref.txt:186 | ||
|
|
@@ -63011,7 +63011,7 @@ msgstr "[[def_orphan]]huérfano" | |
| #: en/glossary-content.txt:322 | ||
| #, placeholders:'<<def_branch,':'<<def_unborn,', priority:310 | ||
| msgid "The act of getting on a <<def_branch,branch>> that does not exist yet (i.e., an <<def_unborn,unborn>> branch). After such an operation, the commit first created becomes a commit without a parent, starting a new history." | ||
| msgstr "El acto de obtener en una <<def_branch,rama>> que aún no existe (ej. una rama <<def_unborn, sin nacer>>). Después de tal operación, la confirmación primeramente creada se convierte en una confirmación sin padre, comenzando un nuevo historial." | ||
| msgstr "El acto de obtener una <<def_branch,rama>> que aún no existe (ej. una rama <<def_unborn, nonata>>). Después de tal operación, la confirmación primeramente creada se convierte en una confirmación sin padre, comenzando un nuevo historial." | ||
|
|
||
| #. type: Labeled list | ||
| #: en/glossary-content.txt:323 | ||
|
|
@@ -63713,13 +63713,13 @@ msgstr "Un <<def_tree_object,objeto árbol>> o un <<def_object,objeto>> que pued | |
| #: en/glossary-content.txt:720 | ||
| #, no-wrap, placeholders:'[[def_unborn]]', priority:310 | ||
| msgid "[[def_unborn]]unborn" | ||
| msgstr "[[def_unborn]]no nacido" | ||
| msgstr "[[def_unborn]]nonata" | ||
|
|
||
| #. type: Plain text | ||
| #: en/glossary-content.txt:730 | ||
| #, placeholders:'<<def_HEAD,':'HEAD':'<<def_branch,':'HEAD':'<<def_orphan,', priority:310 | ||
| msgid "The <<def_HEAD,HEAD>> can point at a <<def_branch,branch>> that does not yet exist and that does not have any commit on it yet, and such a branch is called an unborn branch. The most typical way users encounter an unborn branch is by creating a repository anew without cloning from elsewhere. The HEAD would point at the 'main' (or 'master', depending on your configuration) branch that is yet to be born. Also some operations can get you on an unborn branch with their <<def_orphan,orphan>> option." | ||
| msgstr "" | ||
| msgstr "La <<def_HEAD,CABEZA>> puede apuntar a una <<def_branch,rama>> que aún no existe y que no tiene aún alguna confirmación, dicha rama se le llama una rama nonata. La manera más típica de que los usuarios se encuentren una rama nonata es creando un repositorio nuevo sin clonar de otro lado. La CABEZA apuntará a la rama 'main' (o 'master', dependiendo de tu configuración) que esta por nacer. Además algunas operaciones pueden llevarte a una rama nonata con su respectiva opción <<def_orphan,huérfana>>." | ||
|
|
||
| #. type: Labeled list | ||
| #: en/glossary-content.txt:732 | ||
|
|
||
Oops, something went wrong.