am 8d697e7f: (-s ours) am f1e0c65e: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '8d697e7fbfddf9fc859851314c4b4634aac58be9': Import translations. DO NOT MERGE
This commit is contained in: