am 40d4dd84: (-s ours) am 82640f6f: (-s ours) Import translations. DO NOT MERGE

* commit '40d4dd8409f6fcb88dcb19d30eca9e107f147df5':
  Import translations. DO NOT MERGE