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