Import translations. DO NOT MERGE am: ca1d1d0bbe  -s ours
am: be79130a6b  -s ours

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