Skip to content

Commit

Permalink
New translation batch for es (github#26597)
Browse files Browse the repository at this point in the history
* Add crowdin translations

* Run script/i18n/homogenize-frontmatter.js

* Run script/i18n/fix-translation-errors.js

* Run script/i18n/lint-translation-files.js --check rendering

* run script/i18n/reset-files-with-broken-liquid-tags.js --language=es

* run script/i18n/reset-known-broken-translation-files.js

* Check in es CSV report

Co-authored-by: Grace Park <[email protected]>
  • Loading branch information
docubot and gracepark authored Mar 31, 2022
1 parent b0b9d5c commit 8ddd686
Show file tree
Hide file tree
Showing 27 changed files with 235 additions and 233 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,8 @@ Antes de que crees tu flujo de trabajo de {% data variables.product.prodname_act
Por ejemplo, utiliza [el CLI de AWS](https://aws.amazon.com/cli/):

{% raw %}```bash{:copy}
aws ecr create-repository \ --repository-name MY_ECR_REPOSITORY \ --region MY_AWS_REGION
aws ecr create-repository \
--repository-name MY_ECR_REPOSITORY \ --region MY_AWS_REGION
```{% endraw %}
Asegúrate de que utilizas el mismo nombre de repositorio para amazon ECR (que se representa aquí como `MY_ECR_REPOSITORY`) para la variable `ECR_REPOSITORY` en el flujo de trabajo a continuación.
Expand Down
24 changes: 24 additions & 0 deletions translations/es-ES/content/authentication/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,30 @@ versions:
ghes: '*'
ghae: '*'
ghec: '*'
introLinks:
overview: /authentication/keeping-your-account-and-data-secure/about-authentication-to-github
featuredLinks:
guides:
- /authentication/connecting-to-github-with-ssh/generating-a-new-ssh-key-and-adding-it-to-the-ssh-agent
- /authentication/keeping-your-account-and-data-secure/creating-a-personal-access-token
- /authentication/securing-your-account-with-two-factor-authentication-2fa/configuring-two-factor-authentication
- '{% ifversion ghae %}/authentication/keeping-your-account-and-data-secure/updating-your-github-access-credentials{% endif %}'
popular:
- /authentication/troubleshooting-ssh
- /authentication/connecting-to-github-with-ssh/checking-for-existing-ssh-keys
- /authentication/connecting-to-github-with-ssh/adding-a-new-ssh-key-to-your-github-account
- '{% ifversion ghae %}/authentication/connecting-to-github-with-ssh/testing-your-ssh-connection{% endif %}'
- /authentication/authenticating-with-saml-single-sign-on
- /authentication/managing-commit-signature-verification/displaying-verification-statuses-for-all-of-your-commits
guideCards:
- /authentication/securing-your-account-with-two-factor-authentication-2fa/recovering-your-account-if-you-lose-your-2fa-credentials
- /authentication/troubleshooting-ssh/error-permission-denied-publickey
- /authentication/keeping-your-account-and-data-secure/creating-a-strong-password
- '{% ifversion ghae %}/authentication/keeping-your-account-and-data-secure/updating-your-github-access-credentials{% endif %}'
- '{% ifversion ghae %}/authentication/authenticating-with-saml-single-sign-on/about-authentication-with-saml-single-sign-on{% endif %}'
changelog:
label: '2FA,authentication,security keys,SSH,token authentication'
layout: product-landing
topics:
- 2FA
- Identity
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -464,7 +464,7 @@ jobs:

### Habilita la fusión automática en una solicitud de cambios

Si quieres fusionar tus solicitudes de cambios automáticamente, puedes utilizar la funcionalidad de fusión automática de {% data variables.product.prodname_dotcom %}. Esto habilita a la solicitud de cambios para que se fusione cuando se cumpla con todas las pruebas y aprobaciones requeridas. Para obtener más información sobre la fusión automática, consulta la sección "[Fusionar una solicitud de cambios automáticamente](/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/automatically-merging-a-pull-request)".
Si quieres fusionar tus solicitudes de cambios automáticamente, puedes utilizar la funcionalidad de fusión automática de {% data variables.product.prodname_dotcom %}. Esto habilita a la solicitud de cambios para que se fusione cuando se cumpla con todas las pruebas y aprobaciones requeridas. For more information on auto-merge, see "[Automatically merging a pull request](/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/automatically-merging-a-pull-request)."

Aquí tienes un ejemplo de cómo habilitar la fusión automática para todas las actualizaciones de parche en `my-dependency`:

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,9 @@ Para pasar la validación del [modelo](/graphql/guides/introduction-to-graphql#s

Estos dos ejemplos te muestran cómo calcular los nodos totales en una llamada.

1. Consulta simple: <pre>query {
1. Consulta simple:

<pre>query {
viewer {
repositories(first: <span class="redbox">50</span>) {
edges {
Expand All @@ -46,13 +48,17 @@ Estos dos ejemplos te muestran cómo calcular los nodos totales en una llamada.
}
}</pre>

Cálculo: <pre><span class="redbox">50</span> = 50 repositories
Cálculo:

<pre><span class="redbox">50</span> = 50 repositories
+
<span class="redbox">50</span> x <span class="greenbox">10</span> = 500 repository issues

= 550 total nodes</pre>

2. Consulta compleja: <pre>query {
2. Consulta compleja:

<pre>query {
viewer {
repositories(first: <span class="redbox">50</span>) {
edges {
Expand Down Expand Up @@ -106,7 +112,9 @@ Estos dos ejemplos te muestran cómo calcular los nodos totales en una llamada.
}
}</code></pre>

Cálculo: <pre><span class="redbox">50</span> = 50 repositories
Cálculo:

<pre><span class="redbox">50</span> = 50 repositories
+
<span class="redbox">50</span> x <span class="greenbox">20</span> = 1,000 pullRequests
+
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ children:
- /about-pull-request-merges
- /merging-a-pull-request
- /automatically-merging-a-pull-request
- /adding-a-pull-request-to-the-merge-queue
- /merging-a-pull-request-with-a-merge-queue
- /closing-a-pull-request
- /reverting-a-pull-request
shortTitle: Incorporate changes
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
---
title: Merging a pull request with a merge queue
intro: 'If a merge queue is required by the branch protection setting for the branch, you can add your pull requests to a merge queue and {% data variables.product.product_name %} will merge the pull requests for you once all required checks have passed.'
versions:
fpt: '*'
ghec: '*'
topics:
- Pull requests
shortTitle: Merge PR with merge queue
redirect_from:
- /pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/adding-a-pull-request-to-the-merge-queue
---

{% data reusables.pull_requests.merge-queue-beta %}

## About merge queues

{% data reusables.pull_requests.merge-queue-overview %}
{% data reusables.pull_requests.merge-queue-references %}

## Adding a pull request to a merge queue

{% data reusables.repositories.navigate-to-repo %}
{% data reusables.repositories.sidebar-pr %}

1. In the "Pull Requests" list, click the pull request you would like to add to a merge queue.

1. Click **Merge when ready** to add the pull request to the merge queue. Alternatively, if you are an administrator, you can:
- Directly merge the pull request by checking **Merge without waiting for requirements to be met (administrators only)**, if allowed by branch protection settings, and follow the standard flow. ![Fusionar las opciones de la cola](/assets/images/help/pull_requests/merge-queue-options.png)

{% tip %}

**Tip:** You can click **Merge when ready** whenever you're ready to merge your proposed changes. {% data variables.product.product_name %} will automatically add the pull request to the merge queue once required approval and status checks conditions are met.

{% endtip %}

1. Confirm you want to add the pull request to the merge queue by clicking **Confirm merge when ready**.

## Removing a pull request from a merge queue

{% data reusables.repositories.navigate-to-repo %}
{% data reusables.repositories.sidebar-pr %}

1. In the "Pull Requests" list, click the pull request you would like to remove from a merge queue.

1. To remove the pull request from the queue, click **Remove from queue**. ![Remove pull request from queue](/assets/images/help/pull_requests/remove-from-queue-button.png)

Alternatively, you can navigate to the merge queue page for the base branch, click **...** next to the pull request you want to remove, and select **Remove from queue**. For information on how to get to the merge queue page for the base branch, see the section below.

## Viewing merge queues

You can view the merge queue for a base branch in various places on {% data variables.product.product_name %}.

- En la página de **Ramas** del repositorio. We recommend you use this route if you don't have or don't know about a pull request already in a queue, and if you want to see what's in that queue. Para obtener más información, consulta la sección "[Ver las ramas en tu repositorio](/repositories/configuring-branches-and-merges-in-your-repository/managing-branches-in-your-repository/viewing-branches-in-your-repository)".

![Ver la cola de fusión en la página de las ramas](/assets/images/help/pull_requests/merge-queue-branches-page.png)

- On the **Pull requests** page of your repository, click {% octicon "clock" aria-label="The clock symbol" %} next to any pull request in the merge queue.

![Ver la cola de fusión en la página de solicitudes de cambio](/assets/images/help/pull_requests/clock-icon-in-pull-request-list.png)

- On the pull request page when merge queue is required for merging, scroll to the bottom of the timeline and click **the merge queue** link.

![Merge queue link on pull request](/assets/images/help/pull_requests/merge-queue-link.png)

- La vista de cola de fusión muestra las solicitudes de cambios que están actualmente en cola, con tus solicitudes de cambios marcadas claramente.

![Vista de cola de fusión](/assets/images/help/pull_requests/merge-queue-view.png)

## Manejar las solicitudes de cambios eliminadas de la cola de fusión

{% data reusables.pull_requests.merge-queue-reject %}
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ children:
- /about-merge-methods-on-github
- /configuring-commit-squashing-for-pull-requests
- /configuring-commit-rebasing-for-pull-requests
- /using-a-merge-queue
- /managing-a-merge-queue
- /managing-suggestions-to-update-pull-request-branches
- /managing-auto-merge-for-pull-requests-in-your-repository
- /managing-the-automatic-deletion-of-branches
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
---
title: Managing a merge queue
intro: You can increase development velocity with a merge queue for pull requests in your repository.
versions:
fpt: '*'
ghec: '*'
permissions: People with admin permissions can manage merge queues for pull requests targeting selected branches of a repository.
topics:
- Repositories
- Pull requests
shortTitle: Managing merge queue
redirect_from:
- /repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/using-a-merge-queue
---

{% data reusables.pull_requests.merge-queue-beta %}

## About merge queues

{% data reusables.pull_requests.merge-queue-overview %}

The merge queue creates temporary branches with a special prefix to validate pull request changes. The changes in the pull request are then grouped with the latest version of the `base_branch` as well as changes ahead of it in the queue. {% data variables.product.product_name %} will merge all these changes into `base_branch` once the checks required by the branch protections of `base_branch` pass.

You may need to update your Continuous Integration (CI) configuration to trigger builds on branch names that begin with the special prefix `gh-readonly-queue/{base_branch}` after the group is created.

For example, with {% data variables.product.prodname_actions %}, a workflow with the following trigger will run each time a pull request that targets the base branch `main` is queued to merge.

```yaml
on:
push:
branches:
- gh-readonly-queue/main/**
```
{% data reusables.pull_requests.merge-queue-merging-method %}
Para obtener más información acerca de los métodos de fusión, consulta "[Acerca de la fusión de solicitudes de extracción](/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/about-pull-request-merges)."
{% note %}
**Nota:**
* A merge queue cannot be enabled with branch protection rules that use wildcard characters (`*`) in the branch name pattern.

{% endnote %}

{% data reusables.pull_requests.merge-queue-reject %}

## Managing a merge queue

Repository administrators can require a merge by enabling the branch protection setting "Require merge queue" in the protection rules for the base branch.

Para obtener más información de cómo habilitar el ajuste de protección de cola de fusión, consulta la sección "[Administrar una regla de protección de rama](/repositories/configuring-branches-and-merges-in-your-repository/defining-the-mergeability-of-pull-requests/managing-a-branch-protection-rule#creating-a-branch-protection-rule)".

## Leer más

* "[Merging a pull request with a merge queue](/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/merging-a-pull-request-with-a-merge-queue)"
* "[Acerca de las ramas protegidas](/repositories/configuring-branches-and-merges-in-your-repository/defining-the-mergeability-of-pull-requests/about-protected-branches)"

This file was deleted.

Loading

0 comments on commit 8ddd686

Please sign in to comment.