am 23f86974: (-s ours) Import translations. DO NOT MERGE

* commit '23f869745ced4628260221db2f18b02cd1dda6a5':
  Import translations. DO NOT MERGE