am bd5a0579: (-s ours) am 3186c372: (-s ours) Import translations. DO NOT MERGE

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