am ba0c54f6: (-s ours) am 6689bfb3: (-s ours) am fda0172a: (-s ours) Import translations. DO NOT MERGE

* commit 'ba0c54f61068c42336fa0aa55a8f5a60673b525a':