Import translations. DO NOT MERGE am: 67603ccc01
-s ours
am: ff50dbd224
-s ours
* commit 'ff50dbd22459e984f4aa17a79abf7f26c2936020':
Import translations. DO NOT MERGE
This commit is contained in: