am e40dff3d: (-s ours) am c0d5b79c: (-s ours) am 7b5c7e56: (-s ours) am e37e1232: (-s ours) Import translations. DO NOT MERGE
* commit 'e40dff3d186f1000c560fb3ffc169dd2631c8642': Import translations. DO NOT MERGE
This commit is contained in: