am 7a23b20b: (-s ours) am 9b421970: (-s ours) Import translations. DO NOT MERGE

* commit '7a23b20b0cac3bc7ca7f6ed81cc8ce906271c157':
  Import translations. DO NOT MERGE