am 7a54a07a: (-s ours) am d90a90bc: (-s ours) Import translations. DO NOT MERGE

* commit '7a54a07a0ae4743e8016859c6a28163af487ef9c':
  Import translations. DO NOT MERGE