am 2d4887d7: (-s ours) am 0febc0c3: (-s ours) Import translations. DO NOT MERGE

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