Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit c804539

Browse filesBrowse files
committed
merge pot files.
1 parent e7dc7db commit c804539
Copy full SHA for c804539

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Dismiss banner
Expand file treeCollapse file tree

80 files changed

+3643
-3314
lines changed

‎c-api/capsule.po

Copy file name to clipboardExpand all lines: c-api/capsule.po
+30-31Lines changed: 30 additions & 31 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: 2017-04-02 22:11+0200\n"
11+
"POT-Creation-Date: 2018-06-10 11:27+0200\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"
@@ -28,7 +28,7 @@ msgstr ""
2828
"Reportez-vous à :ref:`using-capsules` pour plus d'informations sur "
2929
"l'utilisation de ces objets."
3030

31-
#: ../Doc/c-api/capsule.rst:15
31+
#: ../Doc/c-api/capsule.rst:17
3232
msgid ""
3333
"This subtype of :c:type:`PyObject` represents an opaque value, useful for C "
3434
"extension modules who need to pass an opaque value (as a :c:type:`void\\*` "
@@ -38,104 +38,104 @@ msgid ""
3838
"loaded modules."
3939
msgstr ""
4040

41-
#: ../Doc/c-api/capsule.rst:24
41+
#: ../Doc/c-api/capsule.rst:27
4242
msgid "The type of a destructor callback for a capsule. Defined as::"
4343
msgstr ""
4444

45-
#: ../Doc/c-api/capsule.rst:28
45+
#: ../Doc/c-api/capsule.rst:31
4646
msgid ""
4747
"See :c:func:`PyCapsule_New` for the semantics of PyCapsule_Destructor "
4848
"callbacks."
4949
msgstr ""
5050

51-
#: ../Doc/c-api/capsule.rst:34
51+
#: ../Doc/c-api/capsule.rst:37
5252
msgid "Return true if its argument is a :c:type:`PyCapsule`."
5353
msgstr ""
5454

55-
#: ../Doc/c-api/capsule.rst:39
55+
#: ../Doc/c-api/capsule.rst:42
5656
msgid ""
5757
"Create a :c:type:`PyCapsule` encapsulating the *pointer*. The *pointer* "
5858
"argument may not be *NULL*."
5959
msgstr ""
6060

61-
#: ../Doc/c-api/capsule.rst:42
61+
#: ../Doc/c-api/capsule.rst:45
6262
msgid "On failure, set an exception and return *NULL*."
6363
msgstr ""
6464

65-
#: ../Doc/c-api/capsule.rst:44
65+
#: ../Doc/c-api/capsule.rst:47
6666
msgid ""
6767
"The *name* string may either be *NULL* or a pointer to a valid C string. If "
6868
"non-*NULL*, this string must outlive the capsule. (Though it is permitted "
6969
"to free it inside the *destructor*.)"
7070
msgstr ""
7171

72-
#: ../Doc/c-api/capsule.rst:48
72+
#: ../Doc/c-api/capsule.rst:51
7373
msgid ""
7474
"If the *destructor* argument is not *NULL*, it will be called with the "
7575
"capsule as its argument when it is destroyed."
7676
msgstr ""
7777

78-
#: ../Doc/c-api/capsule.rst:51
78+
#: ../Doc/c-api/capsule.rst:54
7979
msgid ""
8080
"If this capsule will be stored as an attribute of a module, the *name* "
8181
"should be specified as ``modulename.attributename``. This will enable other "
8282
"modules to import the capsule using :c:func:`PyCapsule_Import`."
8383
msgstr ""
8484

85-
#: ../Doc/c-api/capsule.rst:58
85+
#: ../Doc/c-api/capsule.rst:61
8686
msgid ""
8787
"Retrieve the *pointer* stored in the capsule. On failure, set an exception "
8888
"and return *NULL*."
8989
msgstr ""
9090

91-
#: ../Doc/c-api/capsule.rst:61
91+
#: ../Doc/c-api/capsule.rst:64
9292
msgid ""
9393
"The *name* parameter must compare exactly to the name stored in the capsule. "
9494
"If the name stored in the capsule is *NULL*, the *name* passed in must also "
9595
"be *NULL*. Python uses the C function :c:func:`strcmp` to compare capsule "
9696
"names."
9797
msgstr ""
9898

99-
#: ../Doc/c-api/capsule.rst:69
99+
#: ../Doc/c-api/capsule.rst:72
100100
msgid ""
101101
"Return the current destructor stored in the capsule. On failure, set an "
102102
"exception and return *NULL*."
103103
msgstr ""
104104

105-
#: ../Doc/c-api/capsule.rst:72
105+
#: ../Doc/c-api/capsule.rst:75
106106
msgid ""
107107
"It is legal for a capsule to have a *NULL* destructor. This makes a *NULL* "
108108
"return code somewhat ambiguous; use :c:func:`PyCapsule_IsValid` or :c:func:"
109109
"`PyErr_Occurred` to disambiguate."
110110
msgstr ""
111111

112-
#: ../Doc/c-api/capsule.rst:79
112+
#: ../Doc/c-api/capsule.rst:82
113113
msgid ""
114114
"Return the current context stored in the capsule. On failure, set an "
115115
"exception and return *NULL*."
116116
msgstr ""
117117

118-
#: ../Doc/c-api/capsule.rst:82
118+
#: ../Doc/c-api/capsule.rst:85
119119
msgid ""
120120
"It is legal for a capsule to have a *NULL* context. This makes a *NULL* "
121121
"return code somewhat ambiguous; use :c:func:`PyCapsule_IsValid` or :c:func:"
122122
"`PyErr_Occurred` to disambiguate."
123123
msgstr ""
124124

125-
#: ../Doc/c-api/capsule.rst:89
125+
#: ../Doc/c-api/capsule.rst:92
126126
msgid ""
127127
"Return the current name stored in the capsule. On failure, set an exception "
128128
"and return *NULL*."
129129
msgstr ""
130130

131-
#: ../Doc/c-api/capsule.rst:92
131+
#: ../Doc/c-api/capsule.rst:95
132132
msgid ""
133133
"It is legal for a capsule to have a *NULL* name. This makes a *NULL* return "
134134
"code somewhat ambiguous; use :c:func:`PyCapsule_IsValid` or :c:func:"
135135
"`PyErr_Occurred` to disambiguate."
136136
msgstr ""
137137

138-
#: ../Doc/c-api/capsule.rst:99
138+
#: ../Doc/c-api/capsule.rst:102
139139
msgid ""
140140
"Import a pointer to a C object from a capsule attribute in a module. The "
141141
"*name* parameter should specify the full name to the attribute, as in "
@@ -145,14 +145,13 @@ msgid ""
145145
"import the module conventionally (using :c:func:`PyImport_ImportModule`)."
146146
msgstr ""
147147

148-
#: ../Doc/c-api/capsule.rst:106
148+
#: ../Doc/c-api/capsule.rst:109
149149
msgid ""
150150
"Return the capsule's internal *pointer* on success. On failure, set an "
151-
"exception and return *NULL*. However, if :c:func:`PyCapsule_Import` failed "
152-
"to import the module, and *no_block* was true, no exception is set."
151+
"exception and return *NULL*."
153152
msgstr ""
154153

155-
#: ../Doc/c-api/capsule.rst:112
154+
#: ../Doc/c-api/capsule.rst:115
156155
msgid ""
157156
"Determines whether or not *capsule* is a valid capsule. A valid capsule is "
158157
"non-*NULL*, passes :c:func:`PyCapsule_CheckExact`, has a non-*NULL* pointer "
@@ -161,41 +160,41 @@ msgid ""
161160
"compared.)"
162161
msgstr ""
163162

164-
#: ../Doc/c-api/capsule.rst:118
163+
#: ../Doc/c-api/capsule.rst:121
165164
msgid ""
166165
"In other words, if :c:func:`PyCapsule_IsValid` returns a true value, calls "
167166
"to any of the accessors (any function starting with :c:func:`PyCapsule_Get`) "
168167
"are guaranteed to succeed."
169168
msgstr ""
170169

171-
#: ../Doc/c-api/capsule.rst:122
170+
#: ../Doc/c-api/capsule.rst:125
172171
msgid ""
173172
"Return a nonzero value if the object is valid and matches the name passed "
174173
"in. Return ``0`` otherwise. This function will not fail."
175174
msgstr ""
176175

177-
#: ../Doc/c-api/capsule.rst:127
176+
#: ../Doc/c-api/capsule.rst:131
178177
msgid "Set the context pointer inside *capsule* to *context*."
179178
msgstr ""
180179

181-
#: ../Doc/c-api/capsule.rst:129 ../Doc/c-api/capsule.rst:135
182-
#: ../Doc/c-api/capsule.rst:143 ../Doc/c-api/capsule.rst:150
180+
#: ../Doc/c-api/capsule.rst:133 ../Doc/c-api/capsule.rst:140
181+
#: ../Doc/c-api/capsule.rst:149 ../Doc/c-api/capsule.rst:157
183182
msgid ""
184183
"Return ``0`` on success. Return nonzero and set an exception on failure."
185184
msgstr ""
186185

187-
#: ../Doc/c-api/capsule.rst:133
186+
#: ../Doc/c-api/capsule.rst:138
188187
msgid "Set the destructor inside *capsule* to *destructor*."
189188
msgstr ""
190189

191-
#: ../Doc/c-api/capsule.rst:139
190+
#: ../Doc/c-api/capsule.rst:145
192191
msgid ""
193192
"Set the name inside *capsule* to *name*. If non-*NULL*, the name must "
194193
"outlive the capsule. If the previous *name* stored in the capsule was not "
195194
"*NULL*, no attempt is made to free it."
196195
msgstr ""
197196

198-
#: ../Doc/c-api/capsule.rst:147
197+
#: ../Doc/c-api/capsule.rst:154
199198
msgid ""
200199
"Set the void pointer inside *capsule* to *pointer*. The pointer may not be "
201200
"*NULL*."

‎c-api/gcsupport.po

Copy file name to clipboardExpand all lines: c-api/gcsupport.po
+3-2Lines changed: 3 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: 2017-04-02 22:11+0200\n"
11+
"POT-Creation-Date: 2018-06-10 11:27+0200\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"
@@ -78,7 +78,8 @@ msgstr ""
7878
#: ../Doc/c-api/gcsupport.rst:51
7979
msgid ""
8080
"Resize an object allocated by :c:func:`PyObject_NewVar`. Returns the "
81-
"resized object or *NULL* on failure."
81+
"resized object or *NULL* on failure. *op* must not be tracked by the "
82+
"collector yet."
8283
msgstr ""
8384

8485
#: ../Doc/c-api/gcsupport.rst:57

‎c-api/mapping.po

Copy file name to clipboardExpand all lines: c-api/mapping.po
+40-31Lines changed: 40 additions & 31 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: 2017-04-02 22:11+0200\n"
11+
"POT-Creation-Date: 2018-06-10 11:27+0200\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"
@@ -21,65 +21,74 @@ msgstr ""
2121
msgid "Mapping Protocol"
2222
msgstr ""
2323

24-
#: ../Doc/c-api/mapping.rst:11
24+
#: ../Doc/c-api/mapping.rst:8
2525
msgid ""
26-
"Return ``1`` if the object provides mapping protocol, and ``0`` otherwise. "
27-
"This function always succeeds."
26+
"See also :c:func:`PyObject_GetItem`, :c:func:`PyObject_SetItem` and :c:func:"
27+
"`PyObject_DelItem`."
2828
msgstr ""
2929

30-
#: ../Doc/c-api/mapping.rst:20
30+
#: ../Doc/c-api/mapping.rst:14
3131
msgid ""
32-
"Returns the number of keys in object *o* on success, and ``-1`` on failure. "
33-
"For objects that do not provide mapping protocol, this is equivalent to the "
34-
"Python expression ``len(o)``."
32+
"Return ``1`` if the object provides mapping protocol or supports slicing, "
33+
"and ``0`` otherwise. Note that it returns ``1`` for Python classes with a :"
34+
"meth:`__getitem__` method since in general case it is impossible to "
35+
"determine what the type of keys it supports. This function always succeeds."
3536
msgstr ""
3637

37-
#: ../Doc/c-api/mapping.rst:27 ../Doc/c-api/mapping.rst:33
38+
#: ../Doc/c-api/mapping.rst:26
3839
msgid ""
39-
"Remove the mapping for object *key* from the object *o*. Return ``-1`` on "
40-
"failure. This is equivalent to the Python statement ``del o[key]``."
40+
"Returns the number of keys in object *o* on success, and ``-1`` on failure. "
41+
"This is equivalent to the Python expression ``len(o)``."
42+
msgstr ""
43+
44+
#: ../Doc/c-api/mapping.rst:32
45+
msgid ""
46+
"Return element of *o* corresponding to the string *key* or *NULL* on "
47+
"failure. This is the equivalent of the Python expression ``o[key]``. See "
48+
"also :c:func:`PyObject_GetItem`."
4149
msgstr ""
4250

4351
#: ../Doc/c-api/mapping.rst:39
4452
msgid ""
45-
"On success, return ``1`` if the mapping object has the key *key* and ``0`` "
46-
"otherwise. This is equivalent to the Python expression ``key in o``. This "
47-
"function always succeeds."
53+
"Map the string *key* to the value *v* in object *o*. Returns ``-1`` on "
54+
"failure. This is the equivalent of the Python statement ``o[key] = v``. See "
55+
"also :c:func:`PyObject_SetItem`."
4856
msgstr ""
4957

5058
#: ../Doc/c-api/mapping.rst:46
5159
msgid ""
52-
"Return ``1`` if the mapping object has the key *key* and ``0`` otherwise. "
53-
"This is equivalent to the Python expression ``key in o``. This function "
54-
"always succeeds."
60+
"Remove the mapping for the object *key* from the object *o*. Return ``-1`` "
61+
"on failure. This is equivalent to the Python statement ``del o[key]``. This "
62+
"is an alias of :c:func:`PyObject_DelItem`."
5563
msgstr ""
5664

5765
#: ../Doc/c-api/mapping.rst:53
5866
msgid ""
59-
"On success, return a list or tuple of the keys in object *o*. On failure, "
60-
"return *NULL*."
67+
"Remove the mapping for the string *key* from the object *o*. Return ``-1`` "
68+
"on failure. This is equivalent to the Python statement ``del o[key]``."
6169
msgstr ""
6270

63-
#: ../Doc/c-api/mapping.rst:59
71+
#: ../Doc/c-api/mapping.rst:59 ../Doc/c-api/mapping.rst:66
6472
msgid ""
65-
"On success, return a list or tuple of the values in object *o*. On failure, "
66-
"return *NULL*."
73+
"Return ``1`` if the mapping object has the key *key* and ``0`` otherwise. "
74+
"This is equivalent to the Python expression ``key in o``. This function "
75+
"always succeeds."
6776
msgstr ""
6877

69-
#: ../Doc/c-api/mapping.rst:65
78+
#: ../Doc/c-api/mapping.rst:73
7079
msgid ""
71-
"On success, return a list or tuple of the items in object *o*, where each "
72-
"item is a tuple containing a key-value pair. On failure, return *NULL*."
80+
"On success, return a list or tuple of the keys in object *o*. On failure, "
81+
"return *NULL*."
7382
msgstr ""
7483

75-
#: ../Doc/c-api/mapping.rst:71
84+
#: ../Doc/c-api/mapping.rst:79
7685
msgid ""
77-
"Return element of *o* corresponding to the object *key* or *NULL* on "
78-
"failure. This is the equivalent of the Python expression ``o[key]``."
86+
"On success, return a list or tuple of the values in object *o*. On failure, "
87+
"return *NULL*."
7988
msgstr ""
8089

81-
#: ../Doc/c-api/mapping.rst:77
90+
#: ../Doc/c-api/mapping.rst:85
8291
msgid ""
83-
"Map the object *key* to the value *v* in object *o*. Returns ``-1`` on "
84-
"failure. This is the equivalent of the Python statement ``o[key] = v``."
92+
"On success, return a list or tuple of the items in object *o*, where each "
93+
"item is a tuple containing a key-value pair. On failure, return *NULL*."
8594
msgstr ""

‎c-api/object.po

Copy file name to clipboardExpand all lines: c-api/object.po
+3-3Lines changed: 3 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: 2017-04-02 22:11+0200\n"
11+
"POT-Creation-Date: 2018-06-10 11:27+0200\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"
@@ -395,8 +395,8 @@ msgstr ""
395395

396396
#: ../Doc/c-api/object.rst:398
397397
msgid ""
398-
"Delete the mapping for *key* from *o*. Returns ``-1`` on failure. This is "
399-
"the equivalent of the Python statement ``del o[key]``."
398+
"Remove the mapping for the object *key* from the object *o*. Return ``-1`` "
399+
"on failure. This is equivalent to the Python statement ``del o[key]``."
400400
msgstr ""
401401

402402
#: ../Doc/c-api/object.rst:404

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.