Import translations. DO NOT MERGE am: a3de5f0  -s ours
am: ee2bd1b  -s ours

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