Merge branch '3.12' into cron/sync/3.12

Author: mattwang44

faq/extending.po

@@ -51,10 +51,10 @@ msgstr "我可以在 C++ 中建立自己的函式嗎？"
 #: ../../faq/extending.rst:28
 #, fuzzy
 msgid ""
-"Yes, using the C compatibility features found in C++.  Place ``extern "
-"\"C\" { ... }`` around the Python include files and put ``extern \"C\"`` "
-"before each function that is going to be called by the Python interpreter.  "
-"Global or static C++ objects with constructors are probably not a good idea."
+"Yes, using the C compatibility features found in C++.  Place ``extern \"C\" "
+"{ ... }`` around the Python include files and put ``extern \"C\"`` before "
+"each function that is going to be called by the Python interpreter.  Global "
+"or static C++ objects with constructors are probably not a good idea."
 msgstr ""
 "是的，使用 C++ 中的 C 相容性功能。將 ``extern \"C\" { ... }`` 放在 Python 包"
 "含檔案周圍，並將 ``extern \"C\"`` 放在每個將由 Python 直譯器呼叫的函式之前。"

howto/regex.po

@@ -922,13 +922,13 @@ msgid ""
 "letters, too. Full Unicode matching also works unless the :const:`ASCII` "
 "flag is used to disable non-ASCII matches.  When the Unicode patterns ``[a-"
 "z]`` or ``[A-Z]`` are used in combination with the :const:`IGNORECASE` flag, "
-"they will match the 52 ASCII letters and 4 additional non-ASCII letters: "
-"'İ' (U+0130, Latin capital letter I with dot above), 'ı' (U+0131, Latin "
-"small letter dotless i), 'ſ' (U+017F, Latin small letter long s) and "
-"'K' (U+212A, Kelvin sign).  ``Spam`` will match ``'Spam'``, ``'spam'``, "
-"``'spAM'``, or ``'ſpam'`` (the latter is matched only in Unicode mode). This "
-"lowercasing doesn't take the current locale into account; it will if you "
-"also set the :const:`LOCALE` flag."
+"they will match the 52 ASCII letters and 4 additional non-ASCII letters: 'İ' "
+"(U+0130, Latin capital letter I with dot above), 'ı' (U+0131, Latin small "
+"letter dotless i), 'ſ' (U+017F, Latin small letter long s) and 'K' (U+212A, "
+"Kelvin sign).  ``Spam`` will match ``'Spam'``, ``'spam'``, ``'spAM'``, or "
+"``'ſpam'`` (the latter is matched only in Unicode mode). This lowercasing "
+"doesn't take the current locale into account; it will if you also set the :"
+"const:`LOCALE` flag."
 msgstr ""
 
 #: ../../howto/regex.rst:581

library/cmath.po

@@ -158,8 +158,8 @@ msgid ""
 "specified, returns the natural logarithm of *x*. There is one branch cut, "
 "from 0 along the negative real axis to -∞."
 msgstr ""
-"回傳 *x* 給定 *base* 的對數。如果未指定 *base*，則傳回 *x* 的自然對數。存在"
-"一條分枝切割，從 0 沿負實數軸到 -∞。"
+"回傳 *x* 給定 *base* 的對數。如果未指定 *base*，則傳回 *x* 的自然對數。存在一"
+"條分枝切割，從 0 沿負實數軸到 -∞。"
 
 #: ../../library/cmath.rst:114
 msgid ""

library/exceptions.po

@@ -487,8 +487,8 @@ msgstr ""
 #: ../../library/exceptions.rst:347
 msgid ""
 "This exception is raised when a system function returns a system-related "
-"error, including I/O failures such as \"file not found\" or \"disk "
-"full\" (not for illegal argument types or other incidental errors)."
+"error, including I/O failures such as \"file not found\" or \"disk full\" "
+"(not for illegal argument types or other incidental errors)."
 msgstr ""
 
 #: ../../library/exceptions.rst:351

library/io.po

@@ -1084,24 +1084,28 @@ msgstr ""
 
 #: ../../library/io.rst:631
 msgid "Raw File I/O"
-msgstr ""
+msgstr "原始檔案 I/O"
 
 #: ../../library/io.rst:635
 msgid ""
 "A raw binary stream representing an OS-level file containing bytes data.  It "
 "inherits from :class:`RawIOBase`."
 msgstr ""
+"一個代表包含位元組資料的 OS 層級檔案的原始二進制串流。它繼承自 :class:"
+"`RawIOBase`。"
 
 #: ../../library/io.rst:638
 msgid "The *name* can be one of two things:"
-msgstr ""
+msgstr "*name* 可以是兩種事物之一："
 
 #: ../../library/io.rst:640
 msgid ""
 "a character string or :class:`bytes` object representing the path to the "
 "file which will be opened. In this case closefd must be ``True`` (the "
 "default) otherwise an error will be raised."
 msgstr ""
+"代表將要打開的檔案路徑的一個字元串或 :class:`bytes` 物件。在這種情況下，"
+"closefd 必須是 ``True`` （預設值），否則將引發錯誤。"
 
 #: ../../library/io.rst:643
 msgid ""

library/re.po

@@ -1080,10 +1080,10 @@ msgid ""
 "Note that when the Unicode patterns ``[a-z]`` or ``[A-Z]`` are used in "
 "combination with the :const:`IGNORECASE` flag, they will match the 52 ASCII "
 "letters and 4 additional non-ASCII letters: 'İ' (U+0130, Latin capital "
-"letter I with dot above), 'ı' (U+0131, Latin small letter dotless i), "
-"'ſ' (U+017F, Latin small letter long s) and 'K' (U+212A, Kelvin sign). If "
-"the :py:const:`~re.ASCII` flag is used, only letters 'a' to 'z' and 'A' to "
-"'Z' are matched."
+"letter I with dot above), 'ı' (U+0131, Latin small letter dotless i), 'ſ' "
+"(U+017F, Latin small letter long s) and 'K' (U+212A, Kelvin sign). If the :"
+"py:const:`~re.ASCII` flag is used, only letters 'a' to 'z' and 'A' to 'Z' "
+"are matched."
 msgstr ""
 
 #: ../../library/re.rst:778

library/unittest.mock.po

@@ -16,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Poedit 3.4.1\n"
+"X-Generator: Poedit 3.4.2\n"
 
 #: ../../library/unittest.mock.rst:3
 msgid ":mod:`unittest.mock` --- mock object library"
@@ -798,7 +798,7 @@ msgid ""
 msgstr ""
 "在匹配對 mock 的呼叫時，使用 *spec*\\ （或 *spec_set*\\ ）建立的可呼叫 mock "
 "將會內省 (introspect) 規格物件的簽名 (signature)。因此，它可以匹配實際呼叫的"
-"引數，無論它們是按位置傳遞還是按名稱傳遞： ::
+"引數，無論它們是按位置傳遞還是按名稱傳遞： ::"
 
 #: ../../library/unittest.mock.rst:812
 msgid ""
@@ -2459,7 +2459,7 @@ msgid ""
 "args)."
 msgstr ""
 ":attr:`Mock.call_args` 和 :attr:`Mock.call_args_list` 中的 ``call`` 物件是"
-"（位置引數, 關鍵字引數）的二元組，而 :attr:`Mock.mock_calls`中的 ``call`` 物"
+"（位置引數, 關鍵字引數）的二元組，而 :attr:`Mock.mock_calls` 中的 ``call`` 物"
 "件以及你自己建立的 ``call`` 物件是（名稱, 位置引數, 關鍵字引數）的三元組。"
 
 #: ../../library/unittest.mock.rst:2286
@@ -2568,7 +2568,7 @@ msgstr ""
 msgid ""
 ":data:`ANY` is not limited to comparisons with call objects and so can also "
 "be used in test assertions::"
-msgstr ""
+msgstr ":data:`ANY` 不只能與呼叫物件比較，其也可以在測試斷言中使用： ::"
 
 #: ../../library/unittest.mock.rst:2391
 msgid "FILTER_DIR"
@@ -2582,10 +2582,10 @@ msgid ""
 "filtering, or need to switch it off for diagnostic purposes, then set ``mock."
 "FILTER_DIR = False``."
 msgstr ""
-":data:`FILTER_DIR` 是一個模組級別的變數，用於控制 mock 物件回應 :func:`dir`的"
-"方式。其預設值為 ``True``，它使用以下描述的過濾方式來只顯示有用的成員。如果你"
-"不喜歡這個過濾方式，或由於診斷意圖而需要將其關閉，請設定 ``mock.FILTER_DIR = "
-"False``。"
+":data:`FILTER_DIR` 是一個模組級別的變數，用於控制 mock 物件回應 :func:`dir` "
+"的方式。其預設值為 ``True``，它使用以下描述的過濾方式來只顯示有用的成員。如果"
+"你不喜歡這個過濾方式，或由於診斷意圖而需要將其關閉，請設定 ``mock.FILTER_DIR "
+"= False``。"
 
 #: ../../library/unittest.mock.rst:2401
 msgid ""
@@ -2657,10 +2657,10 @@ msgstr ""
 "*read_data* 是檔案處理方法 :meth:`~io.IOBase.read`、:meth:`~io.IOBase."
 "readline` 和 :meth:`~io.IOBase.readlines` 的回傳字串。對這些方法的呼叫將從 "
 "*read_data* 取得資料，直到資料耗盡。對這些方法的 mock 非常單純：每次呼叫 "
-"*mock* 時，*read_data* 都會倒回到起點。如果你需要對提供給測試程式碼的資料進"
-"行更多控制，你會需要自行客製化這個 mock。如果這樣還不夠，`PyPI <https://pypi."
-"org>`_ 上的其中一個記憶體內檔案系統 (in-memory filesystem) 套件 可以提供用於"
-"測試的真實檔案系統。"
+"*mock* 時，*read_data* 都會倒回到起點。如果你需要對提供給測試程式碼的資料進行"
+"更多控制，你會需要自行客製化這個 mock。如果這樣還不夠，`PyPI <https://pypi."
+"org>`_ 上的其中一個記憶體內檔案系統 (in-memory filesystem) 套件可以提供用於測"
+"試的真實檔案系統。"
 
 #: ../../library/unittest.mock.rst:2476
 msgid ""
@@ -2669,8 +2669,8 @@ msgid ""
 "than returning it on each call."
 msgstr ""
 "新增對 :meth:`~io.IOBase.readline` 和 :meth:`~io.IOBase.readlines` 的支援。:"
-"meth:`~io.IOBase.read` 的 mock 更改為消耗 *read_data* 而不是在每次呼叫時"
-"回傳它。"
+"meth:`~io.IOBase.read` 的 mock 更改為消耗 *read_data* 而不是在每次呼叫時回傳"
+"它。"
 
 #: ../../library/unittest.mock.rst:2481
 msgid "*read_data* is now reset on each call to the *mock*."
@@ -2945,11 +2945,11 @@ msgid ""
 "type, autospec doesn't use a spec for members that are set to ``None``. "
 "These will just be ordinary mocks (well - MagicMocks):"
 msgstr ""
-"這就帶來了另一個問題。為稍後將成為不同型別的物件的成員提供預設值 ``None`` 是相"
-"對常見的。``None`` 作為規格是無用的，因為它不允許你存取其上的\\ *任何*\\ 屬性"
-"或方法。由於 ``None`` 作為規格\\ *永遠不會*\\ 有用，並且可能表示通常屬於其他"
-"型別的成員，因此自動規格不會對設定為 ``None`` 的成員使用規格。這些會只是普通"
-"的 mock（通常是 MagicMocks）："
+"這就帶來了另一個問題。為稍後將成為不同型別的物件的成員提供預設值 ``None`` 是"
+"相對常見的。``None`` 作為規格是無用的，因為它不允許你存取其上的\\ *任何*\\ 屬"
+"性或方法。由於 ``None`` 作為規格\\ *永遠不會*\\ 有用，並且可能表示通常屬於其"
+"他型別的成員，因此自動規格不會對設定為 ``None`` 的成員使用規格。這些會只是普"
+"通的 mock（通常是 MagicMocks）："
 
 #: ../../library/unittest.mock.rst:2734
 msgid ""

whatsnew/2.3.po

@@ -654,9 +654,9 @@ msgstr ""
 msgid ""
 "When encoding a Unicode string into a byte string, unencodable characters "
 "may be encountered.  So far, Python has allowed specifying the error "
-"processing as either \"strict\" (raising :exc:`UnicodeError`), "
-"\"ignore\" (skipping the character), or \"replace\" (using a question mark "
-"in the output string), with \"strict\" being the default behavior. It may be "
+"processing as either \"strict\" (raising :exc:`UnicodeError`), \"ignore\" "
+"(skipping the character), or \"replace\" (using a question mark in the "
+"output string), with \"strict\" being the default behavior. It may be "
 "desirable to specify alternative processing of such errors, such as "
 "inserting an XML character reference or HTML entity reference into the "
 "converted string."

whatsnew/2.7.po

@@ -2385,14 +2385,14 @@ msgid ""
 "ElementTree's code for converting trees to a string has been significantly "
 "reworked, making it roughly twice as fast in many cases.  The :meth:"
 "`ElementTree.write() <xml.etree.ElementTree.ElementTree.write>` and :meth:"
-"`Element.write` methods now have a *method* parameter that can be "
-"\"xml\" (the default), \"html\", or \"text\".  HTML mode will output empty "
-"elements as ``<empty></empty>`` instead of ``<empty/>``, and text mode will "
-"skip over elements and only output the text chunks.  If you set the :attr:"
-"`~xml.etree.ElementTree.Element.tag` attribute of an element to ``None`` but "
-"leave its children in place, the element will be omitted when the tree is "
-"written out, so you don't need to do more extensive rearrangement to remove "
-"a single element."
+"`Element.write` methods now have a *method* parameter that can be \"xml\" "
+"(the default), \"html\", or \"text\".  HTML mode will output empty elements "
+"as ``<empty></empty>`` instead of ``<empty/>``, and text mode will skip over "
+"elements and only output the text chunks.  If you set the :attr:`~xml.etree."
+"ElementTree.Element.tag` attribute of an element to ``None`` but leave its "
+"children in place, the element will be omitted when the tree is written out, "
+"so you don't need to do more extensive rearrangement to remove a single "
+"element."
 msgstr ""
 
 #: ../../whatsnew/2.7.rst:2045