am ee8cbc45: (-s ours) am 36eb99ef: (-s ours) Import translations. DO NOT MERGE

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