am 0b911c89: (-s ours) am fe641ddf: (-s ours) Import translations. DO NOT MERGE

* commit '0b911c89f0e8d8a187de056c3708a192c07af589':
  Import translations. DO NOT MERGE