Import translations. DO NOT MERGE am: 0873f057db
-s ours
am: 83f0595b6e
-s ours
* commit '83f0595b6ec645e033c9638e358bc9d4fe4b3010':
Import translations. DO NOT MERGE
This commit is contained in: