am 90eae721: (-s ours) am cc30f068: (-s ours) Import translations. DO NOT MERGE

* commit '90eae721fe81bf43966172aba60c20ff60467bad':
  Import translations. DO NOT MERGE