am a0a480ad: (-s ours) am 62acae4f: Merge "Import translations. DO NOT MERGE" into jb-dev

* commit 'a0a480ad0426940328fdaaa593624e37ab40bff0':
  Import translations. DO NOT MERGE