Merge branch '3.12' into fix-more-fuzzy-entries

Author: cmaureir

.github/workflows/main.yml

@@ -6,6 +6,9 @@ on:
       - 3.*
   pull_request:
 
+permissions:
+  contents: read
+
 jobs:
   test:
     name: Test
@@ -21,7 +24,7 @@ jobs:
 
       # Instalación de dependencias
       - name: Preparar Python v3.11
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: "3.11"
           cache: "pip"
@@ -31,6 +34,7 @@ jobs:
         run: sudo sed -i '/postgresql-common/d' /var/lib/dpkg/triggers/File
       - name: Instalar dependencias de sistema
         run: |
+          sudo apt-get update
           sudo apt-get install -y hunspell hunspell-es gettext language-pack-es locales-all
       - name: Instalar dependencias de Python
         run: |
@@ -48,7 +52,7 @@ jobs:
       - name: Obtiene la lista de archivos .po con cambios (sólo en PRs)
         if: github.event_name == 'pull_request'
         id: changed-po-files
-        uses: tj-actions/changed-files@v40
+        uses: tj-actions/changed-files@v45
         with:
           files: |
              **/*.po

.github/workflows/pr-comment.yml

@@ -3,26 +3,41 @@ name: Agrega comentario a PR
 on:
   pull_request_target:
 
+permissions:
+  contents: read
+
 jobs:
-  pr-comment:
+  define-comment:
     name: Entradas sin traducción
     runs-on: ubuntu-22.04
+    outputs:
+      any_changed: ${{ steps.changed-files.outputs.any_changed }}
+      comment: ${{ steps.create-pr-comment.outputs.comment }}
     steps:
       - uses: actions/checkout@v4
         with:
-          ref: ${{ github.event.pull_request.merge_commit_sha }}
+          ref: ${{ github.event.pull_request.head.sha }}
           persist-credentials: false
       - name: Preparar Python v3.11
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: "3.11"
           cache: "pip"
+      # checkout these files from the base branch to guarantee they haven't been
+      # modified by the PR
+      - uses: actions/checkout@v4
+        with:
+          path: base-branch
+          sparse-checkout-cone-mode: false
+          sparse-checkout: |
+            requirements.txt
+            scripts/list_missing_entries.py
       - name: Instalar dependencias
         run: |
-          python -m pip install -r requirements.txt
+          python -m pip install -r base-branch/requirements.txt
       - name: Obtiene lista de archivos con cambios
         id: changed-files
-        uses: tj-actions/changed-files@v39
+        uses: tj-actions/changed-files@v45
         with:
           files: |
             **/*.po
@@ -34,12 +49,20 @@ jobs:
         run: |
           {
             echo 'comment<<EOF'
-            python scripts/list_missing_entries.py --github $CHANGED_PO_FILES
+            python base-branch/scripts/list_missing_entries.py --github $CHANGED_PO_FILES
             echo EOF
           } >> "$GITHUB_OUTPUT"
+
+  write-comment:
+    runs-on: ubuntu-22.04
+    needs: [define-comment]
+    if: needs.define-comment.outputs.any_changed == 'true'
+    permissions:
+      issues: write
+      pull-requests: write
+    steps:
       - name: Agregar comentario con entradas faltantes
-        if: steps.changed-files.outputs.any_changed == 'true'
         uses: thollander/actions-comment-pull-request@v2
         with:
-          message: ${{ steps.create-pr-comment.outputs.comment }}
+          message: ${{ needs.define-comment.outputs.comment }}
           comment_tag: missing-entries

.github/workflows/stale.yaml

@@ -3,11 +3,17 @@ on:
   schedule:
     - cron: '30 1 * * *'
 
+permissions:
+  contents: read
+
 jobs:
   stale:
     runs-on: ubuntu-latest
+    permissions:
+      issues: write
+      pull-requests: write
     steps:
-      - uses: actions/stale@v8
+      - uses: actions/stale@v9
         with:
           stale-pr-label: 'needs decision'
           stale-issue-label: 'stale'

.overrides/faq.rst

@@ -204,9 +204,9 @@ repositorio principal de la traducción). Se hace de la siguiente manera::
 
 Luego nos vamos a nuestra rama local, confirmamos e impactamos esos cambios::
 
-    git checkout 3.11
-    git merge upstream/3.11
-    git push origin 3.11
+    git checkout 3.12
+    git merge upstream/3.12
+    git push origin 3.12
 
 ¡Eso es todo!
 

.overrides/progress.rst

@@ -10,7 +10,7 @@ y otras estadísticas.
 
 .. note::
 
-   Estas listas se actualiza automáticamente cuando Pull Requests se *mergean* a la rama ``3.11``.
+   Estas listas se actualiza automáticamente cuando Pull Requests se *mergean* a la rama ``3.12``.
 
 
 En progreso

.overrides/translation-memory.rst

@@ -123,6 +123,10 @@ Dividimos esta sección en dos partes, los términos que se traducen y los que m
    docstring
      docstring. ``library/idle.po``
 
+   floor division
+     división entera a la baja
+     En este `issue`_ más información al respecto.
+
    key
      clave
 
@@ -318,3 +322,6 @@ Estas son las reglas de estilo que hemos convenido hasta el momento:
   extranjerismos.
 
   Referencia: https://www.fundeu.es/recomendacion/locuciones-latinas-latinismos-errores-frecuentes-621/
+
+
+.. _issue: https://github.com/python/python-docs-es/issues/2754

.overrides/upgrade-python-version.rst

@@ -39,6 +39,12 @@ We are currently in branch 3.11, and we want to update the strings from 3.12.
    .. note:: This is important, so the later ``make build`` step will not reset
              the cpython submodule to the previous hash on the old branch.
 
+#. Create a virtual environment and install the dependencies of the project::
+
+     python -m venv env
+     source env/bin/activate  # Windows: env\Scripts\activate.bat
+     pip install -r requirements.txt
+     
 #. Verify that the docs build with the new versions you changed from
    ``requirements.txt`` mainly the sphinx version::
 
@@ -53,21 +59,14 @@ We are currently in branch 3.11, and we want to update the strings from 3.12.
 
 #. Clean possible garbage (form previous builds)::
 
-     rm -rf _build ../python-docs-es-pot cpython/Doc/CONTRIBUTING.rst cpython/Doc/upgrade-python-version.rst
+     rm -rf _build ../python-docs-es-pot cpython/Doc/CONTRIBUTING.rst cpython/Doc/upgrade-python-version.rst reviewers-guide.rst
 
    .. note::
 
       The 'python-docs-es-pot' is a temporary directory that is created
       in the next step. It's included here because it might be a leftover
       from previous attempts on your machine.
 
-#. Create a virtual environment and install the dependencies of the project::
-
-     python -m venv env
-     source env/bin/activate  # Windows: env\Scripts\activate.bat
-     pip install -r requirements.txt
-
-
 #. Create the .po files from the new source code. This will generate all the .po files for version 3.11::
 
      SPHINX_GETTEXT=True sphinx-build -j auto -b gettext -d _build/doctrees . ../python-docs-es-pot
@@ -114,9 +113,16 @@ We are currently in branch 3.11, and we want to update the strings from 3.12.
    of the new branch is done. So prepare a cup of any hot beverage
    and fix them.
 
-Once the process is completely and you are happy with the results,
-there are a few extra steps to finish the process::
+**Once the process is completely and you are happy with the results,
+there are a few extra steps to finish the process**
+
+#. Upgrade GitHub Actions to use Python 3.12, by updating Python version to 3.12 in the ``.github/workflows/main.yml`` file.
 
-#. Upgrade GitHub Actions to use Python 3.12
+#. Update the *Read the Docs* project to use 3.12 in the build and also as default branch/version.
+	
+#. Commit all the newly created files locally.
+	
+#. Create branch 3.12 in the repository in order to merge changes there.
+	
+#. Inside the github project settings, set 3.12 branch as the default branch for the repository.
 
-#. Update Read the Docs project to use 3.12 in the build and also as default branch/version

README.md

@@ -1,6 +1,6 @@
 # Traducción al Español de la Documentación de Python
-![Build Status](https://github.com/python/python-docs-es/actions/workflows/main.yml/badge.svg?branch=3.11 "Build Status")
-![Documentation Status](https://readthedocs.org/projects/python-docs-es/badge/?version=3.11 "Documentation Status")
+![Build Status](https://github.com/python/python-docs-es/actions/workflows/main.yml/badge.svg?branch=3.12 "Build Status")
+![Documentation Status](https://readthedocs.org/projects/python-docs-es/badge/?version=3.12 "Documentation Status")
 ## ¿Cómo contribuir?
 
 Tenemos una guía que te ayudará a contribuir. Por favor

TRANSLATORS

@@ -43,6 +43,7 @@ Carlos Bernad (@carlos-bernad)
 Carlos Enrique Carrasco Varas (@KrlitosForever)
 Carlos Joel Delgado Pizarro (@c0x6a)
 Carlos Martel Lamas (@Letram)
+Carlos Mena Pérez (@carlosm00)
 Catalina Arrey Amunátegui (@CatalinaArrey)
 Claudia Millán Nebot (@clacri @cheshireminima)
 Constanza Areal (@geekcoty)
@@ -120,6 +121,7 @@ Jimmy Tzuc (@JimmyTzuc)
 Jonathan Aguilar (@drawsoek)
 Jorge Luis McDonald Stevens (@jmaxter)
 Jorge Maldonado Ventura (@jorgesumle)
+José Carlos Álvarez González (@jcaalzago)
 José Daniel Gonzalez (@jdgc14)
 Jose Ignacio Riaño Chico
 José Luis Cantilo (@jcantilo)
@@ -157,6 +159,7 @@ Lis
 Lucas Miranda
 Luciano Bovio (@lbovio)
 Luis A. Gonzalez (@sublian)
+Luis Enriquez Torres (@lenriquezt)
 Luis Llave (@llaveluis)
 Luis Sánchez (@LuisAISanchez)
 Maia
@@ -177,6 +180,7 @@ María José Molina Contreras (@mjmolina)
 María Saiz Muñoz (@mariasm87)
 Martín Gaitán (@mgaitan)
 Martín Ramírez (@tinchoram)
+Mateo Cámara (@MateoCamara)
 Matias Bordese (@matiasb)
 Melissa Escobar Gutiérrez (@MelissaEscobar)
 Miguel Ángel
@@ -215,6 +219,7 @@ Samantha Valdez A. (@samvaldez)
 Santiago E Fraire Willemoes (@Woile)
 Santiago Piccinini (@spiccinini)
 Screpnik Claudia Raquel
+Sebastian Melo (@CarpioWeen1)
 Sergio Delgado Quintero (@sdelquin)
 Sergio Infante (@neosergio)
 Silvina Tamburini (@silvinabt87)
@@ -225,7 +230,7 @@ Sumit Kashyap
 Summerok
 Tatiana Delgadillo (@Tai543)
 Tony-Rome
-Ulises Alexander Argüelles Monjaraz (@UlisesAlexanderAM)
+Ulises Alexander Arguelles Monjaraz (@UlisesAlexanderAM)
 Victor Carlos (@tuxtitlan)
 Víctor Yelicich
 Victoria Perez Mola (@victoriapm)
@@ -237,4 +242,5 @@ Xavi Francisco (@srxavi)
 Xavi Rambla Centellas (@xavirambla)
 Yennifer Paola Herrera Ariza (@Yenniferh)
 Yohanna Padrino (@Yo-hanaPR)
-zejiran
+zejiran
+Zodac (@zodacdev)

about.po

@@ -11,15 +11,16 @@ msgstr ""
 "Project-Id-Version: Python 3.8\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2022-10-25 19:47+0200\n"
-"PO-Revision-Date: 2019-12-22 12:23+0100\n"
-"Last-Translator: \n"
-"Language: es\n"
+"PO-Revision-Date: 2023-11-26 19:02+0100\n"
+"Last-Translator: Marcos Medrano <marcosmedrano0@gmail.com>\n"
 "Language-Team: python-doc-es\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\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"
 "Generated-By: Babel 2.10.3\n"
+"X-Generator: Poedit 3.4.1\n"
 
 #: ../Doc/about.rst:3
 msgid "About these documents"
@@ -59,22 +60,20 @@ msgstr ""
 "herramientas de Python y escritor de gran parte del contenido;"
 
 #: ../Doc/about.rst:24
-#, fuzzy
 msgid ""
 "the `Docutils <https://docutils.sourceforge.io/>`_ project for creating "
 "reStructuredText and the Docutils suite;"
 msgstr ""
-"el proyecto `Docutils <http://docutils.sourceforge.net/>`_ para creación de "
-"reStructuredText y el juego de Utilidades de Documentación;"
+"el proyecto `Docutils <https://docutils.sourceforge.io/>`_ para creación de "
+"reStructuredText y la suite Docutils;"
 
 #: ../Doc/about.rst:26
-#, fuzzy
 msgid ""
 "Fredrik Lundh for his Alternative Python Reference project from which Sphinx "
 "got many good ideas."
 msgstr ""
-"Fredrik Lundh por su proyecto `Referencia Alternativa de Python <http://"
-"effbot.org/zone/pyref.htm>`_ para la cual Sphinx tuvo muchas ideas."
+"Fredrik Lundh por su proyecto Referencia Alternativa de Python del que "
+"Sphinx obtuvo muchas buenas ideas."
 
 #: ../Doc/about.rst:31
 msgid "Contributors to the Python Documentation"