Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit00c7214

Browse files
github-actions[bot]mattwang44
authored andcommitted
sync with cpython 289a32ba
1 parentb440e2c commit00c7214

File tree

3 files changed

+60
-25
lines changed

3 files changed

+60
-25
lines changed

‎library/collections.po

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1438,13 +1438,21 @@ msgid ""
14381438
"With the acceptance of :pep:`468`, order is retained for keyword arguments "
14391439
"passed to the :class:`OrderedDict` constructor and its :meth:`update` method."
14401440
msgstr""
1441+
<<<<<<< HEAD
14411442
"隨著 :pep:`468` 被核可,被傳入給 :class:`OrderedDict` 建構函式與其 :meth:"
14421443
"`update` 方法的關鍵字引數之順序被保留了下來。"
14431444

14441445
#:../../library/collections.rst:1161
14451446
msgid":class:`OrderedDict` Examples and Recipes"
14461447
msgstr":class:`OrderedDict` 範例與用法"
14471448

1449+
=======
1450+
1451+
#:../../library/collections.rst:1161
1452+
msgid":class:`OrderedDict` Examples and Recipes"
1453+
msgstr""
1454+
1455+
>>>>>>> a7d42a54 (sync with cpython 289a32ba)
14481456
#:../../library/collections.rst:1163
14491457
msgid""
14501458
"It is straightforward to create an ordered dictionary variant that remembers "
@@ -1462,13 +1470,21 @@ msgid ""
14621470
"An :class:`OrderedDict` would also be useful for implementing variants of :"
14631471
"func:`functools.lru_cache`:"
14641472
msgstr""
1473+
<<<<<<< HEAD
14651474
":class:`OrderedDict` 在實現一個 :func:`functools.lru_cache` 的變形版本時也非"
14661475
"常有用:"
14671476

14681477
#:../../library/collections.rst:1273
14691478
msgid":class:`UserDict` objects"
14701479
msgstr":class:`UserDict` 物件"
14711480

1481+
=======
1482+
1483+
#:../../library/collections.rst:1273
1484+
msgid":class:`UserDict` objects"
1485+
msgstr""
1486+
1487+
>>>>>>> a7d42a54 (sync with cpython 289a32ba)
14721488
#:../../library/collections.rst:1275
14731489
msgid""
14741490
"The class, :class:`UserDict` acts as a wrapper around dictionary objects. "
@@ -1502,12 +1518,21 @@ msgstr ""
15021518
#:../../library/collections.rst:1294
15031519
msgid""
15041520
"A real dictionary used to store the contents of the :class:`UserDict` class."
1521+
<<<<<<< HEAD
15051522
msgstr"一個真實的字典,用於儲存 :class:`UserDict` 類別的資料內容。"
15061523

15071524
#:../../library/collections.rst:1300
15081525
msgid":class:`UserList` objects"
15091526
msgstr":class:`UserList` 物件"
15101527

1528+
=======
1529+
msgstr""
1530+
1531+
#:../../library/collections.rst:1300
1532+
msgid":class:`UserList` objects"
1533+
msgstr""
1534+
1535+
>>>>>>> a7d42a54 (sync with cpython 289a32ba)
15111536
#:../../library/collections.rst:1302
15121537
msgid""
15131538
"This class acts as a wrapper around list objects. It is a useful base class "
@@ -1576,13 +1601,21 @@ msgid ""
15761601
"consult the sources for information about the methods which need to be "
15771602
"provided in that case."
15781603
msgstr""
1604+
<<<<<<< HEAD
15791605
"如果希望一個自此獲得的子類別不遵從上述要求,那所有該類別支援的特殊方法則必須"
15801606
"被覆寫;請參考原始碼來理解在這情況下哪些方法是必須提供的。"
15811607

15821608
#:../../library/collections.rst:1340
15831609
msgid":class:`UserString` objects"
15841610
msgstr":class:`UserString` 物件"
15851611

1612+
=======
1613+
1614+
#:../../library/collections.rst:1340
1615+
msgid":class:`UserString` objects"
1616+
msgstr""
1617+
1618+
>>>>>>> a7d42a54 (sync with cpython 289a32ba)
15861619
#:../../library/collections.rst:1342
15871620
msgid""
15881621
"The class, :class:`UserString` acts as a wrapper around string objects. The "

‎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)

[8]ページ先頭

©2009-2025 Movatter.jp