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

* commit '8edf8df8153ab68cd36c0fbfb9b4a287f94de16b':
  Import translations. DO NOT MERGE