am 17d2bdb6: (-s ours) am a406ec4d: (-s ours) Import translations. DO NOT MERGE

* commit '17d2bdb60adae936c860dc79d52ab8e4e0ed586c':
  Import translations. DO NOT MERGE