am 2f471180: (-s ours) am 612e3bb4: (-s ours) Import translations. DO NOT MERGE

* commit '2f471180def1d5bc05dae9db7fb8aaae495c1b60':
  Import translations. DO NOT MERGE