am 60d2ee87: (-s ours) Import translations. DO NOT MERGE

* commit '60d2ee878896ccf29f99b825cdbae75182ed41f3':
  Import translations. DO NOT MERGE