am 96c84de4: (-s ours) am d6e08fc4: (-s ours) Import translations. DO NOT MERGE

* commit '96c84de4538703ab8f255357554d6a7f3508f803':
  Import translations. DO NOT MERGE