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