am 652925d7: (-s ours) am 67e21b4b: am 8313b3a5: Import translations. DO NOT MERGE

* commit '652925d7e17d9aafc64cca6bd26541461de29f69':