am bca7e3d1: (-s ours) am cfb389e8: (-s ours) am 597d75ea: (-s ours) Import translations. DO NOT MERGE
* commit 'bca7e3d192dd490ffe6a9aa779213d5e7d105814': Import translations. DO NOT MERGE
This commit is contained in: