Skip to content

Commit 868dead

Browse files
authored
Merge branch '3.12' into distributing-python-modules
2 parents a4df989 + fb453db commit 868dead

File tree

19 files changed

+325
-333
lines changed

19 files changed

+325
-333
lines changed

.gitmodules

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,3 @@
33
url = https://github.com/python/cpython.git
44
branch = 3.9
55
shallow = true
6-
[submodule "tutorialpyar"]
7-
path = .migration/tutorialpyar
8-
url = https://github.com/pyar/tutorial.git

.migration/tutorialpyar

Lines changed: 0 additions & 1 deletion
This file was deleted.

TRANSLATORS

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ Alfonso Trigo (@alftri)
1515
Alvar Maciel (@alvarmaciel @amaciel)
1616
Alvaro Cárdenas (@alvaruz)
1717
Álvaro Mondéjar Rubio (@mondeja)
18+
alver joan perez (@JPC501)
1819
alycolbar
1920
Ana (@popiula)
2021
Ana de la Calle
@@ -232,4 +233,4 @@ Xavi Francisco (@srxavi)
232233
Xavi Rambla Centellas (@xavirambla)
233234
Yennifer Paola Herrera Ariza (@Yenniferh)
234235
Yohanna Padrino (@Yo-hanaPR)
235-
zejiran
236+
zejiran

dictionaries/using_configure.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
autodetecta
2+
aclocal
23
backends
34
Python
45
precarga

library/aifc.po

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -362,24 +362,24 @@ msgstr ""
362362

363363
#: ../Doc/library/aifc.rst:10
364364
msgid "Audio Interchange File Format"
365-
msgstr ""
365+
msgstr "Formato de Archivo de Intercambio de Audio"
366366

367367
#: ../Doc/library/aifc.rst:10
368368
msgid "AIFF"
369-
msgstr ""
369+
msgstr "AIFF"
370370

371371
#: ../Doc/library/aifc.rst:10
372372
msgid "AIFF-C"
373-
msgstr ""
373+
msgstr "AIFF-C"
374374

375375
#: ../Doc/library/aifc.rst:190
376376
msgid "u-LAW"
377-
msgstr ""
377+
msgstr "u-LAW"
378378

379379
#: ../Doc/library/aifc.rst:190
380380
msgid "A-LAW"
381-
msgstr ""
381+
msgstr "A-LAW"
382382

383383
#: ../Doc/library/aifc.rst:190
384384
msgid "G.722"
385-
msgstr ""
385+
msgstr "G.722"

library/datetime.po

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1984,7 +1984,7 @@ msgid ""
19841984
"*self* is naive, it is presumed to represent time in the system timezone."
19851985
msgstr ""
19861986
"Si se proporciona, *tz* debe ser una instancia de una subclase :class:"
1987-
"`tzinfo`, y sus métodos :meth:`utcoffset` y :meth:`dst`no deben retornar "
1987+
"`tzinfo`, y sus métodos :meth:`utcoffset` y :meth:`dst` no deben retornar "
19881988
"``None``.Si *self* es naíf, se supone que representa la hora en la zona "
19891989
"horaria del sistema."
19901990

library/functions.po

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2713,7 +2713,7 @@ msgstr ""
27132713
"argumento sea negativo; en tal caso, todos los argumentos son convertidos a "
27142714
"punto flotante y un resultado de punto flotante es retornado. Por ejemplo, "
27152715
"``pow(10, 2)`` retorna ``100``, pero ``pow(10, -2)`` retorna ``0.01``. Para "
2716-
"una base negativa de tipo :class:`int` o :class:`float`y un exponente no "
2716+
"una base negativa de tipo :class:`int` o :class:`float` y un exponente no "
27172717
"integral, se obtiene un resultado complejo. Por ejemplo, ``pow(-9, 0.5)`` "
27182718
"retorna un valor cercano a ``3j``."
27192719

library/os.path.po

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ msgid ""
118118
msgstr ""
119119
"Retorna una versión normalizada y absoluta del nombre de ruta *path*. En la "
120120
"mayoría de las plataformas esto es el equivalente a invocar la función :func:"
121-
"`normpath`de la siguiente manera: ``normpath(join(os.getcwd(), path))``."
121+
"`normpath` de la siguiente manera: ``normpath(join(os.getcwd(), path))``."
122122

123123
#: ../Doc/library/os.path.rst:63 ../Doc/library/os.path.rst:76
124124
#: ../Doc/library/os.path.rst:116 ../Doc/library/os.path.rst:125

library/string.po

Lines changed: 23 additions & 24 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: 2023-03-17 19:35-0500\n"
15-
"Last-Translator: Adolfo Hristo David Roque Gámez <aroquega@gmail.com>\n"
16-
"Language: es\n"
14+
"PO-Revision-Date: 2023-10-13 11:53-0300\n"
15+
"Last-Translator: Alfonso Areiza Guerra <alfareiza@gmail.com>\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.4\n"
2324

2425
#: ../Doc/library/string.rst:2
2526
msgid ":mod:`string` --- Common string operations"
@@ -1534,77 +1535,75 @@ msgstr ""
15341535

15351536
#: ../Doc/library/string.rst:195
15361537
msgid "{} (curly brackets)"
1537-
msgstr ""
1538+
msgstr "{} (paréntesis de llave)"
15381539

15391540
#: ../Doc/library/string.rst:195 ../Doc/library/string.rst:335
15401541
#: ../Doc/library/string.rst:367 ../Doc/library/string.rst:386
15411542
#: ../Doc/library/string.rst:395 ../Doc/library/string.rst:409
15421543
#: ../Doc/library/string.rst:418
1543-
#, fuzzy
15441544
msgid "in string formatting"
1545-
msgstr "Formato de cadena de caracteres personalizado"
1545+
msgstr "en formato de cadena de caracteres"
15461546

15471547
#: ../Doc/library/string.rst:195
15481548
msgid ". (dot)"
1549-
msgstr ""
1549+
msgstr ". (punto)"
15501550

15511551
#: ../Doc/library/string.rst:195
15521552
msgid "[] (square brackets)"
1553-
msgstr ""
1553+
msgstr "[] (paréntesis corchete o rectos)"
15541554

15551555
#: ../Doc/library/string.rst:195
15561556
msgid "! (exclamation)"
1557-
msgstr ""
1557+
msgstr "! (exclamación)"
15581558

15591559
#: ../Doc/library/string.rst:195
15601560
msgid ": (colon)"
1561-
msgstr ""
1561+
msgstr ": (dos puntos)"
15621562

15631563
#: ../Doc/library/string.rst:335
15641564
msgid "< (less)"
1565-
msgstr ""
1565+
msgstr "< (menor que)"
15661566

15671567
#: ../Doc/library/string.rst:335
15681568
msgid "> (greater)"
1569-
msgstr ""
1569+
msgstr "> (mayor que)"
15701570

15711571
#: ../Doc/library/string.rst:335
15721572
msgid "= (equals)"
1573-
msgstr ""
1573+
msgstr "= (igual)"
15741574

15751575
#: ../Doc/library/string.rst:335
15761576
msgid "^ (caret)"
1577-
msgstr ""
1577+
msgstr "^ (caret)"
15781578

15791579
#: ../Doc/library/string.rst:367
15801580
msgid "+ (plus)"
1581-
msgstr ""
1581+
msgstr "+ (más)"
15821582

15831583
#: ../Doc/library/string.rst:367
15841584
msgid "- (minus)"
1585-
msgstr ""
1585+
msgstr "- (menos)"
15861586

15871587
#: ../Doc/library/string.rst:386
15881588
msgid "z"
1589-
msgstr ""
1589+
msgstr "z"
15901590

15911591
#: ../Doc/library/string.rst:395
15921592
msgid "# (hash)"
1593-
msgstr ""
1593+
msgstr "# (numeral o almohadilla)"
15941594

15951595
#: ../Doc/library/string.rst:409
15961596
msgid ", (comma)"
1597-
msgstr ""
1597+
msgstr ", (coma)"
15981598

15991599
#: ../Doc/library/string.rst:418
16001600
msgid "_ (underscore)"
1601-
msgstr ""
1601+
msgstr "_ (guion bajo)"
16021602

16031603
#: ../Doc/library/string.rst:746
16041604
msgid "$ (dollar)"
1605-
msgstr ""
1605+
msgstr "$ (signo dólar)"
16061606

16071607
#: ../Doc/library/string.rst:746
1608-
#, fuzzy
16091608
msgid "in template strings"
1610-
msgstr "Cadenas de plantillas"
1609+
msgstr "en plantillas de cadenas de caracteres"

library/tk.po

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -74,17 +74,16 @@ msgstr ""
7474

7575
#: ../Doc/library/tk.rst:7
7676
msgid "GUI"
77-
msgstr ""
77+
msgstr "GUI"
7878

7979
#: ../Doc/library/tk.rst:7
80-
#, fuzzy
8180
msgid "Graphical User Interface"
82-
msgstr "Interfaces gráficas de usuario con Tk"
81+
msgstr "Interfaz Gráfica de Usuario"
8382

8483
#: ../Doc/library/tk.rst:7
8584
msgid "Tkinter"
86-
msgstr ""
85+
msgstr "Tkinter"
8786

8887
#: ../Doc/library/tk.rst:7
8988
msgid "Tk"
90-
msgstr ""
89+
msgstr "Tk"

0 commit comments

Comments
 (0)