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

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