am 6b82b2fc: (-s ours) am 651361ce: (-s ours) am 29dfdb59: (-s ours) Import translations. DO NOT MERGE

* commit '6b82b2fc1d5baa2ac233168ed860ecbac3e0c74e':
  Import translations. DO NOT MERGE