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

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