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

* commit 'f6b609872c3a1dc3cb34e8eb78641df3a9dbc29b':
  Import translations. DO NOT MERGE