am a581e070: (-s ours) am fa8c000a: (-s ours) Import translations. DO NOT MERGE

* commit 'a581e070109e23b7103fd93d0952576bb8644048':