am 2d4b4587: (-s ours) Import translations. DO NOT MERGE

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