am 1a6aa4e7: (-s ours) Import translations. DO NOT MERGE

* commit '1a6aa4e7d8a87adabcfcf705831efb312888bf35':
  Import translations. DO NOT MERGE