am 12a69237: (-s ours) Import translations. DO NOT MERGE

* commit '12a69237768403efa26ce1214f9495d6e9229ca3':
  Import translations. DO NOT MERGE