am 3d9875f4: (-s ours) Import translations. DO NOT MERGE
automerge: 83c2c04 -s ours
* commit '83c2c049bc090043e9042257ddd1d3cfa5a26f52':
Import translations. DO NOT MERGE
This commit is contained in: