am 2c4d6d91: (-s ours) am fd8be467: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '2c4d6d91': Import translations. DO NOT MERGE