am d68f6f49: (-s ours) am f9f10d03: (-s ours) am 24081d3c: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit 'd68f6f49f0b9c8866325a555e8cfbb2c63dbb828': Import translations. DO NOT MERGE
This commit is contained in: