am 9cbc35d4: (-s ours) am 51b9684f: (-s ours) Import translations. DO NOT MERGE

* commit '9cbc35d426b9505187a2291d551a861cdce4f5e9':
  Import translations. DO NOT MERGE