am 87bcd655: (-s ours) am 0ebddf36: Import translations. DO NOT MERGE

* commit '87bcd65507129883cdfdeb62b881530520a78200':
  Import translations. DO NOT MERGE