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

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