[po] auto sync

github-actions[bot] · github-actions[bot] · commit a3673508de6b · 2020-07-28T04:09:06.000Z
diff --git a/reference/grammar.po b/reference/grammar.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Python 3.9\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-05-31 09:25+0000\n"
+"POT-Creation-Date: 2020-07-28 03:46+0000\n"
 "PO-Revision-Date: 2017-02-16 23:38+0000\n"
 "Last-Translator: QR Wang <wangqirui1996@gmail.com>, 2018\n"
 "Language-Team: Chinese (China) (https://www.transifex.com/python-doc/teams/5390/zh_CN/)\n"
@@ -27,6 +27,19 @@ msgstr "完整的语法规范"
 
 #: ../../reference/grammar.rst:4
 msgid ""
-"This is the full Python grammar, as it is read by the parser generator and "
-"used to parse Python source files:"
-msgstr "这是完整的Python语法，它被送入解析器生成器，以生成解析Python源文件的解析器："
+"This is the full Python grammar, derived directly from the grammar used to "
+"generate the CPython parser (see :source:`Grammar/python.gram`). The version"
+" here omits details related to code generation and error recovery."
+msgstr ""
+
+#: ../../reference/grammar.rst:9
+msgid ""
+"The notation is a mixture of `EBNF "
+"<https://en.wikipedia.org/wiki/Extended_Backus%E2%80%93Naur_form>`_ and `PEG"
+" <https://en.wikipedia.org/wiki/Parsing_expression_grammar>`_. In "
+"particular, ``&`` followed by a symbol, token or parenthesized group "
+"indicates a positive lookahead (i.e., is required to match but not "
+"consumed), while ``!`` indicates a negative lookahead (i.e., is required "
+"_not_ to match).  We use the ``|`` separator to mean PEG's \"ordered "
+"choice\" (written as ``/`` in traditional PEG grammars)."
+msgstr ""
diff --git a/reference/lexical_analysis.po b/reference/lexical_analysis.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Python 3.9\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-13 03:21+0000\n"
+"POT-Creation-Date: 2020-07-28 03:46+0000\n"
 "PO-Revision-Date: 2017-02-16 23:39+0000\n"
 "Last-Translator: Freesand Leo <yuqinju@163.com>, 2020\n"
 "Language-Team: Chinese (China) (https://www.transifex.com/python-doc/teams/5390/zh_CN/)\n"
@@ -905,11 +905,11 @@ msgstr ""
 "注意此特性是在句法层面定义的，但是在编译时实现。在运行时拼接字符串表达式必须使用 '+' 运算符。还要注意字面值拼接时每个部分可以使用不同的引号风格 "
 "(甚至混合使用原始字符串和三引号字符串)，格式化字符串字面值也可与普通字符串字面值拼接。"
 
-#: ../../reference/lexical_analysis.rst:646
+#: ../../reference/lexical_analysis.rst:648
 msgid "Formatted string literals"
 msgstr "格式化字符串字面值"
 
-#: ../../reference/lexical_analysis.rst:650
+#: ../../reference/lexical_analysis.rst:652
 msgid ""
 "A :dfn:`formatted string literal` or :dfn:`f-string` is a string literal "
 "that is prefixed with ``'f'`` or ``'F'``.  These strings may contain "
@@ -921,29 +921,27 @@ msgstr ""
 "前缀的字符串字面值。这种字符串可包含替换字段，即以 ``{}`` "
 "标示的表达式。而其他字符串字面值总是一个常量，格式化字符串字面值实际上是会在运行时被求值的表达式。"
 
-#: ../../reference/lexical_analysis.rst:656
+#: ../../reference/lexical_analysis.rst:658
 msgid ""
 "Escape sequences are decoded like in ordinary string literals (except when a"
 " literal is also marked as a raw string).  After decoding, the grammar for "
 "the contents of the string is:"
 msgstr "转义序列会像在普通字符串字面值中一样被解码 (除非字面值还被标示为原始字符串)。解码之后，字符串内容所用的语法如下:"
 
-#: ../../reference/lexical_analysis.rst:670
+#: ../../reference/lexical_analysis.rst:672
 msgid ""
 "The parts of the string outside curly braces are treated literally, except "
 "that any doubled curly braces ``'{{'`` or ``'}}'`` are replaced with the "
 "corresponding single curly brace.  A single opening curly bracket ``'{'`` "
-"marks a replacement field, which starts with a Python expression.  After the"
-" expression, there may be a conversion field, introduced by an exclamation "
-"point ``'!'``.  A format specifier may also be appended, introduced by a "
-"colon ``':'``.  A replacement field ends with a closing curly bracket "
-"``'}'``."
+"marks a replacement field, which starts with a Python expression. To display"
+" both the expression text and its value after evaluation, (useful in "
+"debugging), an equal sign ``'='`` may be added after the expression. A "
+"conversion field, introduced by an exclamation point ``'!'`` may follow.  A "
+"format specifier may also be appended, introduced by a colon ``':'``. A "
+"replacement field ends with a closing curly bracket ``'}'``."
 msgstr ""
-"字符串在花括号以外的部分按其字面值处理，除了双重花括号 ``'{{'`` 或 ``'}}'`` 会被替换为相应的单个花括号。单个左花括号 ``'{'``"
-" 标示一个替换字段，它以一个 Python 表达式打头，表达式之后可能有一个以叹号 ``'!'`` 标示的转换字段。之后还可能带有一个以冒号 "
-"``':'`` 标示的格式说明符。替换字段以一个右花括号 ``'}'`` 作为结束。"
 
-#: ../../reference/lexical_analysis.rst:679
+#: ../../reference/lexical_analysis.rst:682
 msgid ""
 "Expressions in formatted string literals are treated like regular Python "
 "expressions surrounded by parentheses, with a few exceptions. An empty "
@@ -957,7 +955,7 @@ msgstr ""
 "空表达式不被允许，:keyword:`lambda` 和赋值表达式 ``:=`` 必须显式地加上圆括号。 "
 "替换表达式可以包含换行（例如在三重引号字符串中），但是不能包含注释。 每个表达式会在格式化字符串字面值所包含的位置按照从左至右的顺序被求值。"
 
-#: ../../reference/lexical_analysis.rst:688
+#: ../../reference/lexical_analysis.rst:691
 msgid ""
 "Prior to Python 3.7, an :keyword:`await` expression and comprehensions "
 "containing an :keyword:`async for` clause were illegal in the expressions in"
@@ -966,7 +964,22 @@ msgstr ""
 "在 Python 3.7 之前， :keyword:`await` 表达式包含  :keyword:`async for` "
 "子句的推导式不允许在格式化字符串字面值表达式中使用，这是因为具体实现存在一个问题。"
 
-#: ../../reference/lexical_analysis.rst:693
+#: ../../reference/lexical_analysis.rst:696
+msgid ""
+"When the equal sign ``'='`` is provided, the output will have the expression"
+" text, the ``'='`` and the evaluated value. Spaces after the opening brace "
+"``'{'``, within the expression and after the ``'='`` are all retained in the"
+" output. By default, the ``'='`` causes the :func:`repr` of the expression "
+"to be provided, unless there is a format specified. When a format is "
+"specified it defaults to the :func:`str` of the expression unless a "
+"conversion ``'!r'`` is declared."
+msgstr ""
+
+#: ../../reference/lexical_analysis.rst:704
+msgid "The equal sign ``'='`` was added in Python 3.8."
+msgstr ""
+
+#: ../../reference/lexical_analysis.rst:707
 msgid ""
 "If a conversion is specified, the result of evaluating the expression is "
 "converted before formatting.  Conversion ``'!s'`` calls :func:`str` on the "
@@ -975,7 +988,7 @@ msgstr ""
 "如果指定了转换符，表达式的求值结果会先转换再格式化。转换符 ``'!s'`` 即对结果调用 :func:`str`，``'!r'`` 为调用 "
 ":func:`repr`，而 ``'!a'`` 为调用 :func:`ascii`。"
 
-#: ../../reference/lexical_analysis.rst:697
+#: ../../reference/lexical_analysis.rst:711
 msgid ""
 "The result is then formatted using the :func:`format` protocol.  The format "
 "specifier is passed to the :meth:`__format__` method of the expression or "
@@ -986,7 +999,7 @@ msgstr ""
 "在此之后结果会使用 :func:`format` 协议进行格式化。格式说明符会被传入表达式或转换结果的 :meth:`__format__` "
 "方法。如果省略格式说明符则会传入一个空字符串。然后格式化结果会包含在整个字符串最终的值当中。"
 
-#: ../../reference/lexical_analysis.rst:703
+#: ../../reference/lexical_analysis.rst:717
 msgid ""
 "Top-level format specifiers may include nested replacement fields. These "
 "nested fields may include their own conversion fields and :ref:`format "
@@ -998,112 +1011,112 @@ msgstr ""
 "<formatspec>`，但不可再包含更深层嵌套的替换字段。 这里的 :ref:`格式说明符微语言 <formatspec>` 与 "
 ":meth:`str.format` 方法所使用的微语言一致。"
 
-#: ../../reference/lexical_analysis.rst:709
+#: ../../reference/lexical_analysis.rst:723
 msgid ""
 "Formatted string literals may be concatenated, but replacement fields cannot"
 " be split across literals."
 msgstr "格式化字符串字面值可以拼接，但是一个替换字段不能拆分到多个字面值。"
 
-#: ../../reference/lexical_analysis.rst:712
+#: ../../reference/lexical_analysis.rst:726
 msgid "Some examples of formatted string literals::"
 msgstr "一些格式化字符串字面值的示例::"
 
-#: ../../reference/lexical_analysis.rst:731
+#: ../../reference/lexical_analysis.rst:758
 msgid ""
 "A consequence of sharing the same syntax as regular string literals is that "
 "characters in the replacement fields must not conflict with the quoting used"
 " in the outer formatted string literal::"
 msgstr "与正常字符串字面值采用相同语法导致的一个结果就是替换字段中的字符不能与外部的格式化字符串字面值所用的引号相冲突::"
 
-#: ../../reference/lexical_analysis.rst:738
+#: ../../reference/lexical_analysis.rst:765
 msgid ""
 "Backslashes are not allowed in format expressions and will raise an error::"
 msgstr "格式表达式中不允许有反斜杠，这会引发错误::"
 
-#: ../../reference/lexical_analysis.rst:743
+#: ../../reference/lexical_analysis.rst:770
 msgid ""
 "To include a value in which a backslash escape is required, create a "
 "temporary variable."
 msgstr "想包含需要用反斜杠转义的值，可以创建一个临时变量。"
 
-#: ../../reference/lexical_analysis.rst:750
+#: ../../reference/lexical_analysis.rst:777
 msgid ""
 "Formatted string literals cannot be used as docstrings, even if they do not "
 "include expressions."
 msgstr "格式化字符串字面值不可用作文档字符串，即便其中没有包含表达式。"
 
-#: ../../reference/lexical_analysis.rst:761
+#: ../../reference/lexical_analysis.rst:788
 msgid ""
 "See also :pep:`498` for the proposal that added formatted string literals, "
 "and :meth:`str.format`, which uses a related format string mechanism."
 msgstr "另请参见 :pep:`498` 了解加入格式化字符串字面值的提议，以及使用了相关的格式字符串机制的 :meth:`str.format`。"
 
-#: ../../reference/lexical_analysis.rst:768
+#: ../../reference/lexical_analysis.rst:795
 msgid "Numeric literals"
 msgstr "数字字面值"
 
-#: ../../reference/lexical_analysis.rst:774
+#: ../../reference/lexical_analysis.rst:801
 msgid ""
 "There are three types of numeric literals: integers, floating point numbers,"
 " and imaginary numbers.  There are no complex literals (complex numbers can "
 "be formed by adding a real number and an imaginary number)."
 msgstr "数字字面值有三种类型: 整型数、浮点数和虚数。没有专门的复数字面值 (复数可由一个实数加一个虚数合成)。"
 
-#: ../../reference/lexical_analysis.rst:778
+#: ../../reference/lexical_analysis.rst:805
 msgid ""
 "Note that numeric literals do not include a sign; a phrase like ``-1`` is "
 "actually an expression composed of the unary operator '``-``' and the "
 "literal ``1``."
 msgstr "注意数字字面值并不包含正负号；``-1`` 这样的负数实际上是由单目运算符 '``-``' 和字面值 ``1`` 合成的。"
 
-#: ../../reference/lexical_analysis.rst:792
+#: ../../reference/lexical_analysis.rst:819
 msgid "Integer literals"
 msgstr "整型数字面值"
 
-#: ../../reference/lexical_analysis.rst:794
+#: ../../reference/lexical_analysis.rst:821
 msgid "Integer literals are described by the following lexical definitions:"
 msgstr "整型数字面值由以下词法定义进行描述:"
 
-#: ../../reference/lexical_analysis.rst:808
+#: ../../reference/lexical_analysis.rst:835
 msgid ""
 "There is no limit for the length of integer literals apart from what can be "
 "stored in available memory."
 msgstr "整型数字面值的长度没有限制，能一直大到占满可用内存。"
 
-#: ../../reference/lexical_analysis.rst:811
+#: ../../reference/lexical_analysis.rst:838
 msgid ""
 "Underscores are ignored for determining the numeric value of the literal.  "
 "They can be used to group digits for enhanced readability.  One underscore "
 "can occur between digits, and after base specifiers like ``0x``."
 msgstr ""
 "在确定数字大小时字面值中的下划线会被忽略。它们可用来将数码分组以提高可读性。一个下划线可放在数码之间，也可放在基数说明符例如 ``0x`` 之后。"
 
-#: ../../reference/lexical_analysis.rst:815
+#: ../../reference/lexical_analysis.rst:842
 msgid ""
 "Note that leading zeros in a non-zero decimal number are not allowed. This "
 "is for disambiguation with C-style octal literals, which Python used before "
 "version 3.0."
 msgstr "注意非零的十进制数开头不允许有额外的零。这是为了避免与 Python 在版本 3.0 之前所使用的 C 风格八进制字面值相混淆。"
 
-#: ../../reference/lexical_analysis.rst:819
+#: ../../reference/lexical_analysis.rst:846
 msgid "Some examples of integer literals::"
 msgstr "一些整型数字面值的示例如下::"
 
-#: ../../reference/lexical_analysis.rst:825
-#: ../../reference/lexical_analysis.rst:857
+#: ../../reference/lexical_analysis.rst:852
+#: ../../reference/lexical_analysis.rst:884
 msgid "Underscores are now allowed for grouping purposes in literals."
 msgstr "允许在字面值中使用下划线进行分组。"
 
-#: ../../reference/lexical_analysis.rst:836
+#: ../../reference/lexical_analysis.rst:863
 msgid "Floating point literals"
 msgstr "浮点数字面值"
 
-#: ../../reference/lexical_analysis.rst:838
+#: ../../reference/lexical_analysis.rst:865
 msgid ""
 "Floating point literals are described by the following lexical definitions:"
 msgstr "浮点数字面值由以下词法定义进行描述:"
 
-#: ../../reference/lexical_analysis.rst:848
+#: ../../reference/lexical_analysis.rst:875
 msgid ""
 "Note that the integer and exponent parts are always interpreted using radix "
 "10. For example, ``077e010`` is legal, and denotes the same number as "
@@ -1114,19 +1127,19 @@ msgstr ""
 "注意整型数部分和指数部分在解析时总是以 10 为基数。例如，``077e010`` 是合法的，且表示的数值与 ``77e10`` "
 "相同。浮点数字面值允许的范围依赖于具体实现。对于整型数字面值，支持以下划线进行分组。"
 
-#: ../../reference/lexical_analysis.rst:853
+#: ../../reference/lexical_analysis.rst:880
 msgid "Some examples of floating point literals::"
 msgstr "一些浮点数字面值的示例如下::"
 
-#: ../../reference/lexical_analysis.rst:866
+#: ../../reference/lexical_analysis.rst:893
 msgid "Imaginary literals"
 msgstr "虚数字面值"
 
-#: ../../reference/lexical_analysis.rst:868
+#: ../../reference/lexical_analysis.rst:895
 msgid "Imaginary literals are described by the following lexical definitions:"
 msgstr "虚数字面值由以下词法定义进行描述:"
 
-#: ../../reference/lexical_analysis.rst:873
+#: ../../reference/lexical_analysis.rst:900
 msgid ""
 "An imaginary literal yields a complex number with a real part of 0.0.  "
 "Complex numbers are represented as a pair of floating point numbers and have"
@@ -1137,23 +1150,23 @@ msgstr ""
 "一个虚数字面值将生成一个实部为 0.0 的复数。复数是以一对浮点数来表示的，它们的取值范围相同。要创建一个实部不为零的复数，就加上一个浮点数，例如 "
 "``(3+4j)``。一些虚数字面值的示例如下::"
 
-#: ../../reference/lexical_analysis.rst:885
+#: ../../reference/lexical_analysis.rst:912
 msgid "Operators"
 msgstr "运算符"
 
-#: ../../reference/lexical_analysis.rst:889
+#: ../../reference/lexical_analysis.rst:916
 msgid "The following tokens are operators:"
 msgstr "以下形符属于运算符:"
 
-#: ../../reference/lexical_analysis.rst:902
+#: ../../reference/lexical_analysis.rst:929
 msgid "Delimiters"
 msgstr "分隔符"
 
-#: ../../reference/lexical_analysis.rst:906
+#: ../../reference/lexical_analysis.rst:933
 msgid "The following tokens serve as delimiters in the grammar:"
 msgstr "以下形符在语法中归类为分隔符:"
 
-#: ../../reference/lexical_analysis.rst:915
+#: ../../reference/lexical_analysis.rst:942
 msgid ""
 "The period can also occur in floating-point and imaginary literals.  A "
 "sequence of three periods has a special meaning as an ellipsis literal. The "
@@ -1162,22 +1175,22 @@ msgid ""
 msgstr ""
 "句点也可出现于浮点数和虚数字面值中。连续三个句点有表示一个省略符的特殊含义。以上列表的后半部分为增强赋值操作符，在词法中作为分隔符，但也起到运算作用。"
 
-#: ../../reference/lexical_analysis.rst:920
+#: ../../reference/lexical_analysis.rst:947
 msgid ""
 "The following printing ASCII characters have special meaning as part of "
 "other tokens or are otherwise significant to the lexical analyzer:"
 msgstr "以下可打印 ASCII 字符作为其他形符的组成部分时具有特殊含义，或是对词法分析器有重要意义:"
 
-#: ../../reference/lexical_analysis.rst:927
+#: ../../reference/lexical_analysis.rst:954
 msgid ""
 "The following printing ASCII characters are not used in Python.  Their "
 "occurrence outside string literals and comments is an unconditional error:"
 msgstr "以下可打印 ASCII 字符不在 Python 词法中使用。如果出现于字符串字面值和注释之外将无条件地引发错误:"
 
-#: ../../reference/lexical_analysis.rst:936
+#: ../../reference/lexical_analysis.rst:963
 msgid "Footnotes"
 msgstr "脚注"
 
-#: ../../reference/lexical_analysis.rst:937
+#: ../../reference/lexical_analysis.rst:964
 msgid "https://www.unicode.org/Public/11.0.0/ucd/NameAliases.txt"
 msgstr "https://www.unicode.org/Public/11.0.0/ucd/NameAliases.txt"
diff --git a/whatsnew/changelog.po b/whatsnew/changelog.po
