Import translations. DO NOT MERGE
am: 10e6197  -s ours

* commit '10e6197f586735dfee4372f15bf9caae4d1042e5':
  Import translations. DO NOT MERGE