Import translations. DO NOT MERGE am: f99586c789
-s ours am: eb5c74dc48
-s ours
am: 5b82f632d6
-s ours
* commit '5b82f632d646d34fe7f20ed961c0949bc0bcc11c':
Import translations. DO NOT MERGE
This commit is contained in: