am 6f54a553: (-s ours) am 5d00ba23: (-s ours) Import translations. DO NOT MERGE

* commit '6f54a5532c43fefcf9b3458cf17a67f3a8f27106':
  Import translations. DO NOT MERGE