am 9b85181b: (-s ours) am 15dc8171: (-s ours) Import translations. DO NOT MERGE

* commit '9b85181b09750b238aacc76c90a295a7ea1fa4eb':
  Import translations. DO NOT MERGE