am 80a603f7: (-s ours) am b178a362: (-s ours) Import translations. DO NOT MERGE

* commit '80a603f77d7df6d742131db7a848f06e0a762569':
  Import translations. DO NOT MERGE