Import translations. DO NOT MERGE am: 49a9587ade
-s ours am: 1b2a3b18fc
-s ours
am: 649bbf765d
-s ours
* commit '649bbf765d5bed3b0446b165aa01fa1b6500d229':
Import translations. DO NOT MERGE
This commit is contained in: