am d58d91ef: (-s ours) am 2ae0419f: (-s ours) Import translations. DO NOT MERGE

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