Skip to content

Commit bf235ef

Browse files
committed
Merge remote-tracking branch 'origin/3.8' into pr-375
2 parents fb7acac + 55eaa1b commit bf235ef

17 files changed

+1430
-195
lines changed

TRANSLATORS

+3
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,7 @@ Ginés Salar Ibáñez (@Ibnmardanis24)
126126
Ana (@popiula)
127127
David Silva (@dvidsilva)
128128
Ricardo Rodríguez (@ricrogz)
129+
(@0-Arngerdur-1)
129130
Melissa Escobar Gutiérrez (@MelissaEscobar)
130131
Enrique Zárate (@enrique-zarate)
131132
Jaume Montané (@jaumemy)
@@ -136,3 +137,5 @@ Ulises Alexander Argüelles Monjaraz (@UlisesAlexanderAM)
136137
Juan Elias Rodriguez (@Juerodriguez)
137138
Victor Carlos (@tuxtitlan)
138139
Ignacio Sanz (@elnaquete)
140+
Jaime Rodrigo González Rodríguez (@jairock282)
141+
Martín Ramírez (@tinchoram)

conf.py

+10-4
Original file line numberDiff line numberDiff line change
@@ -69,10 +69,16 @@
6969
_stdauthor, 'manual'),
7070
]
7171

72-
extensions.extend([
73-
'sphinx_tabs.tabs',
74-
'sphinxemoji.sphinxemoji',
75-
])
72+
try:
73+
extensions.extend([
74+
'sphinx_tabs.tabs',
75+
'sphinxemoji.sphinxemoji',
76+
])
77+
except NameError:
78+
extensions = [
79+
'sphinx_tabs.tabs',
80+
'sphinxemoji.sphinxemoji',
81+
]
7682

7783

7884
def setup(app):

dictionaries/howto_pyporting.txt

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
Nick
2+
Futurize
3+
backporting
4+
descodificarlo
5+
dicotomía
6+
lintar
7+
tox
8+
comprobador

dictionaries/library_posix.txt

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Irix
+30
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
reinterpretada
2+
hackear
3+
redireccionadas
4+
sobrescribible
5+
reintentando
6+
Redirecciona
7+
definirlo
8+
reintentará
9+
encadenación
10+
verificable
11+
Firefox
12+
Mozilla
13+
urlretrieve
14+
UnknownHandler
15+
urlencode
16+
DataHandler
17+
FileHandler
18+
ProxyBasicAuthHandler
19+
AbstractDigestAuthHandler
20+
ProxyDigestAuthHandler
21+
BaseHandler
22+
OpenerDirector
23+
getter
24+
Handler
25+
Digest
26+
BasicAuth
27+
ProxyHandler
28+
userinfo
29+
msg
30+
AbstractBasicAuthHandler

0 commit comments

Comments
 (0)