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

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