am d232a3fa: (-s ours) am 60d2ee87: (-s ours) Import translations. DO NOT MERGE

* commit 'd232a3fa5c86f19ccf559bf4dc649d39d3620ca3':