am 0cfbd5b2: (-s ours) Import translations. DO NOT MERGE

* commit '0cfbd5b2d33e051879e02aebd8d08fc14862be15':
  Import translations. DO NOT MERGE