am 2f888a47: (-s ours) am 9b28d5a0: (-s ours) Import translations. DO NOT MERGE

* commit '2f888a47522f8dcaad3f7ec32274675dd74c1501':
  Import translations. DO NOT MERGE