am 2c05f595: (-s ours) am 86117ad0: (-s ours) Import translations. DO NOT MERGE

* commit '2c05f5954fb033a1f24432dd8386bda37ea5e816':
  Import translations. DO NOT MERGE