am 6b590746: (-s ours) am 1955bf1b: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '6b590746dfdb3f721dab048a1978a5630da9e5eb': Import translations. DO NOT MERGE
This commit is contained in: