python
diff --git a/‎library/asyncio-eventloops.po
Lines changed: 14 additions & 13 deletions b/‎library/asyncio-eventloops.po
Lines changed: 14 additions & 13 deletions
diff --git a/‎library/asyncio-task.po
Lines changed: 43 additions & 37 deletions b/‎library/asyncio-task.po
Lines changed: 43 additions & 37 deletions
diff --git a/‎whatsnew/3.6.po
Lines changed: 3 additions & 3 deletions b/‎whatsnew/3.6.po
Lines changed: 3 additions & 3 deletions
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Python 3.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-01-05 15:01+0000\n"
+"POT-Creation-Date: 2018-05-30 13:28+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: 秘湯 <xwhhsprings@gmail.com>, 2017\n"
 "Language-Team: Japanese (https://www.transifex.com/python-doc/teams/5390/ja/)\n"
@@ -305,10 +305,11 @@ msgstr "現在のコンテクストのイベントループを取得します。
 #: ../../library/asyncio-eventloops.rst:171
 msgid ""
 "Returns an event loop object implementing the :class:`AbstractEventLoop` "
-"interface."
-msgstr ":class:`AbstractEventLoop` インターフェイスを実装したイベントループオブジェクトを返します。"
+"interface. In case called from coroutine, it returns the currently running "
+"event loop."
+msgstr ""
 
-#: ../../library/asyncio-eventloops.rst:174
+#: ../../library/asyncio-eventloops.rst:175
 msgid ""
 "Raises an exception in case no event loop has been set for the current "
 "context and the current policy does not specify to create one. It must never"
@@ -317,24 +318,24 @@ msgstr ""
 "現在のコンテキストに設定されているイベントループが存在しない場合やイベントループを作成するためのポリシーが指定されていない場合には例外を送出します。\n"
 "``None`` を返すことがあってはなりません。"
 
-#: ../../library/asyncio-eventloops.rst:180
+#: ../../library/asyncio-eventloops.rst:183
 msgid "Set the event loop for the current context to *loop*."
 msgstr "現在のコンテキストにイベントループ *loop* を設定します。"
 
-#: ../../library/asyncio-eventloops.rst:184
+#: ../../library/asyncio-eventloops.rst:187
 msgid ""
 "Create and return a new event loop object according to this policy's rules."
 msgstr "このポリシーのルールに従った新しいイベントループを作成して返します。"
 
-#: ../../library/asyncio-eventloops.rst:187
+#: ../../library/asyncio-eventloops.rst:190
 msgid ""
 "If there's need to set this loop as the event loop for the current context, "
 ":meth:`set_event_loop` must be called explicitly."
 msgstr ""
 "このループを現在のコンテキストのイベントループとして設定する必要がある場合は、:meth:`set_event_loop` "
 "が明示的に呼び出されなくてはなりません。"
 
-#: ../../library/asyncio-eventloops.rst:191
+#: ../../library/asyncio-eventloops.rst:194
 msgid ""
 "The default policy defines context as the current thread, and manages an "
 
8000
"event loop per thread that interacts with :mod:`asyncio`.  If the current "
@@ -343,25 +344,25 @@ msgid ""
 "when called from the main thread, but raises :exc:`RuntimeError` otherwise."
 msgstr ""
 
-#: ../../library/asyncio-eventloops.rst:199
+#: ../../library/asyncio-eventloops.rst:202
 msgid "Access to the global loop policy"
 msgstr "グローバルループポリシーへのアクセス"
 
-#: ../../library/asyncio-eventloops.rst:203
+#: ../../library/asyncio-eventloops.rst:206
 msgid "Get the current event loop policy."
 msgstr "現在のイベントループポリシーを取得します。"
 
-#: ../../library/asyncio-eventloops.rst:207
+#: ../../library/asyncio-eventloops.rst:210
 msgid ""
 "Set the current event loop policy. If *policy* is ``None``, the default "
 "policy is restored."
 msgstr "現在のイベントループポリシーを設定します。*policy* が ``None`` の場合、デフォルトポリシーが復元されます。"
 
-#: ../../library/asyncio-eventloops.rst:212
+#: ../../library/asyncio-eventloops.rst:215
 msgid "Customizing the event loop policy"
 msgstr ""
 
-#: ../../library/asyncio-eventloops.rst:214
+#: ../../library/asyncio-eventloops.rst:217
 msgid ""
 "To implement a new event loop policy, it is recommended you subclass the "
 "concrete default event loop policy :class:`DefaultEventLoopPolicy` and "
 
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Python 3.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-01-05 15:01+0000\n"
+"POT-Creation-Date: 2018-05-30 13:28+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: SHIMIZU Taku <shimizu.taku@gmail.com>, 2018\n"
 "Language-Team: Japanese (https://www.transifex.com/python-doc/teams/5390/ja/)\n"
@@ -717,52 +717,58 @@ msgstr ""
 " *されません*。 (This is to prevent the cancellation of one child to cause other "
 "children to be cancelled.)"
 
-#: ../../library/asyncio-task.rst:573
+#: ../../library/asyncio-task.rst:571
+msgid ""
+"If the *gather* itself is cancelled, the cancellation is propagated "
+"regardless of *return_exceptions*."
+msgstr ""
+
+#: ../../library/asyncio-task.rst:577
 msgid ""
 "Return ``True`` if *obj* is a :ref:`coroutine object <coroutine>`, which may"
 " be based on a generator or an :keyword:`async def` coroutine."
 msgstr ""
 
-#: ../../library/asyncio-task.rst:578
+#: ../../library/asyncio-task.rst:582
 msgid ""
 "Return ``True`` if *func* is determined to be a :ref:`coroutine function "
 "<coroutine>`, which may be a decorated generator function or an "
 ":keyword:`async def` function."
 msgstr ""
 
-#: ../../library/asyncio-task.rst:584
+#: ../../library/asyncio-task.rst:588
 msgid "Submit a :ref:`coroutine object <coroutine>` to a given event loop."
 msgstr ""
 
-#: ../../library/asyncio-task.rst:586
+#: ../../library/asyncio-task.rst:590
 msgid "Return a :class:`concurrent.futures.Future` to access the result."
 msgstr ""
 
-#: ../../library/asyncio-task.rst:588
+#: ../../library/asyncio-task.rst:592
 msgid ""
 "This function is meant to be called from a different thread than the one "
 "where the event loop is running. Usage::"
 msgstr ""
 
-#: ../../library/asyncio-task.rst:598
+#: ../../library/asyncio-task.rst:602
 msgid ""
 "If an exception is raised in the coroutine, the returned future will be "
 "notified. It can also be used to cancel the task in the event loop::"
 msgstr ""
 
-#: ../../library/asyncio-task.rst:611
+#: ../../library/asyncio-task.rst:615
 msgid ""
 "See the :ref:`concurrency and multithreading <asyncio-multithreading>` "
 "section of the documentation."
 msgstr "このドキュメントの :ref:`asyncio-multithreading` 節を参照してください。"
 
-#: ../../library/asyncio-task.rst:616
+#: ../../library/asyncio-task.rst:620
 msgid ""
 "Unlike other functions from the module, :func:`run_coroutine_threadsafe` "
 "requires the *loop* argument to be passed explicitly."
 msgstr ""
 
-#: ../../library/asyncio-task.rst:624
+#: ../../library/asyncio-task.rst:628
 msgid ""
 "Create a :ref:`coroutine <coroutine>` that completes after a given time (in "
 "seconds).  If *result* is provided, it is produced to the caller when the "
@@ -771,29 +777,29 @@ msgstr ""
 "与えられた時間 (秒) 後に完了する :ref:`コルーチン <coroutine>` を作成します。*result* "
 "が与えられた場合、コルーチン完了時にそれが呼び出し元に返されます。"
 
-#: ../../library/asyncio-task.rst:628
+#: ../../library/asyncio-task.rst:632
 msgid ""
 "The resolution of the sleep depends on the :ref:`granularity of the event "
 "loop <asyncio-delayed-calls>`."
 msgstr "スリープの分解能は :ref:`イベントループの粒度 <asyncio-delayed-calls>` に依存します。"
 
-#: ../../library/asyncio-task.rst:631 ../../library/asyncio-task.rst:695
+#: ../../library/asyncio-task.rst:635 ../../library/asyncio-task.rst:699
 msgid "This function is a :ref:`coroutine <coroutine>`."
 msgstr "この関数は :ref:`コルーチン <coroutine>` です。"
 
-#: ../../library/asyncio-task.rst:635
+#: ../../library/asyncio-task.rst:639
 msgid "Wait for a future, shielding it from cancellation."
 msgstr "フューチャを待機しキャンセル処理から保護します。"
 
-#: ../../library/asyncio-task.rst:637
+#: ../../library/asyncio-task.rst:641
 msgid "The statement::"
 msgstr "命令文::"
 
-#: ../../library/asyncio-task.rst:641
+#: ../../library/asyncio-task.rst:645
 msgid "is exactly equivalent to the statement::"
 msgstr "上の文は以下と完全に等価です::"
 
-#: ../../library/asyncio-task.rst:645
+#: ../../library/asyncio-task.rst:649
 msgid ""
 "*except* that if the coroutine containing it is cancelled, the task running "
 "in ``something()`` is not cancelled.  From the point of view of "
@@ -808,15 +814,15 @@ msgstr ""
 ":exc:`~concurrent.futures.CancelledError` を送出します。注意: ``something()`` "
 "が他の理由でキャンセルされた場合は ``shield()`` でも保護できません。"
 
-#: ../../library/asyncio-task.rst:652
+#: ../../library/asyncio-task.rst:656
 msgid ""
 "If you want to completely ignore cancellation (not recommended) you can "
 "combine ``shield()`` with a try/except clause, as follows::"
 msgstr ""
 "完全にキャンセル処理を無視させたい場合 (推奨はしません) は、以下のように ``shield()`` と try/except "
 "節の組み合わせで行うことができます::"
 
-#: ../../library/asyncio-task.rst:664
+#: ../../library/asyncio-task.rst:668
 msgid ""
 "Wait for the Futures and coroutine objects given by the sequence *futures* "
 "to complete.  Coroutines will be wrapped in Tasks. Returns two sets of "
@@ -825,11 +831,11 @@ msgstr ""
 "シーケンス *futures* で与えられたフューチャおよびコルーチンオブジェクトが完了するまで待機します。コルーチンはタスクでラップされます。戻り値は"
 " (完了した :class:`Future`, 未完の :class:`Future`) の 2 個の集合になります。"
 
-#: ../../library/asyncio-task.rst:668
+#: ../../library/asyncio-task.rst:672
 msgid "The sequence *futures* must not be empty."
 msgstr "シーケンス *futures* は空であってはなりません。"
 
-#: ../../library/asyncio-task.rst:670
+#: ../../library/asyncio-task.rst:674
 msgid ""
 "*timeout* can be used to control the maximum number of seconds to wait "
 "before returning.  *timeout* can be an int or float.  If *timeout* is not "
@@ -838,35 +844,35 @@ msgstr ""
 "*timeout* で結果を返すまで待機する最大秒数を指定できます。*timeout* は整数か浮動小数点数をとります。*timeout* "
 "が指定されないか ``None`` の場合、無期限に待機します。"
 
-#: ../../library/asyncio-task.rst:674
+#: ../../library/asyncio-task.rst:678
 msgid ""
 "*return_when* indicates when this function should return.  It must be one of"
 " the following constants of the :mod:`concurrent.futures` module:"
 msgstr ""
 "*return_when* でこの関数がいつ結果を返すか指定します。指定できる値は以下の :mod:`concurrent.futures` "
 "モジュール定数のどれか一つです:"
 
-#: ../../library/asyncio-task.rst:680
+#: ../../library/asyncio-task.rst:684
 msgid "Constant"
 msgstr "定数"
 
-#: ../../library/asyncio-task.rst:680
+#: ../../library/asyncio-task.rst:684
 msgid "Description"
 msgstr "説明"
 
-#: ../../library/asyncio-task.rst:682
+#: ../../library/asyncio-task.rst:686
 msgid ":const:`FIRST_COMPLETED`"
 msgstr ":const:`FIRST_COMPLETED`"
 
-#: ../../library/asyncio-task.rst:682
+#: ../../library/asyncio-task.rst:686
 msgid "The function will return when any future finishes or is cancelled."
 msgstr "いずれかのフューチャが終了したかキャンセルされたときに返します。"
 
-#: ../../library/asyncio-task.rst:685
+#: ../../library/asyncio-task.rst:689
 msgid ":const:`FIRST_EXCEPTION`"
 msgstr ":const:`FIRST_EXCEPTION`"
 
-#: ../../library/asyncio-task.rst:685
+#: ../../library/asyncio-task.rst:689
 msgid ""
 "The function will return when any future finishes by raising an exception.  "
 "If no future raises an exception then it is equivalent to "
@@ -875,27 +881,27 @@ msgstr ""
 "いずれかのフューチャが例外の送出で終了した場合に返します。例外を送出したフューチャがない場合は、:const:`ALL_COMPLETED` "
 "と等価になります。"
 
-#: ../../library/asyncio-task.rst:691
+#: ../../library/asyncio-task.rst:695
 msgid ":const:`ALL_COMPLETED`"
 msgstr ":const:`ALL_COMPLETED`"
 
-#: ../../library/asyncio-task.rst:691
+#: ../../library/asyncio-task.rst:695
 msgid "The function will return when all futures finish or are cancelled."
 msgstr "すべてのフューチャが終了したかキャンセルされたときに返します。"
 
-#: ../../library/asyncio-task.rst:697
+#: ../../library/asyncio-task.rst:701
 msgid "Usage::"
 msgstr "使い方::"
 
-#: ../../library/asyncio-task.rst:703
+#: ../../library/asyncio-task.rst:707
 msgid ""
 "This does not raise :exc:`asyncio.TimeoutError`! Futures that aren't done "
 "when the timeout occurs are returned in the second set."
 msgstr ""
 "これは :exc:`asyncio.TimeoutError` "
 "を送出しません。タイムアウトが発生して完了しなかったフューチャは戻り値の後者の集合に含まれます。"
 
-#: ../../library/asyncio-task.rst:709
+#: ../../library/asyncio-task.rst:713
 msgid ""
 "Wait for the single :class:`Future` or :ref:`coroutine object <coroutine>` "
 "to complete with timeout. If *timeout* is ``None``, block until the future "
@@ -904,11 +910,11 @@ msgstr ""
 "単一の :class:`Future` または :ref:`コルーチンオブジェクト <coroutine>` を期限付きで待機します。*timeout*"
 " が ``None`` の場合、フューチャが完了するまでブロックします。"
 
-#: ../../library/asyncio-task.rst:713
+#: ../../library/asyncio-task.rst:717
 msgid "Coroutine will be wrapped in :class:`Task`."
 msgstr "コルーチンは :class:`Task` でラップされます。"
 
-#: ../../library/asyncio-task.rst:715
+#: ../../library/asyncio-task.rst:719
 msgid ""
 "Returns result of the Future or coroutine.  When a timeout occurs, it "
 "cancels the task and raises :exc:`asyncio.TimeoutError`. To avoid the task "
@@ -917,14 +923,14 @@ msgstr ""
 "フューチャあるいはコルーチンの結果を返します。タイムアウトが発生した場合、タスクをキャンセルし :exc:`asyncio.TimeoutError` "
 "を送出します。タスクのキャンセルを抑止したい場合は :func:`shield` でラップしてください。"
 
-#: ../../library/asyncio-task.rst:719
+#: ../../library/asyncio-task.rst:723
 msgid "If the wait is cancelled, the future *fut* is also cancelled."
 msgstr "待機が中止された場合 *fut* も中止されます。"
 
-#: ../../library/asyncio-task.rst:721
+#: ../../library/asyncio-task.rst:725
 msgid "This function is a :ref:`coroutine <coroutine>`, usage::"
 msgstr "この関数は :ref:`コルーチン <coroutine>` です。使用法::"
 
-#: ../../library/asyncio-task.rst:725
+#: ../../library/asyncio-task.rst:729
 msgid "If the wait is cancelled, the future *fut* is now also cancelled."
 msgstr "待機が中止された場合 *fut* も中止されます。"
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Python 3.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-05-21 13:20+0900\n"
+"POT-Creation-Date: 2018-05-30 13:28+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: mtb_beta <mtb.toya0403@gmail.com>, 2018\n"
 "Language-Team: Japanese (https://www.transifex.com/python-doc/teams/5390/ja/)\n"
@@ -1029,8 +1029,8 @@ msgstr ""
 #: ../../whatsnew/3.6.rst:820
 msgid ""
 "The :func:`~asyncio.get_event_loop` function has been changed to always "
-"return the currently running loop when called from couroutines and "
-"callbacks. (Contributed by Yury Selivanov in :issue:`28613`.)"
+"return the currently running loop when called from coroutines and callbacks."
+" (Contributed by Yury Selivanov in :issue:`28613`.)"
 msgstr ""
 
 #: ../../whatsnew/3.6.rst:825