am 6113ce3b: Merge "Import translations. DO NOT MERGE" into jb-dev

* commit '6113ce3be4ba7208bac7d9f0cad7e83104dbc8d3':
  Import translations. DO NOT MERGE