am 1af20cc5: (-s ours) am 554b43a0: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '1af20cc5764a38d0713a292fd63bf6a628f2f5eb': Import translations. DO NOT MERGE
This commit is contained in: