am b45f1999: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-dev

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