am d232a3fa: (-s ours) am 60d2ee87: (-s ours) Import translations. DO NOT MERGE
automerge: f513ca2  -s ours

* commit 'f513ca2fa187ffdd099272b12df932f89be4824c':