am ed6a0ca2: (-s ours) am 91baff48: (-s ours) am a2edad16: (-s ours) am 796e3c3f: (-s ours) Import translations. DO NOT MERGE

* commit 'ed6a0ca2f1547a6d1a6a334af1399eaa56c40c1c':