merge upstream changes

Author: flowdas

c-api/memory.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Python 3.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-05-30 09:56+0900\n"
+"POT-Creation-Date: 2018-07-08 11:36+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -53,7 +53,7 @@ msgstr ""
 msgid ""
 "It is important to understand that the management of the Python heap is "
 "performed by the interpreter itself and that the user has no control over"
-" it, even if she regularly manipulates object pointers to memory blocks "
+" it, even if they regularly manipulate object pointers to memory blocks "
 "inside that heap.  The allocation of heap space for Python objects and "
 "other internal buffers is performed on demand by the Python memory "
 "manager through the Python/C API functions listed in this document."
@@ -854,3 +854,18 @@ msgstr ""
 #~ "(ex: :c:func:`PyObject_Malloc`) domains."
 #~ msgstr ""
 
+#~ msgid ""
+#~ "It is important to understand that "
+#~ "the management of the Python heap "
+#~ "is performed by the interpreter itself"
+#~ " and that the user has no "
+#~ "control over it, even if she "
+#~ "regularly manipulates object pointers to "
+#~ "memory blocks inside that heap.  The "
+#~ "allocation of heap space for Python "
+#~ "objects and other internal buffers is"
+#~ " performed on demand by the Python"
+#~ " memory manager through the Python/C "
+#~ "API functions listed in this document."
+#~ msgstr ""
+

distutils/builtdist.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Python 3.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-05-30 09:56+0900\n"
+"POT-Creation-Date: 2018-07-08 11:36+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -48,7 +48,7 @@ msgstr ""
 
 #: ../Doc/distutils/builtdist.rst:24
 msgid ""
-"Of course, the module developer could be his own packager; or the "
+"Of course, the module developer could be their own packager; or the "
 "packager could be a volunteer \"out there\" somewhere who has access to a"
 " platform which the original developer does not; or it could be software "
 "periodically grabbing new source distributions and turning them into "
@@ -843,3 +843,20 @@ msgstr ""
 #~ "is possible."
 #~ msgstr ""
 
+#~ msgid ""
+#~ "Of course, the module developer could"
+#~ " be his own packager; or the "
+#~ "packager could be a volunteer \"out "
+#~ "there\" somewhere who has access to "
+#~ "a platform which the original developer"
+#~ " does not; or it could be "
+#~ "software periodically grabbing new source "
+#~ "distributions and turning them into "
+#~ "built distributions for as many "
+#~ "platforms as the software has access "
+#~ "to.  Regardless of who they are, a"
+#~ " packager uses the setup script and"
+#~ " the :command:`bdist` command family to "
+#~ "generate built distributions."
+#~ msgstr ""
+

distutils/introduction.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Python 3.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-05-26 11:10+0900\n"
+"POT-Creation-Date: 2018-07-08 11:36+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -149,8 +149,8 @@ msgstr ""
 
 #: ../Doc/distutils/introduction.rst:97
 msgid ""
-"If an end-user wishes to install your :mod:`foo` module, all she has to "
-"do is download :file:`foo-1.0.tar.gz` (or :file:`.zip`), unpack it, and"
+"If an end-user wishes to install your :mod:`foo` module, all they have to"
+" do is download :file:`foo-1.0.tar.gz` (or :file:`.zip`), unpack it, and"
 "---from the :file:`foo-1.0` directory---run ::"
 msgstr ""
 
@@ -354,3 +354,12 @@ msgstr ""
 #~ " many Python packages.)"
 #~ msgstr ""
 
+#~ msgid ""
+#~ "If an end-user wishes to install"
+#~ " your :mod:`foo` module, all she has"
+#~ " to do is download :file:`foo-1.0.tar.gz`"
+#~ " (or :file:`.zip`), unpack it, and---"
+#~ "from the :file:`foo-1.0` directory---run "
+#~ "::"
+#~ msgstr ""
+