am 4fa8a9a9: (-s ours) am aaadf294: (-s ours) am 2790a98c: (-s ours) Import translations. DO NOT MERGE

* commit '4fa8a9a9067440dbba64d55614bbc768754ca95d':