Import translations. DO NOT MERGE am: c338bacb59
-s ours
am: 884a8bbe78
-s ours
* commit '884a8bbe7872e8d7aa94f854e4057d2d073cd09a':
Import translations. DO NOT MERGE
This commit is contained in: