am 3a61d0f3: (-s ours) am bb3a3312: (-s ours) Import translations. DO NOT MERGE

* commit '3a61d0f30ab549d99c4c5355fa72c842355d573e':
  Import translations. DO NOT MERGE