Import translations. DO NOT MERGE
am: edc2a563e2  -s ours

* commit 'edc2a563e20f65192262fd72aca5d6d5db436082':
  Import translations. DO NOT MERGE