am 5ddf003c: Merge "Revert "Import translations. DO NOT MERGE"" into jb-dev

* commit '5ddf003cb2957672038bf1db397422402dce930a':
  Revert "Import translations. DO NOT MERGE"