am 20bfdeb1: (-s ours) Import translations. DO NOT MERGE

* commit '20bfdeb12dd13c9a96da9bafbfb130f8ba338b46':
  Import translations. DO NOT MERGE