am fa42c383: (-s ours) am 5d5664c3: (-s ours) Import translations. DO NOT MERGE

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