am 29745b3e: (-s ours) am b65ab00e: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '29745b3e': Import translations. DO NOT MERGE