am 3ef1c1fc: (-s ours) am a61caf47: (-s ours) Import translations. DO NOT MERGE

* commit '3ef1c1fcd4aebdba5741145cdb98214bcc56221b':
  Import translations. DO NOT MERGE