am 08c62927: (-s ours) am 7b6c66d5: (-s ours) am 077cf819: Import translations. DO NOT MERGE

* commit '08c629277ed48ca9777e3cb9d783299f9cb885c3':