Skip to content

Commit 997dbc8

Browse files
sync with cpython d755701b
1 parent 434bcba commit 997dbc8

8 files changed

Lines changed: 46 additions & 47 deletions

library/email.compat32-message.po

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ msgid ""
44
msgstr ""
55
"Project-Id-Version: Python 3.14\n"
66
"Report-Msgid-Bugs-To: \n"
7-
"POT-Creation-Date: 2025-07-07 17:47+0000\n"
7+
"POT-Creation-Date: 2026-08-13 00:20+0000\n"
88
"PO-Revision-Date: 2018-07-15 18:56+0800\n"
99
"Language-Team: Chinese - TAIWAN (https://github.com/python/python-docs-zh-"
1010
"tw)\n"
@@ -146,7 +146,7 @@ msgstr ""
146146
#: ../../library/email.compat32-message.rst:98
147147
msgid ""
148148
"If the message object contains binary data that is not encoded according to "
149-
"RFC standards, the non-compliant data will be replaced by unicode \"unknown "
149+
"RFC standards, the non-compliant data will be replaced by Unicode \"unknown "
150150
"character\" code points. (See also :meth:`.as_bytes` and :class:`~email."
151151
"generator.BytesGenerator`.)"
152152
msgstr ""

library/email.contentmanager.po

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ msgid ""
66
msgstr ""
77
"Project-Id-Version: Python 3.14\n"
88
"Report-Msgid-Bugs-To: \n"
9-
"POT-Creation-Date: 2025-01-19 00:15+0000\n"
9+
"POT-Creation-Date: 2026-08-13 00:20+0000\n"
1010
"PO-Revision-Date: 2018-05-23 14:43+0000\n"
1111
"Last-Translator: Adrian Liaw <adrianliaw2000@gmail.com>\n"
1212
"Language-Team: Chinese - TAIWAN (https://github.com/python/python-docs-zh-"
@@ -148,13 +148,13 @@ msgstr ""
148148
msgid ""
149149
"This content manager provides only a minimum interface beyond that provided "
150150
"by :class:`~email.message.Message` itself: it deals only with text, raw "
151-
"byte strings, and :class:`~email.message.Message` objects. Nevertheless, it "
151+
"bytes, and :class:`~email.message.Message` objects. Nevertheless, it "
152152
"provides significant advantages compared to the base API: ``get_content`` on "
153-
"a text part will return a unicode string without the application needing to "
154-
"manually decode it, ``set_content`` provides a rich set of options for "
155-
"controlling the headers added to a part and controlling the content transfer "
156-
"encoding, and it enables the use of the various ``add_`` methods, thereby "
157-
"simplifying the creation of multipart messages."
153+
"a text part will return a string without the application needing to manually "
154+
"decode it, ``set_content`` provides a rich set of options for controlling "
155+
"the headers added to a part and controlling the content transfer encoding, "
156+
"and it enables the use of the various ``add_`` methods, thereby simplifying "
157+
"the creation of multipart messages."
158158
msgstr ""
159159

160160
#: ../../library/email.contentmanager.rst:112
@@ -164,7 +164,7 @@ msgid ""
164164
"or a ``bytes`` object (for all other non-multipart types). Raise a :exc:"
165165
"`KeyError` if called on a ``multipart``. If the part is a ``text`` part and "
166166
"*errors* is specified, use it as the error handler when decoding the payload "
167-
"to unicode. The default error handler is ``replace``."
167+
"to a string. The default error handler is ``replace``."
168168
msgstr ""
169169

170170
#: ../../library/email.contentmanager.rst:131

library/email.examples.po

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ msgid ""
44
msgstr ""
55
"Project-Id-Version: Python 3.14\n"
66
"Report-Msgid-Bugs-To: \n"
7-
"POT-Creation-Date: 2025-04-08 00:14+0000\n"
7+
"POT-Creation-Date: 2026-08-13 00:20+0000\n"
88
"PO-Revision-Date: 2018-07-15 18:56+0800\n"
99
"Language-Team: Chinese - TAIWAN (https://github.com/python/python-docs-zh-"
1010
"tw)\n"
@@ -27,7 +27,7 @@ msgstr ""
2727
#: ../../library/email.examples.rst:9
2828
msgid ""
2929
"First, let's see how to create and send a simple text message (both the text "
30-
"content and the addresses may contain unicode characters):"
30+
"content and the addresses may contain Unicode characters):"
3131
msgstr ""
3232

3333
#: ../../library/email.examples.rst:12

library/email.header.po

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ msgid ""
66
msgstr ""
77
"Project-Id-Version: Python 3.14\n"
88
"Report-Msgid-Bugs-To: \n"
9-
"POT-Creation-Date: 2026-02-07 00:19+0000\n"
9+
"POT-Creation-Date: 2026-08-13 00:20+0000\n"
1010
"PO-Revision-Date: 2018-05-23 14:44+0000\n"
1111
"Last-Translator: Adrian Liaw <adrianliaw2000@gmail.com>\n"
1212
"Language-Team: Chinese - TAIWAN (https://github.com/python/python-docs-zh-"
@@ -94,10 +94,10 @@ msgstr ""
9494
msgid ""
9595
"Notice here how we wanted the :mailheader:`Subject` field to contain a non-"
9696
"ASCII character? We did this by creating a :class:`Header` instance and "
97-
"passing in the character set that the byte string was encoded in. When the "
98-
"subsequent :class:`~email.message.Message` instance was flattened, the :"
99-
"mailheader:`Subject` field was properly :rfc:`2047` encoded. MIME-aware "
100-
"mail readers would show this header using the embedded ISO-8859-1 character."
97+
"passing in the character set to use when encoding it. When the subsequent :"
98+
"class:`~email.message.Message` instance was flattened, the :mailheader:"
99+
"`Subject` field was properly :rfc:`2047` encoded. MIME-aware mail readers "
100+
"would show this header using the embedded ISO-8859-1 character."
101101
msgstr ""
102102

103103
#: ../../library/email.header.rst:57
@@ -239,10 +239,10 @@ msgstr ""
239239
#: ../../library/email.header.rst:152
240240
msgid ""
241241
"Returns an approximation of the :class:`Header` as a string, using an "
242-
"unlimited line length. All pieces are converted to unicode using the "
243-
"specified encoding and joined together appropriately. Any pieces with a "
244-
"charset of ``'unknown-8bit'`` are decoded as ASCII using the ``'replace'`` "
245-
"error handler."
242+
"unlimited line length. All pieces are decoded using the specified encoding "
243+
"and joined together appropriately. Any pieces with a charset of "
244+
"``'unknown-8bit'`` are decoded as ASCII using the ``'replace'`` error "
245+
"handler."
246246
msgstr ""
247247

248248
#: ../../library/email.header.rst:158

library/email.headerregistry.po

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ msgid ""
66
msgstr ""
77
"Project-Id-Version: Python 3.14\n"
88
"Report-Msgid-Bugs-To: \n"
9-
"POT-Creation-Date: 2026-06-03 00:49+0000\n"
9+
"POT-Creation-Date: 2026-08-13 00:20+0000\n"
1010
"PO-Revision-Date: 2018-05-23 14:44+0000\n"
1111
"Last-Translator: Adrian Liaw <adrianliaw2000@gmail.com>\n"
1212
"Language-Team: Chinese - TAIWAN (https://github.com/python/python-docs-zh-"
@@ -67,7 +67,7 @@ msgstr ""
6767
msgid ""
6868
"*name* and *value* are passed to ``BaseHeader`` from the :attr:`~email."
6969
"policy.EmailPolicy.header_factory` call. The string value of any header "
70-
"object is the *value* fully decoded to unicode."
70+
"object is the *value* fully decoded to a string."
7171
msgstr ""
7272

7373
#: ../../library/email.headerregistry.rst:48
@@ -134,10 +134,10 @@ msgid ""
134134
"defects to this list. On return, the ``kwds`` dictionary *must* contain "
135135
"values for at least the keys ``decoded``, ``defects`` and ``parse_tree``. "
136136
"``decoded`` should be the string value for the header (that is, the header "
137-
"value fully decoded to unicode). ``parse_tree`` is set to the parse tree "
137+
"value fully decoded to a string). ``parse_tree`` is set to the parse tree "
138138
"obtained from parsing the header. The parse method should assume that "
139139
"*string* may contain content-transfer-encoded parts, but should correctly "
140-
"handle all valid unicode characters as well so that it can parse un-encoded "
140+
"handle all valid Unicode characters as well so that it can parse un-encoded "
141141
"header values."
142142
msgstr ""
143143

@@ -181,7 +181,7 @@ msgid ""
181181
"mechanism for encoding non-ASCII text as ASCII characters within a header "
182182
"value. When a *value* containing encoded words is passed to the "
183183
"constructor, the ``UnstructuredHeader`` parser converts such encoded words "
184-
"into unicode, following the :rfc:`2047` rules for unstructured text. The "
184+
"into a string, following the :rfc:`2047` rules for unstructured text. The "
185185
"parser uses heuristics to attempt to decode certain non-compliant encoded "
186186
"words. Defects are registered in such cases, as well as defects for issues "
187187
"such as invalid characters within the encoded words or the non-encoded text."
@@ -280,11 +280,10 @@ msgstr ""
280280

281281
#: ../../library/email.headerregistry.rst:208
282282
msgid ""
283-
"The ``decoded`` value of the header will have all encoded words decoded to "
284-
"unicode. :class:`~encodings.idna` encoded domain names are also decoded to "
285-
"unicode. The ``decoded`` value is set by :ref:`joining <meth-str-join>` "
286-
"the :class:`str` value of the elements of the ``groups`` attribute with ``', "
287-
"'``."
283+
"The ``decoded`` value of the header will have all encoded words decoded to a "
284+
"string. :class:`~encodings.idna` encoded domain names are also decoded to a "
285+
"string. The ``decoded`` value is set by :ref:`joining <meth-str-join>` the :"
286+
"class:`str` value of the elements of the ``groups`` attribute with ``', '``."
288287
msgstr ""
289288

290289
#: ../../library/email.headerregistry.rst:214
@@ -595,7 +594,7 @@ msgid ""
595594
"*domain*, in which case *username* and *domain* will be parsed from the "
596595
"*addr_spec*. An *addr_spec* must be a properly RFC quoted string; if it is "
597596
"not ``Address`` will raise an error. Unicode characters are allowed and "
598-
"will be property encoded when serialized. However, per the RFCs, unicode is "
597+
"will be property encoded when serialized. However, per the RFCs, Unicode is "
599598
"*not* allowed in the username portion of the address."
600599
msgstr ""
601600

library/email.po

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ msgid ""
66
msgstr ""
77
"Project-Id-Version: Python 3.14\n"
88
"Report-Msgid-Bugs-To: \n"
9-
"POT-Creation-Date: 2026-02-07 00:19+0000\n"
9+
"POT-Creation-Date: 2026-08-13 00:20+0000\n"
1010
"PO-Revision-Date: 2018-05-23 16:01+0000\n"
1111
"Last-Translator: Adrian Liaw <adrianliaw2000@gmail.com>\n"
1212
"Language-Team: Chinese - TAIWAN (https://github.com/python/python-docs-zh-"
@@ -87,7 +87,7 @@ msgstr ""
8787
msgid ""
8888
"The email package does its best to hide the details of the various governing "
8989
"RFCs from the application. Conceptually the application should be able to "
90-
"treat the email message as a structured tree of unicode text and binary "
90+
"treat the email message as a structured tree of Unicode text and binary "
9191
"attachments, without having to worry about how these are represented when "
9292
"serialized. In practice, however, it is often necessary to be aware of at "
9393
"least some of the rules governing MIME messages and their structure, "
@@ -130,7 +130,7 @@ msgstr ""
130130

131131
#: ../../library/email.rst:90
132132
msgid ""
133-
"The foregoing represent the modern (unicode friendly) API of the email "
133+
"The foregoing represent the modern (Unicode friendly) API of the email "
134134
"package. The remaining sections, starting with the :class:`~email.message."
135135
"Message` class, cover the legacy :data:`~email.policy.compat32` API that "
136136
"deals much more directly with the details of how email messages are "

library/email.policy.po

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ msgid ""
66
msgstr ""
77
"Project-Id-Version: Python 3.14\n"
88
"Report-Msgid-Bugs-To: \n"
9-
"POT-Creation-Date: 2026-02-12 00:19+0000\n"
9+
"POT-Creation-Date: 2026-08-13 00:20+0000\n"
1010
"PO-Revision-Date: 2018-05-23 16:01+0000\n"
1111
"Last-Translator: Adrian Liaw <adrianliaw2000@gmail.com>\n"
1212
"Language-Team: Chinese - TAIWAN (https://github.com/python/python-docs-zh-"
@@ -630,7 +630,7 @@ msgid ""
630630
"If the value has a ``name`` attribute, it is returned to unmodified. "
631631
"Otherwise the *name*, and the *value* with any CR or LF characters removed, "
632632
"are passed to the ``header_factory``, and the resulting header object is "
633-
"returned. Any surrogateescaped bytes get turned into the unicode unknown-"
633+
"returned. Any surrogateescaped bytes get turned into the Unicode unknown-"
634634
"character glyph."
635635
msgstr ""
636636

@@ -747,10 +747,10 @@ msgstr ""
747747
msgid ""
748748
"From the application view, this means that any header obtained through the :"
749749
"class:`~email.message.EmailMessage` is a header object with extra "
750-
"attributes, whose string value is the fully decoded unicode value of the "
751-
"header. Likewise, a header may be assigned a new value, or a new header "
752-
"created, using a unicode string, and the policy will take care of converting "
753-
"the unicode string into the correct RFC encoded form."
750+
"attributes, whose string value is the fully decoded value of the header. "
751+
"Likewise, a header may be assigned a new value, or a new header created, "
752+
"using a string, and the policy will take care of converting the string into "
753+
"the correct RFC encoded form."
754754
msgstr ""
755755

756756
#: ../../library/email.policy.rst:596

library/email.utils.po

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ msgid ""
77
msgstr ""
88
"Project-Id-Version: Python 3.14\n"
99
"Report-Msgid-Bugs-To: \n"
10-
"POT-Creation-Date: 2026-02-07 00:19+0000\n"
10+
"POT-Creation-Date: 2026-08-13 00:20+0000\n"
1111
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1212
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1313
"Language-Team: Chinese - TAIWAN (https://github.com/python/python-docs-zh-"
@@ -250,11 +250,11 @@ msgid ""
250250
"When a header parameter is encoded in :rfc:`2231` format, :meth:`Message."
251251
"get_param <email.message.Message.get_param>` may return a 3-tuple containing "
252252
"the character set, language, and value. :func:`collapse_rfc2231_value` "
253-
"turns this into a unicode string. Optional *errors* is passed to the "
254-
"*errors* argument of :class:`str`'s :func:`~str.encode` method; it defaults "
255-
"to ``'replace'``. Optional *fallback_charset* specifies the character set "
256-
"to use if the one in the :rfc:`2231` header is not known by Python; it "
257-
"defaults to ``'us-ascii'``."
253+
"turns this into a string. Optional *errors* is passed to the *errors* "
254+
"argument of :class:`str`'s :func:`~str.encode` method; it defaults to "
255+
"``'replace'``. Optional *fallback_charset* specifies the character set to "
256+
"use if the one in the :rfc:`2231` header is not known by Python; it defaults "
257+
"to ``'us-ascii'``."
258258
msgstr ""
259259

260260
#: ../../library/email.utils.rst:214

0 commit comments

Comments
 (0)