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

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