am 87210ee9: (-s ours) am b2856041: (-s ours) am 81e62eb1: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '87210ee9621829786516f52fc45dfeabd5daec0a': Import translations. DO NOT MERGE
This commit is contained in: