am e5f3f658: (-s ours) am 192a856d: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit 'e5f3f658': Import translations. DO NOT MERGE