Skip to content

Commit 43c0e9d

Browse files
JulienPalardJulienPalard
committed
FIX forward porting issues introduced between 3.10 and 3.11.
1 parent baf812e commit 43c0e9d

12 files changed

+20
-32
lines changed

‎.gitattributes

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@
77
# chmod a+x ~/.local/bin/podiff
88
# git config diff.podiff.textconv podiff
99

10-
*.po diff=podiff
10+
*.po diff=podiff merge=po3way
1111
*.pot diff=podiff

‎howto/logging-cookbook.po

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ msgstr ""
1313
"MIME-Version: 1.0\n"
1414
"Content-Type: text/plain; charset=UTF-8\n"
1515
"Content-Transfer-Encoding: 8bit\n"
16-
"Last-Translator: \n"
1716
"X-Generator: Poedit 2.4.2\n"
1817

1918
#: howto/logging-cookbook.rst:5

‎library/html.parser.po

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ msgstr ""
77
"Report-Msgid-Bugs-To: \n"
88
"POT-Creation-Date: 2022-03-23 18:39+0100\n"
99
"PO-Revision-Date: 2022-05-08 09:48+0200\n"
10-
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1110
"Language-Team: FRENCH <traductions@lists.afpy.org>\n"
1211
"Language: fr\n"
1312
"MIME-Version: 1.0\n"

‎library/http.server.po

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ msgstr ""
77
"Report-Msgid-Bugs-To: \n"
88
"POT-Creation-Date: 2022-05-22 23:13+0200\n"
99
"PO-Revision-Date: 2022-04-27 06:17-0400\n"
10-
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1110
"Language-Team: FRENCH <traductions@lists.afpy.org>\n"
1211
"Language: fr\n"
1312
"MIME-Version: 1.0\n"
@@ -250,6 +249,7 @@ msgstr ""
250249
"client. La valeur par défaut est ``'text/html'``."
251250

252251
#: library/http.server.rst:160
252+
#, fuzzy
253253
msgid ""
254254
"Specifies the HTTP version to which the server is conformant. It is sent in "
255255
"responses to let the client know the server's communication capabilities for "
@@ -628,7 +628,7 @@ msgstr ""
628628

629629
#: library/http.server.rst:466
630630
msgid ""
631-
"CGI scripts run by the :class:`CGIHTTPRequestHandler` class cannot execute "
631+
"CGI scripts run by the :class:`CGIHTTPRequestHandler` class cannot execute "
632632
"redirects (HTTP code 302), because code 200 (script output follows) is sent "
633633
"prior to execution of the CGI script. This pre-empts the status code."
634634
msgstr ""

‎library/logging.handlers.po

Lines changed: 1 addition & 1 deletion
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: 2022-03-23 18:39+0100\n"
8+
"POT-Creation-Date: 2022-04-05 10:05+0200\n"
99
"PO-Revision-Date: 2020-12-14 10:12+0100\n"
1010
"Last-Translator: Antoine Wecxsteen\n"
1111
"Language-Team: FRENCH <traductions@lists.afpy.org>\n"

‎library/pathlib.po

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1248,6 +1248,7 @@ msgstr ""
12481248
"leur équivalent :class:`PurePath` / :class:`Path` correspondant."
12491249

12501250
#: library/pathlib.rst:1259
1251+
#, fuzzy
12511252
msgid ""
12521253
"Not all pairs of functions/methods below are equivalent. Some of them, "
12531254
"despite having some overlapping use-cases, have different semantics. They "
@@ -1488,6 +1489,7 @@ msgid "Footnotes"
14881489
msgstr "Notes"
14891490

14901491
#: library/pathlib.rst:1301
1492+
#, fuzzy
14911493
msgid ""
14921494
":func:`os.path.abspath` normalizes the resulting path, which may change its "
14931495
"meaning in the presence of symlinks, while :meth:`Path.absolute` does not."

‎library/random.po

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -195,6 +195,7 @@ msgstr ""
195195
"chaîne de caractères."
196196

197197
#: library/random.rst:89
198+
#, fuzzy
198199
msgid ""
199200
"The *seed* must be one of the following types: *NoneType*, :class:`int`, :"
200201
"class:`float`, :class:`str`, :class:`bytes`, or :class:`bytearray`."
@@ -509,10 +510,6 @@ msgid ""
509510
"The *population* must be a sequence. Automatic conversion of sets to lists "
510511
"is no longer supported."
511512
msgstr ""
512-
"À l’avenir, la *population* devra être une séquence. Les instances de :"
513-
"class:`set` ne sont plus prises en charge. Le *set* doit d’abord être "
514-
"converti en une :class:`list` ou :class:`tuple`, de préférence dans un ordre "
515-
"déterministe de telle sorte que l’échantillon soit reproductible."
516513

517514
#: library/random.rst:266
518515
msgid "Real-valued distributions"

‎library/stdtypes.po

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -680,6 +680,7 @@ msgstr ""
680680
"tout équivalent Unicode (caractères avec la propriété ``Nd``)."
681681

682682
#: library/stdtypes.rst:356
683+
#, fuzzy
683684
msgid ""
684685
"See https://www.unicode.org/Public/14.0.0/ucd/extracted/DerivedNumericType."
685686
"txt for a complete list of code points with the ``Nd`` property."

‎library/warnings.po

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ msgstr ""
77
"Report-Msgid-Bugs-To: \n"
88
"POT-Creation-Date: 2022-05-22 23:13+0200\n"
99
"PO-Revision-Date: 2022-05-18 13:35+0200\n"
10-
"Last-Translator: Stéphane Lambelin\n"
10+
"Last-Translator: Jean Abou Samra <jean@abou-samra.fr>\n"
1111
"Language-Team: FRENCH <traductions@lists.afpy.org>\n"
1212
"Language: fr\n"
1313
"MIME-Version: 1.0\n"

‎library/zlib.po

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ msgstr ""
77
"Report-Msgid-Bugs-To: \n"
88
"POT-Creation-Date: 2022-05-22 23:13+0200\n"
99
"PO-Revision-Date: 2022-05-18 13:34+0200\n"
10-
"Last-Translator: Durand <antoine.durand@ynov.com>\n"
10+
"Last-Translator: Jean Abou Samra <jean@abou-samra.fr>\n"
1111
"Language-Team: FRENCH <traductions@lists.afpy.org>\n"
1212
"Language: fr\n"
1313
"MIME-Version: 1.0\n"
@@ -91,7 +91,7 @@ msgstr ""
9191

9292
#: library/zlib.rst:136
9393
msgid "The result is always unsigned."
94-
msgstr ""
94+
msgstr "Renvoie une valeur non-signée."
9595

9696
#: library/zlib.rst:49
9797
#, fuzzy
@@ -275,6 +275,7 @@ msgstr ""
275275
"algorithme a été conçu pour être exploité comme un algorithme de somme de "
276276
"contrôle, ce n'est pas un algorithme de hachage générique."
277277

278+
#: library/zlib.rst:141
278279
msgid ""
279280
"Decompresses the bytes in *data*, returning a bytes object containing the "
280281
"uncompressed data. The *wbits* parameter depends on the format of *data*, "

‎tutorial/errors.po

Lines changed: 5 additions & 4 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: 2022-03-18 17:06+0100\n"
8+
"POT-Creation-Date: 2022-05-22 23:13+0200\n"
99
"PO-Revision-Date: 2022-05-20 09:47+0200\n"
1010
"Last-Translator: Julien Palard <julien@palard.fr>\n"
1111
"Language-Team: FRENCH <traductions@lists.afpy.org>\n"
@@ -285,9 +285,6 @@ msgid ""
285285
"exit` and :exc:`KeyboardInterrupt` which is raised when a user wishes to "
286286
"interrupt the program."
287287
msgstr ""
288-
"Concernant la dernière clause ``except``, vous pouvez omettre les noms des "
289-
"exceptions, cependant la valeur de l'exception doit alors être récupérée "
290-
"avec ``sys.exc_info()[1]``."
291288

292289
#: tutorial/errors.rst:188
293290
msgid ""
@@ -298,11 +295,15 @@ msgid ""
298295
msgstr ""
299296

300297
#: tutorial/errors.rst:193
298+
#, fuzzy
301299
msgid ""
302300
"The most common pattern for handling :exc:`Exception` is to print or log the "
303301
"exception and then re-raise it (allowing a caller to handle the exception as "
304302
"well)::"
305303
msgstr ""
304+
"Concernant la dernière clause ``except``, vous pouvez omettre les noms des "
305+
"exceptions, cependant la valeur de l'exception doit alors être récupérée "
306+
"avec ``sys.exc_info()[1]``."
306307

307308
#: tutorial/errors.rst:211
308309
msgid ""

‎tutorial/floatingpoint.po

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -30,21 +30,9 @@ msgid ""
3030
"fractional notation, and the second in base 2."
3131
msgstr ""
3232
"Les nombres à virgule flottante sont représentés, au niveau matériel, en "
33-
"fractions de nombres binaires (base 2). Par exemple, la fraction décimale "
34-
"``0.125`` a la valeur 1/10 + 2/100 + 5/1000 et, de la même manière, la "
35-
"fraction binaire..."
36-
37-
#: tutorial/floatingpoint.rst:19
38-
msgid ""
39-
"has value 1/10 + 2/100 + 5/1000, and in the same way the binary fraction ::"
40-
msgstr ""
41-
42-
#: tutorial/floatingpoint.rst:23
43-
msgid ""
44-
"has value 0/2 + 0/4 + 1/8. These two fractions have identical values, the "
45-
"only real difference being that the first is written in base 10 fractional "
46-
"notation, and the second in base 2."
47-
msgstr ""
33+
"fractions de nombres binaires (base 2). Par exemple, la fraction décimale ::"
34+
"a la valeur 1/10 + 2/100 + 5/1000 et, de la même manière, la fraction "
35+
"binaire ::"
4836
"a la valeur 0/2 + 0/4 + 1/8. Ces deux fractions ont une valeur identique, la "
4937
"seule différence est que la première est une fraction décimale, la seconde "
5038
"est une fraction binaire."

0 commit comments

Comments
 (0)