am 04ce868a: (-s ours) am 8807b910: (-s ours) Import translations. DO NOT MERGE

* commit '04ce868a7d3af5b8c63ee10cbc3521ca469f3b62':
  Import translations. DO NOT MERGE