am a4d4df16: Merge "Import translations. DO NOT MERGE" into jb-dev

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