Plain Diff
am d0cf3ddd: (-s ours) am 254bb27b: (-s ours) am 76556a1b: (-s ours) Import translations. DO NOT MERGE * commit 'd0cf3ddd': Import translations. DO NOT MERGE