am 78cd8ad5: (-s ours) am 699e129c: (-s ours) Import translations. DO NOT MERGE

* commit '78cd8ad5e787c3a8e07dc698c1d7a89f6ed76f26':
  Import translations. DO NOT MERGE