am 518ea705: (-s ours) am 3164190b: am 20a3b8c7: (-s ours) Import translations. DO NOT MERGE

* commit '518ea7056895a68fa82a8074443f8db734180865':