am 1ed1c399: Merge "Import translations. DO NOT MERGE" into jb-dev

* commit '1ed1c399939e035707dd6da7057570a8da96394e':
  Import translations. DO NOT MERGE