Import translations. DO NOT MERGE am: 40831d0  -s ours
am: 896ca5c  -s ours

* commit '896ca5c67360077503aca1fbe3d6f90a0ad160de':
  Import translations. DO NOT MERGE