am 680a9d72: (-s ours) Merge "Import translations. DO NOT MERGE"

* commit '680a9d72e3a05733dd83baf22b6a0af7256971c6':
  Import translations. DO NOT MERGE