am 23ca56fc: (-s ours) am c513608d: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '23ca56fc8d7488d05a47f3dc0dbca41ea4f6853d': Import translations. DO NOT MERGE
This commit is contained in: