am 2d6e3f90: (-s ours) am cda74a32: (-s ours) Import translations. DO NOT MERGE

* commit '2d6e3f90a4f561535a2edde14771ba22bafa5307':
  Import translations. DO NOT MERGE