am f6f00b14: (-s ours) Merge "Import translations. DO NOT MERGE"

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