am a1da546b: (-s ours) am 889738c8: (-s ours) am cc665090: (-s ours) Import translations. DO NOT MERGE

* commit 'a1da546b3acc3b6d8cb21d10f2712bc9e7b33587':