Import translations. DO NOT MERGE am: df57be8aef
-s ours
am: bc84451452
-s ours
* commit 'bc844514522870bd3e70bba85a11ea824ff59e5b':
Import translations. DO NOT MERGE
This commit is contained in: