am 7ca960b7: (-s ours) am a41d7d9c: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '7ca960b7': Import translations. DO NOT MERGE