Skip to content

Commit 2eeb977

Browse files
committed
correcion de conflicto
2 parents 312b881 + 9481cf2 commit 2eeb977

File tree

3 files changed

+70
-71
lines changed

3 files changed

+70
-71
lines changed

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)

library/_thread.po

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -128,17 +128,16 @@ msgid ""
128128
"If given, *signum* is the number of the signal to simulate. If *signum* is "
129129
"not given, :const:`signal.SIGINT` is simulated."
130130
msgstr ""
131-
"Si se proporciona, *signum* es el número de la señal a simular. Si no se "
132-
"proporciona *signum*, se simula :data:`signal.SIGINT`."
131+
"Si es dada, *signum* es el número de la señal a simular. Si *signum* no es "
132+
"dada, :data:`signal.SIGINT` es simulado."
133133

134134
#: ../Doc/library/_thread.rst:75
135-
#, fuzzy
136135
msgid ""
137136
"If the given signal isn't handled by Python (it was set to :const:`signal."
138137
"SIG_DFL` or :const:`signal.SIG_IGN`), this function does nothing."
139138
msgstr ""
140-
"Si la señal dada no es manejada por Python (se estableció en :data:`signal."
141-
"SIG_DFL` o :data:`signal.SIG_IGN`), esta función no hace nada."
139+
"Si la señal dada no es manejada por Python (se estableció en :const:`signal."
140+
"SIG_DFL` o :const:`signal.SIG_IGN`), esta función no hace nada."
142141

143142
#: ../Doc/library/_thread.rst:79
144143
msgid "The *signum* argument is added to customize the signal number."
@@ -365,15 +364,14 @@ msgstr ""
365364
"a invocar :func:`_thread.exit`."
366365

367366
#: ../Doc/library/_thread.rst:220
368-
#, fuzzy
369367
msgid ""
370368
"It is not possible to interrupt the :meth:`~threading.Lock.acquire` method "
371369
"on a lock --- the :exc:`KeyboardInterrupt` exception will happen after the "
372370
"lock has been acquired."
373371
msgstr ""
374-
"No es posible interrumpir el método :meth:`acquire` en un candado. La "
375-
"excepción :exc:`KeyboardInterrupt` tendrá lugar después de que el candado "
376-
"haya sido adquirido."
372+
"No es posible interrumpir el método :meth:`~threading.Lock.acquire` en un "
373+
"candado. La excepción :exc:`KeyboardInterrupt` tendrá lugar después de que "
374+
"el candado haya sido adquirido."
377375

378376
#: ../Doc/library/_thread.rst:224
379377
msgid ""
@@ -398,36 +396,36 @@ msgstr ""
398396

399397
#: ../Doc/library/_thread.rst:7
400398
msgid "light-weight processes"
401-
msgstr ""
399+
msgstr "procesos ligeros"
402400

403401
#: ../Doc/library/_thread.rst:7
404402
msgid "processes, light-weight"
405-
msgstr ""
403+
msgstr "procesos, ligero"
406404

407405
#: ../Doc/library/_thread.rst:7
408406
msgid "binary semaphores"
409-
msgstr ""
407+
msgstr "semaforos binarios"
410408

411409
#: ../Doc/library/_thread.rst:7
412410
msgid "semaphores, binary"
413-
msgstr ""
411+
msgstr "semaforos, binario"
414412

415413
#: ../Doc/library/_thread.rst:22
416414
msgid "pthreads"
417-
msgstr ""
415+
msgstr "subprocesos"
418416

419417
#: ../Doc/library/_thread.rst:22
420418
msgid "threads"
421-
msgstr ""
419+
msgstr "Hilos"
422420

423421
#: ../Doc/library/_thread.rst:22
424422
msgid "POSIX"
425-
msgstr ""
423+
msgstr "POSIX"
426424

427425
#: ../Doc/library/_thread.rst:211
428426
msgid "module"
429-
msgstr ""
427+
msgstr "modulo"
430428

431429
#: ../Doc/library/_thread.rst:211
432430
msgid "signal"
433-
msgstr ""
431+
msgstr "señal"

library/token.po

Lines changed: 53 additions & 52 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: 2020-10-05 17:28+0200\n"
14+
"PO-Revision-Date: 2024-10-19 16:27-0600\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/library/token.rst:2
2526
msgid ":mod:`token` --- Constants used with Python parse trees"
@@ -81,203 +82,203 @@ msgstr "Las constantes de token son:"
8182

8283
#: ../Doc/library/token-list.inc:18
8384
msgid "Token value for ``\"(\"``."
84-
msgstr ""
85+
msgstr "Valor de token para ``\"(\"``."
8586

8687
#: ../Doc/library/token-list.inc:22
8788
msgid "Token value for ``\")\"``."
88-
msgstr ""
89+
msgstr "Valor de token para ``\")\"``."
8990

9091
#: ../Doc/library/token-list.inc:26
9192
msgid "Token value for ``\"[\"``."
92-
msgstr ""
93+
msgstr "Valor de token para ``\"[\"``."
9394

9495
#: ../Doc/library/token-list.inc:30
9596
msgid "Token value for ``\"]\"``."
96-
msgstr ""
97+
msgstr "Valor de token para ``\"]\"``."
9798

9899
#: ../Doc/library/token-list.inc:34
99100
msgid "Token value for ``\":\"``."
100-
msgstr ""
101+
msgstr "Valor de token para ``\":\"``."
101102

102103
#: ../Doc/library/token-list.inc:38
103104
msgid "Token value for ``\",\"``."
104-
msgstr ""
105+
msgstr "Valor de token para ``\",\"``."
105106

106107
#: ../Doc/library/token-list.inc:42
107108
msgid "Token value for ``\";\"``."
108-
msgstr ""
109+
msgstr "Valor de token para ``\";\"``."
109110

110111
#: ../Doc/library/token-list.inc:46
111112
msgid "Token value for ``\"+\"``."
112-
msgstr ""
113+
msgstr "Valor de token para ``\"+\"``."
113114

114115
#: ../Doc/library/token-list.inc:50
115116
msgid "Token value for ``\"-\"``."
116-
msgstr ""
117+
msgstr "Valor de token para ``\"-\"``."
117118

118119
#: ../Doc/library/token-list.inc:54
119120
msgid "Token value for ``\"*\"``."
120-
msgstr ""
121+
msgstr "Valor de token para ``\"*\"``."
121122

122123
#: ../Doc/library/token-list.inc:58
123124
msgid "Token value for ``\"/\"``."
124-
msgstr ""
125+
msgstr "Valor de token para ``\"/\"``."
125126

126127
#: ../Doc/library/token-list.inc:62
127128
msgid "Token value for ``\"|\"``."
128-
msgstr ""
129+
msgstr "Valor de token para ``\"|\"``."
129130

130131
#: ../Doc/library/token-list.inc:66
131132
msgid "Token value for ``\"&\"``."
132-
msgstr ""
133+
msgstr "Valor de token para ``\"&\"``."
133134

134135
#: ../Doc/library/token-list.inc:70
135136
msgid "Token value for ``\"<\"``."
136-
msgstr ""
137+
msgstr "Valor de token para ``\"<\"``."
137138

138139
#: ../Doc/library/token-list.inc:74
139140
msgid "Token value for ``\">\"``."
140-
msgstr ""
141+
msgstr "Valor de token para ``\">\"``."
141142

142143
#: ../Doc/library/token-list.inc:78
143144
msgid "Token value for ``\"=\"``."
144-
msgstr ""
145+
msgstr "Valor de token para ``\"=\"``."
145146

146147
#: ../Doc/library/token-list.inc:82
147148
msgid "Token value for ``\".\"``."
148-
msgstr ""
149+
msgstr "Valor de token para ``\".\"``."
149150

150151
#: ../Doc/library/token-list.inc:86
151152
msgid "Token value for ``\"%\"``."
152-
msgstr ""
153+
msgstr "Valor de token para ``\"%\"``."
153154

154155
#: ../Doc/library/token-list.inc:90
155156
msgid "Token value for ``\"{\"``."
156-
msgstr ""
157+
msgstr "Valor de token para ``\"{\"``."
157158

158159
#: ../Doc/library/token-list.inc:94
159160
msgid "Token value for ``\"}\"``."
160-
msgstr ""
161+
msgstr "Valor de token para ``\"}\"``."
161162

162163
#: ../Doc/library/token-list.inc:98
163164
msgid "Token value for ``\"==\"``."
164-
msgstr ""
165+
msgstr "Valor de token para ``\"==\"``."
165166

166167
#: ../Doc/library/token-list.inc:102
167168
msgid "Token value for ``\"!=\"``."
168-
msgstr ""
169+
msgstr "Valor de token para ``\"!=\"``."
169170

170171
#: ../Doc/library/token-list.inc:106
171172
msgid "Token value for ``\"<=\"``."
172-
msgstr ""
173+
msgstr "Valor de token para ``\"<=\"``."
173174

174175
#: ../Doc/library/token-list.inc:110
175176
msgid "Token value for ``\">=\"``."
176-
msgstr ""
177+
msgstr "Valor de token para ``\">=\"``."
177178

178179
#: ../Doc/library/token-list.inc:114
179180
msgid "Token value for ``\"~\"``."
180-
msgstr ""
181+
msgstr "Valor de token para ``\"~\"``."
181182

182183
#: ../Doc/library/token-list.inc:118
183184
msgid "Token value for ``\"^\"``."
184-
msgstr ""
185+
msgstr "Valor de token para ``\"^\"``."
185186

186187
#: ../Doc/library/token-list.inc:122
187188
msgid "Token value for ``\"<<\"``."
188-
msgstr ""
189+
msgstr "Valor de token para ``\"<<\"``."
189190

190191
#: ../Doc/library/token-list.inc:126
191192
msgid "Token value for ``\">>\"``."
192-
msgstr ""
193+
msgstr "Valor de token para ``\">>\"``."
193194

194195
#: ../Doc/library/token-list.inc:130
195196
msgid "Token value for ``\"**\"``."
196-
msgstr ""
197+
msgstr "Valor de token para ``\"**\"``."
197198

198199
#: ../Doc/library/token-list.inc:134
199200
msgid "Token value for ``\"+=\"``."
200-
msgstr ""
201+
msgstr "Valor de token para ``\"+=\"``."
201202

202203
#: ../Doc/library/token-list.inc:138
203204
msgid "Token value for ``\"-=\"``."
204-
msgstr ""
205+
msgstr "Valor de token para ``\"-=\"``."
205206

206207
#: ../Doc/library/token-list.inc:142
207208
msgid "Token value for ``\"*=\"``."
208-
msgstr ""
209+
msgstr "Valor de token para ``\"*=\"``."
209210

210211
#: ../Doc/library/token-list.inc:146
211212
msgid "Token value for ``\"/=\"``."
212-
msgstr ""
213+
msgstr "Valor de token para ``\"/=\"``."
213214

214215
#: ../Doc/library/token-list.inc:150
215216
msgid "Token value for ``\"%=\"``."
216-
msgstr ""
217+
msgstr "Valor de token para ``\"%=\"``."
217218

218219
#: ../Doc/library/token-list.inc:154
219220
msgid "Token value for ``\"&=\"``."
220-
msgstr ""
221+
msgstr "Valor de token para ``\"&=\"``."
221222

222223
#: ../Doc/library/token-list.inc:158
223224
msgid "Token value for ``\"|=\"``."
224-
msgstr ""
225+
msgstr "Valor de token para ``\"|=\"``."
225226

226227
#: ../Doc/library/token-list.inc:162
227228
msgid "Token value for ``\"^=\"``."
228-
msgstr ""
229+
msgstr "Valor de token para ``\"^=\"``."
229230

230231
#: ../Doc/library/token-list.inc:166
231232
msgid "Token value for ``\"<<=\"``."
232-
msgstr ""
233+
msgstr "Valor de token para ``\"<<=\"``."
233234

234235
#: ../Doc/library/token-list.inc:170
235236
msgid "Token value for ``\">>=\"``."
236-
msgstr ""
237+
msgstr "Valor de token para ``\">>=\"``."
237238

238239
#: ../Doc/library/token-list.inc:174
239240
msgid "Token value for ``\"**=\"``."
240-
msgstr ""
241+
msgstr "Valor de token para ``\"**=\"``."
241242

242243
#: ../Doc/library/token-list.inc:178
243244
msgid "Token value for ``\"//\"``."
244-
msgstr ""
245+
msgstr "Valor de token para ``\"//\"``."
245246

246247
#: ../Doc/library/token-list.inc:182
247248
msgid "Token value for ``\"//=\"``."
248-
msgstr ""
249+
msgstr "Valor de token para ``\"//=\"``."
249250

250251
#: ../Doc/library/token-list.inc:186
251252
msgid "Token value for ``\"@\"``."
252-
msgstr ""
253+
msgstr "Valor de token para ``\"@\"``."
253254

254255
#: ../Doc/library/token-list.inc:190
255256
msgid "Token value for ``\"@=\"``."
256-
msgstr ""
257+
msgstr "Valor de token para ``\"@=\"``."
257258

258259
#: ../Doc/library/token-list.inc:194
259260
msgid "Token value for ``\"->\"``."
260-
msgstr ""
261+
msgstr "Valor de token para ``\"->\"``."
261262

262263
#: ../Doc/library/token-list.inc:198
263264
msgid "Token value for ``\"...\"``."
264-
msgstr ""
265+
msgstr "Valor de token para ``\"...\"``."
265266

266267
#: ../Doc/library/token-list.inc:202
267268
msgid "Token value for ``\":=\"``."
268-
msgstr ""
269+
msgstr "Valor de token para ``\":=\"``."
269270

270271
#: ../Doc/library/token-list.inc:206
271272
msgid "Token value for ``\"!\"``."
272-
msgstr ""
273+
msgstr "Valor de token para ``\"!\"``."
273274

274275
#: ../Doc/library/token.rst:49
275276
msgid ""
276277
"The following token type values aren't used by the C tokenizer but are "
277278
"needed for the :mod:`tokenize` module."
278279
msgstr ""
279280
"Los siguientes tipos de valores tokens no son usados por el tokenizador C "
280-
"pero son necesarios para el modulo :mod:`tokenizador`."
281+
"pero son necesarios para el módulo :mod:`tokenize`."
281282

282283
#: ../Doc/library/token.rst:55
283284
msgid "Token value used to indicate a comment."

0 commit comments

Comments
 (0)