am 5874b8c6: (-s ours) am 85a7c04f: (-s ours) Import translations. DO NOT MERGE

* commit '5874b8c62f10ab7895a63a937f39ea6411f362a2':
  Import translations. DO NOT MERGE