Import translations. DO NOT MERGE
am: ed68e29f93  -s ours

* commit 'ed68e29f93d49eab2c9bc5777853e498be920d68':
  Import translations. DO NOT MERGE