am efd1d365: (-s ours) am 7a598057: (-s ours) Import translations. DO NOT MERGE

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