am d7dcc2e7: (-s ours) am 83f4d736: (-s ours) am 564269bf: (-s ours) Import translations. DO NOT MERGE

* commit 'd7dcc2e787371ebcc34672fbe3828b32857e5825':