am ce21c69b: (-s ours) am 253a352f: (-s ours) am 564fb1b8: (-s ours) Import translations. DO NOT MERGE * commit 'ce21c69b': Import translations. DO NOT MERGE