am 78ed71c6: (-s ours) am b02410c4: (-s ours) am 13cbe053: (-s ours) Import translations. DO NOT MERGE
* commit '78ed71c68a246d34154a03b7e5661e73dbd97e26':
This commit is contained in: