Plain Diff
am eea98daa: (-s ours) am 78f11bed: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit 'eea98daa': Import translations. DO NOT MERGE