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

* commit '3bd1ed378f514315c5dcd921652bcc657f119794':