Skip to content

Commit 2075526

Browse files
mattwang44mattwang44
authored
Merge branch '3.9' into index
2 parents c22e614 + 551ff79 commit 2075526

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+1971
-1356
lines changed

‎c-api/call.po

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: Python 3.9\n"
1010
"Report-Msgid-Bugs-To: \n"
11-
"POT-Creation-Date: 2021-09-13 00:11+0000\n"
11+
"POT-Creation-Date: 2021-10-07 00:10+0000\n"
1212
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1313
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1414
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -254,7 +254,7 @@ msgstr ""
254254
msgid ""
255255
"Various functions are available for calling a Python object. Each converts "
256256
"its arguments to a convention supported by the called object – either "
257-
"*tp_call* or vectorcall. In order to do as litle conversion as possible, "
257+
"*tp_call* or vectorcall. In order to do as little conversion as possible, "
258258
"pick one that best fits the format of data you have available."
259259
msgstr ""
260260

‎c-api/init.po

+8-8
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ msgid ""
77
msgstr ""
88
"Project-Id-Version: Python 3.7\n"
99
"Report-Msgid-Bugs-To: \n"
10-
"POT-Creation-Date: 2021-09-13 00:11+0000\n"
10+
"POT-Creation-Date: 2021-09-24 00:11+0000\n"
1111
"PO-Revision-Date: 2018-05-23 14:06+0000\n"
1212
"Last-Translator: Adrian Liaw <adrianliaw2000@gmail.com>\n"
1313
"Language-Team: Chinese - TAIWAN (https://github.com/python/python-docs-zh-"
@@ -618,7 +618,7 @@ msgid ""
618618
"name (set by :c:func:`Py_SetProgramName` above) and some environment "
619619
"variables. The returned string consists of a series of directory names "
620620
"separated by a platform dependent delimiter character. The delimiter "
621-
"character is ``':'`` on Unix and Mac OS X, ``';'`` on Windows. The returned "
621+
"character is ``':'`` on Unix and macOS, ``';'`` on Windows. The returned "
622622
"string points into static storage; the caller should not modify its value. "
623623
"The list :data:`sys.path` is initialized with this value on interpreter "
624624
"startup; it can be (and usually is) modified later to change the search path "
@@ -632,8 +632,8 @@ msgid ""
632632
"default search path but uses the one provided instead. This is useful if "
633633
"Python is embedded by an application that has full knowledge of the location "
634634
"of all modules. The path components should be separated by the platform "
635-
"dependent delimiter character, which is ``':'`` on Unix and Mac OS X, "
636-
"``';'`` on Windows."
635+
"dependent delimiter character, which is ``':'`` on Unix and macOS, ``';'`` "
636+
"on Windows."
637637
msgstr ""
638638

639639
#: ../../c-api/init.rst:475
@@ -676,10 +676,10 @@ msgid ""
676676
"Return the platform identifier for the current platform. On Unix, this is "
677677
"formed from the \"official\" name of the operating system, converted to "
678678
"lower case, followed by the major revision number; e.g., for Solaris 2.x, "
679-
"which is also known as SunOS 5.x, the value is ``'sunos5'``. On Mac OS X, "
680-
"it is ``'darwin'``. On Windows, it is ``'win'``. The returned string "
681-
"points into static storage; the caller should not modify its value. The "
682-
"value is available to Python code as ``sys.platform``."
679+
"which is also known as SunOS 5.x, the value is ``'sunos5'``. On macOS, it "
680+
"is ``'darwin'``. On Windows, it is ``'win'``. The returned string points "
681+
"into static storage; the caller should not modify its value. The value is "
682+
"available to Python code as ``sys.platform``."
683683
msgstr ""
684684

685685
#: ../../c-api/init.rst:521

‎c-api/type.po

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ msgid ""
77
msgstr ""
88
"Project-Id-Version: Python 3.7\n"
99
"Report-Msgid-Bugs-To: \n"
10-
"POT-Creation-Date: 2021-09-13 00:11+0000\n"
10+
"POT-Creation-Date: 2021-09-19 00:12+0000\n"
1111
"PO-Revision-Date: 2015-12-09 17:51+0000\n"
1212
"Last-Translator: Liang-Bo Wang <me@liang2.tw>\n"
1313
"Language-Team: Chinese - TAIWAN (https://github.com/python/python-docs-zh-"
@@ -209,7 +209,7 @@ msgstr ""
209209
msgid ""
210210
"The *module* argument can be used to record the module in which the new "
211211
"class is defined. It must be a module object or ``NULL``. If not ``NULL``, "
212-
"the module is associated with the new type and can later be retreived with :"
212+
"the module is associated with the new type and can later be retrieved with :"
213213
"c:func:`PyType_GetModule`. The associated module is not inherited by "
214214
"subclasses; it must be specified for each class individually."
215215
msgstr ""

‎c-api/typeobj.po

+26-18
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ msgid ""
77
msgstr ""
88
"Project-Id-Version: Python 3.7\n"
99
"Report-Msgid-Bugs-To: \n"
10-
"POT-Creation-Date: 2021-09-13 00:11+0000\n"
10+
"POT-Creation-Date: 2021-09-18 00:10+0000\n"
1111
"PO-Revision-Date: 2018-05-23 14:33+0000\n"
1212
"Last-Translator: Adrian Liaw <adrianliaw2000@gmail.com>\n"
1313
"Language-Team: Chinese - TAIWAN (https://github.com/python/python-docs-zh-"
@@ -694,7 +694,7 @@ msgid ":c:member:`~PyNumberMethods.nb_inplace_subtract`"
694694
msgstr ""
695695

696696
#: ../../c-api/typeobj.rst:212
697-
msgid "__sub__"
697+
msgid "__isub__"
698698
msgstr ""
699699

700700
#: ../../c-api/typeobj.rst:214
@@ -709,8 +709,8 @@ msgstr ""
709709
msgid ":c:member:`~PyNumberMethods.nb_inplace_multiply`"
710710
msgstr ""
711711

712-
#: ../../c-api/typeobj.rst:217 ../../c-api/typeobj.rst:303
713-
msgid "__mul__"
712+
#: ../../c-api/typeobj.rst:217 ../../c-api/typeobj.rst:314
713+
msgid "__imul__"
714714
msgstr ""
715715

716716
#: ../../c-api/typeobj.rst:219
@@ -726,7 +726,7 @@ msgid ":c:member:`~PyNumberMethods.nb_inplace_remainder`"
726726
msgstr ""
727727

728728
#: ../../c-api/typeobj.rst:222
729-
msgid "__mod__"
729+
msgid "__imod__"
730730
msgstr ""
731731

732732
#: ../../c-api/typeobj.rst:224
@@ -750,7 +750,7 @@ msgid ":c:member:`~PyNumberMethods.nb_inplace_power`"
750750
msgstr ""
751751

752752
#: ../../c-api/typeobj.rst:230
753-
msgid "__pow__"
753+
msgid "__ipow__"
754754
msgstr ""
755755

756756
#: ../../c-api/typeobj.rst:232
@@ -806,7 +806,7 @@ msgid ":c:member:`~PyNumberMethods.nb_inplace_lshift`"
806806
msgstr ""
807807

808808
#: ../../c-api/typeobj.rst:245
809-
msgid "__lshift__"
809+
msgid "__ilshift__"
810810
msgstr ""
811811

812812
#: ../../c-api/typeobj.rst:247
@@ -822,7 +822,7 @@ msgid ":c:member:`~PyNumberMethods.nb_inplace_rshift`"
822822
msgstr ""
823823

824824
#: ../../c-api/typeobj.rst:250
825-
msgid "__rshift__"
825+
msgid "__irshift__"
826826
msgstr ""
827827

828828
#: ../../c-api/typeobj.rst:252
@@ -838,7 +838,7 @@ msgid ":c:member:`~PyNumberMethods.nb_inplace_and`"
838838
msgstr ""
839839

840840
#: ../../c-api/typeobj.rst:255
841-
msgid "__and__"
841+
msgid "__iand__"
842842
msgstr ""
843843

844844
#: ../../c-api/typeobj.rst:257
@@ -854,7 +854,7 @@ msgid ":c:member:`~PyNumberMethods.nb_inplace_xor`"
854854
msgstr ""
855855

856856
#: ../../c-api/typeobj.rst:260
857-
msgid "__xor__"
857+
msgid "__ixor__"
858858
msgstr ""
859859

860860
#: ../../c-api/typeobj.rst:262
@@ -870,7 +870,7 @@ msgid ":c:member:`~PyNumberMethods.nb_inplace_or`"
870870
msgstr ""
871871

872872
#: ../../c-api/typeobj.rst:265
873-
msgid "__or__"
873+
msgid "__ior__"
874874
msgstr ""
875875

876876
#: ../../c-api/typeobj.rst:267
@@ -903,26 +903,34 @@ msgstr ""
903903
msgid ":c:member:`~PyNumberMethods.nb_floor_divide`"
904904
msgstr ""
905905

906-
#: ../../c-api/typeobj.rst:273 ../../c-api/typeobj.rst:275
906+
#: ../../c-api/typeobj.rst:273
907907
msgid "__floordiv__"
908908
msgstr ""
909909

910910
#: ../../c-api/typeobj.rst:275
911911
msgid ":c:member:`~PyNumberMethods.nb_inplace_floor_divide`"
912912
msgstr ""
913913

914+
#: ../../c-api/typeobj.rst:275
915+
msgid "__ifloordiv__"
916+
msgstr ""
917+
914918
#: ../../c-api/typeobj.rst:277
915919
msgid ":c:member:`~PyNumberMethods.nb_true_divide`"
916920
msgstr ""
917921

918-
#: ../../c-api/typeobj.rst:277 ../../c-api/typeobj.rst:279
922+
#: ../../c-api/typeobj.rst:277
919923
msgid "__truediv__"
920924
msgstr ""
921925

922926
#: ../../c-api/typeobj.rst:279
923927
msgid ":c:member:`~PyNumberMethods.nb_inplace_true_divide`"
924928
msgstr ""
925929

930+
#: ../../c-api/typeobj.rst:279
931+
msgid "__itruediv__"
932+
msgstr ""
933+
926934
#: ../../c-api/typeobj.rst:281
927935
msgid ":c:member:`~PyNumberMethods.nb_index`"
928936
msgstr ""
@@ -944,7 +952,7 @@ msgid ":c:member:`~PyNumberMethods.nb_inplace_matrix_multiply`"
944952
msgstr ""
945953

946954
#: ../../c-api/typeobj.rst:286
947-
msgid "__matmul__"
955+
msgid "__imatmul__"
948956
msgstr ""
949957

950958
#: ../../c-api/typeobj.rst:290
@@ -1001,6 +1009,10 @@ msgstr ""
10011009
msgid ":c:type:`ssizeargfunc`"
10021010
msgstr ""
10031011

1012+
#: ../../c-api/typeobj.rst:303
1013+
msgid "__mul__"
1014+
msgstr ""
1015+
10041016
#: ../../c-api/typeobj.rst:305
10051017
msgid ":c:member:`~PySequenceMethods.sq_item`"
10061018
msgstr ""
@@ -1037,10 +1049,6 @@ msgstr ""
10371049
msgid ":c:member:`~PySequenceMethods.sq_inplace_repeat`"
10381050
msgstr ""
10391051

1040-
#: ../../c-api/typeobj.rst:314
1041-
msgid "__imul__"
1042-
msgstr ""
1043-
10441052
#: ../../c-api/typeobj.rst:318
10451053
msgid ":c:member:`~PyBufferProcs.bf_getbuffer`"
10461054
msgstr ""

0 commit comments

Comments
 (0)