Plain Diff
am 4ce453ea: (-s ours) am ea009041: (-s ours) am a41a4083: (-s ours) am 5054aebd: (-s ours) Import translations. DO NOT MERGE * commit '4ce453ea':