am 5660b484: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

* commit '5660b4843ed1471b3b5318b77367dda7960596a1':
  Import translations. DO NOT MERGE