am bdf28a18: (-s ours) am 0cb57011: (-s ours) Import translations. DO NOT MERGE

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