[po] auto sync bot

zhsj · zhsj · commit 0839a3c55a95 · 2018-11-05T20:50:45.000+08:00
diff --git a/glossary.po b/glossary.po
@@ -7,8 +7,8 @@
 # ryohei <osakana.ryohei@gmail.com>, 2017
 # Shengjing Zhu <zsj950618@gmail.com>, 2018
 # Fred <fred.wei@foxmail.com>, 2018
-# Junkai Shao <skaifun.dev@gmail.com>, 2018
 # Freesand Leo <yuqinju@163.com>, 2018
+# Junkai Shao <skaifun.dev@gmail.com>, 2018
 # 
 #, fuzzy
 msgid ""
@@ -17,7 +17,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-10-27 09:37+0900\n"
 "PO-Revision-Date: 2017-02-16 17:32+0000\n"
-"Last-Translator: Freesand Leo <yuqinju@163.com>, 2018\n"
+"Last-Translator: Junkai Shao <skaifun.dev@gmail.com>, 2018\n"
 "Language-Team: Chinese (China) (https://www.transifex.com/python-doc/teams/5390/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -845,6 +845,8 @@ msgid ""
 "that is able to detect and break reference cycles.  The garbage collector "
 "can be controlled using the :mod:`gc` module."
 msgstr ""
+"释放不再被使用的内存空间的过程。Python 是通过引用计数和一个能够检测和打破循环引用的循环垃圾回收器来执行垃圾回收的。可以使用 :mod:`gc` "
+"模块来控制垃圾回收器。"
 
 #: ../../glossary.rst:423
 msgid "generator"
@@ -857,21 +859,23 @@ msgid ""
 "producing a series of values usable in a for-loop or that can be retrieved "
 "one at a time with the :func:`next` function."
 msgstr ""
+"返回一个 :term:`generator iterator` 的函数。它看起来很像普通函数，不同点在于其包含 :keyword:`yield` "
+"表达式以便产生一系列值供给 for-循环使用或是通过 :func:`next` 函数逐一获取。"
 
 #: ../../glossary.rst:430
 msgid ""
 "Usually refers to a generator function, but may refer to a *generator "
 "iterator* in some contexts.  In cases where the intended meaning isn't "
 "clear, using the full terms avoids ambiguity."
-msgstr ""
+msgstr "通常是指生成器函数，但在某些情况下也可能是指 *生成器迭代器*。如果需要清楚表达具体含义，请使用全称以避免歧义。"
 
 #: ../../glossary.rst:433
 msgid "generator iterator"
 msgstr "generator iterator -- 生成器迭代器"
 
 #: ../../glossary.rst:435
 msgid "An object created by a :term:`generator` function."
-msgstr ""
+msgstr ":term:`generator` 函数所创建的对象。"
 
 #: ../../glossary.rst:437
 msgid ""
@@ -880,6 +884,8 @@ msgid ""
 "statements).  When the *generator iterator* resumes, it picks up where it "
 "left off (in contrast to functions which start fresh on every invocation)."
 msgstr ""
+"每个 :keyword:`yield` 会临时暂停处理，记住当前位置执行状态（包括局部变量和挂起的 try 语句）。当该 *生成器迭代器* "
+"恢复时，它会从离开位置继续执行（这与每次调用都从新开始的普通函数差别很大）。"
 
 #: ../../glossary.rst:444
 msgid "generator expression"
@@ -892,6 +898,8 @@ msgid ""
 " an optional :keyword:`if` expression.  The combined expression generates "
 "values for an enclosing function::"
 msgstr ""
+"返回一个迭代器的表达式。它看起来很像普通表达式后面带有定义了一个循环变量、范围以及一个可选的 :keyword:`if` 表达式的 "
+":keyword:`for` 表达式。以下复合表达式为外层函数生成一系列值::"
 
 #: ../../glossary.rst:453
 msgid "generic function"
@@ -902,21 +910,23 @@ msgid ""
 "A function composed of multiple functions implementing the same operation "
 "for different types. Which implementation should be used during a call is "
 "determined by the dispatch algorithm."
-msgstr ""
+msgstr "为不同的类型实现相同操作的多个函数所组成的函数。在调用时会由调度算法来确定应该使用哪个实现。"
 
 #: ../../glossary.rst:459
 msgid ""
 "See also the :term:`single dispatch` glossary entry, the "
 ":func:`functools.singledispatch` decorator, and :pep:`443`."
 msgstr ""
+"另请参见 :term:`single dispatch` 术语表条目、:func:`functools.singledispatch` 装饰器以及 "
+":pep:`443`。"
 
 #: ../../glossary.rst:462
 msgid "GIL"
 msgstr "GIL"
 
 #: ../../glossary.rst:464
 msgid "See :term:`global interpreter lock`."
-msgstr ""
+msgstr "参见 :term:`global interpreter lock`。"
 
 #: ../../glossary.rst:465
 msgid "global interpreter lock"
@@ -932,6 +942,9 @@ msgid ""
 "multi-threaded, at the expense of much of the parallelism afforded by multi-"
 "processor machines."
 msgstr ""
+":term:`CPython` 解析器所采用的一种机制，它确保同一时刻只有一个线程在执行 Python "
+":term:`bytecode`。此机制通过设置对象模型 (包括 :class:`dict` 等重要内置类型) 针对并发访问的隐式安全简化了 "
+"CPython 实现。给整个解释器加锁使得解释器多线程运行更方便，其代价则是牺牲了在多处理器上的并行性。"
 
 #: ../../glossary.rst:476
 msgid ""
@@ -1490,6 +1503,8 @@ msgid ""
 "an :term:`argument` (or in some cases, arguments) that the function can "
 "accept.  There are five kinds of parameter:"
 msgstr ""
+":term:`function` （或方法）定义中的命名实体，它指定函数可以接受的一个 :term:`argument` "
+"（或在某些情况下，多个实参）。有五种形参："
 
 #: ../../glossary.rst:786
 msgid ""
@@ -1498,6 +1513,8 @@ msgid ""
 "<argument>`.  This is the default kind of parameter, for example *foo* and "
 "*bar* in the following::"
 msgstr ""
+":dfn:`positional-or-keyword`： 指定可以按 :term:`positionally <argument>` 传递也可以作为 "
+":term:`keyword argument <argument>` 传递的实参，这是默认的参数类型，例如下面的 *foo* 和 *bar* ::"
 
 #: ../../glossary.rst:795
 msgid ""
@@ -1506,6 +1523,8 @@ msgid ""
 "However, some built-in functions have positional-only parameters (e.g. "
 ":func:`abs`)."
 msgstr ""
+":dfn:`positional-only`: 指定只能通过位置传递的参数。Python中没有定义仅位置参数的语法。但是一些内置函数有仅位置参数（比如："
+" :func:`abs`）。"
 
 #: ../../glossary.rst:802
 msgid ""
diff --git a/tutorial/controlflow.po b/tutorial/controlflow.po
@@ -272,6 +272,9 @@ msgid ""
 "assigned a value within a function (unless named in a :keyword:`global` "
 "statement), although they may be referenced."
 msgstr ""
+"函数的 *执行* "
+"会引入一个用于函数局部变量的新符号表。更确切地说，函数中的所有变量赋值都将值存储在本地符号表中；而变量引用首先在本地符号表中查找，然后在封闭函数的本地符号表中查找，然后在全局符号表中查找，最后在内置符号表中查找。所以全局变量不能直接在函数中赋值（除非使用"
+" :keyword:`global` 命名），尽管可以引用它们。"
 
 #: ../../tutorial/controlflow.rst:286
 msgid ""
