From bb85844b134eb4ce68323bcdc3bdc779b4054fc8 Mon Sep 17 00:00:00 2001 From: Julien Palard Date: Wed, 12 Jun 2019 15:08:26 +0200 Subject: [PATCH] Upstream merge --- .travis.yml | 2 +- library/dis.po | 8 ++++---- using/mac.po | 16 +++++++++------- 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/.travis.yml b/.travis.yml index 85060181..0376683f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,4 +11,4 @@ install: script: - powrap --check --quiet **/*.po - pospell -p dict -l fr_FR **/*.po - - make CPYTHON_CLONE=/tmp/cpython/ COMMIT=3621bf20e94ac3647a8f31a68bf7414dd4b50398 + - make CPYTHON_CLONE=/tmp/cpython/ COMMIT=d561f848b235f2011a43b705d112055b92fa2366 diff --git a/library/dis.po b/library/dis.po index a24339b8..40d42b03 100644 --- a/library/dis.po +++ b/library/dis.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: Python 3.6\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-06-03 22:10+0200\n" +"POT-Creation-Date: 2019-06-12 14:38+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: FRENCH \n" @@ -1148,9 +1148,9 @@ msgstr "" #: ../Doc/library/dis.rst:1168 msgid "" "Prefixes any opcode which has an argument too big to fit into the default " -"two bytes. *ext* holds two additional bytes which, taken together with the " -"subsequent opcode's argument, comprise a four-byte argument, *ext* being the " -"two most-significant bytes." +"one byte. *ext* holds an additional byte which act as higher bits in the " +"argument. For each opcode, at most three prefixal ``EXTENDED_ARG`` are " +"allowed, forming an argument from two-byte to four-byte." msgstr "" #: ../Doc/library/dis.rst:1176 diff --git a/using/mac.po b/using/mac.po index 87231e71..c3ba4c23 100644 --- a/using/mac.po +++ b/using/mac.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: Python 3.6\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-06-03 22:10+0200\n" +"POT-Creation-Date: 2019-06-12 14:38+0200\n" "PO-Revision-Date: 2018-11-23 10:07+0100\n" "Last-Translator: Jules Lasne \n" "Language-Team: FRENCH \n" @@ -62,12 +62,13 @@ msgid "What you get after installing is a number of things:" msgstr "Vous obtiendrez un certain nombre de choses après installation:" #: ../Doc/using/mac.rst:28 +#, fuzzy msgid "" -"A :file:`MacPython 3.6` folder in your :file:`Applications` folder. In here " -"you find IDLE, the development environment that is a standard part of " -"official Python distributions; PythonLauncher, which handles double-clicking " -"Python scripts from the Finder; and the \"Build Applet\" tool, which allows " -"you to package Python scripts as standalone applications on your system." +"A :file:`Python 3.7` folder in your :file:`Applications` folder. In here you " +"find IDLE, the development environment that is a standard part of official " +"Python distributions; PythonLauncher, which handles double-clicking Python " +"scripts from the Finder; and the \"Build Applet\" tool, which allows you to " +"package Python scripts as standalone applications on your system." msgstr "" "Un dossier :file:`MacPython 3.6` dans votre dossier :file:`Applications`. " "Dedans vous trouverez **IDLE**, l'environnement de développement qui fait " @@ -216,8 +217,9 @@ msgstr "" "scripts." #: ../Doc/using/mac.rst:96 +#, fuzzy msgid "" -"With Python 3.6, you can use either :program:`python` or :program:`pythonw`." +"With Python 3.7, you can use either :program:`python` or :program:`pythonw`." msgstr "" "Avec Python 3.6, vous pouvez utilisez :program:`python` ou :program:" "`pythonw`."