Plain Diff
am dd74601e: (-s ours) am 12055197: (-s ours) am ef0fa0e7: (-s ours) am fbbc8f1e: (-s ours) am 58305fc4: (-s ours) Import translations. DO NOT MERGE * commit 'dd74601e':