am 6c7521bb: (-s ours) am 8f571939: (-s ours) am d89ea8c8: (-s ours) Import translations. DO NOT MERGE

* commit '6c7521bb685c9b7b7c36f2077612d4b1a0e808d4':
  Import translations. DO NOT MERGE