am bf60728e: (-s ours) am f109f24e: Import translations. DO NOT MERGE

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