Import translations. DO NOT MERGE am: 7efa356849
-s ours
am: 7b54a8154e
-s ours
* commit '7b54a8154e4b1926f07f7ac37cf9997efc4134ca':
Import translations. DO NOT MERGE
This commit is contained in: