Import translations. DO NOT MERGE
am: 4487c16e83  -s ours

* commit '4487c16e83ccecd04f41280084906a51d9d209af':
  Import translations. DO NOT MERGE