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