am 41cbaa16: (-s ours) am 32531e01: (-s ours) am 9ef49eca: (-s ours) Import translations. DO NOT MERGE

* commit '41cbaa164af1b83ccab5496a35c5d16c4dba37d9':
  Import translations. DO NOT MERGE