am 61677b41: (-s ours) am 1bcebeae: (-s ours) Import translations. DO NOT MERGE

* commit '61677b41eb12afd0d6950771d5a18f1d33e339be':
  Import translations. DO NOT MERGE