Import translations. DO NOT MERGE am: 10a758b8b7
-s ours
am: 3abb7c0351
-s ours
* commit '3abb7c035126e7150d90c45c18c155547b3e2a66':
Import translations. DO NOT MERGE
This commit is contained in: