Skip to content

Commit fa3683a

Browse files
committed
Upstream merge
1 parent 59d3ac8 commit fa3683a

33 files changed

+2152
-2075
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ install:
1111
script:
1212
- powrap --check --quiet **/*.po
1313
- pospell -p dict -l fr_FR **/*.po
14-
- make CPYTHON_CLONE=/tmp/cpython/ COMMIT=a3488e5902f5c26e5cc289aec2518e7b5058e5d1
14+
- make CPYTHON_CLONE=/tmp/cpython/ COMMIT=cad4ff65eb12649cd650059b15d8e12f2ae951ef

c-api/exceptions.po

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ msgid ""
55
msgstr ""
66
"Project-Id-Version: Python 3.6\n"
77
"Report-Msgid-Bugs-To: \n"
8-
"POT-Creation-Date: 2019-05-23 16:48+0200\n"
8+
"POT-Creation-Date: 2019-06-03 22:10+0200\n"
99
"PO-Revision-Date: 2018-10-04 12:24+0200\n"
1010
"Last-Translator: Julien Palard <julien@palard.fr>\n"
1111
"Language-Team: FRENCH <traductions@lists.afpy.org>\n"
@@ -516,10 +516,15 @@ msgstr ""
516516

517517
#: ../Doc/c-api/exceptions.rst:519
518518
msgid ""
519-
"This function simulates the effect of a :const:`SIGINT` signal arriving --- "
520-
"the next time :c:func:`PyErr_CheckSignals` is called, :exc:"
521-
"`KeyboardInterrupt` will be raised. It may be called without holding the "
522-
"interpreter lock."
519+
"Simulate the effect of a :const:`SIGINT` signal arriving. The next time :c:"
520+
"func:`PyErr_CheckSignals` is called, the Python signal handler for :const:"
521+
"`SIGINT` will be called."
522+
msgstr ""
523+
524+
#: ../Doc/c-api/exceptions.rst:523
525+
msgid ""
526+
"If :const:`SIGINT` isn't handled by Python (it was set to :data:`signal."
527+
"SIG_DFL` or :data:`signal.SIG_IGN`), this function does nothing."
523528
msgstr ""
524529

525530
#: ../Doc/c-api/exceptions.rst:529

faq/gui.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.6\n"
77
"Report-Msgid-Bugs-To: \n"
8-
"POT-Creation-Date: 2018-06-28 15:29+0200\n"
8+
"POT-Creation-Date: 2019-06-03 22:10+0200\n"
99
"PO-Revision-Date: 2018-10-04 16:57+0200\n"
1010
"Language: fr\n"
1111
"MIME-Version: 1.0\n"
@@ -170,7 +170,7 @@ msgstr ""
170170

171171
#: ../Doc/faq/gui.rst:106
172172
msgid ""
173-
"By installing the `PyObjc Objective-C bridge <https://pythonhosted.org/"
173+
"By installing the `PyObjc Objective-C bridge <https://pypi.org/project/"
174174
"pyobjc/>`_, Python programs can use Mac OS X's Cocoa libraries."
175175
msgstr ""
176176

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy