am 83e9187d: (-s ours) Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-dev

* commit '83e9187d158b891459afc182c675dca56c7dcd93':
  Revert "Import translations. DO NOT MERGE"