Import translations. DO NOT MERGE
am: 2dad7c686e  -s ours

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