am 69083e2a: (-s ours) am 8d256562: (-s ours) am 8e773d9e: (-s ours) Import translations. DO NOT MERGE

* commit '69083e2ac7c924edd662969e4e4b800a80eb0554':
  Import translations. DO NOT MERGE