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

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