am b7104dd0: (-s ours) am e57cc2fd: (-s ours) Import translations. DO NOT MERGE

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