am 3117b930: (-s ours) am 1ab0933a: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '3117b93015ae35c20613c1647096033fb323395d': Import translations. DO NOT MERGE
This commit is contained in: