am 4ef31143: (-s ours) am 8c6c90ca: (-s ours) am 342a66c8: (-s ours) Import translations. DO NOT MERGE

* commit '4ef3114386a900496053ad4f9a96b08cc41685ff':
  Import translations. DO NOT MERGE