am 0aa290a7: (-s ours) am 1e2fad8b: (-s ours) Import translations. DO NOT MERGE

* commit '0aa290a769995107410e4e49ce7fb2770c91457d':
  Import translations. DO NOT MERGE