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