am 87712d44: am a167e65c: Import translations. DO NOT MERGE

* commit '87712d44052e90068f6aa6e021d652b21918e60b':
  Import translations. DO NOT MERGE