am cc95aedc: (-s ours) am c2175d78: (-s ours) am a52bf201: (-s ours) Import translations. DO NOT MERGE
* commit 'cc95aedca49c204a4b6c25cd3e4682d09d2dcaf6': Import translations. DO NOT MERGE
This commit is contained in: