am 3597b08a: (-s ours) am ea596c4f: (-s ours) Import translations. DO NOT MERGE

* commit '3597b08a4ec15e90e26a2dac4ff9af843e04a106':
  Import translations. DO NOT MERGE