Skip to content

Commit 358279b

Browse files
cmaureircmaureir
authored
Merge branch '3.12' into fix-more-fuzzy-entries
2 parents fa944fa + 875e5df commit 358279b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+791
-747
lines changed

‎.github/workflows/main.yml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -88,13 +88,5 @@ jobs:
8888
# Construcción de la documentación
8989
- name: Construir documentación
9090
run: |
91-
# FIXME: Relative paths for includes in 'cpython'
92-
sed -i -e 's|.. include:: ../includes/wasm-notavail.rst|.. include:: ../../../../includes/wasm-notavail.rst|g' cpython/Doc/**/*.rst
93-
sed -i -e 's|.. include:: ../distutils/_setuptools_disclaimer.rst|.. include:: ../../../../distutils/_setuptools_disclaimer.rst|g' cpython/Doc/**/*.rst
94-
sed -i -e 's|.. include:: ./_setuptools_disclaimer.rst|.. include:: ../../../_setuptools_disclaimer.rst|g' cpython/Doc/**/*.rst
95-
sed -i -e 's|.. include:: token-list.inc|.. include:: ../../../token-list.inc|g' cpython/Doc/**/*.rst
96-
sed -i -e 's|.. include:: ../../using/venv-create.inc|.. include:: ../using/venv-create.inc|g' cpython/Doc/**/*.rst
97-
sed -i -e 's|.. include:: ../../../using/venv-create.inc|.. include:: ../../using/venv-create.inc|g' cpython/Doc/**/*.rst
98-
sed -i -e 's|.. include:: /using/venv-create.inc|.. include:: ../../../../using/venv-create.inc|g' cpython/Doc/**/*.rst
9991
# Normal build
10092
PYTHONWARNINGS=ignore::FutureWarning,ignore::RuntimeWarning sphinx-build -j auto -W --keep-going -b html -d cpython/Doc/_build/doctree -D language=es . cpython/Doc/_build/html

‎.github/workflows/pr-comment.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ jobs:
6262
pull-requests: write
6363
steps:
6464
- name: Agregar comentario con entradas faltantes
65-
uses: thollander/actions-comment-pull-request@v2
65+
uses: thollander/actions-comment-pull-request@v3
6666
with:
6767
message: ${{ needs.define-comment.outputs.comment }}
68-
comment_tag: missing-entries
68+
comment-tag: missing-entries

‎Makefile

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ OUTPUT_DOCTREE := $(CPYTHON_WORKDIR)/Doc/build/doctree
2020
OUTPUT_HTML := $(CPYTHON_WORKDIR)/Doc/build/html
2121
LOCALE_DIR := $(CPYTHON_WORKDIR)/locale
2222
POSPELL_TMP_DIR := .pospell
23+
SPHINX_JOBS := auto
2324

2425

2526
.PHONY: help
@@ -38,22 +39,15 @@ help:
3839
# before this. If passing SPHINXERRORHANDLING='', warnings will not be
3940
# treated as errors, which is good to skip simple Sphinx syntax mistakes.
4041
.PHONY: build
41-
build: setup
42-
# FIXME: Relative paths for includes in 'cpython'
43-
# See more about this at https://github.com/python/python-docs-es/issues/1844
44-
sed -i -e 's|.. include:: ../includes/wasm-notavail.rst|.. include:: ../../../../includes/wasm-notavail.rst|g' cpython/Doc/**/*.rst
45-
sed -i -e 's|.. include:: ../distutils/_setuptools_disclaimer.rst|.. include:: ../../../../distutils/_setuptools_disclaimer.rst|g' cpython/Doc/**/*.rst
46-
sed -i -e 's|.. include:: ./_setuptools_disclaimer.rst|.. include:: ../../../_setuptools_disclaimer.rst|g' cpython/Doc/**/*.rst
47-
sed -i -e 's|.. include:: token-list.inc|.. include:: ../../../token-list.inc|g' cpython/Doc/**/*.rst
48-
sed -i -e 's|.. include:: ../../using/venv-create.inc|.. include:: ../using/venv-create.inc|g' cpython/Doc/**/*.rst
49-
sed -i -e 's|.. include:: ../../../using/venv-create.inc|.. include:: ../../using/venv-create.inc|g' cpython/Doc/**/*.rst
50-
sed -i -e 's|.. include:: /using/venv-create.inc|.. include:: ../../../../using/venv-create.inc|g' cpython/Doc/**/*.rst
42+
build: setup do_build
43+
44+
.PHONY: do_build
45+
do_build:
5146
# Normal build
52-
PYTHONWARNINGS=ignore::FutureWarning,ignore::RuntimeWarning $(VENV)/bin/sphinx-build -j auto -W --keep-going -b html -d $(OUTPUT_DOCTREE) -D language=$(LANGUAGE) . $(OUTPUT_HTML) && \
47+
PYTHONWARNINGS=ignore::FutureWarning,ignore::RuntimeWarning $(VENV)/bin/sphinx-build -j $(SPHINX_JOBS) -W --keep-going -b html -d $(OUTPUT_DOCTREE) -D language=$(LANGUAGE) . $(OUTPUT_HTML) && \
5348
echo "Success! Open file://`pwd`/$(OUTPUT_HTML)/index.html, " \
5449
"or run 'make serve' to see them in http://localhost:8000";
5550

56-
5751
# setup: After running "venv" target, prepare that virtual environment with
5852
# a local clone of cpython repository and the translation files.
5953
# If the directories exists, only update the cpython repository and

‎TRANSLATORS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,8 +125,8 @@ José Carlos Álvarez González (@jcaalzago)
125125
José Daniel Gonzalez (@jdgc14)
126126
Jose Ignacio Riaño Chico
127127
José Luis Cantilo (@jcantilo)
128-
José Luis Salgado Banda (@josephLSalgado)
129128
José Miguel Hernández Cabrera (@miguelheca)
129+
Joseph Salgado (@xooseph)
130130
Juan Alegría (@zejiran)
131131
Juan Antonio Lagos (@alochimpasplum)
132132
Juan Biondi (@yeyeto2788)

‎c-api/apiabiversion.po

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,16 @@ msgstr ""
1111
"Project-Id-Version: Python 3.8\n"
1212
"Report-Msgid-Bugs-To: \n"
1313
"POT-Creation-Date: 2023-10-12 19:43+0200\n"
14-
"PO-Revision-Date: 2022-10-31 21:13-0300\n"
14+
"PO-Revision-Date: 2024-10-31 01:00-0400\n"
1515
"Last-Translator: \n"
16-
"Language: es\n"
1716
"Language-Team: python-doc-es\n"
18-
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
17+
"Language: es\n"
1918
"MIME-Version: 1.0\n"
2019
"Content-Type: text/plain; charset=utf-8\n"
2120
"Content-Transfer-Encoding: 8bit\n"
21+
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
2222
"Generated-By: Babel 2.13.0\n"
23+
"X-Generator: Poedit 3.5\n"
2324

2425
#: ../Doc/c-api/apiabiversion.rst:7
2526
msgid "API and ABI Versioning"
@@ -182,12 +183,14 @@ msgstr ""
182183
#: ../Doc/c-api/apiabiversion.rst:61
183184
msgid "Use this for numeric comparisons, e.g. ``#if PY_VERSION_HEX >= ...``."
184185
msgstr ""
186+
"Use esto para comparaciones numéricas, por ejemplo ``#if PY_VERSION_HEX "
187+
">= ...``."
185188

186189
#: ../Doc/c-api/apiabiversion.rst:63
187-
#, fuzzy
188190
msgid "This version is also available via the symbol :c:var:`Py_Version`."
189191
msgstr ""
190-
"Esta versión también está disponible a través del símbolo :data:`Py_Version`."
192+
"Esta versión también está disponible a través del símbolo :c:var:"
193+
"`Py_Version`."
191194

192195
#: ../Doc/c-api/apiabiversion.rst:67
193196
msgid ""

‎c-api/bytearray.po

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,16 @@ msgstr ""
1111
"Project-Id-Version: Python 3.8\n"
1212
"Report-Msgid-Bugs-To: \n"
1313
"POT-Creation-Date: 2023-10-12 19:43+0200\n"
14-
"PO-Revision-Date: 2022-11-05 12:32-0300\n"
14+
"PO-Revision-Date: 2024-10-29 21:11-0400\n"
1515
"Last-Translator: Sofía Denner <sofi.denner@gmail.com>\n"
16-
"Language: es\n"
1716
"Language-Team: python-doc-es\n"
18-
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
17+
"Language: es\n"
1918
"MIME-Version: 1.0\n"
2019
"Content-Type: text/plain; charset=utf-8\n"
2120
"Content-Transfer-Encoding: 8bit\n"
21+
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
2222
"Generated-By: Babel 2.13.0\n"
23+
"X-Generator: Poedit 3.5\n"
2324

2425
#: ../Doc/c-api/bytearray.rst:6
2526
msgid "Byte Array Objects"
@@ -128,9 +129,8 @@ msgstr ""
128129

129130
#: ../Doc/c-api/bytearray.rst:8
130131
msgid "object"
131-
msgstr ""
132+
msgstr "object"
132133

133134
#: ../Doc/c-api/bytearray.rst:8
134-
#, fuzzy
135135
msgid "bytearray"
136-
msgstr "Objetos de arreglos de bytes (*bytearrays*)"
136+
msgstr "bytearray"

‎c-api/float.po

Lines changed: 25 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,16 @@ msgstr ""
1111
"Project-Id-Version: Python 3.8\n"
1212
"Report-Msgid-Bugs-To: \n"
1313
"POT-Creation-Date: 2023-10-12 19:43+0200\n"
14-
"PO-Revision-Date: 2022-12-01 10:01+0400\n"
14+
"PO-Revision-Date: 2024-09-26 15:15-0600\n"
1515
"Last-Translator: Cristián Maureira-Fredes <cmaureirafredes@gmail.com>\n"
16-
"Language: es\n"
1716
"Language-Team: python-doc-es\n"
18-
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
17+
"Language: es\n"
1918
"MIME-Version: 1.0\n"
2019
"Content-Type: text/plain; charset=utf-8\n"
2120
"Content-Transfer-Encoding: 8bit\n"
21+
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
2222
"Generated-By: Babel 2.13.0\n"
23+
"X-Generator: Poedit 3.0.1\n"
2324

2425
#: ../Doc/c-api/float.rst:6
2526
msgid "Floating Point Objects"
@@ -73,7 +74,6 @@ msgstr ""
7374
"de error."
7475

7576
#: ../Doc/c-api/float.rst:47
76-
#, fuzzy
7777
msgid ""
7878
"Return a C :c:expr:`double` representation of the contents of *pyfloat*. If "
7979
"*pyfloat* is not a Python floating point object but has a :meth:`~object."
@@ -84,16 +84,15 @@ msgid ""
8484
msgstr ""
8585
"Retorna una representación C :c:expr:`double` de los contenidos de "
8686
"*pyfloat*. Si *pyfloat* no es un objeto de punto flotante de Python pero "
87-
"tiene un método :meth:`__float__`, primero se llamará a este método para "
88-
"convertir *pyfloat* en un flotante. Si ``__float __()`` no está definido, "
89-
"entonces recurre a :meth:`__index__`. Este método retorna ``-1.0`` en caso "
90-
"de falla, por lo que se debe llamar a :c:func:`PyErr_Occurred` para "
91-
"verificar si hay errores."
87+
"tiene un método :meth:`~object.__float__`, este método será llamado primero "
88+
"para convertir *pyfloat* en un flotante. Si :meth:`!__float __` no está "
89+
"definido, entonces recurre a :meth:`~object.__index__`. Este método retorna "
90+
"``-1.0`` en caso de falla, por lo que se debe llamar a :c:func:"
91+
"`PyErr_Occurred` para verificar si hay errores."
9292

9393
#: ../Doc/c-api/float.rst:54
94-
#, fuzzy
9594
msgid "Use :meth:`~object.__index__` if available."
96-
msgstr "Utilice :meth:`__index__` si está disponible."
95+
msgstr "Utilice :meth:`~object.__index__` si está disponible."
9796

9897
#: ../Doc/c-api/float.rst:60
9998
msgid ""
@@ -185,7 +184,6 @@ msgid "Pack functions"
185184
msgstr "Funciones de Empaquetado"
186185

187186
#: ../Doc/c-api/float.rst:109
188-
#, fuzzy
189187
msgid ""
190188
"The pack routines write 2, 4 or 8 bytes, starting at *p*. *le* is an :c:expr:"
191189
"`int` argument, non-zero if you want the bytes string in little-endian "
@@ -195,12 +193,12 @@ msgid ""
195193
"to ``1`` on big endian processor, or ``0`` on little endian processor."
196194
msgstr ""
197195
"Las rutinas de empaquetado escriben 2, 4 o 8 bytes, comenzando en *p*. *le* "
198-
"es un argumento :c:expr:`int`, distinto de cero si desea la cadena bytes con "
199-
"criterio little-endian (exponente al final, en ``p+1``, ``p+3``, o ``p+6`` "
200-
"``p+7``), cero si se necesita el criterio big-endian (exponente primero, en "
201-
"*p*). La constante :c:data:`PY_BIG_ENDIAN` se puede usar para usar el endian "
202-
"nativo: es igual a ``1`` en el procesador big endian, o ``0`` en el "
203-
"procesador little endian."
196+
"es un argumento :c:expr:`int`, distinto de cero si desea que la cadena de "
197+
"bytes esté en formato little-endian (exponente al final, en ``p+1``, "
198+
"``p+3``, o ``p+6`` ``p+7``), y cero si desea el formato big-endian "
199+
"(exponente primero, en *p*). La constante :c:macro:`PY_BIG_ENDIAN` se puede "
200+
"usar para emplear el endian nativo: es igual a ``1`` en el procesador big-"
201+
"endian, o ``0`` en el procesador little-endian."
204202

205203
#: ../Doc/c-api/float.rst:116
206204
msgid ""
@@ -242,7 +240,6 @@ msgid "Unpack functions"
242240
msgstr "Funciones de Desempaquetado"
243241

244242
#: ../Doc/c-api/float.rst:140
245-
#, fuzzy
246243
msgid ""
247244
"The unpack routines read 2, 4 or 8 bytes, starting at *p*. *le* is an :c:"
248245
"expr:`int` argument, non-zero if the bytes string is in little-endian format "
@@ -251,13 +248,13 @@ msgid ""
251248
"be used to use the native endian: it is equal to ``1`` on big endian "
252249
"processor, or ``0`` on little endian processor."
253250
msgstr ""
254-
"Las rutinas de desempaquetado leen 2, 4 o 8 bytes, comenzando en *p*. *le* "
255-
"es un argumento :c:expr:`int` , distinto de cero si la cadena bytes usa el "
256-
"criterio little-endian (exponente al final, en ``p+1``, ``p+3`` o ``p+6`` y "
257-
"``p+7``), cero si usa el criterio big-endian (exponente primero, en *p*). La "
258-
"constante :c:data:`PY_BIG_ENDIAN` se puede usar para usar el endian: es "
259-
"igual a ``1`` en el procesador big endian, o ``0`` en el procesador little "
260-
"endian."
251+
"Las rutinas de desempaquetado leen 2, 4 u 8 bytes, comenzando en *p*. *le* "
252+
"es un argumento :c:expr:`int` , distinto de cero si la cadena bytes está en "
253+
"formato little-endian (exponente al final, en ``p+1``, ``p+3`` o ``p+6`` y "
254+
"``p+7``), cero si está en formato big-endian (exponente primero, en *p*). La "
255+
"constante :c:macro:`PY_BIG_ENDIAN` se puede usar para utilizar el endian "
256+
"nativo: es igual a ``1`` en un procesador big endian, o ``0`` en un "
257+
"procesador little-endian."
261258

262259
#: ../Doc/c-api/float.rst:147
263260
msgid ""
@@ -294,9 +291,8 @@ msgstr ""
294291

295292
#: ../Doc/c-api/float.rst:8
296293
msgid "object"
297-
msgstr ""
294+
msgstr "object"
298295

299296
#: ../Doc/c-api/float.rst:8
300-
#, fuzzy
301297
msgid "floating point"
302-
msgstr "Objetos de punto flotante"
298+
msgstr "floating point"

‎c-api/marshal.po

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,16 @@ msgstr ""
1111
"Project-Id-Version: Python 3.8\n"
1212
"Report-Msgid-Bugs-To: \n"
1313
"POT-Creation-Date: 2023-10-12 19:43+0200\n"
14-
"PO-Revision-Date: 2022-10-30 17:51-0600\n"
14+
"PO-Revision-Date: 2024-10-28 21:01-0400\n"
1515
"Last-Translator: Cristián Maureira-Fredes <cmaureirafredes@gmail.com>\n"
16-
"Language: es\n"
1716
"Language-Team: python-doc-es\n"
18-
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
17+
"Language: es\n"
1918
"MIME-Version: 1.0\n"
2019
"Content-Type: text/plain; charset=utf-8\n"
2120
"Content-Transfer-Encoding: 8bit\n"
21+
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
2222
"Generated-By: Babel 2.13.0\n"
23+
"X-Generator: Poedit 3.5\n"
2324

2425
#: ../Doc/c-api/marshal.rst:6
2526
msgid "Data marshalling support"
@@ -73,6 +74,8 @@ msgid ""
7374
"This function can fail, in which case it sets the error indicator. Use :c:"
7475
"func:`PyErr_Occurred` to check for that."
7576
msgstr ""
77+
"Esta función puede fallar, en cuyo caso establece el indicador de error. "
78+
"Utiliza :c:func:`PyErr_Occurred` para comprobarlo."
7679

7780
#: ../Doc/c-api/marshal.rst:33
7881
msgid ""

‎c-api/memoryview.po

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,16 @@ msgstr ""
1111
"Project-Id-Version: Python 3.8\n"
1212
"Report-Msgid-Bugs-To: \n"
1313
"POT-Creation-Date: 2023-10-12 19:43+0200\n"
14-
"PO-Revision-Date: 2021-08-01 20:28+0200\n"
14+
"PO-Revision-Date: 2024-10-29 21:14-0400\n"
1515
"Last-Translator: Cristián Maureira-Fredes <cmaureirafredes@gmail.com>\n"
16-
"Language: es\n"
1716
"Language-Team: python-doc-es\n"
18-
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
17+
"Language: es\n"
1918
"MIME-Version: 1.0\n"
2019
"Content-Type: text/plain; charset=utf-8\n"
2120
"Content-Transfer-Encoding: 8bit\n"
21+
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
2222
"Generated-By: Babel 2.13.0\n"
23+
"X-Generator: Poedit 3.5\n"
2324

2425
#: ../Doc/c-api/memoryview.rst:9
2526
msgid "MemoryView objects"
@@ -116,9 +117,8 @@ msgstr ""
116117

117118
#: ../Doc/c-api/memoryview.rst:5
118119
msgid "object"
119-
msgstr ""
120+
msgstr "object"
120121

121122
#: ../Doc/c-api/memoryview.rst:5
122-
#, fuzzy
123123
msgid "memoryview"
124-
msgstr "Objetos de vista de memoria (*MemoryView*)"
124+
msgstr "memoryview"

‎c-api/slice.po

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -66,16 +66,15 @@ msgstr ""
6666
"*length* como errores."
6767

6868
#: ../Doc/c-api/slice.rst:36
69-
#, fuzzy
7069
msgid ""
7170
"Returns ``0`` on success and ``-1`` on error with no exception set (unless "
7271
"one of the indices was not ``None`` and failed to be converted to an "
7372
"integer, in which case ``-1`` is returned with an exception set)."
7473
msgstr ""
7574
"Retorna ``0`` en caso de éxito y ``-1`` en caso de error sin excepción "
76-
"establecida (a menos que uno de los índices no sea :const:`None` y no se "
77-
"haya convertido a un entero, en cuyo caso ``- 1`` se retorna con una "
78-
"excepción establecida)."
75+
"establecida (a menos que uno de los índices no sea ``None`` y no se haya "
76+
"convertido a un entero, en cuyo caso ``- 1`` se retorna con una excepción "
77+
"establecida)."
7978

8079
#: ../Doc/c-api/slice.rst:40
8180
msgid "You probably do not want to use this function."
@@ -187,16 +186,15 @@ msgid "Ellipsis Object"
187186
msgstr "Objeto elipsis"
188187

189188
#: ../Doc/c-api/slice.rst:121
190-
#, fuzzy
191189
msgid ""
192190
"The Python ``Ellipsis`` object. This object has no methods. Like :c:data:"
193191
"`Py_None`, it is an `immortal <https://peps.python.org/pep-0683/>`_. "
194192
"singleton object."
195193
msgstr ""
196-
"El objeto ``Elipsis`` de Python. Este objeto no tiene métodos. Debe tratarse "
197-
"como cualquier otro objeto con respecto a los recuentos de referencia. Como :"
198-
"c:data:`Py_None` es un objeto singleton."
194+
"El objeto ``Elipsis`` de Python. Este objeto no tiene métodos. Al igual que :"
195+
"c:data:`Py_None`, es un objeto singleton `inmortal <https://peps.python.org/"
196+
"pep-0683/>`_."
199197

200198
#: ../Doc/c-api/slice.rst:125
201199
msgid ":c:data:`Py_Ellipsis` is immortal."
202-
msgstr ""
200+
msgstr ":c:data:`Py_Ellipsis` es inmortal."

0 commit comments

Comments
 (0)