am 68b17a1a: (-s ours) Import translations. DO NOT MERGE

* commit '68b17a1afcf46e3e9df0c061295ef5f0b853c154':
  Import translations. DO NOT MERGE