am 23b816b1: (-s ours) Import translations. DO NOT MERGE

* commit '23b816b1bafee73eee28caca3e2a2915f726bbd9':
  Import translations. DO NOT MERGE