Skip to content

Commit dd1dba7

Browse files
flowdasflowdas
committed
merge upstream changes
1 parent 1acacf4 commit dd1dba7

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+13860
-10313
lines changed

‎c-api/memory.po‎

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

857+
#~ msgid ""
858+
#~ "It is important to understand that "
859+
#~ "the management of the Python heap "
860+
#~ "is performed by the interpreter itself"
861+
#~ " and that the user has no "
862+
#~ "control over it, even if she "
863+
#~ "regularly manipulates object pointers to "
864+
#~ "memory blocks inside that heap. The "
865+
#~ "allocation of heap space for Python "
866+
#~ "objects and other internal buffers is"
867+
#~ " performed on demand by the Python"
868+
#~ " memory manager through the Python/C "
869+
#~ "API functions listed in this document."
870+
#~ msgstr ""
871+

‎distutils/builtdist.po‎

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: Python 3.6\n"
1010
"Report-Msgid-Bugs-To: \n"
11-
"POT-Creation-Date: 2018-05-30 09:56+0900\n"
11+
"POT-Creation-Date: 2018-07-08 11:36+0900\n"
1212
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1313
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1414
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -48,7 +48,7 @@ msgstr ""
4848

4949
#: ../Doc/distutils/builtdist.rst:24
5050
msgid ""
51-
"Of course, the module developer could be his own packager; or the "
51+
"Of course, the module developer could be their own packager; or the "
5252
"packager could be a volunteer \"out there\" somewhere who has access to a"
5353
" platform which the original developer does not; or it could be software "
5454
"periodically grabbing new source distributions and turning them into "
@@ -843,3 +843,20 @@ msgstr ""
843843
#~ "is possible."
844844
#~ msgstr ""
845845

846+
#~ msgid ""
847+
#~ "Of course, the module developer could"
848+
#~ " be his own packager; or the "
849+
#~ "packager could be a volunteer \"out "
850+
#~ "there\" somewhere who has access to "
851+
#~ "a platform which the original developer"
852+
#~ " does not; or it could be "
853+
#~ "software periodically grabbing new source "
854+
#~ "distributions and turning them into "
855+
#~ "built distributions for as many "
856+
#~ "platforms as the software has access "
857+
#~ "to. Regardless of who they are, a"
858+
#~ " packager uses the setup script and"
859+
#~ " the :command:`bdist` command family to "
860+
#~ "generate built distributions."
861+
#~ msgstr ""
862+

‎distutils/introduction.po‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: Python 3.6\n"
1010
"Report-Msgid-Bugs-To: \n"
11-
"POT-Creation-Date: 2018-05-26 11:10+0900\n"
11+
"POT-Creation-Date: 2018-07-08 11:36+0900\n"
1212
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1313
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1414
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -149,8 +149,8 @@ msgstr ""
149149

150150
#: ../Doc/distutils/introduction.rst:97
151151
msgid ""
152-
"If an end-user wishes to install your :mod:`foo` module, all she has to "
153-
"do is download :file:`foo-1.0.tar.gz` (or :file:`.zip`), unpack it, and"
152+
"If an end-user wishes to install your :mod:`foo` module, all they have to"
153+
" do is download :file:`foo-1.0.tar.gz` (or :file:`.zip`), unpack it, and"
154154
"---from the :file:`foo-1.0` directory---run ::"
155155
msgstr ""
156156

@@ -354,3 +354,12 @@ msgstr ""
354354
#~ " many Python packages.)"
355355
#~ msgstr ""
356356

357+
#~ msgid ""
358+
#~ "If an end-user wishes to install"
359+
#~ " your :mod:`foo` module, all she has"
360+
#~ " to do is download :file:`foo-1.0.tar.gz`"
361+
#~ " (or :file:`.zip`), unpack it, and---"
362+
#~ "from the :file:`foo-1.0` directory---run "
363+
#~ "::"
364+
#~ msgstr ""
365+

0 commit comments

Comments
 (0)