am 26bc3a39: (-s ours) am 31b12739: (-s ours) Import translations. DO NOT MERGE

* commit '26bc3a3947c4e65866be8098d515ddd548d2e30d':
  Import translations. DO NOT MERGE