am c08ce101: (-s ours) am 50bdac61: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit 'c08ce101e0fc093d1e2e97359dda501cf37d4270': Import translations. DO NOT MERGE
This commit is contained in: