am d0ed5853: (-s ours) am 397c7aaf: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit 'd0ed585368ccfa2438ffc0fedc9ff48664a2a249': Import translations. DO NOT MERGE
This commit is contained in: