am a678d906: (-s ours) am 3aadac7f: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-jetsonic

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