am cc68a36b: (-s ours) am aa218eeb: am e3a87e1f: (-s ours) am d9f2cf37: (-s ours) Import revised translations.  DO NOT MERGE

Merge commit 'cc68a36bd707e1f0b2d0b70301b50e63025e7bc3'

* commit 'cc68a36bd707e1f0b2d0b70301b50e63025e7bc3':