am d010cf12: (-s ours) am 221849b6: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit 'd010cf12c796cf83c760df037916e5572ce55868': Import translations. DO NOT MERGE
This commit is contained in: