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

* commit '67634cc81047cc514c120a8449bb97328c05bcc1':
  Import translations. DO NOT MERGE