[po] auto sync bot

zhsj · zhsj · commit d9fe4c703375 · 2018-11-18T13:41:09.000+08:00
diff --git a/howto/pyporting.po b/howto/pyporting.po
@@ -3,13 +3,18 @@
 # This file is distributed under the same license as the Python package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
+# Translators:
+# Chengeng Ning <telnetning@gmail.com>, 2018
+# Freesand Leo <yuqinju@163.com>, 2018
+# Junkai Shao <skaifun.dev@gmail.com>, 2018
+# 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: Python 3.7\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-06-30 05:56+0900\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2017-02-16 17:45+0000\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"
@@ -20,7 +25,7 @@ msgstr ""
 
 #: ../../howto/pyporting.rst:5
 msgid "Porting Python 2 Code to Python 3"
-msgstr "将Python 2 代码迁移到Python 3"
+msgstr "将 Python 2 代码迁移到 Python 3"
 
 #: ../../howto/pyporting.rst:0
 msgid "author"
@@ -41,23 +46,23 @@ msgid ""
 "Python. This guide is meant to help you figure out how best to support both "
 "Python 2 & 3 simultaneously."
 msgstr ""
-"Python 3是Python的未来，而Python "
-"2仍处于活跃使用阶段，最好让您的项目可用于两个主要版本的Python。本指南旨在帮助您了解如何同时最好地同时支持Python 2和3。"
+"Python 3 是 Python 的未来，但 Python 2 仍处于活跃使用阶段，最好让您的项目在两个主要版本的Python "
+"上都可用。本指南旨在帮助您了解如何最好地同时支持 Python 2 和 3。"
 
 #: ../../howto/pyporting.rst:16
 msgid ""
 "If you are looking to port an extension module instead of pure Python code, "
 "please see :ref:`cporting-howto`."
-msgstr "如果您希望迁移扩展模块而不是纯Python代码，请参阅 :ref:`cporting-howto`。"
+msgstr "如果您希望迁移扩展模块而不是纯 Python 代码，请参阅 :ref:`cporting-howto`。"
 
 #: ../../howto/pyporting.rst:19
 msgid ""
 "If you would like to read one core Python developer's take on why Python 3 "
 "came into existence, you can read Nick Coghlan's `Python 3 Q & A`_ or Brett "
 "Cannon's `Why Python 3 exists`_."
 msgstr ""
-"如果您想阅读一个核心Python开发人员对Python 3为什么会出现的看法，您可以阅读Nick Coghlan的 Python 3 Q＆A或Brett"
-" Cannon的为什么Python 3存在。"
+"如果你想了解核心 Python 开发者对于 Python 3 的出现有何看法，你可以阅读 Nick Coghlan 的 `Python 3 Q & "
+"A`_ 或 Brett Cannon 的 `为什么要有 Python 3`_."
 
 #: ../../howto/pyporting.rst:23
 msgid ""
diff --git a/reference/datamodel.po b/reference/datamodel.po
@@ -1951,6 +1951,9 @@ msgid ""
 " ``x.__hash__()`` returns an appropriate value such that ``x == y`` implies "
 "both that ``x is y`` and ``hash(x) == hash(y)``."
 msgstr ""
+"用户定义的类默认带有 :meth:`__eq__` 和 :meth:`__hash__` 方法；使用它们与任何对象（自己除外）比较必定不相等，并且 "
+"``x.__hash__()`` 会返回一个恰当的值以确保 ``x == y`` 同时意味着 ``x is y`` 且 ``hash(x) == "
+"hash(y)``。"
 
 #: ../../reference/datamodel.rst:1425
 msgid ""
@@ -1961,13 +1964,19 @@ msgid ""
 "their hash value, and will also be correctly identified as unhashable when "
 "checking ``isinstance(obj, collections.abc.Hashable)``."
 msgstr ""
+"一个类如果重载了 :meth:`__eq__` 且没有定义 :meth:`__hash__` 则会将其 :meth:`__hash__` 隐式地设为 "
+"``None``。当一个类的 :meth:`__hash__` 方法为 ``None`` 时，该类的实例将在一个程序尝试获取其哈希值时正确地引发 "
+":exc:`TypeError`，并会在检测 ``isinstance(obj, collections.abc.Hashable)`` "
+"时被正确地识别为不可哈希对象。"
 
 #: ../../reference/datamodel.rst:1432
 msgid ""
 "If a class that overrides :meth:`__eq__` needs to retain the implementation "
 "of :meth:`__hash__` from a parent class, the interpreter must be told this "
 "explicitly by setting ``__hash__ = <ParentClass>.__hash__``."
 msgstr ""
+"如果一个重载了 :meth:`__eq__` 的类需要保留来自父类的 :meth:`__hash__` 实现，则必须通过设置 ``__hash__ = "
+"<ParentClass>.__hash__`` 来显式地告知解释器。"
 
 #: ../../reference/datamodel.rst:1436
 msgid ""
@@ -1977,6 +1986,9 @@ msgid ""
 ":exc:`TypeError` would be incorrectly identified as hashable by an "
 "``isinstance(obj, collections.abc.Hashable)`` call."
 msgstr ""
+"如果一个没有重载 :meth:`__eq__` 的类需要去掉哈希支持，则应该在类定义中包含 ``__hash__ = None``。一个自定义了 "
+":meth:`__hash__` 以显式地引发 :exc:`TypeError` 的类会被 ``isinstance(obj, "
+"collections.abc.Hashable)`` 调用错误地识别为可哈希对象。"
 
 #: ../../reference/datamodel.rst:1445
 msgid ""
