am 8e79b911: (-s ours) am a0fa65e9: (-s ours) Import translations. DO NOT MERGE

* commit '8e79b911269e4ed5feb3099ac014f6641a7449f4':
  Import translations. DO NOT MERGE