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

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