am 40f84ca0: (-s ours) Import translations. DO NOT MERGE
automerge: 9ab85cf -s ours
* commit '9ab85cf0e01e2a96637c8a786a8df5fc5e0ccc65':
Import translations. DO NOT MERGE
This commit is contained in: