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

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