am 3a7194e9: (-s ours) am 285c9d82: (-s ours) Import translations. DO NOT MERGE

* commit '3a7194e98e7dd84f49fe3bd1e25807d5599008f2':