am 58afc354: (-s ours) am 729ad90f: (-s ours) Import translations. DO NOT MERGE

* commit '58afc3547e1b05175153a20d8d340ce3ee97ba7d':
  Import translations. DO NOT MERGE