Import translations. DO NOT MERGE am: 260d90a102
-s ours
am: 04817defc9
-s ours
* commit '04817defc935af871ec90b971f61d4b31d28c97d':
Import translations. DO NOT MERGE
This commit is contained in: