am 7a40e439: (-s ours) am f242aee4: (-s ours) Import translations. DO NOT MERGE

* commit '7a40e4392783bf2e3ee731ea9678e6a0ed764583':
  Import translations. DO NOT MERGE