am 78c7429c: (-s ours) am 0cc0c216: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-kermit

* commit '78c7429c2c272084b1753d51911c70f773d3b3e7':
  Import translations. DO NOT MERGE