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

* commit '3be0912b34cb754ebdb80c07e0d7de062b9b4978':
  Import translations. DO NOT MERGE