am 6ddeb1d3: (-s ours) am 51fc9bdd: (-s ours) Import translations. DO NOT MERGE

* commit '6ddeb1d31c10a7d82ad9fdece4727846da4dc9fb':
  Import translations. DO NOT MERGE