am 22636af2: (-s ours) am ef800067: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '22636af2eec3ea62647ff752d0db456cbbf8e440': Import translations. DO NOT MERGE
This commit is contained in: