am 40d451e4: (-s ours) Import translations. DO NOT MERGE am: 750de1a558  -s ours

* commit '40d451e482b981357014ddd4e0d6d3e186ea4b86':
  Import translations. DO NOT MERGE