am 024fb4d4: (-s ours) am 9f3e169c: (-s ours) Import translations. DO NOT MERGE

* commit '024fb4d4b803c35b3aad784f6a2d877a7118c3b2':
  Import translations. DO NOT MERGE