am bf2e9e65: (-s ours) am 0d928415: (-s ours) Import translations. DO NOT MERGE

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