am 4a4e8e70: (-s ours) am 36b5358c: (-s ours) Import translations. DO NOT MERGE

* commit '4a4e8e700a53ac5fe137821de2719605cfe91d29':
  Import translations. DO NOT MERGE