am 30a99fe7: (-s ours) am 25dd9480: (-s ours) Import translations. DO NOT MERGE

* commit '30a99fe74bb9898322debd6eaa56eb1a8c456c09':
  Import translations. DO NOT MERGE