am 809705c3: (-s ours) am 7bdc151e: Merge "Import translations. DO NOT MERGE" into jb-dev

* commit '809705c33144e66e51ef4a2f17ad8b02eed5cd80':
  Import translations. DO NOT MERGE