am d5c6c1cd: (-s ours) am 0a77b1e9: (-s ours) Import translations. DO NOT MERGE

* commit 'd5c6c1cdf729b9be5f54cdf9716e8e83e94d4629':