Import translations. DO NOT MERGE am: d7fdd2c42f  -s ours
am: e06a6699a2  -s ours

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