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

* commit '69a1f6e6a1259d18848d2172b6407fb0fe6f5bc6':
  Import translations. DO NOT MERGE