am be3adf36: (-s ours) am 80a603f7: (-s ours) am b178a362: (-s ours) Import translations. DO NOT MERGE

* commit 'be3adf3673432b03c4002c61a34a2635bd3ee909':