am 23edefc6: Import translations. DO NOT MERGE

* commit '23edefc6c6d12dd84ff6b7bd8694b50abf0cc158':
  Import translations. DO NOT MERGE