am 867531f8: (-s ours) Import translations. DO NOT MERGE

* commit '867531f895c55f4fd8633c8173b686e4ce1f4582':
  Import translations. DO NOT MERGE