am 88adaa72: (-s ours) am 112916b5: (-s ours) Import translations. DO NOT MERGE

* commit '88adaa72a385c3199787ecd3dae826f25d38572d':
  Import translations. DO NOT MERGE