am 8b56f108: am ce538a42: (-s ours) am ff7300c8: (-s ours) Import translations. DO NOT MERGE

* commit '8b56f108f373fc17ae43aab775c426c147ef3bc8':