am c683e91b: (-s ours) am d10da630: (-s ours) am 4aed4235: (-s ours) Import translations. DO NOT MERGE
* commit 'c683e91b14d2e8826ba1d6f81abb8cc70117699f': Import translations. DO NOT MERGE
This commit is contained in: