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

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