Plain Diff
am fce77a24: (-s ours) am 29ab591d: (-s ours) am f75c08de: (-s ours) Import translations. DO NOT MERGE * commit 'fce77a24': Import translations. DO NOT MERGE