am 35d2cf1c: (-s ours) am b4a027d0: (-s ours) Import translations. DO NOT MERGE

* commit '35d2cf1c0c75342b307fa90f1508741b10169c9f':
  Import translations. DO NOT MERGE