am 4f365804: (-s ours) Import translations. DO NOT MERGE

* commit '4f365804d4ad4535e2090665716621edadf82057':
  Import translations. DO NOT MERGE