am 129c8c4d: (-s ours) am 3a3e0de0: (-s ours) Import translations. DO NOT MERGE

* commit '129c8c4d2e5b962575c6ce6b1885432ce1ac943c':
  Import translations. DO NOT MERGE