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

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