Merge branch '3.12' into translate-asyncio-eventloop

Author: xchux

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