am fd23c3f1: (-s ours) am d5c6c1cd: (-s ours) am 0a77b1e9: (-s ours) Import translations. DO NOT MERGE
* commit 'fd23c3f1a2e33bde9f1e0312a37f20aafd291d9c':
This commit is contained in: