Import translations. DO NOT MERGE
am: 32b1629804  -s ours

* commit '32b1629804f29958966f7711a90c5e507c2049c2':
  Import translations. DO NOT MERGE