am 66838ce1: (-s ours) am cc665090: (-s ours) Import translations. DO NOT MERGE

* commit '66838ce1e80d53fc67e6a2a215cc7d13e28ca060':
  Import translations. DO NOT MERGE