am f73e7284: (-s ours) am 84126461: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit 'f73e728437629491c61fa9ae6fd5546961005bb9': Import translations. DO NOT MERGE
This commit is contained in: