am c83f09b4: (-s ours) am 230fb01b: (-s ours) Import translations. DO NOT MERGE

* commit 'c83f09b4f8371c7c1b1d69c491b931959a7889fa':
  Import translations. DO NOT MERGE