am 04aee4fb: (-s ours) Import translations. DO NOT MERGE

* commit '04aee4fb961356c3985b174ca4ac6cda15dc1c7e':
  Import translations. DO NOT MERGE