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

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