am c55ca83f: (-s ours) am 7a0c3948: Import translations. DO NOT MERGE

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