Import translations. DO NOT MERGE am: 9c57679b0e
-s ours
am: ec30b691de
-s ours
* commit 'ec30b691de360ebc0030e799dd5f42ed90720ada':
Import translations. DO NOT MERGE
This commit is contained in: