Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit e1a6d03

Browse files
authored
Make merge (#1451)
1 parent 9e13f3f commit e1a6d03

14 files changed

+1612
-1082
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
# from which we generated our po files. We use it here so when we
2222
# test build, we're building with the .rst files that generated our
2323
# .po files.
24-
CPYTHON_CURRENT_COMMIT := 8fc828ec4e867c111cef137a2daeea6c3d5db2c7
24+
CPYTHON_CURRENT_COMMIT := b30934e9afb0af3f8e2e5f0992445be775b3c630
2525

2626
CPYTHON_PATH := ../cpython/
2727

c-api/dict.po

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ msgid ""
55
msgstr ""
66
"Project-Id-Version: Python 3\n"
77
"Report-Msgid-Bugs-To: \n"
8-
"POT-Creation-Date: 2020-08-24 09:01+0200\n"
8+
"POT-Creation-Date: 2020-10-15 22:05+0200\n"
99
"PO-Revision-Date: 2018-07-03 11:36+0200\n"
1010
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1111
"Language-Team: FRENCH <[email protected]>\n"
@@ -92,50 +92,51 @@ msgstr ""
9292
#: c-api/dict.rst:83
9393
msgid ""
9494
"Remove the entry in dictionary *p* with key *key*. *key* must be hashable; "
95-
"if it isn't, :exc:`TypeError` is raised. Return ``0`` on success or ``-1`` "
96-
"on failure."
95+
"if it isn't, :exc:`TypeError` is raised. If *key* is not in the dictionary, :"
96+
"exc:`KeyError` is raised. Return ``0`` on success or ``-1`` on failure."
9797
msgstr ""
9898

99-
#: c-api/dict.rst:90
99+
#: c-api/dict.rst:91
100100
msgid ""
101101
"Remove the entry in dictionary *p* which has a key specified by the string "
102-
"*key*. Return ``0`` on success or ``-1`` on failure."
102+
"*key*. If *key* is not in the dictionary, :exc:`KeyError` is raised. Return "
103+
"``0`` on success or ``-1`` on failure."
103104
msgstr ""
104105

105-
#: c-api/dict.rst:96
106+
#: c-api/dict.rst:98
106107
msgid ""
107108
"Return the object from dictionary *p* which has a key *key*. Return "
108109
"``NULL`` if the key *key* is not present, but *without* setting an exception."
109110
msgstr ""
110111

111-
#: c-api/dict.rst:99
112+
#: c-api/dict.rst:101
112113
msgid ""
113114
"Note that exceptions which occur while calling :meth:`__hash__` and :meth:"
114115
"`__eq__` methods will get suppressed. To get error reporting use :c:func:"
115116
"`PyDict_GetItemWithError()` instead."
116117
msgstr ""
117118

118-
#: c-api/dict.rst:106
119+
#: c-api/dict.rst:108
119120
msgid ""
120121
"Variant of :c:func:`PyDict_GetItem` that does not suppress exceptions. "
121122
"Return ``NULL`` **with** an exception set if an exception occurred. Return "
122123
"``NULL`` **without** an exception set if the key wasn't present."
123124
msgstr ""
124125

125-
#: c-api/dict.rst:114
126+
#: c-api/dict.rst:116
126127
msgid ""
127128
"This is the same as :c:func:`PyDict_GetItem`, but *key* is specified as a :c:"
128129
"type:`const char*`, rather than a :c:type:`PyObject*`."
129130
msgstr ""
130131

131-
#: c-api/dict.rst:117
132+
#: c-api/dict.rst:119
132133
msgid ""
133134
"Note that exceptions which occur while calling :meth:`__hash__` and :meth:"
134135
"`__eq__` methods and creating a temporary string object will get suppressed. "
135136
"To get error reporting use :c:func:`PyDict_GetItemWithError()` instead."
136137
msgstr ""
137138

138-
#: c-api/dict.rst:125
139+
#: c-api/dict.rst:127
139140
msgid ""
140141
"This is the same as the Python-level :meth:`dict.setdefault`. If present, "
141142
"it returns the value corresponding to *key* from the dictionary *p*. If the "
@@ -145,29 +146,29 @@ msgid ""
145146
"the insertion."
146147
msgstr ""
147148

148-
#: c-api/dict.rst:135
149+
#: c-api/dict.rst:137
149150
msgid ""
150151
"Return a :c:type:`PyListObject` containing all the items from the dictionary."
151152
msgstr ""
152153

153-
#: c-api/dict.rst:140
154+
#: c-api/dict.rst:142
154155
msgid ""
155156
"Return a :c:type:`PyListObject` containing all the keys from the dictionary."
156157
msgstr ""
157158

158-
#: c-api/dict.rst:145
159+
#: c-api/dict.rst:147
159160
msgid ""
160161
"Return a :c:type:`PyListObject` containing all the values from the "
161162
"dictionary *p*."
162163
msgstr ""
163164

164-
#: c-api/dict.rst:153
165+
#: c-api/dict.rst:155
165166
msgid ""
166167
"Return the number of items in the dictionary. This is equivalent to "
167168
"``len(p)`` on a dictionary."
168169
msgstr ""
169170

170-
#: c-api/dict.rst:159
171+
#: c-api/dict.rst:161
171172
msgid ""
172173
"Iterate over all key-value pairs in the dictionary *p*. The :c:type:"
173174
"`Py_ssize_t` referred to by *ppos* must be initialized to ``0`` prior to the "
@@ -181,18 +182,18 @@ msgid ""
181182
"structure is sparse, the offsets are not consecutive."
182183
msgstr ""
183184

184-
#: c-api/dict.rst:170
185+
#: c-api/dict.rst:172
185186
msgid "For example::"
186187
msgstr "Par exemple ::"
187188

188-
#: c-api/dict.rst:180
189+
#: c-api/dict.rst:182
189190
msgid ""
190191
"The dictionary *p* should not be mutated during iteration. It is safe to "
191192
"modify the values of the keys as you iterate over the dictionary, but only "
192193
"so long as the set of keys does not change. For example::"
193194
msgstr ""
194195

195-
#: c-api/dict.rst:205
196+
#: c-api/dict.rst:207
196197
msgid ""
197198
"Iterate over mapping object *b* adding key-value pairs to dictionary *a*. "
198199
"*b* may be a dictionary, or any object supporting :c:func:`PyMapping_Keys` "
@@ -202,7 +203,7 @@ msgid ""
202203
"or ``-1`` if an exception was raised."
203204
msgstr ""
204205

205-
#: c-api/dict.rst:215
206+
#: c-api/dict.rst:217
206207
msgid ""
207208
"This is the same as ``PyDict_Merge(a, b, 1)`` in C, and is similar to ``a."
208209
"update(b)`` in Python except that :c:func:`PyDict_Update` doesn't fall back "
@@ -211,7 +212,7 @@ msgid ""
211212
"exception was raised."
212213
msgstr ""
213214

214-
#: c-api/dict.rst:224
215+
#: c-api/dict.rst:226
215216
msgid ""
216217
"Update or merge into dictionary *a*, from the key-value pairs in *seq2*. "
217218
"*seq2* must be an iterable object producing iterable objects of length 2, "

faq/programming.po

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ msgid ""
55
msgstr ""
66
"Project-Id-Version: Python 3\n"
77
"Report-Msgid-Bugs-To: \n"
8-
"POT-Creation-Date: 2020-10-01 16:00+0200\n"
8+
"POT-Creation-Date: 2020-10-15 22:05+0200\n"
99
"PO-Revision-Date: 2020-05-30 17:14+0900\n"
1010
"Last-Translator: Samuel Giffard <[email protected]>\n"
1111
"Language-Team: FRENCH <[email protected]>\n"
@@ -1832,8 +1832,9 @@ msgid ""
18321832
msgstr ""
18331833

18341834
#: faq/programming.rst:1179
1835-
msgid "If space is not an issue, the list comprehension may be fastest."
1836-
msgstr ""
1835+
#, fuzzy
1836+
msgid "The list comprehension may be fastest."
1837+
msgstr "Utilisez une liste en compréhension ::"
18371838

18381839
#: faq/programming.rst:1183
18391840
msgid "How do you make an array in Python?"

library/mailbox.po

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ msgid ""
55
msgstr ""
66
"Project-Id-Version: Python 3\n"
77
"Report-Msgid-Bugs-To: \n"
8-
"POT-Creation-Date: 2020-10-01 16:00+0200\n"
8+
"POT-Creation-Date: 2020-10-15 22:05+0200\n"
99
"PO-Revision-Date: 2020-09-24 20:59+0100\n"
10+
"Last-Translator: James Adjinwa <[email protected]>\n"
1011
"Language-Team: FRENCH <[email protected]>\n"
1112
"Language: fr\n"
1213
"MIME-Version: 1.0\n"
1314
"Content-Type: text/plain; charset=UTF-8\n"
1415
"Content-Transfer-Encoding: 8bit\n"
15-
"Last-Translator: James Adjinwa <[email protected]>\n"
1616
"X-Generator: Poedit 2.3\n"
1717

1818
#: library/mailbox.rst:2

library/math.po

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ msgid ""
55
msgstr ""
66
"Project-Id-Version: Python 3\n"
77
"Report-Msgid-Bugs-To: \n"
8-
"POT-Creation-Date: 2020-10-01 16:00+0200\n"
8+
"POT-Creation-Date: 2020-10-15 22:05+0200\n"
99
"PO-Revision-Date: 2019-10-09 21:42+0200\n"
1010
"Last-Translator: Antoine Wecxsteen\n"
1111
"Language-Team: FRENCH <[email protected]>\n"
@@ -221,7 +221,7 @@ msgstr ""
221221
msgid ""
222222
"Return the greatest common divisor of the specified integer arguments. If "
223223
"any of the arguments is nonzero, then the returned value is the largest "
224-
"positive integer that is a divisor af all arguments. If all arguments are "
224+
"positive integer that is a divisor of all arguments. If all arguments are "
225225
"zero, then the returned value is ``0``. ``gcd()`` without arguments returns "
226226
"``0``."
227227
msgstr ""

0 commit comments

Comments
 (0)