am 6d34b698: (-s ours) am 91c54aa8: (-s ours) Import translations. DO NOT MERGE

* commit '6d34b6988b257eb35cd7162d403f6da8114e0b9b':
  Import translations. DO NOT MERGE