am 90c22976: (-s ours) Import translations. DO NOT MERGE

* commit '90c2297645341f347f56b160f06551963c64d039':
  Import translations. DO NOT MERGE