am 84c377f5: (-s ours) am 9c861f80: (-s ours) Import translations. DO NOT MERGE

* commit '84c377f51a0995b2f70028df12abb9f98c44e915':
  Import translations. DO NOT MERGE