Import translations. DO NOT MERGE am: 6b0b2e4f91  -s ours
am: f824f06181  -s ours

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