am cb168840: Import translations. DO NOT MERGE

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