am d35644e4: (-s ours) am 15ecba0f: (-s ours) Import translations. DO NOT MERGE

* commit 'd35644e4f80a479659fd734db866a95c247496e3':
  Import translations. DO NOT MERGE