am 36a300e1: (-s ours) am e1bc1951: (-s ours) Import translations. DO NOT MERGE

* commit '36a300e140c4cc1f691ae221b853a90a6b148d87':
  Import translations. DO NOT MERGE