Plain Diff
am e4218902: (-s ours) am 57cbbb4f: (-s ours) am c9e9d41b: (-s ours) am 2a014399: (-s ours) am 76556a1b: (-s ours) Import translations. DO NOT MERGE * commit 'e4218902':