am 60331810: (-s ours) am b1fdf6fd: am 75e09c30: am 40129973: (-s ours) Import translations. DO NOT MERGE
* commit '60331810199d15048027140f4d70328625dea13c': Import translations. DO NOT MERGE
This commit is contained in: