Merge from 3.4

diff --cc Lib/gettext.py
Simple merge

diff --cc Lib/test/test_gettext.py
Simple merge

diff --cc Misc/NEWS
index 15ab72f3d0d2fc2c9bbc5ceb401c9a5335bba91a,4949d664f524cd587ad2eda15ea58da3175c006a..9f60a3e25e9027b9f6411ecddeccb4a2c5958afa
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -37,30 -34,10 +37,30 @@@ Librar
  - Issue #22982: Improve BOM handling when seeking to multiple positions of
    a writable text file.
  
 +- Issue #23464: Removed deprecated asyncio JoinableQueue.
 +
 +- Issue #23529: Limit the size of decompressed data when reading from
 +  GzipFile, BZ2File or LZMAFile.  This defeats denial of service attacks
 +  using compressed bombs (i.e. compressed payloads which decompress to a huge
 +  size).  Patch by Martin Panter and Nikolaus Rath.
 +
 +- Issue #21859: Added Python implementation of io.FileIO.
 +
  - Issue #23865: close() methods in multiple modules now are idempotent and more
-   robust at shutdown. If needs to release multiple resources, they are released
-   even if errors are occured.
+   robust at shutdown. If they need to release multiple resources, all are
+   released even if errors occur.
  
 +- Issue #23400: Raise same exception on both Python 2 and 3 if sem_open is not
 +  available.  Patch by Davin Potts.
 +
 +- Issue #10838: The subprocess now module includes SubprocessError and
 +  TimeoutError in its list of exported names for the users wild enough
 +  to use ``from subprocess import *``.
 +
 +- Issue #23411: Added DefragResult, ParseResult, SplitResult, DefragResultBytes,
 +  ParseResultBytes, and SplitResultBytes to urllib.parse.__all__.
 +  Patch by Martin Panter.
 +
  - Issue #23881: urllib.request.ftpwrapper constructor now closes the socket if
    the FTP connection failed to fix a ResourceWarning.