Merge with upstream

Author: adrianliaw

faq/design.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Python 3.7\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-06-26 18:54+0800\n"
+"POT-Creation-Date: 2018-07-15 19:13+0800\n"
 "PO-Revision-Date: 2018-05-23 14:35+0000\n"
 "Last-Translator: Adrian Liaw <[email protected]>\n"
 "Language-Team: Chinese - TAIWAN (https://github.com/python/python-docs-zh-"
@@ -433,8 +433,8 @@ msgstr ""
 
 #: ../../faq/design.rst:351
 msgid ""
-"Answer 2: Fortunately, there is `Stackless Python <https://bitbucket.org/"
-"stackless-dev/stackless/wiki/Home>`_, which has a completely redesigned "
+"Answer 2: Fortunately, there is `Stackless Python <https://github.com/"
+"stackless-dev/stackless/wiki>`_, which has a completely redesigned "
 "interpreter loop that avoids the C stack."
 msgstr ""
 
@@ -596,12 +596,13 @@ msgid ""
 msgstr ""
 
 #: ../../faq/design.rst:474
-msgid "How are lists implemented?"
+#, fuzzy
+msgid "How are lists implemented in CPython?"
 msgstr "串列如何被繼承?"
 
 #: ../../faq/design.rst:476
 msgid ""
-"Python's lists are really variable-length arrays, not Lisp-style linked "
+"CPython's lists are really variable-length arrays, not Lisp-style linked "
 "lists. The implementation uses a contiguous array of references to other "
 "objects, and keeps a pointer to this array and the array's length in a list "
 "head structure."
@@ -622,14 +623,16 @@ msgid ""
 msgstr ""
 
 #: ../../faq/design.rst:490
-msgid "How are dictionaries implemented?"
-msgstr ""
+#, fuzzy
+msgid "How are dictionaries implemented in CPython?"
+msgstr "串列如何被繼承?"
 
 #: ../../faq/design.rst:492
 msgid ""
-"Python's dictionaries are implemented as resizable hash tables.  Compared to "
-"B-trees, this gives better performance for lookup (the most common operation "
-"by far) under most circumstances, and the implementation is simpler."
+"CPython's dictionaries are implemented as resizable hash tables.  Compared "
+"to B-trees, this gives better performance for lookup (the most common "
+"operation by far) under most circumstances, and the implementation is "
+"simpler."
 msgstr ""
 
 #: ../../faq/design.rst:496