am 8c152471: (-s ours) am abdfaed8: (-s ours) am 5a2bb8c0: Import revised translations. DO NOT MERGE
* commit '8c152471853613730429fa9104ad9ff61efa91ec': Import revised translations. DO NOT MERGE
This commit is contained in: