am ab74a871: (-s ours) am acf198a7: (-s ours) am 2d546b77: (-s ours) Import translations. DO NOT MERGE
* commit 'ab74a871817767ac861fc7ae30ebb16f406f3109':
This commit is contained in: