Import translations. DO NOT MERGE am: 7b9f79bb6e
-s ours
am: 4b87b724eb
-s ours
* commit '4b87b724eba9c368e9b9fc9fa5262b40bb5a2ae4':
Import translations. DO NOT MERGE
This commit is contained in: