am 996b142f: (-s ours) am 3ab7fb85: Import translations. DO NOT MERGE

* commit '996b142f76d5da131da9b27f02438020d21b1e14':
  Import translations. DO NOT MERGE