Skip to content

Commit a7d42a5

Browse files
sync with cpython 289a32ba
1 parent 93ddb62 commit a7d42a5

File tree

3 files changed

+56
-54
lines changed

3 files changed

+56
-54
lines changed

library/collections.po

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: Python 3.10\n"
1010
"Report-Msgid-Bugs-To: \n"
11-
"POT-Creation-Date: 2021-10-28 17:11+0000\n"
11+
"POT-Creation-Date: 2022-01-05 00:10+0000\n"
1212
"PO-Revision-Date: 2018-05-23 14:41+0000\n"
1313
"Last-Translator: Adrian Liaw <adrianliaw2000@gmail.com>\n"
1414
"Language-Team: Chinese - TAIWAN (https://github.com/python/python-docs-zh-"
@@ -780,7 +780,7 @@ msgid ""
780780
"absent."
781781
msgstr ""
782782

783-
#: ../../library/collections.rst:757 ../../library/collections.rst:1154
783+
#: ../../library/collections.rst:757 ../../library/collections.rst:1156
784784
msgid ""
785785
"Added merge (``|``) and update (``|=``) operators, specified in :pep:`584`."
786786
msgstr ""
@@ -1121,16 +1121,16 @@ msgstr ""
11211121
msgid ""
11221122
"Move an existing *key* to either end of an ordered dictionary. The item is "
11231123
"moved to the right end if *last* is true (the default) or to the beginning "
1124-
"if *last* is false. Raises :exc:`KeyError` if the *key* does not exist::"
1124+
"if *last* is false. Raises :exc:`KeyError` if the *key* does not exist:"
11251125
msgstr ""
11261126

1127-
#: ../../library/collections.rst:1135
1127+
#: ../../library/collections.rst:1137
11281128
msgid ""
11291129
"In addition to the usual mapping methods, ordered dictionaries also support "
11301130
"reverse iteration using :func:`reversed`."
11311131
msgstr ""
11321132

1133-
#: ../../library/collections.rst:1138
1133+
#: ../../library/collections.rst:1140
11341134
msgid ""
11351135
"Equality tests between :class:`OrderedDict` objects are order-sensitive and "
11361136
"are implemented as ``list(od1.items())==list(od2.items())``. Equality tests "
@@ -1140,49 +1140,49 @@ msgid ""
11401140
"dictionary is used."
11411141
msgstr ""
11421142

1143-
#: ../../library/collections.rst:1145
1143+
#: ../../library/collections.rst:1147
11441144
msgid ""
11451145
"The items, keys, and values :term:`views <dictionary view>` of :class:"
11461146
"`OrderedDict` now support reverse iteration using :func:`reversed`."
11471147
msgstr ""
11481148

1149-
#: ../../library/collections.rst:1149
1149+
#: ../../library/collections.rst:1151
11501150
msgid ""
11511151
"With the acceptance of :pep:`468`, order is retained for keyword arguments "
11521152
"passed to the :class:`OrderedDict` constructor and its :meth:`update` method."
11531153
msgstr ""
11541154

1155-
#: ../../library/collections.rst:1159
1155+
#: ../../library/collections.rst:1161
11561156
msgid ":class:`OrderedDict` Examples and Recipes"
11571157
msgstr ""
11581158

1159-
#: ../../library/collections.rst:1161
1159+
#: ../../library/collections.rst:1163
11601160
msgid ""
11611161
"It is straightforward to create an ordered dictionary variant that remembers "
11621162
"the order the keys were *last* inserted. If a new entry overwrites an "
11631163
"existing entry, the original insertion position is changed and moved to the "
11641164
"end::"
11651165
msgstr ""
11661166

1167-
#: ../../library/collections.rst:1173
1167+
#: ../../library/collections.rst:1175
11681168
msgid ""
11691169
"An :class:`OrderedDict` would also be useful for implementing variants of :"
11701170
"func:`functools.lru_cache`:"
11711171
msgstr ""
11721172

1173-
#: ../../library/collections.rst:1271
1173+
#: ../../library/collections.rst:1273
11741174
msgid ":class:`UserDict` objects"
11751175
msgstr ""
11761176

1177-
#: ../../library/collections.rst:1273
1177+
#: ../../library/collections.rst:1275
11781178
msgid ""
11791179
"The class, :class:`UserDict` acts as a wrapper around dictionary objects. "
11801180
"The need for this class has been partially supplanted by the ability to "
11811181
"subclass directly from :class:`dict`; however, this class can be easier to "
11821182
"work with because the underlying dictionary is accessible as an attribute."
11831183
msgstr ""
11841184

1185-
#: ../../library/collections.rst:1281
1185+
#: ../../library/collections.rst:1283
11861186
msgid ""
11871187
"Class that simulates a dictionary. The instance's contents are kept in a "
11881188
"regular dictionary, which is accessible via the :attr:`data` attribute of :"
@@ -1191,37 +1191,37 @@ msgid ""
11911191
"not be kept, allowing it to be used for other purposes."
11921192
msgstr ""
11931193

1194-
#: ../../library/collections.rst:1287
1194+
#: ../../library/collections.rst:1289
11951195
msgid ""
11961196
"In addition to supporting the methods and operations of mappings, :class:"
11971197
"`UserDict` instances provide the following attribute:"
11981198
msgstr ""
11991199

1200-
#: ../../library/collections.rst:1292
1200+
#: ../../library/collections.rst:1294
12011201
msgid ""
12021202
"A real dictionary used to store the contents of the :class:`UserDict` class."
12031203
msgstr ""
12041204

1205-
#: ../../library/collections.rst:1298
1205+
#: ../../library/collections.rst:1300
12061206
msgid ":class:`UserList` objects"
12071207
msgstr ""
12081208

1209-
#: ../../library/collections.rst:1300
1209+
#: ../../library/collections.rst:1302
12101210
msgid ""
12111211
"This class acts as a wrapper around list objects. It is a useful base class "
12121212
"for your own list-like classes which can inherit from them and override "
12131213
"existing methods or add new ones. In this way, one can add new behaviors to "
12141214
"lists."
12151215
msgstr ""
12161216

1217-
#: ../../library/collections.rst:1305
1217+
#: ../../library/collections.rst:1307
12181218
msgid ""
12191219
"The need for this class has been partially supplanted by the ability to "
12201220
"subclass directly from :class:`list`; however, this class can be easier to "
12211221
"work with because the underlying list is accessible as an attribute."
12221222
msgstr ""
12231223

1224-
#: ../../library/collections.rst:1311
1224+
#: ../../library/collections.rst:1313
12251225
msgid ""
12261226
"Class that simulates a list. The instance's contents are kept in a regular "
12271227
"list, which is accessible via the :attr:`data` attribute of :class:"
@@ -1230,19 +1230,19 @@ msgid ""
12301230
"for example a real Python list or a :class:`UserList` object."
12311231
msgstr ""
12321232

1233-
#: ../../library/collections.rst:1317
1233+
#: ../../library/collections.rst:1319
12341234
msgid ""
12351235
"In addition to supporting the methods and operations of mutable sequences, :"
12361236
"class:`UserList` instances provide the following attribute:"
12371237
msgstr ""
12381238

1239-
#: ../../library/collections.rst:1322
1239+
#: ../../library/collections.rst:1324
12401240
msgid ""
12411241
"A real :class:`list` object used to store the contents of the :class:"
12421242
"`UserList` class."
12431243
msgstr ""
12441244

1245-
#: ../../library/collections.rst:1325
1245+
#: ../../library/collections.rst:1327
12461246
msgid ""
12471247
"**Subclassing requirements:** Subclasses of :class:`UserList` are expected "
12481248
"to offer a constructor which can be called with either no arguments or one "
@@ -1252,27 +1252,27 @@ msgid ""
12521252
"object used as a data source."
12531253
msgstr ""
12541254

1255-
#: ../../library/collections.rst:1332
1255+
#: ../../library/collections.rst:1334
12561256
msgid ""
12571257
"If a derived class does not wish to comply with this requirement, all of the "
12581258
"special methods supported by this class will need to be overridden; please "
12591259
"consult the sources for information about the methods which need to be "
12601260
"provided in that case."
12611261
msgstr ""
12621262

1263-
#: ../../library/collections.rst:1338
1263+
#: ../../library/collections.rst:1340
12641264
msgid ":class:`UserString` objects"
12651265
msgstr ""
12661266

1267-
#: ../../library/collections.rst:1340
1267+
#: ../../library/collections.rst:1342
12681268
msgid ""
12691269
"The class, :class:`UserString` acts as a wrapper around string objects. The "
12701270
"need for this class has been partially supplanted by the ability to subclass "
12711271
"directly from :class:`str`; however, this class can be easier to work with "
12721272
"because the underlying string is accessible as an attribute."
12731273
msgstr ""
12741274

1275-
#: ../../library/collections.rst:1348
1275+
#: ../../library/collections.rst:1350
12761276
msgid ""
12771277
"Class that simulates a string object. The instance's content is kept in a "
12781278
"regular string object, which is accessible via the :attr:`data` attribute "
@@ -1281,19 +1281,19 @@ msgid ""
12811281
"converted into a string using the built-in :func:`str` function."
12821282
msgstr ""
12831283

1284-
#: ../../library/collections.rst:1355
1284+
#: ../../library/collections.rst:1357
12851285
msgid ""
12861286
"In addition to supporting the methods and operations of strings, :class:"
12871287
"`UserString` instances provide the following attribute:"
12881288
msgstr ""
12891289

1290-
#: ../../library/collections.rst:1360
1290+
#: ../../library/collections.rst:1362
12911291
msgid ""
12921292
"A real :class:`str` object used to store the contents of the :class:"
12931293
"`UserString` class."
12941294
msgstr ""
12951295

1296-
#: ../../library/collections.rst:1363
1296+
#: ../../library/collections.rst:1365
12971297
msgid ""
12981298
"New methods ``__getnewargs__``, ``__rmod__``, ``casefold``, ``format_map``, "
12991299
"``isprintable``, and ``maketrans``."

library/concurrent.futures.po

Lines changed: 24 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ msgid ""
77
msgstr ""
88
"Project-Id-Version: Python 3.10\n"
99
"Report-Msgid-Bugs-To: \n"
10-
"POT-Creation-Date: 2021-09-13 00:11+0000\n"
10+
"POT-Creation-Date: 2022-01-05 00:10+0000\n"
1111
"PO-Revision-Date: 2018-05-23 14:41+0000\n"
1212
"Last-Translator: Adrian Liaw <adrianliaw2000@gmail.com>\n"
1313
"Language-Team: Chinese - TAIWAN (https://github.com/python/python-docs-zh-"
@@ -56,7 +56,7 @@ msgstr ""
5656

5757
#: ../../library/concurrent.futures.rst:33
5858
msgid ""
59-
"Schedules the callable, *fn*, to be executed as ``fn(*args **kwargs)`` and "
59+
"Schedules the callable, *fn*, to be executed as ``fn(*args, **kwargs)`` and "
6060
"returns a :class:`Future` object representing the execution of the "
6161
"callable. ::"
6262
msgstr ""
@@ -455,62 +455,63 @@ msgstr "模組函式"
455455
#: ../../library/concurrent.futures.rst:437
456456
msgid ""
457457
"Wait for the :class:`Future` instances (possibly created by different :class:"
458-
"`Executor` instances) given by *fs* to complete. Returns a named 2-tuple of "
458+
"`Executor` instances) given by *fs* to complete. Duplicate futures given to "
459+
"*fs* are removed and will be returned only once. Returns a named 2-tuple of "
459460
"sets. The first set, named ``done``, contains the futures that completed "
460461
"(finished or cancelled futures) before the wait completed. The second set, "
461462
"named ``not_done``, contains the futures that did not complete (pending or "
462463
"running futures)."
463464
msgstr ""
464465

465-
#: ../../library/concurrent.futures.rst:444
466+
#: ../../library/concurrent.futures.rst:445
466467
msgid ""
467468
"*timeout* can be used to control the maximum number of seconds to wait "
468469
"before returning. *timeout* can be an int or float. If *timeout* is not "
469470
"specified or ``None``, there is no limit to the wait time."
470471
msgstr ""
471472

472-
#: ../../library/concurrent.futures.rst:448
473+
#: ../../library/concurrent.futures.rst:449
473474
msgid ""
474475
"*return_when* indicates when this function should return. It must be one of "
475476
"the following constants:"
476477
msgstr ""
477478

478-
#: ../../library/concurrent.futures.rst:454
479+
#: ../../library/concurrent.futures.rst:455
479480
msgid "Constant"
480481
msgstr "常數"
481482

482-
#: ../../library/concurrent.futures.rst:454
483+
#: ../../library/concurrent.futures.rst:455
483484
msgid "Description"
484485
msgstr "描述"
485486

486-
#: ../../library/concurrent.futures.rst:456
487+
#: ../../library/concurrent.futures.rst:457
487488
msgid ":const:`FIRST_COMPLETED`"
488489
msgstr ":const:`FIRST_COMPLETED`"
489490

490-
#: ../../library/concurrent.futures.rst:456
491+
#: ../../library/concurrent.futures.rst:457
491492
msgid "The function will return when any future finishes or is cancelled."
492493
msgstr ""
493494

494-
#: ../../library/concurrent.futures.rst:459
495+
#: ../../library/concurrent.futures.rst:460
495496
msgid ":const:`FIRST_EXCEPTION`"
496497
msgstr ":const:`FIRST_EXCEPTION`"
497498

498-
#: ../../library/concurrent.futures.rst:459
499+
#: ../../library/concurrent.futures.rst:460
499500
msgid ""
500501
"The function will return when any future finishes by raising an exception. "
501502
"If no future raises an exception then it is equivalent to :const:"
502503
"`ALL_COMPLETED`."
503504
msgstr ""
504505

505-
#: ../../library/concurrent.futures.rst:465
506+
#: ../../library/concurrent.futures.rst:466
506507
msgid ":const:`ALL_COMPLETED`"
507508
msgstr ":const:`ALL_COMPLETED`"
508509

509-
#: ../../library/concurrent.futures.rst:465
510+
#: ../../library/concurrent.futures.rst:466
510511
msgid "The function will return when all futures finish or are cancelled."
511512
msgstr ""
512513

513-
#: ../../library/concurrent.futures.rst:471
514+
#: ../../library/concurrent.futures.rst:472
514515
msgid ""
515516
"Returns an iterator over the :class:`Future` instances (possibly created by "
516517
"different :class:`Executor` instances) given by *fs* that yields futures as "
@@ -524,49 +525,49 @@ msgid ""
524525
"wait time."
525526
msgstr ""
526527

527-
#: ../../library/concurrent.futures.rst:485
528+
#: ../../library/concurrent.futures.rst:486
528529
msgid ":pep:`3148` -- futures - execute computations asynchronously"
529530
msgstr ""
530531

531-
#: ../../library/concurrent.futures.rst:485
532+
#: ../../library/concurrent.futures.rst:486
532533
msgid ""
533534
"The proposal which described this feature for inclusion in the Python "
534535
"standard library."
535536
msgstr ""
536537

537-
#: ../../library/concurrent.futures.rst:490
538+
#: ../../library/concurrent.futures.rst:491
538539
msgid "Exception classes"
539540
msgstr ""
540541

541-
#: ../../library/concurrent.futures.rst:496
542+
#: ../../library/concurrent.futures.rst:497
542543
msgid "Raised when a future is cancelled."
543544
msgstr ""
544545

545-
#: ../../library/concurrent.futures.rst:500
546+
#: ../../library/concurrent.futures.rst:501
546547
msgid "Raised when a future operation exceeds the given timeout."
547548
msgstr ""
548549

549-
#: ../../library/concurrent.futures.rst:504
550+
#: ../../library/concurrent.futures.rst:505
550551
msgid ""
551552
"Derived from :exc:`RuntimeError`, this exception class is raised when an "
552553
"executor is broken for some reason, and cannot be used to submit or execute "
553554
"new tasks."
554555
msgstr ""
555556

556-
#: ../../library/concurrent.futures.rst:512
557+
#: ../../library/concurrent.futures.rst:513
557558
msgid ""
558559
"Raised when an operation is performed on a future that is not allowed in the "
559560
"current state."
560561
msgstr ""
561562

562-
#: ../../library/concurrent.futures.rst:521
563+
#: ../../library/concurrent.futures.rst:522
563564
msgid ""
564565
"Derived from :exc:`~concurrent.futures.BrokenExecutor`, this exception class "
565566
"is raised when one of the workers of a :class:`ThreadPoolExecutor` has "
566567
"failed initializing."
567568
msgstr ""
568569

569-
#: ../../library/concurrent.futures.rst:531
570+
#: ../../library/concurrent.futures.rst:532
570571
msgid ""
571572
"Derived from :exc:`~concurrent.futures.BrokenExecutor` (formerly :exc:"
572573
"`RuntimeError`), this exception class is raised when one of the workers of "

library/warnings.po

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ msgid ""
77
msgstr ""
88
"Project-Id-Version: Python 3.10\n"
99
"Report-Msgid-Bugs-To: \n"
10-
"POT-Creation-Date: 2021-10-26 16:47+0000\n"
10+
"POT-Creation-Date: 2022-01-05 00:10+0000\n"
1111
"PO-Revision-Date: 2018-05-23 16:15+0000\n"
1212
"Last-Translator: Adrian Liaw <adrianliaw2000@gmail.com>\n"
1313
"Language-Team: Chinese - TAIWAN (https://github.com/python/python-docs-zh-"
@@ -216,7 +216,8 @@ msgid ":exc:`ResourceWarning`"
216216
msgstr ":exc:`ResourceWarning`"
217217

218218
#: ../../library/warnings.rst:107
219-
msgid "Base category for warnings related to resource usage."
219+
msgid ""
220+
"Base category for warnings related to resource usage (ignored by default)."
220221
msgstr ""
221222

222223
#: ../../library/warnings.rst:111

0 commit comments

Comments
 (0)